diff --git a/Assets/Oculus/OculusProjectConfig.asset b/Assets/Oculus/OculusProjectConfig.asset index 83ee5b0..a24c93d 100644 --- a/Assets/Oculus/OculusProjectConfig.asset +++ b/Assets/Oculus/OculusProjectConfig.asset @@ -40,5 +40,5 @@ MonoBehaviour: systemSplashScreen: {fileID: 0} systemSplashScreenType: 0 _systemLoadingScreenBackground: 0 - ovrPluginMd5Win64: e8cfe66d40bc858ac6a51dd265d3b2f7f0a29c248517d959fdfeab3a8c5ba89e - ovrPluginMd5Android: c7bb9a379e186c4b2726b69bbb7d3aced75ccf1ec60fa8579907e323401f936d + ovrPluginMd5Win64: e8cfe66d40bc858ac6a51dd265d3b2f75a0542a3e3343a50aea7cfb077f7e496 + ovrPluginMd5Android: c7bb9a379e186c4b2726b69bbb7d3acebc5010d969f325037b474f297f01d26f diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind Turbine Animated 3.0.unitypackage.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind Turbine Animated 3.0.unitypackage.meta deleted file mode 100644 index be2a30f..0000000 --- a/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind Turbine Animated 3.0.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a4d9fd75d7bc74d1697fa3fb645e60f2 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity b/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity index 4ef218d..f324bf6 100644 --- a/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity +++ b/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.18028326, g: 0.22571333, b: 0.30692202, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: diff --git a/Assets/SharedSpatialAnchors/Scripts/API.cs b/Assets/SharedSpatialAnchors/Scripts/API.cs index 7e8d681..180e7ff 100644 --- a/Assets/SharedSpatialAnchors/Scripts/API.cs +++ b/Assets/SharedSpatialAnchors/Scripts/API.cs @@ -52,6 +52,8 @@ public class API : MonoBehaviour private WebSocketController webSocketControllerScript; private bool isButtonPressed = false; // Boolean to keep voltage updated as long as the turbine is rotating PhotonView photonView; + + void Start() { @@ -149,7 +151,7 @@ public void ExtractDataFromJson(string json) latestWS = point.values[0]; } } - + photonView = PhotonView.Get(this); photonView.RPC("RPC_GreenButtonClick", RpcTarget.All,windDirectionInDirectionTerms,LatestT+" C","Kista",latestWS+" m/s"); } diff --git a/Assets/SharedSpatialAnchors/Scripts/SharedAnchorControlPanel.cs b/Assets/SharedSpatialAnchors/Scripts/SharedAnchorControlPanel.cs index 6c478e3..a46fbfa 100644 --- a/Assets/SharedSpatialAnchors/Scripts/SharedAnchorControlPanel.cs +++ b/Assets/SharedSpatialAnchors/Scripts/SharedAnchorControlPanel.cs @@ -371,9 +371,9 @@ public class SharedAnchorControlPanel : MonoBehaviour photonGrabbable.TransferOwnershipToLocalPlayer(); - var networkedCube = PhotonPun.PhotonNetwork.Instantiate(TwinTurbine_menuItem.name, new Vector3(-1f,1f, 2f), Quaternion.identity); - photonGrabbable = networkedCube.GetComponent<PhotonGrabbableObject>(); + var networkedGUI = PhotonPun.PhotonNetwork.Instantiate(TwinTurbine_menuItem.name, new Vector3(-1f,1f, 2f), Quaternion.identity); + var photonGrabbableGui = networkedGUI.GetComponent<PhotonGrabbableObject>(); - photonGrabbable.TransferOwnershipToLocalPlayer(); + photonGrabbableGui.TransferOwnershipToLocalPlayer(); } }