Merge pull request #99 from AryanpurTech/v0.7-Camera-Fix

v0.7 Camera Fix

Author: ElhamAryanpur

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.7.1] - 2025-04-01
+
+### Bug Fixes
+
+- The camera target being inaccurately set ([5062995](https://github.com/AryanpurTech/BlueEngine/commit/5062995f72e7479a7055131826ab4427647936fc))
+- Camera aspect ratio fix ([09302c7](https://github.com/AryanpurTech/BlueEngine/commit/09302c7a58be3ccb3ea7d9784a62af51fcecfd69))
+
+### Miscellaneous Tasks
+
+- Updated version numbers ([d49b531](https://github.com/AryanpurTech/BlueEngine/commit/d49b5312c6fa21eadef4d3acef8bbbc1e5753525))
+
 ## [0.7.0] - 2025-03-31
 
 ### Bug Fixes

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "blue_engine"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["Elham Aryanpur <elhamaryanpur5@gmail.com>"]
 edition = "2024"
 description = "General-Purpose, Easy-to-use, Fast, and Portable graphics engine"
@@ -33,12 +33,12 @@ android_game_activity = [
 u32 = ["blue_engine_core?/u32", "blue_engine_dynamic?/u32"]
 
 [dependencies]
-blue_engine_core = { version = "0.7.0", optional = true }
+blue_engine_core = { version = "0.7.1", optional = true }
 # blue_engine_core = { path = "crates/blue_engine_core", optional = true }
 
 # Wasm does not support dynamic linking.
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-blue_engine_dynamic = { version = "0.7.0", optional = true }
+blue_engine_dynamic = { version = "0.7.1", optional = true }
 # blue_engine_dynamic = { path = "crates/blue_engine_dynamic", optional = true }
 
 # ========== EXAMPLES ========== #

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "blue_engine_core"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["Elham Aryanpur <elhamaryanpur5@gmail.com>"]
 edition = "2024"
 description = "USE blue_engine THIS IS FOR INTERNAL USE"

crates/blue_engine_core/Cargo.toml

@@ -6,7 +6,7 @@
 
 use super::default_resources::OPENGL_TO_WGPU_MATRIX;
 use crate::{
-    Matrix4, UniformBuffers,
+    Matrix4, UniformBuffers, Vector2,
     prelude::{Renderer, Vector3},
 };
 use winit::dpi::PhysicalSize;
@@ -41,7 +41,7 @@ pub struct Camera {
     /// The up vector of the camera. This defines the elevation of the camera
     pub up: Vector3,
     /// The resolution of the camera view
-    pub resolution: (f32, f32), //maybe this should be a Vector2i
+    pub resolution: Vector2,
     /// The projection of the camera
     pub projection: Projection,
     /// The closest view of camera
@@ -54,8 +54,6 @@ pub struct Camera {
     pub(crate) changed: bool,
     /// The uniform data of the camera to be sent to the gpu
     pub uniform_data: UniformBuffers,
-    /// The position and target of the camera
-    pub(crate) add_position_and_target: bool,
 }
 unsafe impl Send for Camera {}
 unsafe impl Sync for Camera {}
@@ -84,9 +82,9 @@ impl Camera {
 
         let mut camera = Self {
             position: Vector3::new(0.0, 0.0, 3.0),
-            target: Vector3::new(0.0, 0.0, -1.0),
+            target: Vector3::new(0.0, 0.0, 0.0),
             up: Vector3::new(0.0, 1.0, 0.0),
-            resolution: (window_size.width as f32, window_size.height as f32),
+            resolution: Vector2::new(window_size.width as f32, window_size.height as f32),
             projection: crate::Projection::Perspective {
                 fov: 70f32 * (std::f32::consts::PI / 180f32),
             },
@@ -95,13 +93,39 @@ impl Camera {
             view_data: Matrix4::IDENTITY,
             changed: true,
             uniform_data: camera_uniform.0,
-            add_position_and_target: false,
         };
         camera.build_view_projection_matrix();
 
         camera
     }
 
+    /// Builds a view matrix for camera projection
+    pub fn build_view_matrix(&self) -> Matrix4 {
+        Matrix4::look_at_rh(self.position, self.target, self.up)
+    }
+
+    /// Builds a projection matrix for camera
+    pub fn build_projection_matrix(&self) -> Matrix4 {
+        let aspect = self.resolution.x / self.resolution.y;
+
+        match self.projection {
+            crate::Projection::Perspective { fov } => {
+                Matrix4::perspective_rh(fov, aspect, self.near, self.far)
+            }
+            crate::Projection::Orthographic { zoom } => {
+                let width = zoom;
+                let height = width / aspect;
+
+                let left = width * -0.5;
+                let right = width * 0.5;
+                let bottom = height * -0.5;
+                let top = height * 0.5;
+
+                Matrix4::orthographic_rh(left, right, bottom, top, self.near, self.far)
+            }
+        }
+    }
+
     /// Updates the view uniform matrix that decides how camera works
     pub fn build_view_projection_matrix(&mut self) {
         let view = self.build_view_matrix();
@@ -115,16 +139,42 @@ impl Camera {
         let view = self.build_view_matrix();
         let ortho = Matrix4::orthographic_rh(
             0f32,
-            self.resolution.0,
+            self.resolution.x,
             0f32,
-            self.resolution.1,
+            self.resolution.y,
             self.near,
             self.far,
         );
         self.view_data = ortho * view;
         self.changed = true;
     }
 
+    /// This builds a uniform buffer data from camera view data that is sent to the GPU in next frame
+    pub fn update_view_projection(&mut self, renderer: &mut Renderer) {
+        if self.changed {
+            let updated_buffer = renderer
+                .build_uniform_buffer(&[renderer
+                    .build_uniform_buffer_part("Camera Uniform", self.camera_uniform_buffer())])
+                .0;
+            self.uniform_data = updated_buffer;
+            self.changed = false;
+        }
+    }
+
+    /// This builds a uniform buffer data from camera view data that is sent to the GPU in next frame, and returns the bindgroup
+    pub fn update_view_projection_and_return(
+        &mut self,
+        renderer: &mut Renderer,
+    ) -> crate::UniformBuffers {
+        let updated_buffer = renderer
+            .build_uniform_buffer(&[
+                renderer.build_uniform_buffer_part("Camera Uniform", self.camera_uniform_buffer())
+            ])
+            .0;
+
+        updated_buffer
+    }
+
     /// Returns a matrix uniform buffer from camera data that can be sent to GPU
     pub fn camera_uniform_buffer(&self) -> Matrix4 {
         self.view_data
@@ -162,7 +212,7 @@ impl Camera {
 
     /// Sets the aspect ratio of the camera
     pub fn set_resolution(&mut self, window_size: PhysicalSize<u32>) {
-        self.resolution = (window_size.width as f32, window_size.height as f32);
+        self.resolution = Vector2::new(window_size.width as f32, window_size.height as f32);
         self.build_view_projection_matrix();
     }
 
@@ -171,72 +221,6 @@ impl Camera {
         self.projection = projection;
         self.build_view_projection_matrix();
     }
-
-    /// Enables adding position and target for the view target
-    pub fn add_position_and_target(&mut self, enable: bool) {
-        self.add_position_and_target = enable;
-    }
-
-    /// This builds a uniform buffer data from camera view data that is sent to the GPU in next frame
-    pub fn update_view_projection(&mut self, renderer: &mut Renderer) {
-        if self.changed {
-            let updated_buffer = renderer
-                .build_uniform_buffer(&[renderer
-                    .build_uniform_buffer_part("Camera Uniform", self.camera_uniform_buffer())])
-                .0;
-            self.uniform_data = updated_buffer;
-            self.changed = false;
-        }
-    }
-
-    /// This builds a uniform buffer data from camera view data that is sent to the GPU in next frame, and returns the bindgroup
-    pub fn update_view_projection_and_return(
-        &mut self,
-        renderer: &mut Renderer,
-    ) -> crate::UniformBuffers {
-        let updated_buffer = renderer
-            .build_uniform_buffer(&[
-                renderer.build_uniform_buffer_part("Camera Uniform", self.camera_uniform_buffer())
-            ])
-            .0;
-
-        updated_buffer
-    }
-
-    /// Builds a view matrix for camera projection
-    pub fn build_view_matrix(&self) -> Matrix4 {
-        Matrix4::look_at_rh(
-            self.position.into(),
-            if self.add_position_and_target {
-                (self.position + self.target).into()
-            } else {
-                self.target.into()
-            },
-            self.up.into(),
-        )
-    }
-
-    /// Builds a projection matrix for camera
-    pub fn build_projection_matrix(&self) -> Matrix4 {
-        let aspect = self.resolution.0 / self.resolution.1;
-
-        match self.projection {
-            crate::Projection::Perspective { fov } => {
-                Matrix4::perspective_rh(aspect, fov, self.near, self.far)
-            }
-            crate::Projection::Orthographic { zoom } => {
-                let width = zoom;
-                let height = width / aspect;
-
-                let left = width * -0.5;
-                let right = width * 0.5;
-                let bottom = height * -0.5;
-                let top = height * 0.5;
-
-                Matrix4::orthographic_rh(left, right, bottom, top, self.near, self.far)
-            }
-        }
-    }
 }
 
 impl CameraContainer {
@@ -311,12 +295,6 @@ impl CameraContainer {
             main_camera.set_projection(projection);
         }
     }
-    /// Enables adding position and target for the view target
-    pub fn add_position_and_target(&mut self, enable: bool) {
-        if let Some(main_camera) = self.cameras.get_mut("main") {
-            main_camera.add_position_and_target(enable);
-        }
-    }
     /// This builds a uniform buffer data from camera view data that is sent to the GPU in next frame
     pub fn update_view_projection(&mut self, renderer: &mut Renderer) {
         if let Some(main_camera) = self.cameras.get_mut("main") {

crates/blue_engine_core/src/utils/camera.rs

@@ -1,6 +1,6 @@
 [package]
 name = "blue_engine_dynamic"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["Elham Aryanpur <elhamaryanpur5@gmail.com>"]
 edition = "2024"
 description = "USE blue_engine THIS IS FOR INTERNAL USE"
@@ -20,5 +20,5 @@ android_game_activity = ["blue_engine_core/android_game_activity"]
 u32 = ["blue_engine_core/u32"]
 
 [dependencies]
-blue_engine_core = { version = "0.7.0" }
+blue_engine_core = { version = "0.7.1" }
 # blue_engine_core = { path = "../blue_engine_core" }

crates/blue_engine_dynamic/Cargo.toml

@@ -3,8 +3,6 @@ use blue_engine::{CameraContainer, InputHelper, ObjectStorage, Vector3, winit};
 
 impl FlyCamera {
     pub fn new(camera: &mut CameraContainer) -> Self {
-        camera.add_position_and_target(true);
-
         Self {
             camera_right: Self::update_vertices(camera),
             yaw: -90f32,
@@ -117,6 +115,7 @@ impl blue_engine::Signal for FlyCamera {
                 + (camera.get("main").unwrap().target * camera_speed);
 
             camera.set_position([result.x, result.y, result.z]);
+            camera.set_target([result.x, result.y, result.z]);
         }
 
         // S
@@ -125,6 +124,7 @@ impl blue_engine::Signal for FlyCamera {
                 - (camera.get("main").unwrap().target * camera_speed);
 
             camera.set_position([result.x, result.y, result.z]);
+            camera.set_target([result.x, result.y, result.z]);
         }
         // A
         if input.key_held(blue_engine::KeyCode::KeyA) {
@@ -133,6 +133,7 @@ impl blue_engine::Signal for FlyCamera {
             let result = camera_pos - (self.camera_right * camera_speed);
 
             camera.set_position([result.x, result.y, result.z]);
+            camera.set_target([result.x, result.y, result.z]);
         }
         // D
         if input.key_held(blue_engine::KeyCode::KeyD) {
@@ -141,6 +142,7 @@ impl blue_engine::Signal for FlyCamera {
             let result = camera_pos + (self.camera_right * camera_speed);
 
             camera.set_position([result.x, result.y, result.z]);
+            camera.set_target([result.x, result.y, result.z]);
         }
     }
 }

crates/blue_engine_utilities/src/definitions/flycamera.rs

@@ -5,7 +5,6 @@
 */
 
 use blue_engine::{
-    Vector3,
     prelude::{Engine, ObjectSettings, ShaderSettings},
     primitive_shapes::square,
 };
@@ -33,13 +32,13 @@ fn main() {
     );
 
     let radius = 2f32;
-    let start = std::time::SystemTime::now();
+    let start = std::time::Instant::now();
 
     engine
         .update_loop(move |_, _, _, _, camera, _| {
-            let camx = start.elapsed().unwrap().as_secs_f32().sin() * radius;
-            let camz = start.elapsed().unwrap().as_secs_f32().cos() * radius;
-            camera.set_position(Vector3::new(camx, 0.0, camz));
+            let camx = start.elapsed().as_secs_f32().sin() * radius;
+            let camz = start.elapsed().as_secs_f32().cos() * radius;
+            camera.set_position([camx, 0.0, camz]);
         })
         .expect("Error during update loop");
 }