Update UnityPhysicsSamples

Compatible with Unity.Physics 0.3.1-preview

Author: CookieSalad

UnityPhysicsSamples/Assets/Common/Materials/Colorful.mat

@@ -8,14 +8,13 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Colorful
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: _SPECULARHIGHLIGHTS_OFF
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 1
  m_DoubleSidedGI: 0
- m_CustomRenderQueue: 2050
- stringTagMap:
- RenderType: Opaque
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
  disabledShaderPasses: []
  m_SavedProperties:
  serializedVersion: 3
@@ -91,7 +90,6 @@ Material:
  - _WorkflowMode: 1
  - _ZWrite: 1
  m_Colors:
- - _BaseColor: {r: 1, g: 0.3940544, b: 0.38207546, a: 1}
  - _Color: {r: 1, g: 0.39405444, b: 0.3820755, a: 1}
  - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
  - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}

UnityPhysicsSamples/Assets/Common/Materials/PhysicsDynamicMaterial.mat

@@ -21,14 +21,13 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: PhysicsDynamicMaterial
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: _EMISSION _SPECULARHIGHLIGHTS_OFF
  m_LightmapFlags: 2
  m_EnableInstancingVariants: 1
  m_DoubleSidedGI: 0
- m_CustomRenderQueue: 2050
- stringTagMap:
- RenderType: Opaque
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
  disabledShaderPasses: []
  m_SavedProperties:
  serializedVersion: 3
@@ -136,8 +135,6 @@ Material:
  - Color_4F18FDD0: {r: 0, g: 0, b: 0, a: 0}
  - Color_AC52ADAA: {r: 0.5943396, g: 0.5376669, b: 0.08130119, a: 0}
  - _BandColor: {r: 0.9921569, g: 0.7215686, b: 0.07450981, a: 0}
- - _BaseColor: {r: 0.92156863, g: 0.7137255, b: 0.19215667, a: 0}
- - _BaseColour: {r: 1, g: 1, b: 1, a: 1}
  - _CellColorA: {r: 1, g: 1, b: 1, a: 1}
  - _CellColorB: {r: 0.8, g: 0.8, b: 0.8, a: 1}
  - _Color: {r: 0.92156863, g: 0.7137255, b: 0.19215682, a: 1}

UnityPhysicsSamples/Assets/Common/Materials/PhysicsKinematicMaterial.mat

@@ -21,14 +21,13 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: PhysicsKinematicMaterial
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: _EMISSION _SPECULARHIGHLIGHTS_OFF
  m_LightmapFlags: 2
  m_EnableInstancingVariants: 1
  m_DoubleSidedGI: 0
- m_CustomRenderQueue: 2050
- stringTagMap:
- RenderType: Opaque
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
  disabledShaderPasses: []
  m_SavedProperties:
  serializedVersion: 3
@@ -96,6 +95,7 @@ Material:
  - _Glossiness: 0.5
  - _GlossyReflections: 1
  - _Metallic: 0
+ - _Mode: 0
  - _OcclusionStrength: 1
  - _Parallax: 0.02
  - _QueueOffset: 0
@@ -113,7 +113,6 @@ Material:
  - Color_4F18FDD0: {r: 0.6627451, g: 0.05882353, b: 0.56078434, a: 0}
  - Color_AC52ADAA: {r: 0.39626288, g: 0.12482201, b: 0.4811321, a: 0}
  - _BandColor: {r: 0.65882355, g: 0.058823533, b: 0.56078434, a: 0}
- - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
  - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
  - _EmissionColor: {r: 0, g: 0.005882353, b: 0.34509805, a: 1}
  - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}

UnityPhysicsSamples/Assets/Common/Materials/PhysicsStaticMaterial.mat

@@ -8,8 +8,7 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: PhysicsStaticMaterial
- m_Shader: {fileID: -6465566751694194690, guid: 284c017caead21c4185658d8d466797c,
- type: 3}
+ m_Shader: {fileID: 4800000, guid: 3d31450a5235a479fa7f005559c2e1a9, type: 3}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 1
@@ -113,8 +112,6 @@ Material:
  - _WorkflowMode: 1
  - _ZWrite: 1
  m_Colors:
- - _BaseColor: {r: 0.6603774, g: 0.6426353, b: 0.05918475, a: 0}
- - _BaseColour: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1}
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1}
  - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
  - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}

UnityPhysicsSamples/Assets/Common/Materials/PhysicsStaticTerrainMaterial.mat

@@ -8,8 +8,7 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: PhysicsStaticTerrainMaterial
- m_Shader: {fileID: -6465566751694194690, guid: 284c017caead21c4185658d8d466797c,
- type: 3}
+ m_Shader: {fileID: 4800000, guid: 3d31450a5235a479fa7f005559c2e1a9, type: 3}
  m_ShaderKeywords: _TOPDOWN_ON
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 1
@@ -113,7 +112,6 @@ Material:
  - _WorkflowMode: 1
  - _ZWrite: 1
  m_Colors:
- - _BaseColour: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1}
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1}
  - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
  - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}

UnityPhysicsSamples/Assets/Common/Prefabs/Physics Scene Basic Elements.prefab

@@ -246,7 +246,6 @@ GameObject:
  m_Component:
  - component: {fileID: 1357867727081484656}
  - component: {fileID: 1357867727081484657}
- - component: {fileID: 1357867727081484663}
  m_Layer: 0
  m_Name: Directional Light
  m_TagString: Untagged
@@ -276,8 +275,9 @@ Light:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1357867727081484658}
  m_Enabled: 1
- serializedVersion: 9
+ serializedVersion: 10
  m_Type: 1
+ m_Shape: 0
  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
  m_Intensity: 1
  m_Range: 10
@@ -328,19 +328,6 @@ Light:
  m_UseBoundingSphereOverride: 0
  m_ShadowRadius: 0
  m_ShadowAngle: 0
---- !u!114 &1357867727081484663
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1357867727081484658}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
- m_Name: 
- m_EditorClassIdentifier: 
- m_UsePipelineSettings: 1
 --- !u!1 &1357867727155988469
 GameObject:
  m_ObjectHideFlags: 0
@@ -495,6 +482,31 @@ PrefabInstance:
  propertyPath: m_Name
  value: Floor
  objectReference: {fileID: 0}
+ - target: {fileID: 1716085102806623427, guid: ebfe93b387bf4a54989a6f911bdc11d1,
+ type: 3}
+ propertyPath: m_Orientation.value.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3945518518046659535, guid: ebfe93b387bf4a54989a6f911bdc11d1,
+ type: 3}
+ propertyPath: m_Capsule.Height
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3945518518046659535, guid: ebfe93b387bf4a54989a6f911bdc11d1,
+ type: 3}
+ propertyPath: m_Capsule.Axis
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3945518518046659535, guid: ebfe93b387bf4a54989a6f911bdc11d1,
+ type: 3}
+ propertyPath: m_Cylinder.Axis
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3945518518046659535, guid: ebfe93b387bf4a54989a6f911bdc11d1,
+ type: 3}
+ propertyPath: m_SphereRadius
+ value: 0.5
+ objectReference: {fileID: 0}
  - target: {fileID: 7682084060178167355, guid: ebfe93b387bf4a54989a6f911bdc11d1,
  type: 3}
  propertyPath: m_LocalPosition.y
@@ -545,31 +557,6 @@ PrefabInstance:
  propertyPath: m_LocalEulerAnglesHint.z
  value: 0
  objectReference: {fileID: 0}
- - target: {fileID: 3945518518046659535, guid: ebfe93b387bf4a54989a6f911bdc11d1,
- type: 3}
- propertyPath: m_Capsule.Height
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3945518518046659535, guid: ebfe93b387bf4a54989a6f911bdc11d1,
- type: 3}
- propertyPath: m_Capsule.Axis
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3945518518046659535, guid: ebfe93b387bf4a54989a6f911bdc11d1,
- type: 3}
- propertyPath: m_Cylinder.Axis
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 3945518518046659535, guid: ebfe93b387bf4a54989a6f911bdc11d1,
- type: 3}
- propertyPath: m_SphereRadius
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 1716085102806623427, guid: ebfe93b387bf4a54989a6f911bdc11d1,
- type: 3}
- propertyPath: m_Orientation.value.w
- value: 1
- objectReference: {fileID: 0}
  - target: {fileID: 7890845515503907925, guid: ebfe93b387bf4a54989a6f911bdc11d1,
  type: 3}
  propertyPath: m_SerializedData.mesh

UnityPhysicsSamples/Assets/Common/Scripts/MousePick/MousePickBehaviour.cs

@@ -1,8 +1,10 @@
+using System;
 using Unity.Burst;
 using Unity.Collections;
 using Unity.Entities;
 using Unity.Jobs;
 using Unity.Mathematics;
+using Unity.Physics;
 using Unity.Physics.Systems;
 using Unity.Transforms;
 using UnityEngine;
@@ -14,32 +16,28 @@ namespace Unity.Physics.Extensions
  public class ColliderUtils
  {
  [BurstCompile]
- public static unsafe bool IsTrigger(BlobAssetReference<Collider> collider, ColliderKey key)
+ public static bool IsTrigger(BlobAssetReference<Collider> collider, ColliderKey key)
  {
  bool bIsTrigger = false;
- var c = (Collider*)collider.GetUnsafePtr();
+ unsafe
  {
- var cc = ((ConvexCollider*)c);
- if (cc->CollisionType != CollisionType.Convex)
+ var c = (Collider*)collider.GetUnsafePtr();
  {
- c->GetLeaf(key, out ChildCollider child);
- cc = (ConvexCollider*)child.Collider;
- Assert.IsTrue(cc->CollisionType == CollisionType.Convex);
+ var cc = ((ConvexCollider*)c);
+ if (cc->CollisionType != CollisionType.Convex)
+ {
+ c->GetLeaf(key, out ChildCollider child);
+ cc = (ConvexCollider*)child.Collider;
+ Assert.IsTrue(cc->CollisionType == CollisionType.Convex);
+ }
+ bIsTrigger = cc->Material.IsTrigger;
  }
- bIsTrigger = cc->Material.IsTrigger;
  }
  return bIsTrigger;
  }
  }
 
  // A mouse pick collector which stores every hit. Based off the ClosestHitCollector
- // Creating an ICollector<RaycastHit> specifically as the base IQueryResult interface doesn't have RigidBodyIndex etc
- // This is a workaround to filter out static bodies and trigger volumes from the mouse picker.
- // Currently filtered in the TransformHits function when the Body Index is available.
- // This interface will be changed in future so that hits can be filtered appropriately during AddHit instead.
- // https://github.com/Unity-Technologies/Unity.Physics/issues/256
- // With this temporary filtering workaround CastRay will return true even if we filtered hits.
- // Hence, the MaxFraction is checked instead to see if a true hit was collected.
  [BurstCompile]
  public struct MousePickCollector : ICollector<RaycastHit>
  {
@@ -51,13 +49,11 @@ public struct MousePickCollector : ICollector<RaycastHit>
  public float MaxFraction { get; private set; }
  public int NumHits { get; private set; }
 
- private RaycastHit m_OldHit;
  private RaycastHit m_ClosestHit;
  public RaycastHit Hit => m_ClosestHit;
 
  public MousePickCollector(float maxFraction, NativeSlice<RigidBody> rigidBodies, int numDynamicBodies)
  {
- m_OldHit = default(RaycastHit);
  m_ClosestHit = default(RaycastHit);
  MaxFraction = maxFraction;
  NumHits = 0;
@@ -71,44 +67,27 @@ public MousePickCollector(float maxFraction, NativeSlice<RigidBody> rigidBodies,
  public bool AddHit(RaycastHit hit)
  {
  Assert.IsTrue(hit.Fraction < MaxFraction);
- MaxFraction = hit.Fraction;
- m_OldHit = m_ClosestHit;
- m_ClosestHit = hit;
- NumHits = 1;
- return true;
- }
 
- void CheckIsAcceptable(float oldFraction)
- {
- var isAcceptable = (0 <= m_ClosestHit.RigidBodyIndex) && (m_ClosestHit.RigidBodyIndex < NumDynamicBodies);
- if (isAcceptable)
+ var isAcceptable = (hit.RigidBodyIndex >= 0) && (hit.RigidBodyIndex < NumDynamicBodies);
+ if(IgnoreTriggers)
  {
- var body = Bodies[m_ClosestHit.RigidBodyIndex];
- if (IgnoreTriggers)
- {
- isAcceptable = !ColliderUtils.IsTrigger(body.Collider, m_ClosestHit.ColliderKey);
- }
+ var body = Bodies[hit.RigidBodyIndex];
+ isAcceptable = isAcceptable && !ColliderUtils.IsTrigger(body.Collider, hit.ColliderKey);
  }
+
  if (!isAcceptable)
  {
- m_ClosestHit = m_OldHit;
- NumHits = 0;
- MaxFraction = oldFraction;
- m_OldHit = default(RaycastHit);
+ return false;
  }
- }
 
- public void TransformNewHits(int oldNumHits, float oldFraction, MTransform transform, uint numSubKeyBits, uint subKey)
- {
- m_ClosestHit.Transform(transform, numSubKeyBits, subKey);
+ MaxFraction = hit.Fraction;
+ m_ClosestHit = hit;
+ NumHits = 1;
+ return true;
  }
 
- public void TransformNewHits(int oldNumHits, float oldFraction, MTransform transform, int rigidBodyIndex)
- {
- m_ClosestHit.Transform(transform, rigidBodyIndex);
- CheckIsAcceptable(oldFraction);
- }
  #endregion
+
  }
 
  public struct MousePick : IComponentData

UnityPhysicsSamples/Assets/Common/Scripts/RayTracer/RayTracerSystem.cs

@@ -83,7 +83,7 @@ public unsafe void Execute(int index)
 
  float3 targetImagePlane = Request.ImageCenter + Request.Up * Request.PlaneHalfExtents * yFrac + Request.Right * Request.PlaneHalfExtents * xFrac;
  float3 rayDir = Request.RayLength * (Request.PinHole - targetImagePlane);
- 
+
  RaycastHit hit;
  bool hasHit;
  if (Request.CastSphere)
@@ -195,7 +195,7 @@ protected override void OnCreate()
  m_Requests = new List<RayRequest>();
  m_Results = new List<RayResult>();
  }
- 
+
  protected override JobHandle OnUpdate(JobHandle inputDeps)
  {
  if (m_Requests == null || m_Requests.Count == 0)