Skip to content

Commit ef3662b

Browse files
committed
chore: clippy fixes
1 parent 9a76f9f commit ef3662b

File tree

2 files changed

+3
-24
lines changed

2 files changed

+3
-24
lines changed

examples2d/voxels2.rs

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ pub fn init_world(testbed: &mut Testbed) {
1111
// TODO: make the testbed support custom enums (or at least a list of option from strings and
1212
// associated constants).
1313
let settings = testbed.example_settings_mut();
14-
let geometry_mode = settings.get_or_set_string(
15-
"Voxels mode",
16-
0,
17-
vec!["PseudoCube".to_string(), "PseudoBall".to_string()],
18-
);
1914
let falling_objects = settings.get_or_set_string(
2015
"Falling objects",
2116
3, // Defaults to Mixed.
@@ -30,12 +25,6 @@ pub fn init_world(testbed: &mut Testbed) {
3025
let voxel_size = Vector::new(1.0, voxel_size_y);
3126
let test_ccd = settings.get_or_set_bool("Test CCD", false);
3227

33-
let primitive_geometry = if geometry_mode == 0 {
34-
VoxelPrimitiveGeometry::PseudoCube
35-
} else {
36-
VoxelPrimitiveGeometry::PseudoBall
37-
};
38-
3928
/*
4029
* World
4130
*/
@@ -93,13 +82,7 @@ pub fn init_world(testbed: &mut Testbed) {
9382
.map(|i| [i, (i + 1) % polyline.len() as u32])
9483
.collect();
9584
let rb = bodies.insert(RigidBodyBuilder::fixed().translation(vector![-20.0, -10.0]));
96-
let shape = SharedShape::voxelized_mesh(
97-
primitive_geometry,
98-
&polyline,
99-
&indices,
100-
0.2,
101-
FillMode::default(),
102-
);
85+
let shape = SharedShape::voxelized_mesh(&polyline, &indices, 0.2, FillMode::default());
10386

10487
colliders.insert_with_parent(ColliderBuilder::new(shape), rb, &mut bodies);
10588

@@ -112,11 +95,7 @@ pub fn init_world(testbed: &mut Testbed) {
11295
point![(i as f32 - 125.0) * voxel_size.x / 2.0, y * voxel_size.y]
11396
})
11497
.collect();
115-
colliders.insert(ColliderBuilder::voxels_from_points(
116-
primitive_geometry,
117-
voxel_size,
118-
&voxels,
119-
));
98+
colliders.insert(ColliderBuilder::voxels_from_points(voxel_size, &voxels));
12099

121100
/*
122101
* Set up the testbed.

src_testbed/graphics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ impl GraphicsManager {
255255
}
256256
}
257257

258-
self.b2color.insert(handle, color.into());
258+
self.b2color.insert(handle, color);
259259

260260
color
261261
}

0 commit comments

Comments
 (0)