nichkara/rapier
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: actually apply the disabled_color_multiplier in the debug-renderer

Browse Source
This commit is contained in:
Sébastien Crozet
2023-12-09 21:46:41 +01:00
parent 4015cefebf
commit 39f4520b91
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pipeline/debug_render_pipeline/debug_render_pipeline.rs
View File

@@ -175,7 +175,9 @@ impl DebugRenderPipeline {
} }
if let (Some(rb1), Some(rb2)) = (bodies.get(body1), bodies.get(body2)) { if let (Some(rb1), Some(rb2)) = (bodies.get(body1), bodies.get(body2)) {
let coeff = if (rb1.is_fixed() || rb1.is_sleeping()) let coeff = if !data.is_enabled() || !rb1.is_enabled() || !rb2.is_enabled() {
self.style.disabled_color_multiplier
} else if (rb1.is_fixed() || rb1.is_sleeping())
&& (rb2.is_fixed() || rb2.is_sleeping()) && (rb2.is_fixed() || rb2.is_sleeping())
{ {
self.style.sleep_color_multiplier self.style.sleep_color_multiplier
@@ -250,7 +252,9 @@ impl DebugRenderPipeline {
&& backend.filter_object(object) && backend.filter_object(object)
{ {
let basis = rb.rotation().to_rotation_matrix().into_inner(); let basis = rb.rotation().to_rotation_matrix().into_inner();
let coeff = if rb.is_sleeping() { let coeff = if !rb.is_enabled() {
self.style.disabled_color_multiplier
} else if rb.is_sleeping() {
self.style.sleep_color_multiplier self.style.sleep_color_multiplier
} else { } else {
[1.0; 4] [1.0; 4]
@@ -283,7 +287,9 @@ impl DebugRenderPipeline {
if backend.filter_object(object) { if backend.filter_object(object) {
let color = if let Some(parent) = co.parent().and_then(|p| bodies.get(p)) { let color = if let Some(parent) = co.parent().and_then(|p| bodies.get(p)) {
let coeff = if parent.is_sleeping() { let coeff = if !parent.is_enabled() || !co.is_enabled() {
self.style.disabled_color_multiplier
} else if parent.is_sleeping() {
self.style.sleep_color_multiplier self.style.sleep_color_multiplier
} else { } else {
[1.0; 4] [1.0; 4]

4
src/pipeline/debug_render_pipeline/debug_render_style.rs
View File

@@ -39,7 +39,7 @@ pub struct DebugRenderStyle {
/// If a rigid-body is disabled, its attached entities will have their colors /// If a rigid-body is disabled, its attached entities will have their colors
/// multiplied by this array. (For a joint, both attached rigid-bodies must be disabled /// multiplied by this array. (For a joint, both attached rigid-bodies must be disabled
/// for this multiplier to be applied). /// for this multiplier to be applied).
pub disable_color_multiplier: [f32; 4], pub disabled_color_multiplier: [f32; 4],
/// The length of the local coordinate axes rendered for a rigid-body. /// The length of the local coordinate axes rendered for a rigid-body.
pub rigid_body_axes_length: Real, pub rigid_body_axes_length: Real,
/// The collor for the segments joining the two contact points. /// The collor for the segments joining the two contact points.
@@ -66,7 +66,7 @@ impl Default for DebugRenderStyle {
multibody_joint_anchor_color: [300.0, 1.0, 0.4, 1.0], multibody_joint_anchor_color: [300.0, 1.0, 0.4, 1.0],
multibody_joint_separation_color: [0.0, 1.0, 0.4, 1.0], multibody_joint_separation_color: [0.0, 1.0, 0.4, 1.0],
sleep_color_multiplier: [1.0, 1.0, 0.2, 1.0], sleep_color_multiplier: [1.0, 1.0, 0.2, 1.0],
disable_color_multiplier: [0.25, 1.0, 0.2, 1.0], disabled_color_multiplier: [0.0, 0.0, 1.0, 1.0],
rigid_body_axes_length: 0.5, rigid_body_axes_length: 0.5,
contact_depth_color: [120.0, 1.0, 0.4, 1.0], contact_depth_color: [120.0, 1.0, 0.4, 1.0],
contact_normal_color: [0.0, 1.0, 1.0, 1.0], contact_normal_color: [0.0, 1.0, 1.0, 1.0],