Merge pull request #515 from Soham1803/feat/disabled_object_color_change
feat/Color of disabled object will change
This commit is contained in:
@@ -5,6 +5,7 @@
|
|||||||
- Add `EffectiveCharacterMovement::is_sliding_down_slope` to indicate if the character controlled by the kinematic
|
- Add `EffectiveCharacterMovement::is_sliding_down_slope` to indicate if the character controlled by the kinematic
|
||||||
character controller is sliding on a slope that is too steep.
|
character controller is sliding on a slope that is too steep.
|
||||||
- Add `Wheel::side_friction_stiffness` to customize the side friction applied to the vehicle controller’s wheel.
|
- Add `Wheel::side_friction_stiffness` to customize the side friction applied to the vehicle controller’s wheel.
|
||||||
|
- Add `DebugRenderStyle::disabled_color_multiplier` to make the debug-renderer color disabled object differently.
|
||||||
|
|
||||||
### Modified
|
### Modified
|
||||||
- Make `Wheel::friction_slip` public to customize the front friction applied to the vehicle controller’s wheels.
|
- Make `Wheel::friction_slip` public to customize the front friction applied to the vehicle controller’s wheels.
|
||||||
|
|||||||
@@ -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]
|
||||||
|
|||||||
@@ -36,6 +36,10 @@ pub struct DebugRenderStyle {
|
|||||||
/// multiplied by this array. (For a joint, both attached rigid-bodies must be sleeping
|
/// multiplied by this array. (For a joint, both attached rigid-bodies must be sleeping
|
||||||
/// or non-dynamic for this multiplier to be applied).
|
/// or non-dynamic for this multiplier to be applied).
|
||||||
pub sleep_color_multiplier: [f32; 4],
|
pub sleep_color_multiplier: [f32; 4],
|
||||||
|
/// 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
|
||||||
|
/// for this multiplier to be applied).
|
||||||
|
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.
|
||||||
@@ -62,6 +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],
|
||||||
|
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],
|
||||||
|
|||||||
Reference in New Issue
Block a user