add sound effects to button, mic stand, model generation, shape scanner

3d-generation-pipeline/README.md

@@ -1,11 +1,11 @@
 ### TODO
 * glTF loading: vahetada ära shader Universal render pipelin Lit, mitte panna buildi kaasa glTf oma
-* shape scanner initialisation correct number of confs
 * user flow: grab item? mida krabada
 * user prefs: settinguid meelde jätta
 * võtta spawnitud mudeli mõõtmed: mehscollideri max x, max y, etc? bounding box?
 * mängija collide'ib spawnitud mudeliga - ei tohiks
 * shape scanner:
+	* initialisation correct number of confs
     * mitte-liigutatavaks, aga samal ajal kõrgus dünaamiliselt õige. või lihtsalt piisavalt madalale asetada või väljaulatuv kang millest krabada
 	* peenikesemad kiired
 	* mitte lihtsalt ontriggerenter ja -exit, sest kui mitu objekti lähevad samal ajal sisse

Assets/_PROJECT/Scripts/Audio/FMODEvents.cs

@@ -22,7 +22,9 @@ public class FMODEvents : MonoBehaviour
     [field: SerializeField] public EventReference BowGrab { get; private set; }
     [field: SerializeField] public EventReference Spray { get; private set; }
     [field: SerializeField] public EventReference Coughing { get; private set; }
-    //[field: SerializeField] public EventReference MyNewSoundEffect { get; private set; }
+    [field: SerializeField] public EventReference KitchenPlate { get; private set; }
+    [field: SerializeField] public EventReference ShapeScannerSuccess { get; private set; }
+    [field: SerializeField] public EventReference Printing { get; private set; }
 
     [field: Header("CAR")]
     [field: SerializeField] public EventReference DoorOpen { get; private set; }
@@ -35,6 +37,7 @@ public class FMODEvents : MonoBehaviour
     [field: SerializeField] public EventReference Hover { get; private set; }
     [field: SerializeField] public EventReference LetterEnter { get; private set; }
     [field: SerializeField] public EventReference LetterHover { get; private set; }
+    [field: SerializeField] public EventReference RadioButton { get; private set; }
 
     [field: Header("Initial events")]
     [field: SerializeField] public EventReference PortalSpacial { get; private set; }

Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/ArcheryRangeModelGenerationController.cs

@@ -1,6 +1,7 @@
 using System;
 using UnityEngine;
 using UnityEngine.UI;
+using FMOD.Studio;
 
 public class ArcheryRangeModelGenerationController : MonoBehaviour
 {
@@ -20,6 +21,7 @@ public class ArcheryRangeModelGenerationController : MonoBehaviour
     public Material wireActiveMaterial;
 
     private bool modelGenerationInProgress;
+    private EventInstance printingSound;
 
     // Start is called before the first frame update
     void Start()
@@ -27,6 +29,9 @@ public class ArcheryRangeModelGenerationController : MonoBehaviour
         imageGenerationButton.OnButtonPressed += InvokeImageGeneration;
         modelGenerationButton.OnButtonPressed += InvokeModelGeneration;
         modelGenerationInProgress = false;
+
+        printingSound = AudioManager.Instance.CreateInstance(FMODEvents.Instance.Printing);
+        printingSound.setParameterByName("3DPrinterPrintingJob", 1);
     }
 
     // Update is called once per frame
@@ -56,6 +61,10 @@ public class ArcheryRangeModelGenerationController : MonoBehaviour
     private async void InvokeModelGeneration()
     {
         modelGenerationInProgress = true;
+
+        printingSound.start();
+        printingSound.setParameterByName("3DPrinterPrintingJob", 0);
+
         string encodedTexture = Convert.ToBase64String(GeneratedTexture.EncodeToJPG());
         byte[] encodedModel = await TrellisClient.Instance.GenerateModel(encodedTexture);
 
@@ -66,6 +75,8 @@ public class ArcheryRangeModelGenerationController : MonoBehaviour
         spawnedObject.transform.position = modelDisplay.position;
         GeneratedModel = spawnedObject;
 
+        printingSound.setParameterByName("3DPrinterPrintingJob", 1);
+
         OnModelReady();
         modelGenerationButton.Deactivate();
         modelGenerationInProgress = false;
@@ -79,5 +90,6 @@ public class ArcheryRangeModelGenerationController : MonoBehaviour
         }
 
         modelDisplay.GetComponent<MeshRenderer>().material = modelDisplayActiveMaterial;
+        AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.ShapeScannerSuccess, gameObject);
     }
 }

Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneStand.cs

@@ -34,6 +34,7 @@ public class MicrophoneStand : MonoBehaviour
         {
             microphoneOffStatus.SetActive(false);
             microphoneOnStatus.SetActive(true);
+            AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.RadioButton, gameObject);
             fmodWhisperBridge.ActivateRecording();
         }
     }
@@ -45,6 +46,7 @@ public class MicrophoneStand : MonoBehaviour
         {
             microphoneOffStatus.SetActive(true);
             microphoneOnStatus.SetActive(false);
+            AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.RadioButton, gameObject);
             fmodWhisperBridge.DeactivateRecording();
         }
     }

Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs

@@ -57,6 +57,7 @@ public class PushableButton : MonoBehaviour
     {
         movableParts.DOLocalMoveY(downPositionY, moveDuration);
         isButtonDown = true;
+        AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Click, gameObject);
 
         if (wire != null)
         {
@@ -71,6 +72,7 @@ public class PushableButton : MonoBehaviour
     {
         movableParts.DOLocalMoveY(upPositionY, moveDuration);
         isButtonDown = false;
+        AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Click, gameObject);
 
         if (wire != null)
         {

Assets/_PROJECT/Scripts/ModeGeneration/ShapeDetection/ShapeScanner.cs

@@ -97,6 +97,8 @@ public class ShapeScanner : MonoBehaviour
         rayCount = configuration.rows.SelectMany(row => row.cells).Count();
         correctRayStates = configuration.rows.SelectMany(row => row.cells).Count(cell => !cell);
         UpdateDisplay(calculateCorrectPercentage());
+
+        AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.ShapeScannerSuccess, gameObject);
     }
 
     private float calculateCorrectPercentage()

Assets/_PROJECT/Scripts/NPCController.cs

@@ -13,6 +13,8 @@ public class NPCController : MonoBehaviour
     public float mouthScalingMultiplier = 2.5f;
     public float mouthMovementDuration = 0.25f;
 
+    public string voicelineKey;
+
     // Start is called before the first frame update
     void Awake()
     {
@@ -22,6 +24,11 @@ public class NPCController : MonoBehaviour
         isTalking = false;
     }
 
+    void Start()
+    {
+       
+    }
+
     // Update is called once per frame
     void Update()
     {