From cce7b15ada9beff7c47781acc459e2706f70caca Mon Sep 17 00:00:00 2001 From: everyofflineuser Date: Mon, 7 Apr 2025 10:12:50 +0900 Subject: [PATCH 1/3] Fix cube --- crates/blue_engine_core/src/prelude/primitive_shapes.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/blue_engine_core/src/prelude/primitive_shapes.rs b/crates/blue_engine_core/src/prelude/primitive_shapes.rs index 5946609..30468a0 100644 --- a/crates/blue_engine_core/src/prelude/primitive_shapes.rs +++ b/crates/blue_engine_core/src/prelude/primitive_shapes.rs @@ -138,6 +138,7 @@ pub fn rectangle( /// Creates a 3D cube pub fn cube( name: impl StringBuffer, + settings: ObjectSettings, renderer: &mut Renderer, objects: &mut ObjectStorage, ) -> Result<(), crate::error::Error> { @@ -281,7 +282,7 @@ pub fn cube( 16, 17, 18, 18, 19, 16, // front 20, 21, 22, 22, 23, 20, // back ], - ObjectSettings::default(), + settings, renderer, )?, ); From d0ca243ac5a92fab9db8f54620d610f4ebea86dd Mon Sep 17 00:00:00 2001 From: everyofflineuser Date: Mon, 7 Apr 2025 10:16:20 +0900 Subject: [PATCH 2/3] Update cube.rs --- examples/shapes/cube.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/shapes/cube.rs b/examples/shapes/cube.rs index 59dc4d2..67723d0 100644 --- a/examples/shapes/cube.rs +++ b/examples/shapes/cube.rs @@ -4,12 +4,12 @@ * The license is same as the one on the root. */ -use blue_engine::{prelude::Engine, primitive_shapes::cube}; +use blue_engine::{prelude::Engine, primitive_shapes::cube, ObjectSettings}; fn main() -> Result<(), blue_engine::error::Error> { let mut engine = Engine::new()?; - cube("Cube", &mut engine.renderer, &mut engine.objects)?; + cube("Cube", ObjectSettings::default(), &mut engine.renderer, &mut engine.objects)?; engine .objects .get_mut("Cube") From b5e9468d869ada774606fadc0751ae07532d4b62 Mon Sep 17 00:00:00 2001 From: everyofflineuser Date: Mon, 7 Apr 2025 10:31:10 +0900 Subject: [PATCH 3/3] Fix Examples --- crates/blue_engine_utilities/examples/animation.rs | 4 ++-- crates/blue_engine_utilities/examples/flycamera.rs | 4 ++-- crates/blue_engine_utilities/examples/physics.rs | 3 ++- crates/blue_engine_utilities/examples/raycast.rs | 10 +++++----- examples/shapes/cube.rs | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/crates/blue_engine_utilities/examples/animation.rs b/crates/blue_engine_utilities/examples/animation.rs index a361371..be1e5a9 100644 --- a/crates/blue_engine_utilities/examples/animation.rs +++ b/crates/blue_engine_utilities/examples/animation.rs @@ -1,5 +1,5 @@ #[cfg(feature = "animation")] -use blue_engine::{Engine, WindowDescriptor, primitive_shapes::cube}; +use blue_engine::{Engine, WindowDescriptor, primitive_shapes::cube, ObjectSettings}; #[cfg(feature = "animation")] use blue_engine_utilities::{AnimationKeyframe, animation::Animation}; @@ -14,7 +14,7 @@ fn main() -> eyre::Result<()> { })?; // make a cube - cube("cube", &mut engine.renderer, &mut engine.objects)?; + cube("cube", ObjectSettings::default(), &mut engine.renderer, &mut engine.objects)?; // initialize an animation sequence let mut animation = Animation::new("cube"); diff --git a/crates/blue_engine_utilities/examples/flycamera.rs b/crates/blue_engine_utilities/examples/flycamera.rs index b01087f..36b2c33 100644 --- a/crates/blue_engine_utilities/examples/flycamera.rs +++ b/crates/blue_engine_utilities/examples/flycamera.rs @@ -1,4 +1,4 @@ -use blue_engine::{Engine, WindowDescriptor, primitive_shapes::cube}; +use blue_engine::{Engine, WindowDescriptor, primitive_shapes::cube, ObjectSettings}; use blue_engine_utilities::FlyCamera; fn main() -> eyre::Result<()> { @@ -15,7 +15,7 @@ fn main() -> eyre::Result<()> { blue_engine::TextureData::Bytes(texture_data), blue_engine::TextureMode::Clamp, )?; - cube("floor", &mut engine.renderer, &mut engine.objects); + cube("floor", ObjectSettings::default(), &mut engine.renderer, &mut engine.objects); engine .objects .get_mut("floor") diff --git a/crates/blue_engine_utilities/examples/physics.rs b/crates/blue_engine_utilities/examples/physics.rs index 014d4af..6684970 100644 --- a/crates/blue_engine_utilities/examples/physics.rs +++ b/crates/blue_engine_utilities/examples/physics.rs @@ -8,6 +8,7 @@ use blue_engine::{ Engine, WindowDescriptor, primitive_shapes::{cube, uv_sphere}, + ObjectSettings, }; #[cfg(feature = "physics")] use blue_engine_utilities::{FlyCamera, physics::Physics, raycast::Raycast}; @@ -27,7 +28,7 @@ fn main() -> eyre::Result<()> { let mut physics = Physics::new(); let fly_camera = FlyCamera::new(&mut engine.camera); - cube("floor", &mut engine.renderer, &mut engine.objects); + cube("floor", ObjectSettings::default(), &mut engine.renderer, &mut engine.objects); engine .objects .get_mut("floor") diff --git a/crates/blue_engine_utilities/examples/raycast.rs b/crates/blue_engine_utilities/examples/raycast.rs index 8016a82..5361839 100644 --- a/crates/blue_engine_utilities/examples/raycast.rs +++ b/crates/blue_engine_utilities/examples/raycast.rs @@ -1,5 +1,5 @@ #[cfg(feature = "physics")] -use blue_engine::{Engine, WindowDescriptor, imports::glm, primitive_shapes::cube}; +use blue_engine::{Engine, WindowDescriptor, imports::glm, primitive_shapes::cube, ObjectSettings}; #[cfg(feature = "physics")] use blue_engine_utilities::{FlyCamera, raycast::Raycast}; @@ -13,9 +13,9 @@ fn main() -> eyre::Result<()> { ..Default::default() })?; - cube("cube1", &mut engine.renderer, &mut engine.objects); - cube("cube2", &mut engine.renderer, &mut engine.objects); - cube("cube3", &mut engine.renderer, &mut engine.objects); + cube("cube1", ObjectSettings::default(), &mut engine.renderer, &mut engine.objects); + cube("cube2", ObjectSettings::default(), &mut engine.renderer, &mut engine.objects); + cube("cube3", ObjectSettings::default(), &mut engine.renderer, &mut engine.objects); engine .objects @@ -52,7 +52,7 @@ fn main() -> eyre::Result<()> { //if input.mouse_pressed(0) { let _raycast_pos = raycast.get_current_ray(); - //cube("cube5", renderer, objects); + //cube("cube5", ObjectSettings::default(), renderer, objects); //obj.position(raycast_pos.x, raycast_pos.y, raycast_pos.z); //} //println!("{:?}", raycast_pos); diff --git a/examples/shapes/cube.rs b/examples/shapes/cube.rs index 67723d0..63e18ab 100644 --- a/examples/shapes/cube.rs +++ b/examples/shapes/cube.rs @@ -26,4 +26,4 @@ fn main() -> Result<(), blue_engine::error::Error> { })?; Ok(()) -} +} \ No newline at end of file