Merge branch 'Simulation' of http://prod3.imt.hig.no/Kent/CityGen into Simulation

Assets/Scripts/CityGen/CityGen.cs

@@ -31,6 +31,8 @@ public partial class CityGen : MonoBehaviour {
 			this.prefabsIndex = id;
 
 			//TODO:add prefabs
+			this.prefabs = new GameObject[1];
+			this.prefabs[0] = Resources.Load<GameObject>("House/House");
 
 			this.pins = new Pin[1];
 			this.pins[0] = new Pin();
@@ -41,9 +43,19 @@ public partial class CityGen : MonoBehaviour {
 	[System.Serializable]
 	public class Prefab {
 		[HideInInspector]
-		public int identifiers;
-		public Vector2 footprints;
+		public int identifier;
+		public Vector2 footprint;
 		public Vector2 offsetForFootprint;
+
+		public void genDemo(GameObject prefab, int id){
+			this.identifier = id;
+
+			this.footprint.x =  prefab.GetComponentInChildren<Renderer>().bounds.max.x -  prefab.GetComponentInChildren<Renderer>().bounds.min.x;
+			this.footprint.y =  prefab.GetComponentInChildren<Renderer>().bounds.max.y -  prefab.GetComponentInChildren<Renderer>().bounds.min.y;
+		
+			this.offsetForFootprint.x = prefab.GetComponentInChildren<Renderer>().bounds.min.x;
+			this.offsetForFootprint.y = prefab.GetComponentInChildren<Renderer>().bounds.min.y; 
+		}
 	}
 
 	[System.Serializable]
@@ -60,7 +72,7 @@ public partial class CityGen : MonoBehaviour {
 	[System.Serializable]
 	public class City {
 		public ZoneType[] zoneTypes;
-		public Prefab[] prefabs;
+		public List<Prefab> prefabs;
 		public Vector2 layoutDimension;
 		[HideInInspector]
 		public int[,] layout;
@@ -81,7 +93,22 @@ public partial class CityGen : MonoBehaviour {
 			}
 
 			//TODO: add prefabs
+			int id = 0;
+			foreach(ZoneType zone in zoneTypes){
+				foreach(GameObject prefab in zone.prefabs){
+					prefabs.Add(new Prefab());
+					prefabs[prefabs.Count - 1].genDemo(prefab, id);
+				}
+				id++;
+			}
 
+			/*
+			this.prefabs = new Prefab[4];
+			for(int i = 0; i < prefabs.Length; i++){
+				prefabs[i] = new Prefab();
+				prefabs[i].genDemo(i);
+			}
+			*/
 			this.layoutDimension.x = 5;
 			this.layoutDimension.y = 5;
 

Assets/Scripts/CityGen/CityGen_Simulator.cs

@@ -121,11 +121,12 @@ public partial class CityGen : MonoBehaviour {
     				//house.GetComponent<Renderer>().material.color = new Color(1, 0, 0, 1);
     				//print(cube.GetComponent<Renderer>().bounds.max);
     				
-    				Instantiate(house, Vector3.zero, Quaternion.identity);
     				
-    				house.transform.position = new Vector3(house.transform.position.x + j + house.GetComponentInChildren<Renderer>().bounds.max.x,
-    														 house.transform.position.y, 
-    														 house.transform.position.z + i + house.GetComponentInChildren<Renderer>().bounds.max.z);
+    				Vector3 position = new Vector3 (transform.position.x + j + house.GetComponentInChildren<Renderer>().bounds.max.x,
+    												transform.position.y, 
+    												transform.position.z + i + house.GetComponentInChildren<Renderer>().bounds.max.z);
+
+    				Instantiate(house, position, Quaternion.identity);
     				
     				//print(cube.GetComponent<Renderer>().bounds.max);