diff --git a/Assets/Plugins/ParrelSync.meta b/Assets/Plugins/ParrelSync.meta new file mode 100644 index 0000000..d0092ed --- /dev/null +++ b/Assets/Plugins/ParrelSync.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64dcfe5f95badbf46b7e8db9110b25be +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ParrelSync/ScriptableObjects.meta b/Assets/Plugins/ParrelSync/ScriptableObjects.meta new file mode 100644 index 0000000..e18cb0e --- /dev/null +++ b/Assets/Plugins/ParrelSync/ScriptableObjects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9f0d7d3363842e2479df33beb60d2fa7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset b/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset new file mode 100644 index 0000000..0ec926c --- /dev/null +++ b/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0011418c9d75434988a06b6df93b283, type: 3} + m_Name: ParrelSyncProjectSettings + m_EditorClassIdentifier: + m_OptionalSymbolicLinkFolders: [] diff --git a/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset.meta b/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset.meta new file mode 100644 index 0000000..c314c91 --- /dev/null +++ b/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8e33279de3786345a88ee8cb21917e0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SceneSharing/Materials/GreenButton.mat b/Assets/SceneSharing/Materials/GreenButton.mat new file mode 100644 index 0000000..8c9e835 --- /dev/null +++ b/Assets/SceneSharing/Materials/GreenButton.mat @@ -0,0 +1,82 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GreenButton + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _METALLICGLOSSMAP + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 93cef7b123baace49a4508c4b6f2cec3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 9f393d521eced1743813048ee4c113a7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: d067328b96a9e22468bb2cbd30c51050, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: 48b5754585338eb40872d655be3f9d31, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/SceneSharing/Materials/GreenButton.mat.meta b/Assets/SceneSharing/Materials/GreenButton.mat.meta new file mode 100644 index 0000000..59ce119 --- /dev/null +++ b/Assets/SceneSharing/Materials/GreenButton.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 496d80de84119434795ada5b79b544f3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SceneSharing/Materials/Podium_AlbedoTransparency-Green.png b/Assets/SceneSharing/Materials/Podium_AlbedoTransparency-Green.png new file mode 100644 index 0000000..6b697ea Binary files /dev/null and b/Assets/SceneSharing/Materials/Podium_AlbedoTransparency-Green.png differ diff --git a/Assets/SceneSharing/Materials/Podium_AlbedoTransparency-Green.png.meta b/Assets/SceneSharing/Materials/Podium_AlbedoTransparency-Green.png.meta new file mode 100644 index 0000000..35bb7f4 --- /dev/null +++ b/Assets/SceneSharing/Materials/Podium_AlbedoTransparency-Green.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 9f393d521eced1743813048ee4c113a7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SharedSpatialAnchors/Materials/ScreenMaterial.mat b/Assets/SharedSpatialAnchors/Materials/ScreenMaterial.mat new file mode 100644 index 0000000..d2c8a82 --- /dev/null +++ b/Assets/SharedSpatialAnchors/Materials/ScreenMaterial.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ScreenMaterial + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/SharedSpatialAnchors/Materials/ScreenMaterial.mat.meta b/Assets/SharedSpatialAnchors/Materials/ScreenMaterial.mat.meta new file mode 100644 index 0000000..b3654d5 --- /dev/null +++ b/Assets/SharedSpatialAnchors/Materials/ScreenMaterial.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c04eb7eec73ebfa45a9c3155d8ca14bc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SharedSpatialAnchors/Prefabs/.DS_Store b/Assets/SharedSpatialAnchors/Prefabs/.DS_Store index c570302..1bed5c8 100644 Binary files a/Assets/SharedSpatialAnchors/Prefabs/.DS_Store and b/Assets/SharedSpatialAnchors/Prefabs/.DS_Store differ diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/.DS_Store b/Assets/SharedSpatialAnchors/Prefabs/Resources/.DS_Store new file mode 100644 index 0000000..093762c Binary files /dev/null and b/Assets/SharedSpatialAnchors/Prefabs/Resources/.DS_Store differ 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/.DS_Store b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/.DS_Store new file mode 100644 index 0000000..2436815 Binary files /dev/null and b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/.DS_Store differ 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 b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals/Stockholms Universitet 3 (online-audio-converter.com).wav new file mode 100644 index 0000000..07703f0 Binary files /dev/null and b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals/Stockholms Universitet 3 (online-audio-converter.com).wav differ 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 b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals/Stockholms Universitet 4 (online-audio-converter.com).wav new file mode 100644 index 0000000..dcd88c2 Binary files /dev/null and b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Noise Reduced and finals/Stockholms Universitet 4 (online-audio-converter.com).wav differ 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 b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format/Narration1.wav new file mode 100644 index 0000000..b7c5b22 Binary files /dev/null and b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format/Narration1.wav differ 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 b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format/Narration2.wav new file mode 100644 index 0000000..d46046d Binary files /dev/null and b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals in WAV format/Narration2.wav differ 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 b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals/Stockholms Universitet 3.m4a new file mode 100644 index 0000000..fd2ca46 Binary files /dev/null and b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals/Stockholms Universitet 3.m4a differ 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 b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals/Stockholms Universitet 4.m4a new file mode 100644 index 0000000..5f73d86 Binary files /dev/null and b/Assets/SharedSpatialAnchors/Prefabs/Resources/Audio Narrations/Originals/Stockholms Universitet 4.m4a differ 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/GUI.prefab b/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab index d89359e..64409e2 100644 --- a/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab +++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab @@ -912,7 +912,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4890728644967733176} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.12994087, y: 0.080064446, z: 1.5369034} + m_LocalPosition: {x: -0.014, y: 0.080064446, z: 1.5369034} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1119,6 +1119,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7516989854395125640, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_TagString + value: SB + objectReference: {fileID: 0} - target: {fileID: 7516989854707263118, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} propertyPath: m_LocalScale.x value: 0.89236 @@ -1139,6 +1143,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7516989854951799700, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 496d80de84119434795ada5b79b544f3, type: 2} - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} propertyPath: _hoverColor.b value: 0.003921569 @@ -1468,15 +1476,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -4740409285023748802, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} propertyPath: ObservedComponents.Array.size - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: -4740409285023748802, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} propertyPath: ObservedComponents.Array.data[0] value: - objectReference: {fileID: 4890728645620921254} + objectReference: {fileID: 1160440965950818012} - target: {fileID: -4740409285023748802, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} propertyPath: ObservedComponents.Array.data[1] value: + objectReference: {fileID: 4890728645620921254} + - target: {fileID: 4293156748659161764, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} + propertyPath: m_TagString + value: EB objectReference: {fileID: 0} - target: {fileID: 4293156748659161770, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} propertyPath: m_LocalPosition.y @@ -1528,7 +1540,7 @@ PrefabInstance: objectReference: {fileID: 1160440965950818012} - target: {fileID: 4293156749170067433, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} propertyPath: _whenSelect.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: RPC_EmergencyButtonClick + value: emergencyButtonClick objectReference: {fileID: 0} - target: {fileID: 4293156749170067433, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} propertyPath: _whenSelect.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName @@ -1758,6 +1770,10 @@ PrefabInstance: propertyPath: m_Name value: CanvasJsonData objectReference: {fileID: 0} + - target: {fileID: 6036491612173940071, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} + propertyPath: m_TagString + value: GUIData + objectReference: {fileID: 0} - target: {fileID: 6036491612173940088, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} propertyPath: m_Color.b value: 0 diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/TalkingAvatar.prefab b/Assets/SharedSpatialAnchors/Prefabs/Resources/TalkingAvatar.prefab index f99ae4d..8500ec1 100644 --- a/Assets/SharedSpatialAnchors/Prefabs/Resources/TalkingAvatar.prefab +++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/TalkingAvatar.prefab @@ -1,5 +1,215 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1560011088 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1560011096} + - component: {fileID: 1560011095} + - component: {fileID: 1560011094} + - component: {fileID: 1560011093} + - component: {fileID: 1560011092} + - component: {fileID: 1560011091} + - component: {fileID: 1560011090} + - component: {fileID: 1560011089} + m_Layer: 0 + m_Name: Quad + m_TagString: Quad + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1560011096 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560011088} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.15662651, y: 2.3273864, z: 0.063716404} + m_LocalScale: {x: 1.2048193, y: 1.15848, z: 1.15848} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2316982808971492402} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!33 &1560011095 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560011088} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1560011094 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560011088} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c04eb7eec73ebfa45a9c3155d8ca14bc, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &1560011093 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560011088} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!328 &1560011092 +VideoPlayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560011088} + m_Enabled: 1 + m_VideoClip: {fileID: 32900000, guid: f051530b0ac65ed468ee999e045ddf17, type: 3} + m_TargetCameraAlpha: 1 + m_TargetCamera3DLayout: 0 + m_TargetCamera: {fileID: 0} + m_TargetTexture: {fileID: 0} + m_TimeReference: 0 + m_TargetMaterialRenderer: {fileID: 0} + m_TargetMaterialProperty: <noninit> + m_RenderMode: 3 + m_AspectRatio: 2 + m_DataSource: 0 + m_PlaybackSpeed: 1 + m_AudioOutputMode: 2 + m_TargetAudioSources: + - {fileID: 0} + m_DirectAudioVolumes: + - 0 + m_Url: + m_EnabledAudioTracks: 01 + m_DirectAudioMutes: 01 + m_ControlledAudioTrackCount: 1 + m_PlayOnAwake: 1 + m_SkipOnDrop: 1 + m_Looping: 0 + m_WaitForFirstFrame: 1 + m_FrameReadyEventEnabled: 0 + m_VideoShaders: [] +--- !u!114 &1560011091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560011088} + 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: 1 + OwnershipTransfer: 0 + observableSearch: 2 + ObservedComponents: + - {fileID: 1560011090} + - {fileID: 1560011089} + sceneViewId: 0 + InstantiationId: 0 + isRuntimeInstantiated: 0 +--- !u!114 &1560011090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560011088} + 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 &1560011089 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560011088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8efc6b1d64977384eb3405357896c656, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PositionModel: + SynchronizeEnabled: 1 + TeleportEnabled: 1 + TeleportIfDistanceGreaterThan: 3 + InterpolateOption: 2 + InterpolateMoveTowardsSpeed: 1 + InterpolateLerpSpeed: 1 + ExtrapolateOption: 0 + ExtrapolateSpeed: 1 + ExtrapolateIncludingRoundTripTime: 1 + ExtrapolateNumberOfStoredPositions: 1 + m_RotationModel: + SynchronizeEnabled: 1 + InterpolateOption: 1 + InterpolateRotateTowardsSpeed: 180 + InterpolateLerpSpeed: 5 + m_ScaleModel: + SynchronizeEnabled: 1 + InterpolateOption: 0 + InterpolateMoveTowardsSpeed: 1 + InterpolateLerpSpeed: 0 --- !u!1 &15133356018227668 GameObject: m_ObjectHideFlags: 0 @@ -946,9 +1156,11 @@ GameObject: - component: {fileID: 3196596099490932396} - component: {fileID: 4067417591161320129} - component: {fileID: 3569971862085791352} + - component: {fileID: 1553315533} + - component: {fileID: 1553315532} m_Layer: 0 m_Name: TalkingAvatar - m_TagString: Untagged + m_TagString: Avatar m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -962,11 +1174,12 @@ Transform: m_GameObject: {fileID: 3128949758138181256} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 1.42, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.83, y: 0.86319995, z: 0.86319995} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 5280034911807405635} - {fileID: 7815928270693653670} + - {fileID: 1560011096} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} @@ -1063,6 +1276,117 @@ MonoBehaviour: m_SynchronizeAngularVelocity: 1 m_TeleportEnabled: 1 m_TeleportIfDistanceGreaterThan: 3 +--- !u!82 &1553315533 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3128949758138181256} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: d04b5fce2c9627f4483faa6f2951f454, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1553315532 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3128949758138181256} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: df56a8fa2ce0307498969d4c550617b5, type: 3} + m_Name: + m_EditorClassIdentifier: + audioSource: {fileID: 0} + audioNarration_1: {fileID: 8300000, guid: d04b5fce2c9627f4483faa6f2951f454, type: 3} + audioNarration_2: {fileID: 8300000, guid: 9b80a823b03707d42a56551b996ed9be, type: 3} --- !u!1 &3489539847802727250 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab b/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab index 4f7a5d7..84f4056 100644 --- a/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab +++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab @@ -12,9 +12,13 @@ GameObject: - component: {fileID: 382264866493358940} - component: {fileID: 382264866492359068} - component: {fileID: 5204658000653702064} + - component: {fileID: 2369382148363411835} + - component: {fileID: 5762830989053361383} + - component: {fileID: 6073354290617709007} + - component: {fileID: 5326010102002042226} m_Layer: 0 m_Name: wind_turbine_0001_rotor - m_TagString: Untagged + m_TagString: WindTurbine m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -96,6 +100,98 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fd8e0fba131aaac4caffc43785275be1, type: 3} m_Name: m_EditorClassIdentifier: + speed: 0 + startRotationY: 0 + endRotationY: 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: 1 + OwnershipTransfer: 1 + observableSearch: 2 + ObservedComponents: + - {fileID: 5762830989053361383} + - {fileID: 5326010102002042226} + 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!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!114 &5326010102002042226 +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: 8efc6b1d64977384eb3405357896c656, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PositionModel: + SynchronizeEnabled: 1 + TeleportEnabled: 1 + TeleportIfDistanceGreaterThan: 3 + InterpolateOption: 2 + InterpolateMoveTowardsSpeed: 1 + InterpolateLerpSpeed: 1 + ExtrapolateOption: 0 + ExtrapolateSpeed: 1 + ExtrapolateIncludingRoundTripTime: 1 + ExtrapolateNumberOfStoredPositions: 1 + m_RotationModel: + SynchronizeEnabled: 0 + InterpolateOption: 2 + InterpolateRotateTowardsSpeed: 180 + InterpolateLerpSpeed: 5 + m_ScaleModel: + SynchronizeEnabled: 0 + InterpolateOption: 0 + InterpolateMoveTowardsSpeed: 1 + InterpolateLerpSpeed: 0 --- !u!1 &382264866490105690 GameObject: m_ObjectHideFlags: 0 @@ -116,9 +212,10 @@ GameObject: - component: {fileID: 6433795997240961375} - component: {fileID: 7309076934599776581} - component: {fileID: 2935496554514557820} + - component: {fileID: 5643319099722428757} m_Layer: 0 m_Name: Wind_Turbine_withMap - m_TagString: Untagged + m_TagString: Wind_Turbine_withMap m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 @@ -292,12 +389,12 @@ Rigidbody: m_GameObject: {fileID: 382264866490105690} serializedVersion: 2 m_Mass: 100 - m_Drag: 10 - m_AngularDrag: 10 + m_Drag: 1 + m_AngularDrag: 1 m_UseGravity: 0 m_IsKinematic: 0 m_Interpolate: 0 - m_Constraints: 126 + m_Constraints: 94 m_CollisionDetection: 0 --- !u!114 &4423142984711990833 MonoBehaviour: @@ -314,12 +411,13 @@ MonoBehaviour: ObservedComponentsFoldoutOpen: 1 Group: 0 prefixField: -1 - Synchronization: 3 + Synchronization: 1 OwnershipTransfer: 1 observableSearch: 2 ObservedComponents: - {fileID: 6433795997240961375} - {fileID: 7309076934599776581} + - {fileID: 5643319099722428757} sceneViewId: 0 InstantiationId: 0 isRuntimeInstantiated: 0 @@ -367,6 +465,39 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 118420a922675d145ade2a28e327d7a5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &5643319099722428757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382264866490105690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8efc6b1d64977384eb3405357896c656, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PositionModel: + SynchronizeEnabled: 1 + TeleportEnabled: 1 + TeleportIfDistanceGreaterThan: 3 + InterpolateOption: 2 + InterpolateMoveTowardsSpeed: 1 + InterpolateLerpSpeed: 1 + ExtrapolateOption: 0 + ExtrapolateSpeed: 1 + ExtrapolateIncludingRoundTripTime: 1 + ExtrapolateNumberOfStoredPositions: 1 + m_RotationModel: + SynchronizeEnabled: 1 + InterpolateOption: 1 + InterpolateRotateTowardsSpeed: 180 + InterpolateLerpSpeed: 5 + m_ScaleModel: + SynchronizeEnabled: 1 + InterpolateOption: 0 + InterpolateMoveTowardsSpeed: 1 + InterpolateLerpSpeed: 0 --- !u!1001 &5204658001146585073 PrefabInstance: m_ObjectHideFlags: 0 @@ -378,6 +509,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 @@ -494,12 +633,37 @@ PrefabInstance: propertyPath: m_Name value: map_logo objectReference: {fileID: 0} + - target: {fileID: 8661891273527454774, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} + propertyPath: m_TagString + value: map + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: -6453332735135581912, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - {fileID: -8231463906739603765, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - {fileID: -1201471494275974383, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} - {fileID: 2070753283667298535, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} +--- !u!1 &3463145896363193287 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8661891273527454774, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} + m_PrefabInstance: {fileID: 5204658001146585073} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1119216912 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3463145896363193287} + serializedVersion: 2 + m_Mass: 1000000 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 --- !u!4 &4270609215839807869 stripped Transform: m_CorrespondingSourceObject: {fileID: 8322344887590106764, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3} diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/qUAD.mov b/Assets/SharedSpatialAnchors/Prefabs/Resources/qUAD.mov new file mode 100644 index 0000000..9871fff Binary files /dev/null and b/Assets/SharedSpatialAnchors/Prefabs/Resources/qUAD.mov differ diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/qUAD.mov.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/qUAD.mov.meta new file mode 100644 index 0000000..49fd899 --- /dev/null +++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/qUAD.mov.meta @@ -0,0 +1,18 @@ +fileFormatVersion: 2 +guid: f051530b0ac65ed468ee999e045ddf17 +VideoClipImporter: + externalObjects: {} + serializedVersion: 2 + frameRange: 0 + startFrame: -1 + endFrame: -1 + colorSpace: 0 + deinterlace: 0 + encodeAlpha: 0 + flipVertical: 0 + flipHorizontal: 0 + importAudio: 1 + targetSettings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity b/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity index 7ef3fc2..c30486f 100644 --- a/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity +++ b/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity @@ -1679,6 +1679,64 @@ Transform: m_Father: {fileID: 1929030171} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1771592182 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1771592184} + - component: {fileID: 1771592183} + m_Layer: 0 + m_Name: Proxima + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1771592183 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1771592182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e277581af68d4604da056e460b819656, type: 3} + m_Name: + m_EditorClassIdentifier: + _displayName: TT + _port: 7759 + _password: 123456 + _useHttps: 0 + _certificate: {fileID: 0} + _certificatePassword: + _runOnEnable: 1 + _logBufferSize: 1000 + _instantiateStatusUI: 1 + _instantiateConnectUI: 1 + _dontDestroyOnLoad: 1 + _setRunInBackground: 1 + _serverType: 1 + _serverUrl: +--- !u!4 &1771592184 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1771592182} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.3851701, y: 0.9054507, z: -0.015399694} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1774543903 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/SharedSpatialAnchors/Scripts/API.cs b/Assets/SharedSpatialAnchors/Scripts/API.cs index 25ce3df..a90d2ef 100644 --- a/Assets/SharedSpatialAnchors/Scripts/API.cs +++ b/Assets/SharedSpatialAnchors/Scripts/API.cs @@ -7,6 +7,10 @@ using System.Security.Cryptography; using TMPro; using UnityEngine; using UnityEngine.Networking; +using WebSocketSharp; +using UnityEngine.Video; +using UnityEngine.Playables; + //https://github.com/GlitchEnzo/NuGetForUnity // Creating the data structure according to the expected Json [Serializable] @@ -36,7 +40,7 @@ public class ApiResponse } -public class API : MonoBehaviour +public class API : MonoBehaviourPunCallbacks, IPunObservable { public TextMeshProUGUI voltageValue; public TextMeshProUGUI windDirValue; @@ -44,15 +48,20 @@ public class API : MonoBehaviour public TextMeshProUGUI loc; public TextMeshProUGUI windSpeedValue; private float LatestT; - private float latestWD; - private float latestWS; + public float latestWD = 0.0f; + public float latestWS = 0.01f; private String windDirectionInDirectionTerms; private string unit; private GameObject webSocketController; private WebSocketController webSocketControllerScript; public bool isButtonPressed = false; // Boolean to keep voltage updated as long as the turbine is rotating PhotonView photonView; + private GameObject avatar; + private AudioController audioControllerScript; + public bool turn_WT_on_Y_Axis = false; + GameObject videoPlayerQuad; + VideoPlayer videoPlayer; void Start() { @@ -60,36 +69,80 @@ public class API : MonoBehaviour //TestFromJsonToData(); //EmergencyButtonClick(); photonView = PhotonView.Get(this); - photonView.RPC("RPC_EmergencyButtonClick", RpcTarget.All); + photonView.RPC("RPC_EmergencyButtonClick", RpcTarget.All,false,0.0f); + + avatar = GameObject.FindGameObjectWithTag("Avatar"); + audioControllerScript = avatar.GetComponent<AudioController>(); + + + // Turning on both the buttons on GUI when something is playing + transform.GetChild(1).gameObject.SetActive(false); + transform.GetChild(3).gameObject.SetActive(false); + + videoPlayerQuad = avatar.transform.GetChild(2).gameObject; + videoPlayer = videoPlayerQuad.GetComponent<VideoPlayer>(); } void Update() { if (isButtonPressed) { + webSocketController = GameObject.FindGameObjectWithTag("WebController"); + webSocketControllerScript = webSocketController.GetComponent<WebSocketController>(); + if (webSocketControllerScript.ws.ReadyState != WebSocketState.Open) + { + webSocketControllerScript.ws.Connect(); + } photonView = PhotonView.Get(this); photonView.RPC("RPC_VoltageUpdate", RpcTarget.All, webSocketControllerScript.voltageValue.ToString()); - + } + + if (audioControllerScript.audioSource.isActiveAndEnabled && !audioControllerScript.audioSource.isPlaying) + { + // Turning off both the buttons on GUI when something is playing + transform.GetChild(1).gameObject.SetActive(true); + transform.GetChild(3).gameObject.SetActive(true); + videoPlayer.Pause(); + } + } public void OnButtonClick() { - webSocketController = GameObject.FindGameObjectWithTag("WebController"); - webSocketControllerScript = webSocketController.GetComponent<WebSocketController>(); - StartCoroutine(GetText()); - } + if (!isButtonPressed) + { + webSocketController = GameObject.FindGameObjectWithTag("WebController"); + webSocketControllerScript = webSocketController.GetComponent<WebSocketController>(); + webSocketControllerScript.ConnectWithESP32(); + StartCoroutine(GetText()); - [PunRPC] - public void RPC_EmergencyButtonClick() + + audioControllerScript.fn_call_AudioNarration2(); + Debug.Log("Button is Clicked"); + transform.GetChild(1).gameObject.SetActive(false); + transform.GetChild(3).gameObject.SetActive(false); + } + + } + public void emergencyButtonClick() { - isButtonPressed = false; + photonView = PhotonView.Get(this); + photonView.RPC("RPC_EmergencyButtonClick", RpcTarget.All, false, 0.0f); + } + [PunRPC] + public void RPC_EmergencyButtonClick(bool isButtonPressedVal, float latestWS_val) + { + isButtonPressed = isButtonPressedVal; + latestWS = latestWS_val; + loc.SetText("----"); windDirValue.SetText("----"); temperatureValue.SetText("----"); voltageValue.SetText("----"); windSpeedValue.SetText("----"); + } IEnumerator GetText() { @@ -105,7 +158,7 @@ public class API : MonoBehaviour { Debug.Log("Received data" + www.downloadHandler.text); ExtractDataFromJson(www.downloadHandler.text); - isButtonPressed = true; // Boolean to keep voltage updated as long as the turbine is rotating + } } @@ -143,7 +196,12 @@ public void ExtractDataFromJson(string json) latestWD = point.values[0]; windDirectionInDirectionTerms = GetWindDirection(latestWD); //windDirValue.SetText(latestWD.ToString()); + if (webSocketControllerScript.ws.ReadyState != WebSocketState.Open) + { + webSocketControllerScript.ws.Connect(); + } webSocketControllerScript.ws.Send(latestWD.ToString()+":take input"); + Debug.Log(latestWD.ToString()+" - Degrees sent to ESP"); } if (point.name == "t") { @@ -158,22 +216,26 @@ public void ExtractDataFromJson(string json) } } photonView = PhotonView.Get(this); - photonView.RPC("RPC_GreenButtonClick", RpcTarget.All,windDirectionInDirectionTerms,LatestT+" C","Kista",latestWS+" m/s"); + photonView.RPC("RPC_GreenButtonClick", RpcTarget.All,windDirectionInDirectionTerms,LatestT+" C","Kista",latestWS+" m/s",true,latestWD,latestWS, true); } [PunRPC] - public void RPC_GreenButtonClick(String windDirection,String locationTemperature,String location,String windSpeed) + public void RPC_GreenButtonClick(String windDirection,String locationTemperature,String location,String windSpeed,bool turn_WT_on_Y_Axis_val,float latestWD_val, float latestWS_val,bool isButtonPressed_val) { - Debug.Log("Latest WS is - " + windSpeed); + isButtonPressed = isButtonPressed_val; + latestWD = latestWD_val; // Just for RPC purposes + latestWS = latestWS_val; // Just for RPC purposes windDirValue.SetText(windDirection); temperatureValue.SetText(locationTemperature); loc.SetText(location); 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. + videoPlayer.Play(); } [PunRPC] public void RPC_VoltageUpdate(String voltageGenerated) { - Debug.Log("Voltge generated is - " + voltageGenerated); + //Debug.Log("Voltge generated is - " + voltageGenerated); voltageValue.text = voltageGenerated; } public string GetWindDirection(float degrees) @@ -185,4 +247,19 @@ public void ExtractDataFromJson(string json) int index = (int)Math.Floor((degrees + 11.25) / 22.5); return directions[index]; } + + + void IPunObservable.OnPhotonSerializeView(PhotonStream stream, PhotonMessageInfo info) + { + if (stream.IsWriting) + { + stream.SendNext(turn_WT_on_Y_Axis); + stream.SendNext(isButtonPressed); + } + else + { + turn_WT_on_Y_Axis = (bool)stream.ReceiveNext(); + isButtonPressed = (bool)stream.ReceiveNext(); + } + } } diff --git a/Assets/SharedSpatialAnchors/Scripts/AudioController.cs b/Assets/SharedSpatialAnchors/Scripts/AudioController.cs new file mode 100644 index 0000000..ef387a5 --- /dev/null +++ b/Assets/SharedSpatialAnchors/Scripts/AudioController.cs @@ -0,0 +1,65 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Photon.Pun; + +public class AudioController : MonoBehaviour +{ + public AudioSource audioSource; + public AudioClip audioNarration_1; + public AudioClip audioNarration_2; + PhotonView photonView; + + // Start is called before the first frame update + void Start() + { + audioSource = GetComponent<AudioSource>(); + } + + public void Update() + { + + } + + // Audio Narration 1 + public void fn_call_AudioNarration1() + { + photonView = PhotonView.Get(this); + photonView.RPC("RPC_startAudioNarration1", RpcTarget.All); + } + + [PunRPC] + public void RPC_startAudioNarration1() + { + StartCoroutine(CoRoutine_startAudioNarration1()); + } + IEnumerator CoRoutine_startAudioNarration1() + { + yield return new WaitForSeconds(1.0f); + audioSource.PlayOneShot(audioNarration_1); + } + + // Audio Narration 2 + public void fn_call_AudioNarration2() + { + photonView = PhotonView.Get(this); + photonView.RPC("RPC_startAudioNarration2", RpcTarget.All); + } + + [PunRPC] + public void RPC_startAudioNarration2() + { + StartCoroutine(CoRoutine_startAudioNarration2()); + } + IEnumerator CoRoutine_startAudioNarration2() + { + yield return new WaitForSeconds(0.0f); + audioSource.PlayOneShot(audioNarration_2); + yield return new WaitForSeconds(audioNarration_2.length+2.0f); + audioSource.gameObject.SetActive(false); + } + + + + +} diff --git a/Assets/SharedSpatialAnchors/Scripts/AudioController.cs.meta b/Assets/SharedSpatialAnchors/Scripts/AudioController.cs.meta new file mode 100644 index 0000000..edc54c9 --- /dev/null +++ b/Assets/SharedSpatialAnchors/Scripts/AudioController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: df56a8fa2ce0307498969d4c550617b5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SharedSpatialAnchors/Scripts/NetworkedAttribute.cs b/Assets/SharedSpatialAnchors/Scripts/NetworkedAttribute.cs new file mode 100644 index 0000000..7d7464e --- /dev/null +++ b/Assets/SharedSpatialAnchors/Scripts/NetworkedAttribute.cs @@ -0,0 +1,5 @@ +using System; + +internal class NetworkedAttribute : Attribute +{ +} \ No newline at end of file diff --git a/Assets/SharedSpatialAnchors/Scripts/NetworkedAttribute.cs.meta b/Assets/SharedSpatialAnchors/Scripts/NetworkedAttribute.cs.meta new file mode 100644 index 0000000..780a8aa --- /dev/null +++ b/Assets/SharedSpatialAnchors/Scripts/NetworkedAttribute.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c5abaf289b293084480009e235498473 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SharedSpatialAnchors/Scripts/SharedAnchorControlPanel.cs b/Assets/SharedSpatialAnchors/Scripts/SharedAnchorControlPanel.cs index 61558e5..523d502 100644 --- a/Assets/SharedSpatialAnchors/Scripts/SharedAnchorControlPanel.cs +++ b/Assets/SharedSpatialAnchors/Scripts/SharedAnchorControlPanel.cs @@ -373,18 +373,24 @@ public class SharedAnchorControlPanel : MonoBehaviour SampleController.Instance.Log("Trying to Spawn WT Object"); SampleController.Instance.Log(spawnPoint.position.ToString()); Debug.Log(spawnPoint.position); + + var networkedGUI = PhotonPun.PhotonNetwork.Instantiate(TwinTurbine_menuItem.name, new Vector3(-1f, 1f, 2f), Quaternion.identity); + var photonGrabbableGui = networkedGUI.GetComponent<PhotonGrabbableObject>(); + + //var networkedWindTurbine = PhotonPun.PhotonNetwork.Instantiate(TwinTurbine_windTurbine.name, new Vector3(Camera.main.transform.position.x,0, Camera.main.transform.position.z-2), Quaternion.identity); var networkedWindTurbine = PhotonPun.PhotonNetwork.Instantiate(TwinTurbine_windTurbine.name, new Vector3(0.0f, -0.2f, 0.5f), Quaternion.identity); var photonGrabbable = networkedWindTurbine.GetComponent<PhotonGrabbableObject>(); photonGrabbable.TransferOwnershipToLocalPlayer(); - var networkedGUI = PhotonPun.PhotonNetwork.Instantiate(TwinTurbine_menuItem.name, new Vector3(-1f,1f, 2f), Quaternion.identity); - var photonGrabbableGui = networkedGUI.GetComponent<PhotonGrabbableObject>(); + //photonGrabbableGui.TransferOwnershipToLocalPlayer(); - var networkedAvatar = PhotonPun.PhotonNetwork.Instantiate(TwinTurbine_talkingAvatar.name, new Vector3(1f, -0.2f, 1.15f), Quaternion.identity); + var networkedAvatar = PhotonPun.PhotonNetwork.Instantiate(TwinTurbine_talkingAvatar.name, new Vector3(1f, -0.2f, 1.15f), Quaternion.Euler(Vector3.up * 120)); var photonGrabbableAvatar = networkedAvatar.GetComponent<PhotonGrabbableObject>(); + + } } diff --git a/Assets/SharedSpatialAnchors/Scripts/WebSocketController.cs b/Assets/SharedSpatialAnchors/Scripts/WebSocketController.cs index 69a6700..7f9c9cb 100644 --- a/Assets/SharedSpatialAnchors/Scripts/WebSocketController.cs +++ b/Assets/SharedSpatialAnchors/Scripts/WebSocketController.cs @@ -19,7 +19,7 @@ public class WebSocketController : MonoBehaviour public String voltageValue = "0.0f"; public void Start(){ - ConnectWithESP32(); + //ConnectWithESP32(); //narrationController.GetComponent<NarrationController>(); } @@ -42,10 +42,10 @@ public class WebSocketController : MonoBehaviour }; ws.OnMessage += (sender, e) => { - Debug.Log("Received message: " + e.Data); + //Debug.Log("Received message: " + e.Data); //Debug.Log(); voltageValue = e.Data.Split(':')[1].ToString(); - Debug.Log(voltageValue); + // Debug.Log(voltageValue); //Voltage:180.0 if (e.Data.Equals("Start Narration", StringComparison.OrdinalIgnoreCase)){ // narrationControllerScript.startNarration = true; @@ -54,6 +54,7 @@ public class WebSocketController : MonoBehaviour }; ws.Connect(); Debug.Log("Websocket state - " + ws.ReadyState); + } diff --git a/Assets/ThirdParty/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset b/Assets/ThirdParty/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset index e677cf0..cac930d 100644 --- a/Assets/ThirdParty/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset +++ b/Assets/ThirdParty/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: PhotonServerSettings m_EditorClassIdentifier: AppSettings: - AppIdRealtime: c0b7ef81-05dc-458d-a5e8-4c82bdf44b70 + AppIdRealtime: 4d5353bb-2065-4588-bba5-d8324a90926b AppIdFusion: AppIdChat: AppIdVoice: @@ -52,6 +52,10 @@ MonoBehaviour: - RPC_EmergencyButtonClick - RPC_GreenButtonClick - RPC_VoltageUpdate + - RPC_WT_Turn + - RPC_startAudioNarration1 + - RPC_startAudioNarration2 + - RPC_WT_TurnOnIts_Y_Axis DisableAutoOpenWizard: 1 ShowSettings: 1 DevRegionSetOnce: 1 diff --git a/Assets/Wind_Turbine/Scripts/Windturbine.cs b/Assets/Wind_Turbine/Scripts/Windturbine.cs index 6d98bdf..3c8caa6 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; @@ -5,19 +6,89 @@ using UnityEngine; public class Windturbine : MonoBehaviour { float angle; - float speed; + public float speed; + private API apiScript; + private GameObject GUIdataGameObject; + PhotonView photonView; + + public float startRotationY = 0f; + public float endRotationY; + + private void OnEnable() + { + GUIdataGameObject = GameObject.FindGameObjectWithTag("GUIData"); + apiScript = GUIdataGameObject.GetComponent<API>(); + } // Start is called before the first frame update void Start() { angle = Random.Range(0.0f, 120.0f); speed = Random.Range(75.0f, 86.0f); + + //THis condition is to detach the map with the Wind turbine after Instantiating. This helps the map stick to the ground when the turbine rotates. + GameObject.FindGameObjectWithTag("map").transform.SetParent(null); ; + } // Update is called once per frame void Update() { - transform.localEulerAngles = new Vector3(0.0f, 0.0f, angle); - angle += Time.deltaTime * speed; + photonView = PhotonView.Get(this); + photonView.RPC("RPC_WT_Turn", RpcTarget.All); + + if(apiScript.turn_WT_on_Y_Axis) //From Base class + { + Debug.Log("FLAG IS TRUE"); + WT_TurnOnIts_Y_Axis(); + apiScript.turn_WT_on_Y_Axis = false; + } + } + + // Method to turn the 'Turbine blades' as per the SPEED of wind that is fetched from API + [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); // as the value we are fetching could not turn the blades completely, Multiplying the value we are fetching from API by 10. + + } + + public void WT_TurnOnIts_Y_Axis() + { + photonView = PhotonView.Get(this); + photonView.RPC("RPC_WT_TurnOnIts_Y_Axis", RpcTarget.All); + } + + [PunRPC] + public void RPC_WT_TurnOnIts_Y_Axis() + { + Debug.Log("Rotate On it's Y-Axis"); + endRotationY = apiScript.latestWD; + Debug.Log("endRotationY - Rotate On it's Y-Axis ----"+ endRotationY); + StartCoroutine(RotateObject(startRotationY, endRotationY, 3.5f)); + } + + // Method to turn the 'Turbine' on its Y axis as per the DIRECTION of wind that is fetched from API + IEnumerator RotateObject(float startAngle, float endAngle, float duration) + { + Debug.Log("Rotate On it's Y-Axis- COROUTINE"); + yield return new WaitForSeconds(2f); + float timeElapsed = 0f; + Quaternion startRotation = Quaternion.Euler(0, startAngle, 0); + Quaternion endRotation = Quaternion.Euler(0, endAngle, 0); + + while (timeElapsed < duration) + { + transform.parent.gameObject.transform.rotation = Quaternion.Lerp(startRotation, endRotation, timeElapsed / duration); + timeElapsed += Time.deltaTime; + yield return null; + } + + // Ensure the rotation exactly matches the end rotation at the end + transform.parent.gameObject.transform.rotation = endRotation; + } + } diff --git a/Packages/manifest.json b/Packages/manifest.json index 2c07da0..08d3a6c 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -20,6 +20,7 @@ "com.unity.xr.management": "4.4.0", "com.unity.xr.mock-hmd": "1.3.0-preview.1", "com.unity.xr.oculus": "3.4.0", + "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 8ff4399..7e56266 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -264,6 +264,13 @@ }, "url": "https://packages.unity.com" }, + "com.veriorpies.parrelsync": { + "version": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "d1ef610e9fe3ad0b490cce91594449fc0af809a6" + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6eb6409..4c12deb 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -138,7 +138,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 53 + bundleVersion: 75 preloadedAssets: - {fileID: 0} - {fileID: 0} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 602fe2a..6cd26cd 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -5,6 +5,14 @@ TagManager: serializedVersion: 2 tags: - WebController + - WindTurbine + - GUIData + - Avatar + - map + - Wind_Turbine_withMap + - EB + - SB + - Quad layers: - Default - TransparentFX