Changed SpawnEvent to use Vector3 position

2 files changed, 12 insertions, 11 deletions

diff --git a/nGJ2019/Assets/Scripts/EventTimeline.cs b/nGJ2019/Assets/Scripts/EventTimeline.cs
index 18b87cc..465815c 100644
--- a/nGJ2019/Assets/Scripts/EventTimeline.cs
+++ b/nGJ2019/Assets/Scripts/EventTimeline.cs
@@ -1,19 +1,20 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine;
 
 public class EventTimeline
 {
 	public class SpawnEvent
 	{
 		public float time;
-		public float height;
+		public Vector3 position;
 		public ObstacleType type;
 		
-		public SpawnEvent(float time, float height, ObstacleType type)
+		public SpawnEvent(float time, Vector3 position, ObstacleType type)
 		{
 			this.time = time;
-			this.height = height;
+			this.position = position;
 			this.type = type;
 		}
 	}
@@ -44,9 +45,9 @@ public class EventTimeline
 		currentTime = 0;
 	}
 	
-	public void Add(float time, float height, ObstacleType type)
+	public void Add(float time, Vector3 position, ObstacleType type)
 	{
-		futureEvents.Add(new SpawnEvent(time, height, type));
+		futureEvents.Add(new SpawnEvent(time, position, type));
 		futureEvents.Sort((x,y) => x.time.CompareTo(y.time));
 	}
 
diff --git a/nGJ2019/Assets/Scripts/ObstacleSpawner.cs b/nGJ2019/Assets/Scripts/ObstacleSpawner.cs
index 0e6b3ac..a23b8aa 100644
--- a/nGJ2019/Assets/Scripts/ObstacleSpawner.cs
+++ b/nGJ2019/Assets/Scripts/ObstacleSpawner.cs
@@ -34,7 +34,7 @@ public class ObstacleSpawner : MonoBehaviour
         break;
     }
 
-    var o = Instantiate(prefab, new Vector3(spawnLine, e.height, 0), Quaternion.identity);
+    var o = Instantiate(prefab, new Vector3(spawnLine, e.position.y, e.position.z), Quaternion.identity);
     scrolling.Obstacles.Add(o);
   }
 
@@ -42,12 +42,12 @@ public class ObstacleSpawner : MonoBehaviour
   {
     for (int i = 0; i < 120; i += 5)
     {
-      timeline.Add(i, 0, ObstacleType.caveWalls);
+      timeline.Add(i, new Vector3(0, 0, 0), ObstacleType.caveWalls);
     }
-    timeline.Add(2, 2.75f, ObstacleType.rockTop);
-    timeline.Add(8, -2, ObstacleType.rockBottom);
-    timeline.Add(20, 0, ObstacleType.narrowPassage);
-    timeline.Add(30, 0, ObstacleType.rockJaws);
+    timeline.Add(2, new Vector3(0, 2.75f, 0), ObstacleType.rockTop);
+    timeline.Add(8, new Vector3(0, -2, 0), ObstacleType.rockBottom);
+    timeline.Add(20, new Vector3(0, 0, 0), ObstacleType.narrowPassage);
+    timeline.Add(30, new Vector3(0, 0, 1), ObstacleType.rockJaws);
 
     timeline.OnSpawnEvent += spawnOnEvent;
   }