Move examples to glam

Author: LegNeato

crates/optix/examples/ex03_window/Cargo.toml

@@ -13,3 +13,4 @@ anyhow = "1.0.44"
 glfw = "0.42.0"
 gl = "0.14.0"
 num-traits = "0.2.14"
+glam = { version = "0.30", features = ["bytemuck"] }

crates/optix/examples/ex03_window/src/gl_util.rs

@@ -2,7 +2,7 @@ use gl;
 use gl::types::{GLchar, GLenum, GLint, GLsizeiptr, GLuint, GLvoid};
 use std::ffi::{CStr, CString};
 
-use crate::vector::*;
+use glam::Vec4;
 
 pub struct Shader {
     id: GLuint,
@@ -516,7 +516,7 @@ impl FullscreenQuad {
         self.vertex_array.unbind();
     }
 
-    pub fn update_texture(&self, data: &[V4f32]) {
+    pub fn update_texture(&self, data: &[Vec4]) {
         unsafe {
             gl::BindTexture(gl::TEXTURE_2D, self.texture_id);
             gl::TexSubImage2D(

crates/optix/examples/ex03_window/src/main.rs

@@ -3,8 +3,7 @@
 mod renderer;
 use renderer::Renderer;
 
-mod vector;
-pub use vector::*;
+use glam::{IVec2, Vec4};
 mod gl_util;
 use gl_util::FullscreenQuad;
 use glfw::{Action, Context, Key};
@@ -42,7 +41,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let mut fsq = FullscreenQuad::new(width, height).unwrap();
 
-    let mut image_data = vec![v4f32(0.0, 0.0, 0.0, 0.0); (width * height) as usize];
+    let mut image_data = vec![Vec4::new(0.0, 0.0, 0.0, 0.0); (width * height) as usize];
 
     unsafe {
         gl::Viewport(0, 0, fb_width, fb_height);
@@ -62,7 +61,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             renderer.resize(w, h)?;
             width = w;
             height = h;
-            image_data.resize((width * height) as usize, v4f32(0.0, 0.0, 0.0, 0.0));
+            image_data.resize((width * height) as usize, Vec4::new(0.0, 0.0, 0.0, 0.0));
         }
 
         renderer.render()?;

crates/optix/examples/ex03_window/src/renderer.rs

@@ -14,7 +14,7 @@ use optix::{
     shader_binding_table::{SbtRecord, ShaderBindingTable},
 };
 
-use crate::vector::V4f32;
+use glam::{IVec2, Vec4};
 
 pub struct Renderer {
     launch_params: DeviceVariable<LaunchParams>,
@@ -23,7 +23,7 @@ pub struct Renderer {
     buf_hitgroup: DeviceBuffer<HitgroupRecord>,
     buf_miss: DeviceBuffer<MissRecord>,
     pipeline: Pipeline,
-    color_buffer: DeviceBuffer<V4f32>,
+    color_buffer: DeviceBuffer<Vec4>,
     ctx: DeviceContext,
     stream: Stream,
     cuda_context: CuContext,
@@ -144,10 +144,7 @@ impl Renderer {
         let launch_params = DeviceVariable::new(LaunchParams {
             frame_id: 0,
             color_buffer: color_buffer.as_device_ptr(),
-            fb_size: Point2i {
-                x: width as i32,
-                y: height as i32,
-            },
+            fb_size: IVec2::new(width as i32, height as i32),
         })?;
 
         Ok(Renderer {
@@ -193,24 +190,17 @@ impl Renderer {
         Ok(())
     }
 
-    pub fn download_pixels(&self, slice: &mut [V4f32]) -> Result<(), Box<dyn std::error::Error>> {
+    pub fn download_pixels(&self, slice: &mut [Vec4]) -> Result<(), Box<dyn std::error::Error>> {
         self.color_buffer.copy_to(slice)?;
         Ok(())
     }
 }
 
-#[repr(C)]
-#[derive(Copy, Clone, DeviceCopy)]
-struct Point2i {
-    pub x: i32,
-    pub y: i32,
-}
-
 #[repr(C)]
 #[derive(Copy, Clone, DeviceCopy)]
 struct LaunchParams {
-    pub color_buffer: DevicePointer<V4f32>,
-    pub fb_size: Point2i,
+    pub color_buffer: DevicePointer<Vec4>,
+    pub fb_size: IVec2,
     pub frame_id: i32,
 }