From 9c8a5f8fb307c1a8687890f2fc688fe41f31cb15 Mon Sep 17 00:00:00 2001
From: Abdul Mukheem Shaik <mukheemuddin@gmail.com>
Date: Sun, 26 May 2024 16:25:16 +0200
Subject: [PATCH] Added RPC to make WT Turn work only when user presses green
button
---
.../Prefabs/Resources/Audio Narrations.meta | 8 ++++
.../Noise Reduced and finals.meta | 8 ++++
...et 3 (online-audio-converter.com).wav.meta | 22 ++++++++++
...et 4 (online-audio-converter.com).wav.meta | 22 ++++++++++
.../Originals in WAV format.meta | 8 ++++
.../Narration1.wav.meta | 22 ++++++++++
.../Narration2.wav.meta | 22 ++++++++++
.../Resources/Audio Narrations/Originals.meta | 8 ++++
.../Stockholms Universitet 3.m4a.meta | 7 ++++
.../Stockholms Universitet 4.m4a.meta | 7 ++++
.../Resources/Wind_Turbine_withMap.prefab | 41 +++++++++++++++++++
.../Resources/PhotonServerSettings.asset | 1 +
Assets/Wind_Turbine/Scripts/Windturbine.cs | 14 ++++++-
13 files changed, 189 insertions(+), 1 deletion(-)
create mode 100644 Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations.meta
create mode 100644 Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals.meta
create mode 100644 Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals/Stockholms Universitet 3 (online-audio-converter.com).wav.meta
create mode 100644 Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals/Stockholms Universitet 4 (online-audio-converter.com).wav.meta
create mode 100644 Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format.meta
create mode 100644 Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format/Narration1.wav.meta
create mode 100644 Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format/Narration2.wav.meta
create mode 100644 Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals.meta
create mode 100644 Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals/Stockholms Universitet 3.m4a.meta
create mode 100644 Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals/Stockholms Universitet 4.m4a.meta
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations.meta
new file mode 100644
index 0000000..f7a803f
--- /dev/null
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 99ebf73cea974b24fbaa751df176d2c0
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals.meta
new file mode 100644
index 0000000..fc2da89
--- /dev/null
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3ebfc49f8158f4f45bab1ca9422ea35a
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals/Stockholms Universitet 3 (online-audio-converter.com).wav.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals/Stockholms Universitet 3 (online-audio-converter.com).wav.meta
new file mode 100644
index 0000000..56d3cd3
--- /dev/null
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals/Stockholms Universitet 3 (online-audio-converter.com).wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 9b80a823b03707d42a56551b996ed9be
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals/Stockholms Universitet 4 (online-audio-converter.com).wav.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals/Stockholms Universitet 4 (online-audio-converter.com).wav.meta
new file mode 100644
index 0000000..fcdaf08
--- /dev/null
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals/Stockholms Universitet 4 (online-audio-converter.com).wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: d04b5fce2c9627f4483faa6f2951f454
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format.meta
new file mode 100644
index 0000000..e2cbcc3
--- /dev/null
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b536b3fe2c90f5c4b975678a907a8478
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format/Narration1.wav.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format/Narration1.wav.meta
new file mode 100644
index 0000000..bd4e9c0
--- /dev/null
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format/Narration1.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 2507559d8d0f1cc4ca0ba02c5e3a33a4
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format/Narration2.wav.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format/Narration2.wav.meta
new file mode 100644
index 0000000..ba5c858
--- /dev/null
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format/Narration2.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 1804cdfd62684924aad3bbc22963b2ca
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals.meta
new file mode 100644
index 0000000..e39b825
--- /dev/null
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 91e0783b001c5b84db00051164c5a138
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals/Stockholms Universitet 3.m4a.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals/Stockholms Universitet 3.m4a.meta
new file mode 100644
index 0000000..83ebd19
--- /dev/null
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals/Stockholms Universitet 3.m4a.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c6bbf16acd5664e4da08d29e6dccd73f
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals/Stockholms Universitet 4.m4a.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals/Stockholms Universitet 4.m4a.meta
new file mode 100644
index 0000000..c70be00
--- /dev/null
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals/Stockholms Universitet 4.m4a.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f19ef78b3b23cc645a00e50d78dc69c4
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab b/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab
index f4293ea..5c272f8 100644
--- a/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab
@@ -12,6 +12,8 @@ GameObject:
- component: {fileID: 382264866493358940}
- component: {fileID: 382264866492359068}
- component: {fileID: 5204658000653702064}
+ - component: {fileID: 2369382148363411835}
+ - component: {fileID: 5762830989053361383}
m_Layer: 0
m_Name: wind_turbine_0001_rotor
m_TagString: WindTurbine
@@ -97,6 +99,45 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 0
+--- !u!114 &2369382148363411835
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 382264866490105688}
+ 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: 5762830989053361383}
+ sceneViewId: 0
+ InstantiationId: 0
+ isRuntimeInstantiated: 0
+--- !u!114 &5762830989053361383
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 382264866490105688}
+ 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!1 &382264866490105690
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ThirdParty/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset b/Assets/ThirdParty/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset
index e677cf0..a1ce2f5 100644
--- a/Assets/ThirdParty/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset
+++ b/Assets/ThirdParty/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset
@@ -52,6 +52,7 @@ MonoBehaviour:
- RPC_EmergencyButtonClick
- RPC_GreenButtonClick
- RPC_VoltageUpdate
+ - RPC_WT_Turn
DisableAutoOpenWizard: 1
ShowSettings: 1
DevRegionSetOnce: 1
diff --git a/Assets/Wind_Turbine/Scripts/Windturbine.cs b/Assets/Wind_Turbine/Scripts/Windturbine.cs
index 77345d2..f7cff63 100644
--- a/Assets/Wind_Turbine/Scripts/Windturbine.cs
+++ b/Assets/Wind_Turbine/Scripts/Windturbine.cs
@@ -1,3 +1,4 @@
+using Photon.Pun;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -8,6 +9,7 @@ public class Windturbine : MonoBehaviour
public float speed;
private API apiScript;
private GameObject GUIdataGameObject;
+ PhotonView photonView;
// Start is called before the first frame update
void Start()
{
@@ -19,9 +21,19 @@ public class Windturbine : MonoBehaviour
// Update is called once per frame
void Update()
+ {
+
+
+ photonView = PhotonView.Get(this);
+ photonView.RPC("RPC_WT_Turn", RpcTarget.All);
+ }
+
+ [PunRPC]
+ public void RPC_WT_Turn()
{
Debug.Log("WIND SPEED FROM API SCRIPT:" + apiScript.latestWS);
transform.localEulerAngles = new Vector3(0.0f, 0.0f, angle);
- angle += Time.deltaTime * (apiScript.latestWS*10);
+ angle += Time.deltaTime * (apiScript.latestWS * 10);
+
}
}