aboutsummaryrefslogtreecommitdiff
path: root/src_testbed/testbed.rs
diff options
context:
space:
mode:
authorSébastien Crozet <developer@crozet.re>2022-08-08 09:10:59 +0200
committerGitHub <noreply@github.com>2022-08-08 09:10:59 +0200
commitabdbf5ffec5cd7f3c2a1bfd17491b3740561a4e1 (patch)
treec5ff894118ffa0495196e342116d6ed7bc3d129d /src_testbed/testbed.rs
parent90c97341b1e9c032375ece0aa6a00348702b7e8b (diff)
parentc4f078daf35d093c59905860296abb2ff3655a5c (diff)
downloadrapier-abdbf5ffec5cd7f3c2a1bfd17491b3740561a4e1.tar.gz
rapier-abdbf5ffec5cd7f3c2a1bfd17491b3740561a4e1.tar.bz2
rapier-abdbf5ffec5cd7f3c2a1bfd17491b3740561a4e1.zip
Merge pull request #374 from SludgePhD/update-bevy-wgpu
Update bevy (and thus wgpu)
Diffstat (limited to 'src_testbed/testbed.rs')
-rw-r--r--src_testbed/testbed.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src_testbed/testbed.rs b/src_testbed/testbed.rs
index e2e7f07..3d4f814 100644
--- a/src_testbed/testbed.rs
+++ b/src_testbed/testbed.rs
@@ -836,7 +836,7 @@ fn setup_graphics_environment(mut commands: Commands) {
});
commands
- .spawn_bundle(PerspectiveCameraBundle {
+ .spawn_bundle(Camera3dBundle {
transform: Transform::from_matrix(
Mat4::look_at_rh(
Vec3::new(-30.0, 30.0, 100.0),
@@ -869,13 +869,13 @@ fn setup_graphics_environment(mut commands: Commands) {
// ..Default::default()
// });
commands
- .spawn_bundle(OrthographicCameraBundle {
+ .spawn_bundle(Camera2dBundle {
transform: Transform {
translation: Vec3::new(0.0, 0.0, 0.0),
rotation: Quat::IDENTITY,
scale: Vec3::new(0.01, 0.01, 1.0),
},
- ..OrthographicCameraBundle::new_2d()
+ ..Camera2dBundle::default()
})
.insert(OrbitCamera {
zoom: 100.0,
@@ -1298,7 +1298,7 @@ fn highlight_hovered_body(
if let Some(cursor) = window.cursor_position() {
let ndc_cursor = (cursor / Vec2::new(window.width(), window.height()) * 2.0) - Vec2::ONE;
- let ndc_to_world = camera_transform.compute_matrix() * camera.projection_matrix.inverse();
+ let ndc_to_world = camera_transform.compute_matrix() * camera.projection_matrix().inverse();
let ray_pt1 = ndc_to_world.project_point3(Vec3::new(ndc_cursor.x, ndc_cursor.y, -1.0));
let ray_pt2 = ndc_to_world.project_point3(Vec3::new(ndc_cursor.x, ndc_cursor.y, 1.0));
let ray_dir = ray_pt2 - ray_pt1;