From 780ba4a216aa9ef68d7f10db4a2b67b866699f43 Mon Sep 17 00:00:00 2001 From: johnny-smitherson <127537716+johnny-smitherson@users.noreply.github.com> Date: Mon, 23 Oct 2023 16:21:07 +0000 Subject: update bevy 0.11 - fix compile errors --- src_testbed/debug_render.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src_testbed/debug_render.rs') diff --git a/src_testbed/debug_render.rs b/src_testbed/debug_render.rs index 928b8ba..979d8ec 100644 --- a/src_testbed/debug_render.rs +++ b/src_testbed/debug_render.rs @@ -20,17 +20,16 @@ impl Default for RapierDebugRenderPlugin { } } } - impl Plugin for RapierDebugRenderPlugin { fn build(&self, app: &mut App) { - app.add_plugin(crate::lines::DebugLinesPlugin::with_depth_test( + app.add_plugins(crate::lines::DebugLinesPlugin::with_depth_test( self.depth_test, )) .insert_resource(DebugRenderPipelineResource(DebugRenderPipeline::new( Default::default(), !DebugRenderMode::RIGID_BODY_AXES & !DebugRenderMode::COLLIDER_AABBS, ))) - .add_system_to_stage(CoreStage::Update, debug_render_scene); + .add_systems(Update, debug_render_scene); } } -- cgit From 23a7ed5beba12161d67184cdf7e63caa86be45eb Mon Sep 17 00:00:00 2001 From: Sébastien Crozet Date: Sun, 29 Oct 2023 18:59:47 +0100 Subject: Fix crashes on MacOS --- src_testbed/debug_render.rs | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'src_testbed/debug_render.rs') diff --git a/src_testbed/debug_render.rs b/src_testbed/debug_render.rs index 979d8ec..8e588db 100644 --- a/src_testbed/debug_render.rs +++ b/src_testbed/debug_render.rs @@ -1,5 +1,5 @@ use crate::harness::Harness; -use crate::lines::DebugLines; +use bevy::gizmos::gizmos::Gizmos; use bevy::prelude::*; use rapier::math::{Point, Real}; use rapier::pipeline::{ @@ -22,10 +22,7 @@ impl Default for RapierDebugRenderPlugin { } impl Plugin for RapierDebugRenderPlugin { fn build(&self, app: &mut App) { - app.add_plugins(crate::lines::DebugLinesPlugin::with_depth_test( - self.depth_test, - )) - .insert_resource(DebugRenderPipelineResource(DebugRenderPipeline::new( + app.insert_resource(DebugRenderPipelineResource(DebugRenderPipeline::new( Default::default(), !DebugRenderMode::RIGID_BODY_AXES & !DebugRenderMode::COLLIDER_AABBS, ))) @@ -34,25 +31,23 @@ impl Plugin for RapierDebugRenderPlugin { } struct BevyLinesRenderBackend<'a> { - lines: &'a mut DebugLines, + gizmos: Gizmos<'a>, } impl<'a> DebugRenderBackend for BevyLinesRenderBackend<'a> { #[cfg(feature = "dim2")] fn draw_line(&mut self, _: DebugRenderObject, a: Point, b: Point, color: [f32; 4]) { - self.lines.line_colored( + self.gizmos.line( [a.x as f32, a.y as f32, 1.0e-8 as f32].into(), [b.x as f32, b.y as f32, 1.0e-8 as f32].into(), - 0.0, Color::hsla(color[0], color[1], color[2], color[3]), ) } #[cfg(feature = "dim3")] fn draw_line(&mut self, _: DebugRenderObject, a: Point, b: Point, color: [f32; 4]) { - self.lines.line_colored( + self.gizmos.line( [a.x as f32, a.y as f32, a.z as f32].into(), [b.x as f32, b.y as f32, b.z as f32].into(), - 0.0, Color::hsla(color[0], color[1], color[2], color[3]), ) } @@ -61,9 +56,9 @@ impl<'a> DebugRenderBackend for BevyLinesRenderBackend<'a> { fn debug_render_scene( mut pipeline: ResMut, harness: NonSend, - mut lines: ResMut, + gizmos: Gizmos, ) { - let mut backend = BevyLinesRenderBackend { lines: &mut *lines }; + let mut backend = BevyLinesRenderBackend { gizmos }; pipeline.0.render( &mut backend, &harness.physics.bodies, -- cgit From 31518e3dce8f34266471407b1d0a0a96b52f7f96 Mon Sep 17 00:00:00 2001 From: johnny-smitherson <127537716+johnny-smitherson@users.noreply.github.com> Date: Fri, 3 Nov 2023 21:01:39 +0000 Subject: fix compiler warnings & mention breaking in changelog --- src_testbed/debug_render.rs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src_testbed/debug_render.rs') diff --git a/src_testbed/debug_render.rs b/src_testbed/debug_render.rs index 8e588db..2d87760 100644 --- a/src_testbed/debug_render.rs +++ b/src_testbed/debug_render.rs @@ -9,17 +9,10 @@ use rapier::pipeline::{ #[derive(Resource)] pub struct DebugRenderPipelineResource(pub DebugRenderPipeline); +#[derive(Default)] pub struct RapierDebugRenderPlugin { - depth_test: bool, } -impl Default for RapierDebugRenderPlugin { - fn default() -> Self { - Self { - depth_test: cfg!(feature = "dim3"), - } - } -} impl Plugin for RapierDebugRenderPlugin { fn build(&self, app: &mut App) { app.insert_resource(DebugRenderPipelineResource(DebugRenderPipeline::new( -- cgit From fb3eee502c76ab25b5777b0b2a9d1c8e6a466f6b Mon Sep 17 00:00:00 2001 From: Sébastien Crozet Date: Sat, 4 Nov 2023 17:56:13 +0100 Subject: cargo fmt --- src_testbed/debug_render.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src_testbed/debug_render.rs') diff --git a/src_testbed/debug_render.rs b/src_testbed/debug_render.rs index 2d87760..8b79edc 100644 --- a/src_testbed/debug_render.rs +++ b/src_testbed/debug_render.rs @@ -10,8 +10,7 @@ use rapier::pipeline::{ pub struct DebugRenderPipelineResource(pub DebugRenderPipeline); #[derive(Default)] -pub struct RapierDebugRenderPlugin { -} +pub struct RapierDebugRenderPlugin {} impl Plugin for RapierDebugRenderPlugin { fn build(&self, app: &mut App) { -- cgit From ab68a8386a28bd190281cd952ada2f1e7a5084fc Mon Sep 17 00:00:00 2001 From: Sébastien Crozet Date: Sat, 4 Nov 2023 18:12:38 +0100 Subject: feat: add a checkbox to enable/disable the debug renderer in the testbed --- src_testbed/debug_render.rs | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) (limited to 'src_testbed/debug_render.rs') diff --git a/src_testbed/debug_render.rs b/src_testbed/debug_render.rs index 8b79edc..4633865 100644 --- a/src_testbed/debug_render.rs +++ b/src_testbed/debug_render.rs @@ -7,17 +7,23 @@ use rapier::pipeline::{ }; #[derive(Resource)] -pub struct DebugRenderPipelineResource(pub DebugRenderPipeline); +pub struct DebugRenderPipelineResource { + pub pipeline: DebugRenderPipeline, + pub enabled: bool, +} #[derive(Default)] pub struct RapierDebugRenderPlugin {} impl Plugin for RapierDebugRenderPlugin { fn build(&self, app: &mut App) { - app.insert_resource(DebugRenderPipelineResource(DebugRenderPipeline::new( - Default::default(), - !DebugRenderMode::RIGID_BODY_AXES & !DebugRenderMode::COLLIDER_AABBS, - ))) + app.insert_resource(DebugRenderPipelineResource { + pipeline: DebugRenderPipeline::new( + Default::default(), + !DebugRenderMode::RIGID_BODY_AXES & !DebugRenderMode::COLLIDER_AABBS, + ), + enabled: false, + }) .add_systems(Update, debug_render_scene); } } @@ -46,17 +52,19 @@ impl<'a> DebugRenderBackend for BevyLinesRenderBackend<'a> { } fn debug_render_scene( - mut pipeline: ResMut, + mut debug_render: ResMut, harness: NonSend, gizmos: Gizmos, ) { - let mut backend = BevyLinesRenderBackend { gizmos }; - pipeline.0.render( - &mut backend, - &harness.physics.bodies, - &harness.physics.colliders, - &harness.physics.impulse_joints, - &harness.physics.multibody_joints, - &harness.physics.narrow_phase, - ); + if debug_render.enabled { + let mut backend = BevyLinesRenderBackend { gizmos }; + debug_render.pipeline.render( + &mut backend, + &harness.physics.bodies, + &harness.physics.colliders, + &harness.physics.impulse_joints, + &harness.physics.multibody_joints, + &harness.physics.narrow_phase, + ); + } } -- cgit