fix to Sink_24 prefab heirarchy

-mesh collider of sink_24 was set to wrong parent, causing error when the sink sim obj attempted to access child colliders.
allenai · Jun 8, 2021 · d26bb0e · d26bb0e
1 parent c454816
commit d26bb0e
Showing 1 changed file with 59 additions and 20 deletions.
diff --git a/unity/Assets/Physics/SimObjsPhysics/Bathroom Objects/BathroomSink/Prefabs/Sink_24.prefab b/unity/Assets/Physics/SimObjsPhysics/Bathroom Objects/BathroomSink/Prefabs/Sink_24.prefab
@@ -33,10 +33,9 @@ Transform:
   - {fileID: 7010936195035402852}
   - {fileID: 7010703901414181518}
   - {fileID: 7013349544614541466}
-  - {fileID: 7015417250208689322}
   - {fileID: 7757337460450565412}
   m_Father: {fileID: 7015417250220683966}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!114 &6975063933490828436
 MonoBehaviour:
@@ -50,7 +49,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b439f6e4ef5714ee2a3643acf37b7a9d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  uniqueID: Sink|-00.30|+00.80|+03.26|SinkBasin
+  objectID: 
   Type: 137
   PrimaryProperty: 1
   SecondaryProperties: 07000000
@@ -67,8 +66,8 @@ MonoBehaviour:
   - {fileID: 7013262009334466442}
   ReceptacleTriggerBoxes:
   - {fileID: 7015917488381343936}
-  isVisible: 0
-  isInteractable: 0
+  debugIsVisible: 0
+  debugIsInteractable: 0
   isInAgentHand: 0
   MyColliders: []
   HFdynamicfriction: 0
@@ -77,11 +76,29 @@ MonoBehaviour:
   HFrbdrag: 0
   HFrbangulardrag: 0
   salientMaterials: 
+  MySpawnPoints: []
   CurrentTemperature: 0
   HowManySecondsUntilRoomTemp: 10
   inMotion: 0
+  numSimObjHit: 0
+  numFloorHit: 0
+  numStructureHit: 0
   lastVelocity: 0
+  IsReceptacle: 0
+  IsPickupable: 0
+  IsMoveable: 0
+  isStatic: 0
+  IsToggleable: 0
+  IsOpenable: 0
+  IsBreakable: 0
+  IsFillable: 0
+  IsDirtyable: 0
+  IsCookable: 0
+  IsSliceable: 0
+  canChangeTempToHot: 0
+  canChangeTempToCold: 0
   ContainedObjectReferences: []
+  CurrentlyContains: []
 --- !u!54 &7033093963289880462
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -225,7 +242,7 @@ Transform:
   - {fileID: 7015417249144012906}
   - {fileID: 7015417249596520578}
   m_Father: {fileID: 7015417250220683966}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7015417249144012907
 GameObject:
@@ -405,12 +422,12 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7015417250208689327}
-  m_LocalRotation: {x: -8.659561e-17, y: -0.7071068, z: 8.659561e-17, w: 0.7071068}
-  m_LocalPosition: {x: 0.005845726, y: -0.0215, z: -0.003148795}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 7013567961913275812}
-  m_RootOrder: 4
+  m_Father: {fileID: 7015417250220683966}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!33 &7015417250208689304
 MeshFilter:
@@ -436,6 +453,7 @@ MeshRenderer:
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -449,6 +467,7 @@ MeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
@@ -471,9 +490,9 @@ MeshCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  serializedVersion: 3
+  serializedVersion: 4
   m_Convex: 0
-  m_CookingOptions: 14
+  m_CookingOptions: 30
   m_Mesh: {fileID: 4300180, guid: a31914cd7d4a11f429bd3c0cfa659133, type: 3}
 --- !u!1 &7015417250220683967
 GameObject:
@@ -487,7 +506,7 @@ GameObject:
   - component: {fileID: 7015417250220683936}
   - component: {fileID: 7015417250220683937}
   m_Layer: 8
-  m_Name: Sink
+  m_Name: Sink_24
   m_TagString: SimObjPhysics
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -504,6 +523,7 @@ Transform:
   m_LocalPosition: {x: -0.3025, y: 0.7992, z: 3.2637513}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 7015417250208689322}
   - {fileID: 7013567961913275812}
   - {fileID: 7015417249074918352}
   m_Father: {fileID: 0}
@@ -521,7 +541,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b439f6e4ef5714ee2a3643acf37b7a9d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  uniqueID: Sink|-00.30|+00.80|+03.26
+  objectID: 
   Type: 7
   PrimaryProperty: 1
   SecondaryProperties: 
@@ -537,8 +557,8 @@ MonoBehaviour:
   - {fileID: 7015417249144012906}
   - {fileID: 7015417249596520578}
   ReceptacleTriggerBoxes: []
-  isVisible: 0
-  isInteractable: 0
+  debugIsVisible: 0
+  debugIsInteractable: 0
   isInAgentHand: 0
   MyColliders: []
   HFdynamicfriction: 0
@@ -547,11 +567,29 @@ MonoBehaviour:
   HFrbdrag: 0
   HFrbangulardrag: 0
   salientMaterials: 
+  MySpawnPoints: []
   CurrentTemperature: 0
   HowManySecondsUntilRoomTemp: 10
   inMotion: 0
+  numSimObjHit: 0
+  numFloorHit: 0
+  numStructureHit: 0
   lastVelocity: 0
+  IsReceptacle: 0
+  IsPickupable: 0
+  IsMoveable: 0
+  isStatic: 0
+  IsToggleable: 0
+  IsOpenable: 0
+  IsBreakable: 0
+  IsFillable: 0
+  IsDirtyable: 0
+  IsCookable: 0
+  IsSliceable: 0
+  canChangeTempToHot: 0
+  canChangeTempToCold: 0
   ContainedObjectReferences: []
+  CurrentlyContains: []
 --- !u!54 &7015417250220683937
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -747,7 +785,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   CurrentlyContains: []
   myParent: {fileID: 7015417250220683967}
-  occupied: 0
 --- !u!1 &7015965729277189154
 GameObject:
   m_ObjectHideFlags: 0
@@ -1103,7 +1140,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7013567961913275812}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &7757337460447173890
 MeshFilter:
@@ -1127,6 +1164,7 @@ MeshRenderer:
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -1138,6 +1176,7 @@ MeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
@@ -1160,7 +1199,7 @@ MeshCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  serializedVersion: 3
+  serializedVersion: 4
   m_Convex: 0
-  m_CookingOptions: 14
+  m_CookingOptions: 30
   m_Mesh: {fileID: 4300288, guid: a31914cd7d4a11f429bd3c0cfa659133, type: 3}