diff options
| author | Sébastien Crozet <developer@crozet.re> | 2023-11-04 18:32:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-04 18:32:55 +0100 |
| commit | e9ea2ca10b3058a6ac2d7f4b79d351ef18ad3c06 (patch) | |
| tree | 8a64ad550e9b99158bdbb26a260e9ab27ffd4be6 /src_testbed/objects/node.rs | |
| parent | dbc540d788a3c46d85e07d47e7028d67aab04dbf (diff) | |
| parent | 1886c6f362139d780596baa6a0d6208a2c49212f (diff) | |
| download | rapier-e9ea2ca10b3058a6ac2d7f4b79d351ef18ad3c06.tar.gz rapier-e9ea2ca10b3058a6ac2d7f4b79d351ef18ad3c06.tar.bz2 rapier-e9ea2ca10b3058a6ac2d7f4b79d351ef18ad3c06.zip | |
Merge pull request #540 from johnny-smitherson/bevy-0.11
update bevy 0.11 - fix compile errors
Diffstat (limited to 'src_testbed/objects/node.rs')
| -rw-r--r-- | src_testbed/objects/node.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src_testbed/objects/node.rs b/src_testbed/objects/node.rs index f4b9015..8ddffab 100644 --- a/src_testbed/objects/node.rs +++ b/src_testbed/objects/node.rs @@ -5,8 +5,8 @@ use bevy::render::mesh::{Indices, VertexAttributeValues}; use na::{point, Point3, Vector3}; use std::collections::HashMap; -use bevy::pbr::wireframe::Wireframe; use bevy::render::render_resource::PrimitiveTopology; +use bevy_pbr::wireframe::Wireframe; use rapier::geometry::{ColliderHandle, ColliderSet, Shape, ShapeType}; #[cfg(feature = "dim3")] use rapier::geometry::{Cone, Cylinder}; @@ -15,7 +15,7 @@ use rapier::math::{Isometry, Real, Vector}; use crate::graphics::BevyMaterial; #[cfg(feature = "dim2")] use { - bevy::sprite::MaterialMesh2dBundle, + bevy_sprite::MaterialMesh2dBundle, na::{Point2, Vector2}, rapier::geometry::{Ball, Cuboid}, }; @@ -235,10 +235,11 @@ impl EntityWithGraphics { // // Ball mesh // - let ball = Mesh::from(shape::Icosphere { + let ball = Mesh::try_from(shape::Icosphere { subdivisions: 2, radius: 1.0, - }); + }) + .unwrap(); out.insert(ShapeType::Ball, meshes.add(ball)); // |