scale is a vec3 now instead of float.

7 files changed, 119 insertions, 347 deletions

diff --git a/bindgen/rust/celeritas-sys/build.rs b/bindgen/rust/celeritas-sys/build.rs
index de12094..f0a1d36 100644
--- a/bindgen/rust/celeritas-sys/build.rs
+++ b/bindgen/rust/celeritas-sys/build.rs
@@ -3,23 +3,26 @@ use std::path::PathBuf;
 
 use bindgen::callbacks::ParseCallbacks;
 
-const SERIALIZABLE_TYPES: &[&'static str] = &[
+const SERIALIZABLE_TYPES: &[&str] = &[
     "Vec2",
     "Vec3",
     "Vec4",
     "Mat4",
     "Quat",
     "Transform",
+    "Bbox_3D",
+    "OBB",
     "DirectionalLight",
     "PointLight",
 ];
-const EQ_TYPES: &[&'static str] = &[
+const EQ_TYPES: &[&str] = &[
     "BufferHandle",
     "TextureHandle",
     "MeshHandle",
     "MaterialHandle",
     "ModelHandle",
 ];
+const DEFAULT_TYPES: &[&str] = &["ShaderDataLayout"];
 
 #[derive(Debug)]
 struct AdditionalDerives;
@@ -32,6 +35,9 @@ impl ParseCallbacks for AdditionalDerives {
         if EQ_TYPES.contains(&info.name) {
             derives.extend_from_slice(&["PartialEq".to_string()]);
         }
+        if DEFAULT_TYPES.contains(&info.name) {
+            derives.push("Default".to_string());
+        }
         derives
     }
 }
@@ -44,8 +50,7 @@ fn main() {
     // println!("cargo:rustc-link-search=../../build/windows/x64/debug");
 
     let static_lib_path =
-        "/Users/josh/code/CodenameVentus/deps/celeritas-core/build/macosx/arm64/debug"
-            .to_string();
+        "/Users/josh/code/CodenameVentus/deps/celeritas-core/build/macosx/arm64/debug".to_string();
     // let static_lib_path = std::env::var("CELERITAS_CORE_LIB")
     //     .unwrap_or("../../../build/macosx/arm64/debug".to_string());
 
diff --git a/bindgen/rust/celeritas-sys/examples/glfw.rs b/bindgen/rust/celeritas-sys/examples/glfw.rs
deleted file mode 100644
index 36abd8f..0000000
--- a/bindgen/rust/celeritas-sys/examples/glfw.rs
+++ /dev/null
@@ -1,227 +0,0 @@
-use std::ffi::CString;
-use std::ptr::addr_of_mut;
-
-use celeritas_sys::*;
-use egui_backend::egui::{vec2, Pos2, Rect};
-use egui_glfw as egui_backend;
-use egui_glfw::glfw::{fail_on_errors, Context};
-
-use egui_glfw::glfw;
-
-const SCREEN_WIDTH: u32 = 1000;
-const SCREEN_HEIGHT: u32 = 1000;
-
-fn main() {
-    unsafe {
-        let mut glfw = glfw::init(glfw::fail_on_errors!()).unwrap();
-        glfw.window_hint(glfw::WindowHint::ContextVersion(4, 1));
-        glfw.window_hint(glfw::WindowHint::OpenGlForwardCompat(true));
-        glfw.window_hint(glfw::WindowHint::OpenGlProfile(
-            glfw::OpenGlProfileHint::Core,
-        ));
-        glfw.window_hint(glfw::WindowHint::DoubleBuffer(true));
-        glfw.window_hint(glfw::WindowHint::Resizable(false));
-
-        let (mut window, events) = glfw
-            .create_window(
-                SCREEN_WIDTH,
-                SCREEN_HEIGHT,
-                "Egui in GLFW!",
-                glfw::WindowMode::Windowed,
-            )
-            .expect("Failed to create GLFW window.");
-
-        window.set_all_polling(true);
-        window.make_current();
-        // glfw.set_swap_interval(glfw::SwapInterval::None);
-        glfw.set_swap_interval(glfw::SwapInterval::Adaptive);
-
-        gl::load_with(|symbol| window.get_proc_address(symbol) as *const _);
-
-        let window_ptr = window.window_ptr();
-        unsafe {
-            // Cast the window pointer to the expected type
-            let window_ptr = window_ptr as *mut celeritas_sys::GLFWwindow;
-            Core_Bringup(window_ptr);
-        };
-
-        let mut painter = egui_backend::Painter::new(&mut window);
-        let egui_ctx = egui::Context::default();
-
-        let (width, height) = window.get_framebuffer_size();
-        let native_pixels_per_point = window.get_content_scale().0;
-        let native_pixels_per_point = 2.0;
-        egui_ctx.set_pixels_per_point(2.0);
-
-        let mut egui_input_state = egui_backend::EguiInputState::new(egui::RawInput {
-            screen_rect: Some(Rect::from_min_size(
-                Pos2::new(0f32, 0f32),
-                vec2(width as f32, height as f32) / native_pixels_per_point,
-            )),
-            ..Default::default()
-        });
-
-        egui_input_state.input.time = Some(0.01);
-
-        // let triangle = triangle::Triangle::new();
-        let slider = &mut 0.0;
-
-        // C data
-        let camera_pos = Vec3 {
-            x: 18.9,
-            y: 10.6,
-            z: 11.6,
-        };
-        let camera_front = Vec3 {
-            x: -0.6,
-            y: -0.2,
-            z: -0.7,
-        };
-        let mut camera = Camera_Create(
-            camera_pos,
-            camera_front,
-            Vec3 {
-                x: 0.0,
-                y: 1.0,
-                z: 0.0,
-            },
-            45.0,
-        );
-        SetCamera(camera);
-
-        let mut cube_geo = Geo_CreateCuboid(f32x3 {
-            x: 2.0,
-            y: 2.0,
-            z: 2.0,
-        });
-        let mut crate_mesh = Mesh_Create(addr_of_mut!(cube_geo), false);
-        let albedo_map = TextureLoadFromFile(
-            CString::new("assets/demo/crate/Wood_Crate_001_basecolor.jpg")
-                .unwrap()
-                .as_ptr() as *const i8,
-        );
-        let roughness_map = TextureLoadFromFile(
-            CString::new("assets/demo/crate/Wood_Crate_001_roughness.jpg")
-                .unwrap()
-                .as_ptr() as *const i8,
-        );
-        let normal_map = TextureLoadFromFile(
-            CString::new("assets/demo/crate/Wood_Crate_001_normal.jpg")
-                .unwrap()
-                .as_ptr() as *const i8,
-        );
-        let ao_map = TextureLoadFromFile(
-            CString::new("assets/demo/crate/Wood_Crate_001_ambientOcclusion.jpg")
-                .unwrap()
-                .as_ptr() as *const i8,
-        );
-        let name: [i8; 64] = [0; 64];
-        let mut crate_mat = Material {
-            name: name,
-            kind: 0,
-            param_albedo: Vec3 {
-                x: 0.0,
-                y: 0.0,
-                z: 0.0,
-            },
-            param_metallic: 0.0,
-            param_roughness: 0.0,
-            param_ao: 0.0,
-            pbr_albedo_map: albedo_map,
-            pbr_normal_map: normal_map,
-            metal_roughness_combined: true,
-            pbr_metallic_map: TextureHandle { raw: 99999 },
-            pbr_roughness_map: roughness_map,
-            pbr_ao_map: ao_map,
-        };
-        let crate_renderent = RenderEnt {
-            mesh: addr_of_mut!(crate_mesh),
-            material: addr_of_mut!(crate_mat),
-            affine: mat4_ident(),
-            casts_shadows: true,
-        };
-        let mut render_ents: [RenderEnt; 1] = [crate_renderent];
-        let mut skybox = Skybox_Default();
-
-        // Main rendering loop
-        while !window.should_close() {
-            glfw.poll_events();
-
-            egui_ctx.begin_frame(egui_input_state.input.take());
-
-            unsafe {
-                gl::ClearColor(0.455, 0.302, 0.663, 1.0);
-                gl::Clear(gl::COLOR_BUFFER_BIT);
-                gl::Clear(gl::DEPTH_TEST);
-            }
-
-            Frame_Begin();
-            gl::Enable(gl::DEPTH_TEST);
-            gl::Enable(gl::CULL_FACE);
-
-            Camera_Update(addr_of_mut!(camera));
-            SetCamera(camera);
-
-            Skybox_Draw(addr_of_mut!(skybox), camera);
-            Render_RenderEntities(render_ents.as_mut_ptr(), render_ents.len());
-
-            // Frame_End();
-
-            // triangle.draw();
-
-            gl::Disable(gl::DEPTH_TEST);
-            gl::Disable(gl::CULL_FACE);
-
-            egui::Window::new("Egui with GLFW").show(&egui_ctx, |ui| {
-                ui.label("Celeritas in-game editor");
-                let btn_m = &mut ui.button("-");
-                let btn_p = &mut ui.button("+");
-
-                ui.add(egui::Slider::new(slider, 0.0..=100.0).text("My value"));
-
-                if btn_m.clicked() && *slider > 0.0 {
-                    *slider -= 1.0;
-                }
-
-                if btn_p.clicked() && *slider < 100.0 {
-                    *slider += 1.0;
-                }
-            });
-
-            let egui::FullOutput {
-                platform_output,
-                textures_delta,
-                shapes,
-                ..
-            } = egui_ctx.end_frame();
-
-            //Handle cut, copy text from egui
-            if !platform_output.copied_text.is_empty() {
-                egui_backend::copy_to_clipboard(&mut egui_input_state, platform_output.copied_text);
-            }
-
-            //Note: passing a bg_color to paint_jobs will clear any previously drawn stuff.
-            //Use this only if egui is being used for all drawing and you aren't mixing your own Open GL
-            //drawing calls with it.
-            //Since we are custom drawing an OpenGL Triangle we don't need egui to clear the background.
-
-            let clipped_shapes = egui_ctx.tessellate(shapes, native_pixels_per_point);
-            painter.paint_and_update_textures(
-                native_pixels_per_point,
-                &clipped_shapes,
-                &textures_delta,
-            );
-
-            for (_, event) in glfw::flush_messages(&events) {
-                match event {
-                    glfw::WindowEvent::Close => window.set_should_close(true),
-                    _ => {
-                        egui_backend::handle_event(event, &mut egui_input_state);
-                    }
-                }
-            }
-
-            window.swap_buffers();
-        }
-    }
-}
diff --git a/bindgen/rust/celeritas-sys/examples/main_loop.rs b/bindgen/rust/celeritas-sys/examples/main_loop.rs
index 65f4137..6bb923f 100644
--- a/bindgen/rust/celeritas-sys/examples/main_loop.rs
+++ b/bindgen/rust/celeritas-sys/examples/main_loop.rs
@@ -1,108 +1,108 @@
-use std::{
-    ffi::CString,
-    ptr::{self, addr_of_mut},
-};
+// use std::{
+//     ffi::CString,
+//     ptr::{self, addr_of_mut},
+// };
 
-use celeritas::*;
+// use celeritas::*;
 
-unsafe fn run_game() {
-    // init
-    let p: *mut GLFWwindow = ptr::null_mut();
-    Core_Bringup(p);
+// unsafe fn run_game() {
+//     // init
+//     let p: *mut GLFWwindow = ptr::null_mut();
+//     Core_Bringup(p);
 
-    let core = get_global_core();
-    let glfw_window_ptr = Core_GetGlfwWindowPtr(core);
+//     let core = get_global_core();
+//     let glfw_window_ptr = Core_GetGlfwWindowPtr(core);
 
-    // cam pos: 18.871811 10.658584 11.643305 cam frontL -0.644326 -0.209243 -0.735569
-    let camera_pos = Vec3 {
-        x: 18.9,
-        y: 10.6,
-        z: 11.6,
-    };
-    let camera_front = Vec3 {
-        x: -0.6,
-        y: -0.2,
-        z: -0.7,
-    };
-    let camera = Camera_Create(
-        camera_pos,
-        camera_front,
-        Vec3 {
-            x: 0.0,
-            y: 1.0,
-            z: 0.0,
-        },
-        45.0,
-    );
-    SetCamera(camera);
+//     // cam pos: 18.871811 10.658584 11.643305 cam frontL -0.644326 -0.209243 -0.735569
+//     let camera_pos = Vec3 {
+//         x: 18.9,
+//         y: 10.6,
+//         z: 11.6,
+//     };
+//     let camera_front = Vec3 {
+//         x: -0.6,
+//         y: -0.2,
+//         z: -0.7,
+//     };
+//     let camera = Camera_Create(
+//         camera_pos,
+//         camera_front,
+//         Vec3 {
+//             x: 0.0,
+//             y: 1.0,
+//             z: 0.0,
+//         },
+//         45.0,
+//     );
+//     SetCamera(camera);
 
-    let mut cube_geo = Geo_CreateCuboid(f32x3 {
-        x: 2.0,
-        y: 2.0,
-        z: 2.0,
-    });
-    let mut crate_mesh = Mesh_Create(addr_of_mut!(cube_geo), false);
-    let albedo_map = TextureLoadFromFile(
-        CString::new("assets/demo/crate/Wood_Crate_001_basecolor.jpg")
-            .unwrap()
-            .as_ptr() as *const i8,
-    );
-    let roughness_map = TextureLoadFromFile(
-        CString::new("assets/demo/crate/Wood_Crate_001_roughness.jpg")
-            .unwrap()
-            .as_ptr() as *const i8,
-    );
-    let normal_map = TextureLoadFromFile(
-        CString::new("assets/demo/crate/Wood_Crate_001_normal.jpg")
-            .unwrap()
-            .as_ptr() as *const i8,
-    );
-    let ao_map = TextureLoadFromFile(
-        CString::new("assets/demo/crate/Wood_Crate_001_ambientOcclusion.jpg")
-            .unwrap()
-            .as_ptr() as *const i8,
-    );
-    let name: [i8; 64] = [0; 64];
-    let mut crate_mat = Material {
-        name: name,
-        kind: 0,
-        param_albedo: Vec3 {
-            x: 0.0,
-            y: 0.0,
-            z: 0.0,
-        },
-        param_metallic: 0.0,
-        param_roughness: 0.0,
-        param_ao: 0.0,
-        pbr_albedo_map: albedo_map,
-        pbr_normal_map: normal_map,
-        metal_roughness_combined: true,
-        pbr_metallic_map: TextureHandle { raw: 99999 },
-        pbr_roughness_map: roughness_map,
-        pbr_ao_map: ao_map,
-    };
-    let crate_renderent = RenderEnt {
-        mesh: addr_of_mut!(crate_mesh),
-        material: addr_of_mut!(crate_mat),
-        affine: mat4_ident(),
-        casts_shadows: true,
-    };
-    let mut render_entities: [RenderEnt; 1] = [crate_renderent];
+//     let mut cube_geo = Geo_CreateCuboid(f32x3 {
+//         x: 2.0,
+//         y: 2.0,
+//         z: 2.0,
+//     });
+//     let mut crate_mesh = Mesh_Create(addr_of_mut!(cube_geo), false);
+//     let albedo_map = TextureLoadFromFile(
+//         CString::new("assets/demo/crate/Wood_Crate_001_basecolor.jpg")
+//             .unwrap()
+//             .as_ptr() as *const i8,
+//     );
+//     let roughness_map = TextureLoadFromFile(
+//         CString::new("assets/demo/crate/Wood_Crate_001_roughness.jpg")
+//             .unwrap()
+//             .as_ptr() as *const i8,
+//     );
+//     let normal_map = TextureLoadFromFile(
+//         CString::new("assets/demo/crate/Wood_Crate_001_normal.jpg")
+//             .unwrap()
+//             .as_ptr() as *const i8,
+//     );
+//     let ao_map = TextureLoadFromFile(
+//         CString::new("assets/demo/crate/Wood_Crate_001_ambientOcclusion.jpg")
+//             .unwrap()
+//             .as_ptr() as *const i8,
+//     );
+//     let name: [i8; 64] = [0; 64];
+//     let mut crate_mat = Material {
+//         name: name,
+//         kind: 0,
+//         param_albedo: Vec3 {
+//             x: 0.0,
+//             y: 0.0,
+//             z: 0.0,
+//         },
+//         param_metallic: 0.0,
+//         param_roughness: 0.0,
+//         param_ao: 0.0,
+//         pbr_albedo_map: albedo_map,
+//         pbr_normal_map: normal_map,
+//         metal_roughness_combined: true,
+//         pbr_metallic_map: TextureHandle { raw: 99999 },
+//         pbr_roughness_map: roughness_map,
+//         pbr_ao_map: ao_map,
+//     };
+//     let crate_renderent = RenderEnt {
+//         mesh: addr_of_mut!(crate_mesh),
+//         material: addr_of_mut!(crate_mat),
+//         affine: mat4_ident(),
+//         casts_shadows: true,
+//     };
+//     let mut render_entities: [RenderEnt; 1] = [crate_renderent];
 
-    // main loop
-    while !ShouldExit() {
-        Frame_Begin();
+//     // main loop
+//     while !ShouldExit() {
+//         Frame_Begin();
 
-        Render_RenderEntities(render_entities.as_mut_ptr(), render_entities.len());
+//         Render_RenderEntities(render_entities.as_mut_ptr(), render_entities.len());
 
-        Frame_End();
-    }
-}
+//         Frame_End();
+//     }
+// }
 
 fn main() {
     println!("Running from Rust!");
 
-    unsafe {
-        run_game();
-    }
+    //     unsafe {
+    //         run_game();
+    //     }
 }
diff --git a/bindgen/rust/celeritas-sys/src/lib.rs b/bindgen/rust/celeritas-sys/src/lib.rs
index 90a5914..048e9f7 100644
--- a/bindgen/rust/celeritas-sys/src/lib.rs
+++ b/bindgen/rust/celeritas-sys/src/lib.rs
@@ -2,8 +2,6 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 
-use std::ffi::c_void;
-
 use serde::{Deserialize, Serialize};
 
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
@@ -81,7 +79,11 @@ impl Transform {
                 z: 0.,
                 w: 1.0,
             },
-            scale: 1.,
+            scale: Vec3 {
+                x: 1.,
+                y: 1.,
+                z: 1.,
+            },
             is_dirty: true,
         }
     }
@@ -116,15 +118,6 @@ impl Default for ShaderBinding {
     }
 }
 
-impl Default for ShaderDataLayout {
-    fn default() -> Self {
-        Self {
-            bindings: [ShaderBinding::default(); 8],
-            binding_count: 0,
-        }
-    }
-}
-
 impl Default for Camera {
     fn default() -> Self {
         let camera_pos = Vec3 {
@@ -137,7 +130,8 @@ impl Default for Camera {
             y: -0.2,
             z: -0.7,
         };
-        let camera = unsafe {
+
+        unsafe {
             Camera_Create(
                 camera_pos,
                 camera_front,
@@ -148,8 +142,7 @@ impl Default for Camera {
                 },
                 45.0,
             )
-        };
-        camera
+        }
     }
 }
 
diff --git a/bindgen/rust/examples/shaders.rs b/bindgen/rust/examples/shaders.rs
index ad0b35f..0dede8f 100644
--- a/bindgen/rust/examples/shaders.rs
+++ b/bindgen/rust/examples/shaders.rs
@@ -6,6 +6,7 @@ use celeritas_sys::{
     ShaderVisibility_VISIBILITY_FRAGMENT, ShaderVisibility_VISIBILITY_VERTEX,
 };
 
+#[allow(clippy::upper_case_acronyms)]
 #[repr(C)]
 struct MVP {
     model: Mat4,
@@ -13,7 +14,7 @@ struct MVP {
     proj: Mat4,
 }
 
-fn shader_vis_all() -> u32 {
+pub fn shader_vis_all() -> u32 {
     ShaderVisibility_VISIBILITY_VERTEX
         | ShaderVisibility_VISIBILITY_FRAGMENT
         | ShaderVisibility_VISIBILITY_COMPUTE
diff --git a/bindgen/rust/src/lib.rs b/bindgen/rust/src/lib.rs
index dd83293..4d6cb7f 100644
--- a/bindgen/rust/src/lib.rs
+++ b/bindgen/rust/src/lib.rs
@@ -22,7 +22,7 @@ use std::{
 };
 
 use celeritas_sys::{
-    Core_Bringup, Core_Shutdown, DirectionalLight, Material, Material_Insert, Model, PointLight,
+    Core_Bringup, Core_Shutdown, DirectionalLight, Material, Material_Insert, PointLight,
     TextureHandle, Transform,
 };
 use serde::{Deserialize, Serialize};
diff --git a/bindgen/rust/src/ral.rs b/bindgen/rust/src/ral.rs
index 3ea69e2..5f7c7d1 100644
--- a/bindgen/rust/src/ral.rs
+++ b/bindgen/rust/src/ral.rs
@@ -1,6 +1,6 @@
 //! Wrapper around the RAL code in celeritas-core
 
-use std::ffi::{c_void, CString};
+use std::ffi::c_void;
 
 use celeritas_sys::{
     BufferHandle, GPU_CmdEncoder, GPU_CmdEncoder_BeginRender, GPU_CmdEncoder_EndRender,
@@ -319,8 +319,8 @@ mod test {
     use super::*;
 
     struct TestData {
-        a: [f32; 2],
-        b: [f32; 4],
+        _a: [f32; 2],
+        _b: [f32; 4],
     }
     impl ShaderData for TestData {
         fn layout() -> ShaderDataLayout {
@@ -338,7 +338,7 @@ mod test {
             .add_attr("position", VertexAttrKind::Floatx2)
             .add_attr("color", VertexAttrKind::Floatx4);
 
-        let mut builder = PipelineBuilder::new("Test Pipeline".into())
+        let builder = PipelineBuilder::new("Test Pipeline".into())
             .add_shader_layout::<TestData>()
             .add_vertex_desc(vertex_desc);