Merge branch 'programming'

Viagg-io/Assets/BehaviourTrees/2.6-Castello.bt.txt

@@ -79,89 +79,6 @@ Tree("26_Castello_Castelli_di_Bellinzona_Intro") {
             }
         }
 
-        BTC.Show("Depthkit.VIDEOS.Intro5CastellidiBe")
-        BTC.Run("Depthkit.VIDEOS.Intro5CastellidiBe")
-        BTC.Hide("Depthkit.VIDEOS.Intro5CastellidiBe")
-
-        BTC.AddPossbileSpeechIntent("Castelli_di_Bellinzona.Intro.6")
-        BTC.AddPossbileSpeechIntent("Castelli_di_Bellinzona.Intro.7")
-        BTC.StartSpeechIntentRecognition()
-
-        Composite(Race) {
-            // -- Race 1: User sagt etwas
-            Composite(Sequence) {
-                BTC.UserStartedSpeechInput()
-
-                Composite(Selector) {
-                    // -- Selector 1: Intent erkannt
-                    Composite(Sequence) {
-                        BTC.SpeechIntentRecognized()
-                        
-                        Composite(Race) {
-                            Composite(Sequence) {
-                                BTC.CompareIntentID("Castelli_di_Bellinzona.Intro.6")
-                                BTC.ClearPossbileSpeechIntents()
-                                // Warten bis User Foto macht
-                                BTC.Run("NamedEventTrigger.GO.CameraButton")
-                            }
-                            Composite(Sequence) {
-                                BTC.CompareIntentID("Castelli_di_Bellinzona.Intro.7")
-                                BTC.ClearPossbileSpeechIntents()
-                            }
-                        }
-                    }
-
-                    // -- Selector 2: Intent nicht erkannt
-                    Composite(Sequence) {
-                        BTC.ClearPossbileSpeechIntents()
-
-                        // Fallback Button
-                        Composite(Marathon) {
-                            BTC.Show("GO.GO.SpeechButton")
-                            BTC.Set("TextMeshPro.GO.Option1Button", "text", "Sì.")
-                            BTC.Show("GO.GO.Option1Button")
-                            BTC.Set("TextMeshPro.GO.Option2Button", "text", "No.")
-                            BTC.Show("GO.GO.Option2Button")
-                        }
-
-                        Composite(Race) {
-                            Composite(Sequence) {
-                                // Ja
-                                BTC.Run("NamedEventTrigger.GO.Option1Button")
-                                BTC.AbortEventListener("NamedEventTrigger.GO.Option2Button")
-                                BTC.Hide("GO.GO.Option1Button")
-                                BTC.Hide("GO.GO.Option2Button")
-                                BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
-                                BTC.Hide("GO.GO.SpeechOptions")
-                                // Warten bis User Foto macht
-                                BTC.Run("NamedEventTrigger.GO.CameraButton")
-                            }
-                            Composite(Sequence) {
-                                // Nein
-                                BTC.Run("NamedEventTrigger.GO.Option2Button")
-                                BTC.AbortEventListener("NamedEventTrigger.GO.Option1Button")
-                                BTC.Hide("GO.GO.Option1Button")
-                                BTC.Hide("GO.GO.Option2Button")
-                                BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
-                                BTC.Hide("GO.GO.SpeechOptions")
-                            }
-                        }
-                    }
-                }
-            }
-
-            // -- Race 2: User sagt nichts
-            Composite(Sequence) {
-                BTC.Wait(10)
-                BTC.CompareUserSpeechInputStarted(false)
-                BTC.AbortSpeechEventListener()
-                BTC.StopSpeechIntentRecognition()
-                BTC.ClearPossbileSpeechIntents()
-            }
-        }
-
         BTC.Show("Depthkit.VIDEOS.Intro10CastellidiB")
         BTC.Run("Depthkit.VIDEOS.Intro10CastellidiB")
         BTC.Hide("Depthkit.VIDEOS.Intro10CastellidiB")

Viagg-io/Assets/Prefabs/Components/_SPEECH.prefab

@@ -470,6 +470,14 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6476992883679287242, guid: 6287e16ef914a5149b47dccded9a2e99, type: 3}
+      propertyPath: speechKey
+      value: 366T2LGGbIlIwMaqsXgyPhYOZ7XN9TXyyMEximTYmuUHZaIcEYejJQQJ99BEACI8hq2XJ3w3AAAYACOG9aeN
+      objectReference: {fileID: 0}
+    - target: {fileID: 6476992883679287242, guid: 6287e16ef914a5149b47dccded9a2e99, type: 3}
+      propertyPath: speechRegion
+      value: switzerlandnorth
+      objectReference: {fileID: 0}
     - target: {fileID: 6488617071109158819, guid: 6287e16ef914a5149b47dccded9a2e99, type: 3}
       propertyPath: m_Name
       value: ViaggioAI
@@ -522,6 +530,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7430897408325283729, guid: 6287e16ef914a5149b47dccded9a2e99, type: 3}
+      propertyPath: speechKey
+      value: 366T2LGGbIlIwMaqsXgyPhYOZ7XN9TXyyMEximTYmuUHZaIcEYejJQQJ99BEACI8hq2XJ3w3AAAYACOG9aeN
+      objectReference: {fileID: 0}
     - target: {fileID: 8045499084232000901, guid: 6287e16ef914a5149b47dccded9a2e99, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0

Viagg-io/Assets/Scenes/2.0-SBB.unity

@@ -1720,6 +1720,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1167381564}
   - component: {fileID: 1167381563}
+  - component: {fileID: 1167381565}
   m_Layer: 0
   m_Name: MediaPlayer
   m_TagString: Untagged
@@ -1748,8 +1749,8 @@ MonoBehaviour:
     transparency: 0
     alphaPacking: 0
     stereoPacking: 0
-  _autoOpen: 1
+  _autoOpen: 0
-  _autoPlayOnStart: 1
+  _autoPlayOnStart: 0
   _loop: 1
   _audioVolume: 1
   _audioBalance: 0
@@ -1946,6 +1947,19 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1167381565
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1167381562}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1f9d0c2aced6745009cded319d0b6d14, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  videoPath: PanoramaVideo/SBB_Panorama.mp4
 --- !u!1001 &1238952579
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3561,7 +3575,7 @@ MonoBehaviour:
   overrideLogStringDisplay: 0
   overrideDebugInternalActive: 0
   overrideDebugChangesActive: 0
-  instanceID: 2808508
+  instanceID: 1048262
   __behaviourTreeGenerator: {fileID: 0}
   taskScripts:
   - {fileID: 4900000, guid: aceafeb25fe43443aa61f49093d6ed3b, type: 3}

Viagg-io/Assets/Scripts/PlayAVProVideo.cs

@@ -0,0 +1,31 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using RenderHeads.Media.AVProVideo;
+
+public class PlayAVProVideo : MonoBehaviour
+{
+    [SerializeField]
+    string videoPath;
+    private MediaPlayer _mediaPlayer;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        _mediaPlayer = GetComponent<MediaPlayer>();
+        if (_mediaPlayer != null)
+        {
+            Debug.Log("Panorama is loading");
+            _mediaPlayer.OpenMedia(new MediaPath(videoPath, MediaPathType.RelativeToPersistentDataFolder), autoPlay: true);
+        }
+    }
+
+    private void OnDisable()
+    {
+        if (_mediaPlayer != null)
+        {
+            Debug.Log("Panorama is closing");
+            _mediaPlayer.CloseMedia();
+        }
+    }
+}

Viagg-io/Assets/Scripts/PlayAVProVideo.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1f9d0c2aced6745009cded319d0b6d14
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Viagg-io/Assets/StreamingAssets/MAYBE01_A003C015_241011NB_CANON_LOOP_SLOWED_STABILIZED.mp4.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 526d5174ea3e52044836bcbea53460b0
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: