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/Resources/TalkingAvatar.prefab b/Assets/SharedSpatialAnchors/Prefabs/Resources/TalkingAvatar.prefab
index 204fad0..66f24bd 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: 3
+ 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: 0
+ 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: 0
+ TeleportEnabled: 1
+ TeleportIfDistanceGreaterThan: 3
+ InterpolateOption: 2
+ InterpolateMoveTowardsSpeed: 1
+ InterpolateLerpSpeed: 1
+ ExtrapolateOption: 0
+ ExtrapolateSpeed: 1
+ ExtrapolateIncludingRoundTripTime: 1
+ ExtrapolateNumberOfStoredPositions: 1
+ m_RotationModel:
+ SynchronizeEnabled: 0
+ InterpolateOption: 1
+ InterpolateRotateTowardsSpeed: 180
+ InterpolateLerpSpeed: 5
+ m_ScaleModel:
+ SynchronizeEnabled: 0
+ InterpolateOption: 0
+ InterpolateMoveTowardsSpeed: 1
+ InterpolateLerpSpeed: 0
--- !u!1 &15133356018227668
GameObject:
m_ObjectHideFlags: 0
@@ -969,6 +1179,7 @@ Transform:
m_Children:
- {fileID: 5280034911807405635}
- {fileID: 7815928270693653670}
+ - {fileID: 1560011096}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
@@ -1173,6 +1384,7 @@ MonoBehaviour:
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
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/Scripts/API.cs b/Assets/SharedSpatialAnchors/Scripts/API.cs
index b456362..3e0de29 100644
--- a/Assets/SharedSpatialAnchors/Scripts/API.cs
+++ b/Assets/SharedSpatialAnchors/Scripts/API.cs
@@ -8,6 +8,8 @@ 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
@@ -58,7 +60,8 @@ public class API : MonoBehaviourPunCallbacks, IPunObservable
private AudioController audioControllerScript;
public bool turn_WT_on_Y_Axis = false;
-
+ GameObject videoPlayerQuad;
+ VideoPlayer videoPlayer;
void Start()
{
@@ -76,6 +79,9 @@ public class API : MonoBehaviourPunCallbacks, IPunObservable
// 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()
@@ -90,7 +96,7 @@ public class API : MonoBehaviourPunCallbacks, IPunObservable
}
photonView = PhotonView.Get(this);
photonView.RPC("RPC_VoltageUpdate", RpcTarget.All, webSocketControllerScript.voltageValue.ToString());
-
+ videoPlayer.Play();
}
if (audioControllerScript.audioSource.isActiveAndEnabled && !audioControllerScript.audioSource.isPlaying)
@@ -98,6 +104,7 @@ public class API : MonoBehaviourPunCallbacks, IPunObservable
// 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();
}
}
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 6bf4374..6cd26cd 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -12,6 +12,7 @@ TagManager:
- Wind_Turbine_withMap
- EB
- SB
+ - Quad
layers:
- Default
- TransparentFX