Hot-fix for 4.7.3 (#313)

lge-ros2 · Aug 19, 2024 · 52a1c8f · 52a1c8f
2 parents 9fe147d + fa411b7
commit 52a1c8f
Show file tree

Hide file tree

Showing 15 changed files with 315 additions and 309 deletions.
diff --git a/Assets/Resources/PhysicsMaterials/Props.physicMaterial b/Assets/Resources/PhysicsMaterials/Props.physicMaterial
@@ -9,6 +9,6 @@ PhysicMaterial:
   m_Name: Props
   dynamicFriction: 0.6
   staticFriction: 0.6
-  bounciness: 0.0001
+  bounciness: 0.00001
   frictionCombine: 0
   bounceCombine: 0
diff --git a/Assets/Scripts/Core/ObjectSpawning.cs b/Assets/Scripts/Core/ObjectSpawning.cs
@@ -237,12 +237,14 @@ private GameObject CreateUnitProps(in PropsType type, in Mesh targetMesh)
 			default:
 				var meshCollider = newObject.AddComponent<MeshCollider>();
 				meshCollider.sharedMesh = targetMesh;
-				meshCollider.sharedMaterial = _propsPhysicalMaterial;
 				meshCollider.convex = true;
 				meshCollider.isTrigger = false;
 				break;
 		}
 
+		var collider = newObject.GetComponent<Collider>();
+		collider.sharedMaterial = _propsPhysicalMaterial;
+
 		var rigidBody = newObject.AddComponent<Rigidbody>();
 		rigidBody.mass = 1;
 		rigidBody.drag = 0.25f;

diff --git a/Assets/Scripts/Devices/Camera.cs b/Assets/Scripts/Devices/Camera.cs
@@ -272,8 +272,6 @@ private IEnumerator CameraWorker()
 			var MaxUpdateRate = (float)Application.targetFrameRate;
 			var messageGenerationTime = 1f / (MaxUpdateRate - UpdateRate);
 
-			Debug.Log(messageGenerationTime);
-
 			while (_startCameraWork)
 			{
 				_universalCamData.enabled = true;
@@ -310,10 +308,10 @@ protected void OnCompleteAsyncReadback(AsyncGPUReadbackRequest request)
 
 				lock (_asyncWorkList)
 				{
-					checked
+					var asyncWorkIndex = _asyncWorkList.FindIndex(x => x.request.Equals(request));
+					if (asyncWorkIndex >= 0 && asyncWorkIndex < _asyncWorkList.Count)
 					{
-						var asyncWorkIndex = _asyncWorkList.FindIndex(x => x.request.Equals(request));
-						if (asyncWorkIndex >= 0 && asyncWorkIndex < _asyncWorkList.Count)
+						checked
 						{
 							asyncWork = _asyncWorkList[asyncWorkIndex];
 							var readbackData = request.GetData<byte>();