Browse Source

Use prefab in all scenes

Nick Steyer 1 year ago
parent
commit
6bfeda4694

+ 19 - 75
Assets/Calibration/Calibration.unity

@@ -249,50 +249,6 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1915020868
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1915020870}
-  - component: {fileID: 1915020869}
-  m_Layer: 0
-  m_Name: PersonManager
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1915020869
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1915020868}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9113063bb18312e4e8212e4124aab528, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!4 &1915020870
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1915020868}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.54269624, y: -2.6881542, z: 5.9205313}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2057004203
@@ -423,72 +379,60 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
---- !u!1001 &2139725572
+--- !u!1001 &2114185233
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 1180261165772202, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+    - target: {fileID: 3876240157451764341, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
       propertyPath: m_Name
-      value: ZED_Rig_Mono
+      value: PersonManager
       objectReference: {fileID: 0}
-    - target: {fileID: 4329734432191940, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 3
       objectReference: {fileID: 0}
-    - target: {fileID: 4329734432191940, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: -0.54269624
       objectReference: {fileID: 0}
-    - target: {fileID: 4329734432191940, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0
+      value: -2.6881542
       objectReference: {fileID: 0}
-    - target: {fileID: 4329734432191940, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0
+      value: 5.9205313
       objectReference: {fileID: 0}
-    - target: {fileID: 4329734432191940, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4329734432191940, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4329734432191940, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4329734432191940, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4329734432191940, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4329734432191940, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4329734432191940, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
-      propertyPath: depthMode
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
-      propertyPath: inputType
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
-      propertyPath: svoInputFileName
-      value: C:/Users/nick.steyer/Git/Files/HD1080_SN39598725_17-45-47.svo
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}

+ 59 - 59
Assets/Calibration/CalibrationTest.unity

@@ -205,8 +205,65 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!1001 &1745191451
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3876240157451764341, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_Name
+      value: PersonManager
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.54269624
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -2.6881542
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 5.9205313
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
 --- !u!1 &2057004203
 GameObject:
   m_ObjectHideFlags: 0
@@ -304,7 +361,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!54 &2057004209
 Rigidbody:
@@ -334,60 +391,3 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c488f1db47e57994bab11c4c73dd2430, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1001 &6511037193794854364
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 6511037194564238232, guid: 92f16d4429a85304ca9b36fd0ac9b1ac, type: 3}
-      propertyPath: m_Name
-      value: PersonManager
-      objectReference: {fileID: 0}
-    - target: {fileID: 6511037194564238234, guid: 92f16d4429a85304ca9b36fd0ac9b1ac, type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 6511037194564238234, guid: 92f16d4429a85304ca9b36fd0ac9b1ac, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.54269624
-      objectReference: {fileID: 0}
-    - target: {fileID: 6511037194564238234, guid: 92f16d4429a85304ca9b36fd0ac9b1ac, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -2.6881542
-      objectReference: {fileID: 0}
-    - target: {fileID: 6511037194564238234, guid: 92f16d4429a85304ca9b36fd0ac9b1ac, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 5.9205313
-      objectReference: {fileID: 0}
-    - target: {fileID: 6511037194564238234, guid: 92f16d4429a85304ca9b36fd0ac9b1ac, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6511037194564238234, guid: 92f16d4429a85304ca9b36fd0ac9b1ac, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6511037194564238234, guid: 92f16d4429a85304ca9b36fd0ac9b1ac, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6511037194564238234, guid: 92f16d4429a85304ca9b36fd0ac9b1ac, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6511037194564238234, guid: 92f16d4429a85304ca9b36fd0ac9b1ac, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6511037194564238234, guid: 92f16d4429a85304ca9b36fd0ac9b1ac, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6511037194564238234, guid: 92f16d4429a85304ca9b36fd0ac9b1ac, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 92f16d4429a85304ca9b36fd0ac9b1ac, type: 3}

+ 57 - 0
Assets/Pong/Pong.unity

@@ -666,6 +666,63 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1035421261
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3876240157451764341, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_Name
+      value: PersonManager
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_RootOrder
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.54269624
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -2.6881542
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 5.9205313
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3876240157451764343, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 520f07e4e9b1df3499037a602046fe08, type: 3}
 --- !u!1 &1310445729
 GameObject:
   m_ObjectHideFlags: 0

+ 32 - 12
Assets/StreetLight/Prefabs/PersonManager.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &6511037194564238232
+--- !u!1 &3876240157451764341
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,8 +8,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 6511037194564238234}
-  - component: {fileID: 6511037194564238233}
+  - component: {fileID: 3876240157451764343}
+  - component: {fileID: 3876240157451764340}
   m_Layer: 0
   m_Name: PersonManager
   m_TagString: Untagged
@@ -17,40 +17,40 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6511037194564238234
+--- !u!4 &3876240157451764343
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6511037194564238232}
+  m_GameObject: {fileID: 3876240157451764341}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.54269624, y: -2.6881542, z: 5.9205313}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6509029714718062364}
+  - {fileID: 3874303201111199473}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &6511037194564238233
+--- !u!114 &3876240157451764340
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6511037194564238232}
+  m_GameObject: {fileID: 3876240157451764341}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9113063bb18312e4e8212e4124aab528, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1001 &6511037194356261592
+--- !u!1001 &3876240157647125301
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 6511037194564238234}
+    m_TransformParent: {fileID: 3876240157451764343}
     m_Modifications:
     - target: {fileID: 1180261165772202, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
       propertyPath: m_Name
@@ -112,14 +112,34 @@ PrefabInstance:
       propertyPath: svoInputFileName
       value: C:/Users/nick.steyer/SmartStreetLight/Files/testEntfernt.svo
       objectReference: {fileID: 0}
+    - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+      propertyPath: trackingIsStatic
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+      propertyPath: advancedPanelOpen
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+      propertyPath: objectDetectionModel
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+      propertyPath: estimateInitialPosition
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
+      propertyPath: spatialMappingFoldoutOpen
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
       propertyPath: objectDetectionFoldoutOpen
       value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
---- !u!4 &6509029714718062364 stripped
+--- !u!4 &3874303201111199473 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4329734432191940, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3}
-  m_PrefabInstance: {fileID: 6511037194356261592}
+  m_PrefabInstance: {fileID: 3876240157647125301}
   m_PrefabAsset: {fileID: 0}

+ 1 - 1
Assets/StreetLight/Prefabs/PersonManager.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 92f16d4429a85304ca9b36fd0ac9b1ac
+guid: 520f07e4e9b1df3499037a602046fe08
 PrefabImporter:
   externalObjects: {}
   userData: