From 2e268510a721975f647f7e67e8655b30ba600eca Mon Sep 17 00:00:00 2001
From: hodasemi <michaelh.95@t-online.de>
Date: Sun, 9 Mar 2025 08:32:34 +0100
Subject: [PATCH] Get a better look at the whole sky box

---
 examples/simple_window/src/main.rs | 17 ++++++-----------
 skybox/build.rs                    |  3 +++
 skybox/shader/skybox.vert          |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/examples/simple_window/src/main.rs b/examples/simple_window/src/main.rs
index 1bfc2cf..09d950f 100644
--- a/examples/simple_window/src/main.rs
+++ b/examples/simple_window/src/main.rs
@@ -18,7 +18,7 @@ fn main() -> Result<()> {
     world_builder.resources.insert(GameState::default());
 
     // let dir = Path::new("C:/Users/M.Huebner/Downloads/Space Skybox Generator/Export");
-    let dir = Path::new("/home/michaelh/Sync/skybox");
+    let dir = Path::new("/home/michaelh/Sync/skybox_labeled");
     SkyBox::new(
         &mut world_builder,
         [
@@ -47,8 +47,7 @@ fn main() -> Result<()> {
 enum GameState {
     #[default]
     Startup,
-    Loading,
-    Menu,
+
     Game(Game),
 }
 
@@ -58,8 +57,6 @@ impl GameState {
 
         match me {
             GameState::Startup => *me = GameState::Game(Game { start: world.now() }),
-            GameState::Loading => (),
-            GameState::Menu => (),
             GameState::Game(game) => game.update(world)?,
         }
 
@@ -71,8 +68,6 @@ impl EventConsumer for GameState {
     fn event(&mut self, world: &mut World, event: EngineEvent<'_>) -> Result<()> {
         match self {
             GameState::Startup => (),
-            GameState::Loading => (),
-            GameState::Menu => (),
             GameState::Game(game) => game.event(world, event)?,
         }
 
@@ -90,10 +85,10 @@ impl Game {
         let view = world.resources.get_mut::<Scene>().view_mut();
         let camera = view.camera_mut();
 
+        let diff = now.as_secs_f32() - self.start.as_secs_f32();
         camera.set_eye_dir(
-            Matrix3::from_angle_z(Deg((now.as_secs_f32() - self.start.as_secs_f32())
-                * 36.0
-                * 2.0))
+            Matrix3::from_angle_z(Deg(diff * 36.0))
+                * Matrix3::from_angle_x(Deg(diff.sin() * 45.0))
                 * Vector3::unit_y(),
         );
         view.update_buffer()?;
@@ -101,7 +96,7 @@ impl Game {
         Ok(())
     }
 
-    fn event(&mut self, world: &mut World, event: EngineEvent<'_>) -> Result<()> {
+    fn event(&mut self, _world: &mut World, _event: EngineEvent<'_>) -> Result<()> {
         Ok(())
     }
 }
diff --git a/skybox/build.rs b/skybox/build.rs
index 55b785f..33784f4 100644
--- a/skybox/build.rs
+++ b/skybox/build.rs
@@ -31,6 +31,9 @@ fn find_shader_files(path: impl AsRef<Path>) -> Vec<String> {
 }
 
 fn compile_shader(shader_files: &[String]) {
+    println!("cargo:rerun-if-changed=shader/skybox.vert");
+    println!("cargo:rerun-if-changed=shader/skybox.frag");
+
     Command::new("glslangValidator")
         .arg("--help")
         .output()
diff --git a/skybox/shader/skybox.vert b/skybox/shader/skybox.vert
index 20fab41..2f40198 100644
--- a/skybox/shader/skybox.vert
+++ b/skybox/shader/skybox.vert
@@ -19,7 +19,7 @@ void main()
 	out_uvw = in_position;
 
 	// Convert cubemap coordinates into Vulkan coordinate space
-	out_uvw.xy *= -1.0;
+	// out_uvw.xy *= -1.0;
 
 	// Remove translation from view matrix
 	mat4 view_mat = mat4(mat3(globals.view));