[render] minor refactor, wip camera struct

Author: ARessegetesStery

crates/eqx_core/src/util_macros.rs

@@ -1,3 +1,4 @@
+// TODO: remove these. Path concatenation should be done in runtime
 #[macro_export]
 macro_rules! shader_src_from {
     ($path:expr) => {{

crates/eqx_render/src/lib.rs

@@ -1,3 +1,8 @@
+/*!
+This crate `eqx_render` equips more advanced algorithms for rendering.
+Basic rendering facilities are included in `eqx_window`.
+*/
+
 pub fn add(left: u64, right: u64) -> u64 {
     left + right
 }

crates/eqx_window/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 anyhow = "1.0"
 bytemuck = { version = "1.22", features = ["derive"] }
 eqx_core = { path = "../eqx_core", version = "0.1.0" }
-cgmath = "0.18"
+glam = "0.30"
 eqx_app = { path = "../eqx_app", version = "0.1.0" }
 image = { version = "0.25", default-features = false, features = ["png"] }
 log = "0.4"

crates/eqx_window/src/camera.rs

@@ -0,0 +1,28 @@
+pub use glam::{Mat4, Vec3};
+
+pub struct Camera {
+    pub pos: Vec3,
+    pub target: Vec3,
+    pub up: Vec3,
+    pub aspect: f32,
+    pub fov: f32,
+    pub near_clip: f32,
+    pub far_clip: f32,
+}
+
+impl Camera {
+    fn view_projection_matrix(&self) -> Mat4 {
+        #[rustfmt::skip]
+        pub const OPENGL_TO_WGPU_MATRIX: glam::Mat4 = glam::Mat4::from_cols(
+            glam::Vec4::new(1.0, 0.0, 0.0, 0.0),
+            glam::Vec4::new(0.0, 1.0, 0.0, 0.0),
+            glam::Vec4::new(0.0, 0.0, 0.5, 0.0),
+            glam::Vec4::new(0.0, 0.0, 0.5, 1.0),
+        );
+
+        let view = Mat4::look_at_rh(self.pos, self.target, self.up);
+        let projection = Mat4::perspective_rh(self.aspect, self.fov, self.near_clip, self.far_clip);
+
+        OPENGL_TO_WGPU_MATRIX * projection * view
+    }
+}

crates/eqx_window/src/lib.rs

@@ -1,7 +1,13 @@
+/*!
+`eqx_window` provides window creation and basic rendering utilities (camera, texture, light, etc.)
+There is a separate crate `eqx_render` for deeper rendering algorithms
+*/
+
+mod camera;
 mod primitives;
 mod texture;
-mod window;
+mod window_display;
 
 pub mod prelude {
-    pub use crate::window::WindowDisplay;
+    pub use crate::window_display::WindowDisplay;
 }

crates/eqx_window/src/window.rs crates/eqx_window/src/window_display.rscrates/eqx_window/src/window.rs renamed to crates/eqx_window/src/window_display.rs

@@ -1,18 +1,19 @@
+use crate::camera::Camera;
 use crate::primitives::{Vertex, TEST_INDICES, TEST_VERTICES};
 use crate::texture::Texture;
 use eqx_app::prelude::Module;
-use wgpu::util::{BufferInitDescriptor, DeviceExt};
+use eqx_core::shader_src_from;
 
+use glam::Vec3;
+use wgpu::util::{BufferInitDescriptor, DeviceExt};
 use winit::{
     event::*,
     event_loop::EventLoop,
     keyboard::{KeyCode, PhysicalKey},
+    window::Window as WInitWindow,
     window::WindowBuilder,
 };
 
-use eqx_core::shader_src_from;
-use winit::window::Window as WInitWindow;
-
 const VS_MAIN: &str = "vs_main";
 const FS_MAIN: &str = "fs_main";
 
@@ -27,6 +28,7 @@ struct State<'a> {
     vertex_buffer: wgpu::Buffer,
     index_buffer: wgpu::Buffer,
     texture_bind_group: wgpu::BindGroup,
+    camera: Camera,
 }
 
 impl<'a> State<'a> {
@@ -189,6 +191,16 @@ impl<'a> State<'a> {
             usage: wgpu::BufferUsages::INDEX,
         });
 
+        let camera = Camera {
+            pos: Vec3::new(0.0, 1.0, 2.0),
+            target: Vec3::new(0.0, 0.0, 0.0),
+            up: Vec3::new(0.0, 1.0, 0.0),
+            aspect: config.width as f32 / config.height as f32,
+            fov: 45.0,
+            near_clip: 0.1,
+            far_clip: 100.0,
+        };
+
         Self {
             surface,
             device,
@@ -200,6 +212,7 @@ impl<'a> State<'a> {
             vertex_buffer,
             index_buffer,
             texture_bind_group,
+            camera,
         }
     }