professor final voice line comes from himself, not radio

3d-generation-pipeline/README.md

@@ -1,6 +1,11 @@
 ### TODO
+* tutorialis kuubikud blokivad liikumist
+* pidev krabamise heli, kui kahe käega korraga krabada: "(Un)requesting ownership of Cube"
 * FMOD ChannelControl errorid
+* keyboard numbrid ei tööta pärast minigame'i completemist?
 * speech-to-text:
+	* vahepeal lakkab töötamast lih??? tundub et siis kui pikalt tühjust salvestab
+	* sööta talle nulle kui on disabled, sest ikka kuidagi tuvastab eelnevat rääkimist
 	* uurida miks buildis Whisper halvemini töötab
 	* proovida suuremat Whisperi mudelit, äkki töötab mürases keskkonnas paremini
 * npc character:
@@ -8,14 +13,12 @@
 * shape detection:
 	* peab mängijale kuidagi selgitama, kuidas scale'ida prinditud objekte
 	* prinditud objekti scale'imisele min ja max size limiit
-	* 3d printerile soft particle'id, et ei clipiks seina sisse
+	* 3d printerile soft particle'id, et ei oleks teravaid ääri seina sisse minnes
 * archery range:
-	* archery targettide rework, et buildis ka töötaks
+	* archery targetite rework, et buildis ka töötaks
 	* võiks jääda kordama viimast instruktsiooni, kui mängija ei progressi edasi
 	* UFO möödalendamise animation/cutscene alguses kui ütleb "delta attacked by ufos" + panna juba alguses kapsli sisse ufo pöörlema
 * cafe:
-	* audio detection sama heaks nagu ülejäänud 2 mängul!
-	* continuous krabamise heli miskipärast
 	* võiks saada hinnata saadud tellimust
 	* "order again" nupp
 
@@ -31,3 +34,8 @@ Can't/Won't Do:
 	* Getting Whisper stream to work with FMOD instead of Unity default audio
 * TRELLIS: added functionality to specify texture baking optimisation total steps as an argument (`texture_opt_total_steps`), to replace the hardcoded 2500. But this is not tracked in Git (because modified this https://github.com/IgorAherne/trellis-stable-projectorz/releases/tag/latest)
 * Custom Shader Variant Collection to include glTF-pbrMetallicRoughness shader in build
+
+Katse tähelepanekud:
+* peab väga proper english accenti tegema
+* mõne inimese puhul kuuleb "cat" asemel "cut"
+* kui helitugevus oli liiga suur siis cafe waiter kuulis kohviku taustaheli taldriku klirinat kui "piano music"

Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/TutorialAudioListener.cs

@@ -168,20 +168,14 @@ public class TutorialAudioListener : MonoBehaviour
 
     private EventReference GetGrabEvent(GrabSoundType type)
     {
-        switch (type)
+        return type switch
         {
-            case GrabSoundType.Bow:
+            GrabSoundType.Bow => FMODEvents.Instance.BowGrab,
-                return FMODEvents.Instance.BowGrab;
+            GrabSoundType.Sprayer => FMODEvents.Instance.SprayerGrab,
-
-            case GrabSoundType.Sprayer:
-                return FMODEvents.Instance.SprayerGrab;
-
             //Add more objects for grabbing here and do not forget to define them in FMODEvents.cs
             //Add the GrabAudioProfile.cs component to an object instance
-
+            _ => FMODEvents.Instance.DefaultGrab,
-            default:
+        };
-                return FMODEvents.Instance.DefaultGrab;
-        }
     }
 
     private void HandleGrab(XRGrabInteractable grab)
@@ -195,10 +189,6 @@ public class TutorialAudioListener : MonoBehaviour
             : GrabSoundType.Default;
 
         EventReference grabEvent = GetGrabEvent(type);
-        Debug.Log(grabEvent);
         AudioManager.Instance.PlayAttachedInstance(grabEvent, grab.gameObject);
     }
-
-
-
 }

Assets/_PROJECT/Components/NewHandPresence/TutorialController.cs

@@ -31,6 +31,7 @@ namespace _PROJECT.NewHandPresence
         
         private XRControllerHintController _leftHintController;
         private XRControllerHintController _rightHintController;
+        private XRBaseInteractor lastInteractor = null;
 
         private SmartHandPresence _leftSmartHandPresence;
         private SmartHandPresence _rightSmartHandPresence;
@@ -244,16 +245,22 @@ namespace _PROJECT.NewHandPresence
             StopCoroutine(initializationInfoCoroutine);
         }
 
-        private void OnGripPerformed(SelectEnterEventArgs arg0)
+        private void OnGripPerformed(SelectEnterEventArgs args)
         {
-            var grab = arg0.interactableObject as XRGrabInteractable;
 
-            // Notify any listeners
+            var interactor = args.interactorObject as XRBaseInteractor;
-            OnGrab?.Invoke(grab);
+            var interactable = args.interactableObject as XRGrabInteractable;
 
-            if (_state != TutorialState.Grip) return;
+            if (lastInteractor == interactor)
-            Debug.Log("Grip performed");
+                return; // same hand grabbing again
-            UpdateState(_state.Next());
+
+            lastInteractor = interactor;
+
+
+            OnGrab?.Invoke(interactable as XRGrabInteractable);
+
+            if (_state == TutorialState.Grip)
+                UpdateState(_state.Next());
         }
 
         private void OnTeleportPerformed(LocomotionSystem obj)

Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs

@@ -171,7 +171,7 @@ public class ShapeDetectionNPC : NPCController
             state = 8;
             staticRadio.SetActive(false);
             questMarker.gameObject.SetActive(false);
-            SpeakVoiceLine(7, radio.gameObject, 0);
+            SpeakVoiceLine(7, gameObject, 0);
             await Task.Delay(6500);
             MoveToNextPoint(0);
         }

config.json

@@ -1,7 +1,7 @@
 {
     "isContinuousLocomotion": true,
     "continuousLocomotionSpeed": 3.0,
-    "volumeMaster": 0.5,
+    "volumeMaster": 0.6466318964958191,
     "volumeAmbient": 0.1889490932226181,
     "volumeMusic": 0.5,
     "volumeSFX": 0.5,

highscore.json

@@ -1 +1 @@
-{"HighScore":416.0}
+{"HighScore":1.0}

highscores.json

@@ -1,13 +1,17 @@
 {
     "entries": [
         {
-            "name": "Perfoon",
+            "name": "karlkolm",
-            "score": 416.0
+            "score": 241.0
         },
         {
             "name": "andreas",
             "score": 207.0
         },
+        {
+            "name": "karlkaks",
+            "score": 198.0
+        },
         {
             "name": "rikkss",
             "score": 195.0
@@ -16,49 +20,41 @@
             "name": "jjkujkkg",
             "score": 194.0
         },
+        {
+            "name": "gert",
+            "score": 184.0
+        },
+        {
+            "name": "karl",
+            "score": 183.0
+        },
         {
             "name": "f",
             "score": 181.0
         },
+        {
+            "name": "gg",
+            "score": 179.0
+        },
+        {
+            "name": "gert",
+            "score": 164.0
+        },
         {
             "name": "rikkss",
             "score": 163.0
         },
+        {
+            "name": "hendrik",
+            "score": 163.0
+        },
         {
             "name": "andeas",
             "score": 161.0
         },
         {
-            "name": "rikkss",
+            "name": "fark..........",
-            "score": 141.0
+            "score": 142.0
-        },
-        {
-            "name": "h",
-            "score": 138.0
-        },
-        {
-            "name": "raimps",
-            "score": 115.0
-        },
-        {
-            "name": "m",
-            "score": 109.0
-        },
-        {
-            "name": "andreas",
-            "score": 96.0
-        },
-        {
-            "name": "m",
-            "score": 76.0
-        },
-        {
-            "name": "k",
-            "score": 58.0
-        },
-        {
-            "name": "kr",
-            "score": 53.0
         }
     ]
 }