Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion crates/blue_engine_core/src/prelude/primitive_shapes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down Expand Up @@ -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,
)?,
);
Expand Down
4 changes: 2 additions & 2 deletions crates/blue_engine_utilities/examples/animation.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand All @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions crates/blue_engine_utilities/examples/flycamera.rs
Original file line number Diff line number Diff line change
@@ -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<()> {
Expand All @@ -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")
Expand Down
3 changes: 2 additions & 1 deletion crates/blue_engine_utilities/examples/physics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand All @@ -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")
Expand Down
10 changes: 5 additions & 5 deletions crates/blue_engine_utilities/examples/raycast.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand All @@ -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
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions examples/shapes/cube.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -26,4 +26,4 @@ fn main() -> Result<(), blue_engine::error::Error> {
})?;

Ok(())
}
}