diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab b/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab index fd3453e..a7387f7 100644 --- a/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab +++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab @@ -14,6 +14,7 @@ GameObject: - component: {fileID: 5204658000653702064} - component: {fileID: 2369382148363411835} - component: {fileID: 5762830989053361383} + - component: {fileID: 6073354290617709007} m_Layer: 0 m_Name: wind_turbine_0001_rotor m_TagString: WindTurbine @@ -116,8 +117,8 @@ MonoBehaviour: ObservedComponentsFoldoutOpen: 1 Group: 0 prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 + Synchronization: 1 + OwnershipTransfer: 1 observableSearch: 2 ObservedComponents: - {fileID: 5762830989053361383} @@ -140,6 +141,22 @@ MonoBehaviour: m_SynchronizeRotation: 1 m_SynchronizeScale: 1 m_UseLocal: 1 +--- !u!54 &6073354290617709007 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382264866490105688} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &382264866490105690 GameObject: m_ObjectHideFlags: 0 @@ -358,7 +375,7 @@ MonoBehaviour: ObservedComponentsFoldoutOpen: 1 Group: 0 prefixField: -1 - Synchronization: 3 + Synchronization: 1 OwnershipTransfer: 1 observableSearch: 2 ObservedComponents: @@ -422,6 +439,14 @@ PrefabInstance: propertyPath: sceneViewId value: 0 objectReference: {fileID: 0} + - target: {fileID: -9180565859901777493, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} + propertyPath: Synchronization + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -9180565859901777493, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} + propertyPath: OwnershipTransfer + value: 1 + objectReference: {fileID: 0} - target: {fileID: -9180565859901777493, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} propertyPath: ObservedComponents.Array.size value: 1 diff --git a/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity b/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity index e29326a..7ef3fc2 100644 --- a/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity +++ b/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity @@ -2461,84 +2461,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd8280e8c381fbd4bbcad4b7ee581c31, type: 3} ---- !u!1001 &6073354290617709005 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 382264866490105690, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3} - propertyPath: m_Name - value: Wind_Turbine_withMap - objectReference: {fileID: 0} - - target: {fileID: 382264866490459002, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 382264866490459002, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3} - propertyPath: m_LocalPosition.x - value: 2.664 - objectReference: {fileID: 0} - - target: {fileID: 382264866490459002, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382264866490459002, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382264866490459002, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 382264866490459002, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382264866490459002, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382264866490459002, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382264866490459002, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382264866490459002, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382264866490459002, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3} ---- !u!1 &6073354290617709006 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 382264866490105688, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3} - m_PrefabInstance: {fileID: 6073354290617709005} - m_PrefabAsset: {fileID: 0} ---- !u!54 &6073354290617709007 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6073354290617709006} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!1001 &6512430749679280819 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/SharedSpatialAnchors/Scripts/API.cs b/Assets/SharedSpatialAnchors/Scripts/API.cs index 35290f4..8f2433a 100644 --- a/Assets/SharedSpatialAnchors/Scripts/API.cs +++ b/Assets/SharedSpatialAnchors/Scripts/API.cs @@ -197,11 +197,11 @@ public void ExtractDataFromJson(string json) windSpeedValue.SetText(windSpeed); turn_WT_on_Y_Axis = turn_WT_on_Y_Axis_val; // flag set to true so that WT can rotate on it's Y axis. - + /* windTurbineController = windTurbineWithMap.transform.GetChild(0).gameObject; windTurbineControllerScript = windTurbineController.GetComponent<Windturbine>(); - windTurbineControllerScript.WT_TurnOnIts_Y_Axis(); + windTurbineControllerScript.WT_TurnOnIts_Y_Axis();*/ } [PunRPC] public void RPC_VoltageUpdate(String voltageGenerated)