Merge pull request #778 from allenai/FloorDecal_Update

Floor Decal Heirarchy Update
allenai · Jun 3, 2021 · c454816 · c454816
2 parents 56149da + 85890df
commit c454816
Show file tree

Hide file tree

Showing 14 changed files with 18,404 additions and 15,882 deletions.
diff --git a/unity/Assets/Scenes/FloorPlan21_physics.unity b/unity/Assets/Scenes/FloorPlan21_physics.unity
diff --git a/unity/Assets/Scenes/FloorPlan23_physics.unity b/unity/Assets/Scenes/FloorPlan23_physics.unity
diff --git a/unity/Assets/Scenes/FloorPlan26_physics.unity b/unity/Assets/Scenes/FloorPlan26_physics.unity
diff --git a/unity/Assets/Scenes/FloorPlan27_physics.unity b/unity/Assets/Scenes/FloorPlan27_physics.unity
diff --git a/unity/Assets/Scenes/FloorPlan312_physics.unity b/unity/Assets/Scenes/FloorPlan312_physics.unity
diff --git a/unity/Assets/Scenes/FloorPlan3_physics.unity b/unity/Assets/Scenes/FloorPlan3_physics.unity
diff --git a/unity/Assets/Scenes/FloorPlan401_physics.unity b/unity/Assets/Scenes/FloorPlan401_physics.unity
diff --git a/unity/Assets/Scenes/FloorPlan407_physics.unity b/unity/Assets/Scenes/FloorPlan407_physics.unity
diff --git a/unity/Assets/Scenes/FloorPlan429_physics.unity b/unity/Assets/Scenes/FloorPlan429_physics.unity
@@ -2487,7 +2487,7 @@ GameObject:
   - component: {fileID: 294974291}
   m_Layer: 8
   m_Name: FP429:Decals.013
-  m_TagString: Structure
+  m_TagString: SimObjPhysics
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 8
@@ -5743,6 +5743,7 @@ GameObject:
   - component: {fileID: 698928819}
   - component: {fileID: 698928821}
   - component: {fileID: 698928820}
+  - component: {fileID: 698928822}
   m_Layer: 8
   m_Name: FP429:Decals.015
   m_TagString: Structure
@@ -5814,6 +5815,19 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 698928818}
   m_Mesh: {fileID: 4300064, guid: d18be3ecd8f845247ac1d8ca47e1cdb5, type: 3}
+--- !u!114 &698928822
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 698928818}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 917874e6a1f71455ca9c978c826895fb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  WhatIsMyStructureObjectTag: 1
 --- !u!1 &708572723
 GameObject:
   m_ObjectHideFlags: 0
@@ -9574,7 +9588,7 @@ GameObject:
   - component: {fileID: 1138095910}
   m_Layer: 8
   m_Name: FP429:Decals.014
-  m_TagString: Structure
+  m_TagString: SimObjPhysics
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 8
@@ -10694,7 +10708,7 @@ GameObject:
   - component: {fileID: 1296214776}
   m_Layer: 8
   m_Name: FP429:Decals.012
-  m_TagString: Structure
+  m_TagString: SimObjPhysics
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 8
@@ -15552,7 +15566,6 @@ GameObject:
   - component: {fileID: 2089890153}
   - component: {fileID: 2089890155}
   - component: {fileID: 2089890154}
-  - component: {fileID: 2089890156}
   - component: {fileID: 2089890157}
   m_Layer: 8
   m_Name: mesh
@@ -15628,19 +15641,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2089890152}
   m_Mesh: {fileID: 4300048, guid: d18be3ecd8f845247ac1d8ca47e1cdb5, type: 3}
---- !u!65 &2089890156
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2089890152}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 0
-  serializedVersion: 2
-  m_Size: {x: 3.8807116, y: 0.32019204, z: 4.280608}
-  m_Center: {x: 0.88859487, y: 0.11886552, z: 1.9306502}
 --- !u!114 &2089890157
 MonoBehaviour:
   m_ObjectHideFlags: 0