From 90da91b63c61527e017c41e9f9bc51b1d27f82a1 Mon Sep 17 00:00:00 2001 From: stendler <stendler@mi.fu-berlin.de> Date: Sat, 3 Feb 2018 23:24:48 +0100 Subject: [PATCH] tidy up gameobject naming and structuring should be more intuitive to navigate now. Also fixed missing UserGps references. --- Assets/MemoryBox/arScene/arScene.unity | 166 +++++++++++++++++-------- 1 file changed, 111 insertions(+), 55 deletions(-) diff --git a/Assets/MemoryBox/arScene/arScene.unity b/Assets/MemoryBox/arScene/arScene.unity index ac6a2f2..ba97e08 100644 --- a/Assets/MemoryBox/arScene/arScene.unity +++ b/Assets/MemoryBox/arScene/arScene.unity @@ -572,7 +572,7 @@ Prefab: - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} @@ -757,7 +757,7 @@ GameObject: - component: {fileID: 194651073} - component: {fileID: 194651072} m_Layer: 5 - m_Name: CanvasHudAR + m_Name: 0_ArSceneHud m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -835,7 +835,7 @@ RectTransform: - {fileID: 642231144} - {fileID: 606266133} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2472,7 +2472,7 @@ RectTransform: m_Children: - {fileID: 1013992010} m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2743,7 +2743,7 @@ RectTransform: m_Children: - {fileID: 473078453} m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2771,12 +2771,12 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 578402800} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.1900024, y: 0.76000977, z: -8.810001} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1444983101} - m_Father: {fileID: 0} + m_Father: {fileID: 1340223787} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &594891860 @@ -3027,7 +3027,7 @@ RectTransform: m_Children: - {fileID: 1842627833} m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4324,23 +4324,23 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1340223787} m_Modifications: - target: {fileID: 400000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3} propertyPath: m_LocalPosition.x - value: 3.19 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3} propertyPath: m_LocalPosition.y - value: -0.76 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3} propertyPath: m_LocalPosition.z - value: 8.81 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3} propertyPath: m_LocalRotation.y @@ -4356,7 +4356,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3} propertyPath: m_RootOrder - value: 2 + value: 5 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3} @@ -4378,8 +4378,12 @@ MonoBehaviour: m_EditorClassIdentifier: Latitude: 52.55301 Longitude: 13.40355 - UserGps: {fileID: 0} + UserGps: {fileID: 606266132} Logger: {fileID: 1167427449} +--- !u!4 &898356013 stripped +Transform: + m_PrefabParentObject: {fileID: 400000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3} + m_PrefabInternal: {fileID: 898356010} --- !u!1 &900807304 GameObject: m_ObjectHideFlags: 0 @@ -4439,10 +4443,10 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 900807304} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 6.99, z: -0} + m_LocalPosition: {x: -3.1900024, y: 7.7500095, z: -8.810001} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1340223787} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &959351419 @@ -4706,7 +4710,7 @@ RectTransform: - {fileID: 83552039} - {fileID: 1481167039} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5006,11 +5010,11 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1135407578} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.1900024, y: 0.76000977, z: -8.810001} m_LocalScale: {x: 22.8, y: 10, z: 16} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1340223787} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1167427447 stripped @@ -5428,23 +5432,23 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1340223787} m_Modifications: - target: {fileID: 400000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3} propertyPath: m_LocalPosition.x - value: 7.4141026 + value: 4.2241 objectReference: {fileID: 0} - target: {fileID: 400000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3} propertyPath: m_LocalPosition.y - value: -1.8009572 + value: -1.0409474 objectReference: {fileID: 0} - target: {fileID: 400000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3} propertyPath: m_LocalPosition.z - value: 8.645708 + value: -0.16429329 objectReference: {fileID: 0} - target: {fileID: 400000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3} propertyPath: m_LocalRotation.y @@ -5460,7 +5464,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 400000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3} propertyPath: m_RootOrder - value: 1 + value: 4 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3} @@ -5482,8 +5486,12 @@ MonoBehaviour: m_EditorClassIdentifier: Latitude: 52.43355 Longitude: 13.3631 - UserGps: {fileID: 0} + UserGps: {fileID: 606266132} Logger: {fileID: 1167427449} +--- !u!4 &1240764953 stripped +Transform: + m_PrefabParentObject: {fileID: 400000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3} + m_PrefabInternal: {fileID: 1240764950} --- !u!1 &1255785230 GameObject: m_ObjectHideFlags: 0 @@ -5907,6 +5915,42 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 1920006673} m_Script: {fileID: 11500000, guid: 3dc4c2157d4275f46b77eb403039aad3, type: 3} +--- !u!1 &1340223786 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1340223787} + m_Layer: 0 + m_Name: 0_ArScene3D + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1340223787 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1340223786} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.1900024, y: -0.76000977, z: 8.810001} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1135407582} + - {fileID: 1415908556} + - {fileID: 1641205795} + - {fileID: 1614600505} + - {fileID: 1240764953} + - {fileID: 898356013} + - {fileID: 900807306} + - {fileID: 578402801} + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1345883128 GameObject: m_ObjectHideFlags: 0 @@ -6048,7 +6092,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2868ee2241426d74cab54df7dec06227, type: 3} m_Name: m_EditorClassIdentifier: - UserGps: {fileID: 0} + UserGps: {fileID: 606266132} Logger: {fileID: 1167427449} --- !u!4 &1373830367 Transform: @@ -6301,23 +6345,23 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1340223787} m_Modifications: - target: {fileID: 400000, guid: 089f84405caae2546b3bcc31622603f4, type: 3} propertyPath: m_LocalPosition.x - value: 1.8995457 + value: -1.2904568 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 089f84405caae2546b3bcc31622603f4, type: 3} propertyPath: m_LocalPosition.y - value: -0.318 + value: 0.44200978 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 089f84405caae2546b3bcc31622603f4, type: 3} propertyPath: m_LocalPosition.z - value: 9.242 + value: 0.43199825 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 089f84405caae2546b3bcc31622603f4, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 089f84405caae2546b3bcc31622603f4, type: 3} propertyPath: m_LocalRotation.y @@ -6333,7 +6377,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 089f84405caae2546b3bcc31622603f4, type: 3} propertyPath: m_RootOrder - value: 5 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 089f84405caae2546b3bcc31622603f4, type: 3} @@ -6355,8 +6399,12 @@ MonoBehaviour: m_EditorClassIdentifier: Latitude: 52.52625 Longitude: 13.40055 - UserGps: {fileID: 0} + UserGps: {fileID: 606266132} Logger: {fileID: 1167427449} +--- !u!4 &1415908556 stripped +Transform: + m_PrefabParentObject: {fileID: 400000, guid: 089f84405caae2546b3bcc31622603f4, type: 3} + m_PrefabInternal: {fileID: 1415908553} --- !u!1 &1444983096 GameObject: m_ObjectHideFlags: 0 @@ -7253,23 +7301,23 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1340223787} m_Modifications: - target: {fileID: 400000, guid: 8696793e801fa684e8964f90180d1efd, type: 3} propertyPath: m_LocalPosition.x - value: 1.0400001 + value: -2.1500025 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 8696793e801fa684e8964f90180d1efd, type: 3} propertyPath: m_LocalPosition.y - value: -0.31561625 + value: 0.44439352 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 8696793e801fa684e8964f90180d1efd, type: 3} propertyPath: m_LocalPosition.z - value: 10.078289 + value: 1.2682877 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 8696793e801fa684e8964f90180d1efd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 8696793e801fa684e8964f90180d1efd, type: 3} propertyPath: m_LocalRotation.y @@ -7307,8 +7355,12 @@ MonoBehaviour: m_EditorClassIdentifier: Latitude: 52.55314 Longitude: 13.40363 - UserGps: {fileID: 0} + UserGps: {fileID: 606266132} Logger: {fileID: 1167427449} +--- !u!4 &1614600505 stripped +Transform: + m_PrefabParentObject: {fileID: 400000, guid: 8696793e801fa684e8964f90180d1efd, type: 3} + m_PrefabInternal: {fileID: 1614600502} --- !u!1 &1624793990 GameObject: m_ObjectHideFlags: 0 @@ -7567,23 +7619,23 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1340223787} m_Modifications: - target: {fileID: 400000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3} propertyPath: m_LocalPosition.x - value: 3.7 + value: 0.5099976 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3} propertyPath: m_LocalPosition.y - value: -2.23 + value: -1.4699903 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3} propertyPath: m_LocalPosition.z - value: 8.365051 + value: -0.4449501 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3} propertyPath: m_LocalRotation.y @@ -7599,7 +7651,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3} propertyPath: m_RootOrder - value: 4 + value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3} @@ -7621,8 +7673,12 @@ MonoBehaviour: m_EditorClassIdentifier: Latitude: 52.43353 Longitude: 13.36297 - UserGps: {fileID: 0} + UserGps: {fileID: 606266132} Logger: {fileID: 1167427449} +--- !u!4 &1641205795 stripped +Transform: + m_PrefabParentObject: {fileID: 400000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3} + m_PrefabInternal: {fileID: 1641205792} --- !u!1 &1666448631 GameObject: m_ObjectHideFlags: 0 @@ -8532,7 +8588,7 @@ RectTransform: - {fileID: 669629320} - {fileID: 1522110708} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -8552,7 +8608,7 @@ GameObject: - component: {fileID: 1746675492} - component: {fileID: 1746675496} m_Layer: 5 - m_Name: DebugCanvas + m_Name: X_DebugCanvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -9036,7 +9092,7 @@ Prefab: - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 224043149731492524, guid: e8350cb38dd13ca46975a05ee8bd0e3a, type: 2} @@ -9813,7 +9869,7 @@ GameObject: m_Component: - component: {fileID: 2143593087} m_Layer: 0 - m_Name: System + m_Name: '[System]' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -9832,7 +9888,7 @@ Transform: - {fileID: 629051739} - {fileID: 1373830367} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2144542796 GameObject: -- GitLab