fix: raytracing inclusion mask incorrect bit remove operation

turanszkij · Nov 8, 2023 · 5287c0b · 5287c0b
1 parent dce2696
commit 5287c0b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/WickedEngine/wiScene.cpp b/WickedEngine/wiScene.cpp
@@ -2567,7 +2567,7 @@ namespace wi::scene
 				}
 				if (!talking_active)
 				{
-					expression_mastering._flags ^= ExpressionComponent::TALKING_ENDED;
+					expression_mastering._flags &= ~ExpressionComponent::TALKING_ENDED;
 				}
 			}
 
@@ -3965,11 +3965,11 @@ namespace wi::scene
 					}
 					if (!object.IsCastingShadow())
 					{
-						instance.instance_mask ^= wi::renderer::raytracing_inclusion_mask_shadow;
+						instance.instance_mask &= ~wi::renderer::raytracing_inclusion_mask_shadow;
 					}
 					if (object.IsNotVisibleInReflections())
 					{
-						instance.instance_mask ^= wi::renderer::raytracing_inclusion_mask_reflection;
+						instance.instance_mask &= ~wi::renderer::raytracing_inclusion_mask_reflection;
 					}
 					instance.bottom_level = &mesh.BLASes[object.lod];
 					instance.instance_contribution_to_hit_group_index = 0;

diff --git a/WickedEngine/wiScene_Components.h b/WickedEngine/wiScene_Components.h
@@ -1101,7 +1101,7 @@ namespace wi::scene
 		float slopeBlendPower = 0;
 
 		// Set decal to only use alpha from base color texture. Useful for blending normalmap-only decals
-		constexpr void SetBaseColorOnlyAlpha(bool value) { if (value) { _flags |= BASECOLOR_ONLY_ALPHA; } else { _flags ^= BASECOLOR_ONLY_ALPHA; } }
+		constexpr void SetBaseColorOnlyAlpha(bool value) { if (value) { _flags |= BASECOLOR_ONLY_ALPHA; } else { _flags &= ~BASECOLOR_ONLY_ALPHA; } }
 
 		constexpr bool IsBaseColorOnlyAlpha() const { return _flags & BASECOLOR_ONLY_ALPHA; }
 

diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
@@ -9,7 +9,7 @@ namespace wi::version
 	// minor features, major updates, breaking compatibility changes
 	const int minor = 71;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 340;
+	const int revision = 341;
 
 	const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);