Merge branch 'master' of https://github.com/MrHangover/WAVES

MrHangover · Jan 22, 2017 · 0dce6a1 · 0dce6a1
2 parents 51e7652 + 52c0b10
commit 0dce6a1
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 6 deletions.
diff --git a/Assets/Prefabs/Level.prefab b/Assets/Prefabs/Level.prefab
diff --git a/Assets/Prefabs/LevelAssests (1).prefab b/Assets/Prefabs/LevelAssests (1).prefab
diff --git a/Assets/Prefabs/LevelPrefabs/Player.prefab b/Assets/Prefabs/LevelPrefabs/Player.prefab
diff --git a/Assets/Prefabs/MenuCanvas.prefab b/Assets/Prefabs/MenuCanvas.prefab
diff --git a/Assets/Scenes/TheLevel.unity b/Assets/Scenes/TheLevel.unity
diff --git a/Assets/Scripts/Menu.cs b/Assets/Scripts/Menu.cs
@@ -21,6 +21,9 @@ public class Menu : MonoBehaviour {
 
 	[SerializeField] GameObject barParent;
 	[SerializeField] GameObject barText;
+	[SerializeField] Toggle avgToggle;
+
+
 
 	// Use this for initialization
 	void Start () {
@@ -44,6 +47,11 @@ void Update () {
 		if (Input.GetKeyDown (KeyCode.F)) {
 			ShowHideBars ();
 		}
+
+		if (Input.GetKeyDown (KeyCode.A)) {
+			WaveManager.instance.useAvg = !WaveManager.instance.useAvg;
+			avgToggle.isOn = WaveManager.instance.useAvg;
+		}
 
 	}
 

diff --git a/Assets/Scripts/WaveManager.cs b/Assets/Scripts/WaveManager.cs
@@ -40,8 +40,9 @@ public class WaveManager : MonoBehaviour {
     public bool isMakingWaves = true;
 
 	public float amplitudeModifier = 2f;
-	public float mapMin = -25f;
+	public float mapMin = -27f;
 	public float mapMax = 10f;
+	public bool useAvg = true;
 
     //Privates
     List<WaveObject> colliderPillars;
@@ -99,14 +100,20 @@ void FixedUpdate () {
         {
 			if (FrequencyAnalysis.instance != null) {
 				//freq = MapToCalibration((FrequencyAnalysis.instance.MapToCalibration(frequencyAndAmp[0].Key)));
-				freq = TotalMap(FrequencyAnalysis.instance.avgFreq);
+				if(useAvg){
+					freq = TotalMap(FrequencyAnalysis.instance.avgFreq);
+				}
+				else{
+					freq = TotalMap(FrequencyAnalysis.instance.frequencyAndAmp[0].Key);
+				}
+
 				amp = Mathf.Clamp (frequencyAndAmp [0].Value * amplitudeModifier, 0, 10f);
 			}
 
         }
 		if (FrequencyAnalysis.instance != null) {
 			//float hejmartin = FrequencyAnalysis.instance.MapToCalibration(frequencyAndAmp[0].Key);
-			Debug.Log("FREQ: " +frequencyAndAmp[0].Key +"    "+ freq+"   AMP: "+amp);
+			//Debug.Log("FREQ: " +frequencyAndAmp[0].Key +"    "+ freq+"   AMP: "+amp);
 		}
 
         //Moving the physical pillars

diff --git a/Assets/Scripts/soundscripts/FrequencyAnalysis.cs b/Assets/Scripts/soundscripts/FrequencyAnalysis.cs
@@ -74,9 +74,13 @@ void Start() {
 		print (Microphone.devices.Length);
 		aso.clip = Microphone.Start (Microphone.devices[microphoneNr], true, 1, 44100);
 		while (!(Microphone.GetPosition(null) > 0)){}
-		aso.Play ();
 		aso.loop = true;
 
+		aso.Play ();
+
+
+
+
 		numberleft = new float[numSamples];
 		volumeSamples = new float[numSamples];
 
@@ -100,9 +104,7 @@ void Start() {
 	// Update is called once per frame
 	void Update () {
 		numberleft = new float[numSamples];
-
 		aso.GetSpectrumData (numberleft, 0,FFTWindow.BlackmanHarris);
-
 		//	22050/samplenumber = 10.7
 		//	TO FIND ELEMENT IN ARRAY: 
 		//	FrequencyYouWant / 10.7(result from last)
@@ -223,6 +225,7 @@ void Update () {
 		avgFreq /= frequencyAndAmp.Count;
 		//print ("----------------------------");
 		//print (avgFreq);
+
 	}
 
 

diff --git a/Assets/mic.mixer b/Assets/mic.mixer
diff --git a/Assets/mic.mixer.meta b/Assets/mic.mixer.meta
diff --git a/Assets/minotaurDestroy.cs b/Assets/minotaurDestroy.cs
@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class minotaurDestroy : MonoBehaviour {
+
+	// Use this for initialization
+	void Start () {
+
+	}
+
+	// Update is called once per frame
+	void Update () {
+
+	}
+
+    void OnCollisionEnter2D(Collision2D other)
+    {
+        Destroy(gameObject);
+    }
+}