diff --git a/examples2d/voxels2.rs b/examples2d/voxels2.rs index 43d7c33..147c6d8 100644 --- a/examples2d/voxels2.rs +++ b/examples2d/voxels2.rs @@ -11,11 +11,6 @@ pub fn init_world(testbed: &mut Testbed) { // TODO: make the testbed support custom enums (or at least a list of option from strings and // associated constants). let settings = testbed.example_settings_mut(); - let geometry_mode = settings.get_or_set_string( - "Voxels mode", - 0, - vec!["PseudoCube".to_string(), "PseudoBall".to_string()], - ); let falling_objects = settings.get_or_set_string( "Falling objects", 3, // Defaults to Mixed. @@ -30,12 +25,6 @@ pub fn init_world(testbed: &mut Testbed) { let voxel_size = Vector::new(1.0, voxel_size_y); let test_ccd = settings.get_or_set_bool("Test CCD", false); - let primitive_geometry = if geometry_mode == 0 { - VoxelPrimitiveGeometry::PseudoCube - } else { - VoxelPrimitiveGeometry::PseudoBall - }; - /* * World */ @@ -93,13 +82,7 @@ pub fn init_world(testbed: &mut Testbed) { .map(|i| [i, (i + 1) % polyline.len() as u32]) .collect(); let rb = bodies.insert(RigidBodyBuilder::fixed().translation(vector![-20.0, -10.0])); - let shape = SharedShape::voxelized_mesh( - primitive_geometry, - &polyline, - &indices, - 0.2, - FillMode::default(), - ); + let shape = SharedShape::voxelized_mesh(&polyline, &indices, 0.2, FillMode::default()); colliders.insert_with_parent(ColliderBuilder::new(shape), rb, &mut bodies); @@ -112,11 +95,7 @@ pub fn init_world(testbed: &mut Testbed) { point![(i as f32 - 125.0) * voxel_size.x / 2.0, y * voxel_size.y] }) .collect(); - colliders.insert(ColliderBuilder::voxels_from_points( - primitive_geometry, - voxel_size, - &voxels, - )); + colliders.insert(ColliderBuilder::voxels_from_points(voxel_size, &voxels)); /* * Set up the testbed. diff --git a/src_testbed/graphics.rs b/src_testbed/graphics.rs index 52f1f37..d3c666a 100644 --- a/src_testbed/graphics.rs +++ b/src_testbed/graphics.rs @@ -255,7 +255,7 @@ impl GraphicsManager { } } - self.b2color.insert(handle, color.into()); + self.b2color.insert(handle, color); color }