Merge branch 'main' into feature/pure-openxr

icosa-foundation · Jan 23, 2025 · d59ec8e · d59ec8e
2 parents 8e33019 + 8bcd3ff
commit d59ec8e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/Assets/QualityLevels.asset b/Assets/QualityLevels.asset
@@ -29,7 +29,7 @@ MonoBehaviour:
     m_GpuLevel: 4
     m_FixedFoveationLevel: 0
   - m_Bloom: 1
-    m_Hdr: 0
+    m_Hdr: 1
     m_Fxaa: 1
     m_MsaaLevel: 1
     m_MaxLod: 99999999

diff --git a/Assets/Scripts/Tools/FreePaintTool.cs b/Assets/Scripts/Tools/FreePaintTool.cs
@@ -210,6 +210,15 @@ override public void AssignControllerMaterials(InputManager.ControllerName contr
 
         void PositionPointer()
         {
+            // Discard the pointer if the controller is exactly zero
+            // as it probably indicates the controller tracking stalled this frame
+            // TODO:Mikesky: See if can be done at input level
+            if (InputManager.m_Instance.GetControllerBehavior(InputManager.ControllerName.Brush).transform.position == Vector3.zero)
+            {
+                Debug.LogError($"Controller Glitch!");
+                return;
+            }
+
             // Angle the pointer according to the user-defined pointer angle.
             Transform rAttachPoint = InputManager.m_Instance.GetBrushControllerAttachPoint();
             Vector3 pos = rAttachPoint.position;

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -930,7 +930,7 @@ PlayerSettings:
   useDeterministicCompilation: 1
   additionalIl2CppArgs: 
   scriptingRuntimeVersion: 1
-  gcIncremental: 0
+  gcIncremental: 1
   gcWBarrierValidation: 0
   apiCompatibilityLevelPerPlatform:
     Android: 3

diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset
@@ -88,7 +88,7 @@ QualitySettings:
     shadows: 1
     shadowResolution: 2
     shadowProjection: 1
-    shadowCascades: 1
+    shadowCascades: 2
     shadowDistance: 30
     shadowNearPlaneOffset: 2
     shadowCascade2Split: 0.33333334