diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/map_logo.prefab b/Assets/SharedSpatialAnchors/Prefabs/Resources/map_logo.prefab index c8c72b3..b47b66d 100644 --- a/Assets/SharedSpatialAnchors/Prefabs/Resources/map_logo.prefab +++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/map_logo.prefab @@ -1040,6 +1040,15 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8322344887590106764} + - component: {fileID: 5361334261533984054} + - component: {fileID: -6369266532475339321} + - component: {fileID: 5341318377746430832} + - component: {fileID: -1201471494275974383} + - component: {fileID: -8231463906739603765} + - component: {fileID: -9180565859901777493} + - component: {fileID: 1693667315275080053} + - component: {fileID: -6453332735135581912} + - component: {fileID: 2070753283667298535} m_Layer: 0 m_Name: map_logo m_TagString: Untagged @@ -1056,7 +1065,7 @@ Transform: m_GameObject: {fileID: 8661891273527454774} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.1894, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 9, y: 9, z: 9} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5323377776038644989} @@ -1071,3 +1080,180 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5361334261533984054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661891273527454774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4357a20539a2184997fc22358044a5f, type: 3} + m_Name: + m_EditorClassIdentifier: + prefab: {fileID: 8661891273527454774} + previewPrefab: {fileID: 8661891273527454774} +--- !u!114 &-6369266532475339321 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661891273527454774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 43f86b14a27b52f4f9298c33015b5c26, type: 3} + m_Name: + m_EditorClassIdentifier: + _transferOnSecondSelection: 0 + _addNewPointsToFront: 0 + _forwardElement: {fileID: 0} + _oneGrabTransformer: {fileID: 5341318377746430832} + _twoGrabTransformer: {fileID: 0} + _targetTransform: {fileID: 0} + _maxGrabPoints: -1 +--- !u!114 &5341318377746430832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661891273527454774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3236b8f205019504589358e7e0412a38, type: 3} + m_Name: + m_EditorClassIdentifier: + _positionConstraints: + ConstraintsAreRelative: 0 + XAxis: + ConstrainAxis: 0 + AxisRange: + Min: 0 + Max: 0 + YAxis: + ConstrainAxis: 0 + AxisRange: + Min: 0 + Max: 0 + ZAxis: + ConstrainAxis: 0 + AxisRange: + Min: 0 + Max: 0 + _rotationConstraints: + XAxis: + ConstrainAxis: 0 + AxisRange: + Min: 0 + Max: 0 + YAxis: + ConstrainAxis: 0 + AxisRange: + Min: 0 + Max: 0 + ZAxis: + ConstrainAxis: 0 + AxisRange: + Min: 0 + Max: 0 +--- !u!114 &-1201471494275974383 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661891273527454774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1bedaac29a943f844a7074b53c8bdf9f, type: 3} + m_Name: + m_EditorClassIdentifier: + _pointable: {fileID: -6369266532475339321} + _rigidbody: {fileID: -8231463906739603765} + _scaleMassWithSize: 1 +--- !u!54 &-8231463906739603765 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661891273527454774} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 3 +--- !u!114 &-9180565859901777493 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661891273527454774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} + m_Name: + m_EditorClassIdentifier: + ObservedComponentsFoldoutOpen: 1 + Group: 0 + prefixField: -1 + Synchronization: 3 + OwnershipTransfer: 0 + observableSearch: 2 + ObservedComponents: + - {fileID: 1693667315275080053} + - {fileID: -6453332735135581912} + sceneViewId: 0 + InstantiationId: 0 + isRuntimeInstantiated: 0 +--- !u!114 &1693667315275080053 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661891273527454774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SynchronizePosition: 1 + m_SynchronizeRotation: 1 + m_SynchronizeScale: 1 + m_UseLocal: 1 +--- !u!114 &-6453332735135581912 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661891273527454774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64179f3720bbfe947b7724caa67b7c1d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SynchronizeVelocity: 1 + m_SynchronizeAngularVelocity: 1 + m_TeleportEnabled: 1 + m_TeleportIfDistanceGreaterThan: 3 +--- !u!114 &2070753283667298535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661891273527454774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 118420a922675d145ade2a28e327d7a5, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity b/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity index b1c151a..6dcdd22 100644 --- a/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity +++ b/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity @@ -4701,7 +4701,7 @@ GameObject: - component: {fileID: 1232630264} - component: {fileID: 1232630263} m_Layer: 0 - m_Name: Spannner + m_Name: Spawnner m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4714,13 +4714,13 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1232630262} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4357a20539a2184997fc22358044a5f, type: 3} m_Name: m_EditorClassIdentifier: - prefab: {fileID: 5361334261533984053} - previewPrefab: {fileID: 5361334261533984053} + prefab: {fileID: 8661891273527454774, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} + previewPrefab: {fileID: 8661891273527454774, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} --- !u!4 &1232630264 Transform: m_ObjectHideFlags: 0 @@ -4734,7 +4734,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1282461827 GameObject: @@ -5942,7 +5942,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1515478303 GameObject: @@ -9342,94 +9342,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd8280e8c381fbd4bbcad4b7ee581c31, type: 3} ---- !u!1001 &5361334261533984052 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_LocalScale.x - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_LocalScale.y - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_LocalScale.z - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_LocalPosition.x - value: 0.2285 - objectReference: {fileID: 0} - - target: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_LocalPosition.z - value: -0.652 - objectReference: {fileID: 0} - - target: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8661891273527454774, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - propertyPath: m_Name - value: map_logo - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} ---- !u!1 &5361334261533984053 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8661891273527454774, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - m_PrefabInstance: {fileID: 5361334261533984052} - m_PrefabAsset: {fileID: 0} ---- !u!114 &5361334261533984054 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5361334261533984053} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4357a20539a2184997fc22358044a5f, type: 3} - m_Name: - m_EditorClassIdentifier: - prefab: {fileID: 5361334261533984053} - previewPrefab: {fileID: 5361334261533984053} --- !u!4 &7079690333416248134 stripped Transform: m_CorrespondingSourceObject: {fileID: 5414912244175512723, guid: 60fa00281e83b294583adc31df520fbe, type: 3} diff --git a/Assets/SharedSpatialAnchors/Scripts/SharedAnchorControlPanel.cs b/Assets/SharedSpatialAnchors/Scripts/SharedAnchorControlPanel.cs index e17efde..1b76989 100644 --- a/Assets/SharedSpatialAnchors/Scripts/SharedAnchorControlPanel.cs +++ b/Assets/SharedSpatialAnchors/Scripts/SharedAnchorControlPanel.cs @@ -260,7 +260,7 @@ public class SharedAnchorControlPanel : MonoBehaviour SampleController.Instance.Log("Trying to Spawn WT Object"); SampleController.Instance.Log(spawnPoint.position.ToString()); Debug.Log(spawnPoint.position); - var networkedWindTurbine = PhotonPun.PhotonNetwork.Instantiate(TwinTurbine_windTurbine.name, new Vector3(Camera.main.transform.position.x,0, Camera.main.transform.position.z-3), Quaternion.identity); + var networkedWindTurbine = PhotonPun.PhotonNetwork.Instantiate(TwinTurbine_windTurbine.name, new Vector3(Camera.main.transform.position.x,0, Camera.main.transform.position.z), Quaternion.identity); var photonGrabbable = networkedWindTurbine.GetComponent<PhotonGrabbableObject>(); photonGrabbable.TransferOwnershipToLocalPlayer(); }