Merge pull request #27 from Kylemc1413/main

Cleanup Excessive control panel audio sources

Assets/Script/LocomotionToggle.cs

@@ -45,7 +45,6 @@ public class LocomotionToggle : MonoBehaviour
             locoEvent = new LocomotionToggleEvent();
 
         audioSrc = GetComponent<AudioSource>();
-        audioSrc.playOnAwake = false;
         soundOn = Resources.Load<AudioClip>("Audio/loco on");
         soundOff = Resources.Load<AudioClip>("Audio/loco off");
 

Assets/Script/PanelButton.cs

@@ -3,7 +3,6 @@ using System.Runtime.InteropServices;
 using UnityEngine;
 using WindowsInput.Native;
 
-[RequireComponent(typeof(AudioSource))]
 public class PanelButton : MonoBehaviour
 {
     [DllImport("user32.dll")]
@@ -25,18 +24,12 @@ public class PanelButton : MonoBehaviour
 
     private Renderer cr;
     public GameObject camera;
-    private AudioSource audioSrc;
-    private static AudioClip btnSound;
+    public AudioSource audioSrc;
 
     void Start()
     {
-        btnSound = Resources.Load<AudioClip>("Audio/button press");
         cr = GetComponent<Renderer>();
 
-        audioSrc = GetComponent<AudioSource>();
-        audioSrc.playOnAwake = false;
-        audioSrc.clip = btnSound;
-
         if (isToggle)
         {
             // initialize toggle state
@@ -50,7 +43,7 @@ public class PanelButton : MonoBehaviour
         _insideColliderCount += 1;
         ButtonPress();
         if (doesBeep)
-            audioSrc.Play();
+            audioSrc?.Play();
     }
 
     private void OnTriggerExit(Collider other)

Assets/Script/PanelHiderButton.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
+[RequireComponent(typeof(AudioSource))]
 public class PanelHiderButton : MonoBehaviour
 {
     private int colliderCount = 0;
@@ -20,8 +21,6 @@ public class PanelHiderButton : MonoBehaviour
     [SerializeField]
     private Image timerRing;
     [SerializeField]
-    private AudioSource audioSrc;
-    [SerializeField]
     private List<GameObject> panelButtons;
 
     [Header("Assets")]
@@ -34,8 +33,10 @@ public class PanelHiderButton : MonoBehaviour
     [SerializeField]
     private AudioClip unlockSound;
 
+    private AudioSource audioSrc;
     private void Start()
     {
+        audioSrc = GetComponent<AudioSource>();
         r = GetComponent<Renderer>();
         statusImg.texture = isLocked ? lockImg : unlockImg;
         audioSrc.clip = lockSound;

Assets/Script/PanelThirdPersonButton.cs

@@ -3,22 +3,16 @@ using System.Runtime.InteropServices;
 using UnityEngine;
 using WindowsInput.Native;
 
-[RequireComponent(typeof(AudioSource))]
 public class PanelThirdPersonButton : MonoBehaviour
 {
     public bool isTP;
 
     private Renderer cr;
     public GameObject tpCamera;
-    private AudioSource audioSrc;
-    private static AudioClip btnSound;
+    public AudioSource audioSrc;
 
     void Start()
     {
-        btnSound = Resources.Load<AudioClip>("Audio/button press");
-        audioSrc = GetComponent<AudioSource>();
-        audioSrc.playOnAwake = false;
-        audioSrc.clip = btnSound;
 
         cr = GetComponent<Renderer>();