changed leave generator to use circular radius

GandhiGames · Dec 19, 2016 · e17678b · e17678b
1 parent 90e978b
commit e17678b
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 10 deletions.
diff --git a/documentation/Fractal Tree Information.docx b/documentation/Fractal Tree Information.docx
diff --git a/fractal_tree/Assets/Scenes/Tree Demo.unity b/fractal_tree/Assets/Scenes/Tree Demo.unity
diff --git a/fractal_tree/Assets/Scripts/Demo/DemoTreeCreator.cs b/fractal_tree/Assets/Scripts/Demo/DemoTreeCreator.cs
@@ -21,6 +21,8 @@ public class DemoTreeCreator : MonoBehaviour
 		/// </summary>
 		public bool showingStationary = true;
 
+		public int startIndex = 0;
+
 		/// <summary>
 		/// Gets the active tree or null if there is none.
 		/// </summary>
@@ -36,6 +38,8 @@ public class DemoTreeCreator : MonoBehaviour
 
 		void Start()
 		{
+			m_TreeIndex = startIndex;
+
 			foreach (var demo in treeBuilders) {
 
 				if (leafGenerator != null && demo.stationaryTree.treeType == TreeBuilder.TreeType.Colonization) {

diff --git a/fractal_tree/Assets/Scripts/Trees/ColonizationLeafGenerator.cs b/fractal_tree/Assets/Scripts/Trees/ColonizationLeafGenerator.cs
@@ -9,19 +9,21 @@ namespace FractalTree
 	/// </summary>
 	public class ColonizationLeafGenerator : MonoBehaviour
 	{
-		/// <summary>
-		/// The bounds within which to spawn the leafs.
-		/// </summary>
-		public Rect bounds;
+		public float radius = 6f;
 
 		/// <summary>
 		/// The number of leaves to spawn.
 		/// </summary>
 		public int numToCreate = 100;
 
+
+		public bool buildOnStart = false;
+
 		void Awake ()
 		{
-			Generate ();
+			if (buildOnStart) {
+				Generate ();
+			}
 		}
 
 		public void Generate()
@@ -30,9 +32,7 @@ public void Generate()
 
 			for (int i = 0; i < numToCreate; i++) {
 				GameObject leaf = new GameObject ("Leaf " + (i + 1));
-				leaf.transform.position = new Vector2 (
-					Random.Range (bounds.xMin, bounds.xMax),
-					Random.Range (bounds.yMin, bounds.yMax));
+				leaf.transform.position = (Vector2)transform.position + (Random.insideUnitCircle * radius); 
 				leaf.AddComponent<ColonizationLeaf> ();
 				leaf.transform.SetParent (transform);
 

diff --git a/fractal_tree/Assets/Scripts/Trees/LTree.cs b/fractal_tree/Assets/Scripts/Trees/LTree.cs
@@ -153,7 +153,7 @@ private void CalculateNextStep ()
 					branchesCreated.Add (branch);
 					current = next;
 				} else if (currentChar.Equals ('G')) {
-					 current += (Vector2.up * m_Length).Rotate (rotation);
+					current += (Vector2.up * m_Length).Rotate (rotation);
 				} else if (currentChar.Equals ('+')) {
 					rotation -= m_Angle;
 				} else if (currentChar.Equals ('-')) {
@@ -187,6 +187,10 @@ private void CalculateNextStep ()
 
 						}
 					}
+				} else if (currentChar.Equals ('!')) {
+					m_Angle *= -1f;
+				} else if (currentChar.Equals ('|')) {
+					rotation = 180f;
 				}
 
 			}

diff --git a/fractal_tree/Library/CurrentLayout.dwlt b/fractal_tree/Library/CurrentLayout.dwlt
diff --git a/fractal_tree/Library/CurrentMaximizeLayout.dwlt b/fractal_tree/Library/CurrentMaximizeLayout.dwlt
diff --git a/fractal_tree/Library/LastSceneManagerSetup.txt b/fractal_tree/Library/LastSceneManagerSetup.txt
@@ -1 +1,4 @@
-sceneSetups: []
+sceneSetups:
+- path: Assets/Scenes/Tree Demo.unity
+  isLoaded: 1
+  isActive: 1
diff --git a/fractal_tree/Library/ScriptAssemblies/Assembly-CSharp.dll b/fractal_tree/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/fractal_tree/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/fractal_tree/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/fractal_tree/Library/assetDatabase3 b/fractal_tree/Library/assetDatabase3
diff --git a/fractal_tree/Library/metadata/30/30ecff6a494516c4d8096d2e4a5fb464 b/fractal_tree/Library/metadata/30/30ecff6a494516c4d8096d2e4a5fb464
diff --git a/fractal_tree/Library/metadata/9e/9e6e2c21b366f4ad58f1a27544e987ff b/fractal_tree/Library/metadata/9e/9e6e2c21b366f4ad58f1a27544e987ff
diff --git a/fractal_tree/Library/metadata/e7/e7b11c11153fa4d878a888bd6790fdc5 b/fractal_tree/Library/metadata/e7/e7b11c11153fa4d878a888bd6790fdc5
diff --git a/fractal_tree/obj/Debug/Assembly-CSharp.dll b/fractal_tree/obj/Debug/Assembly-CSharp.dll
diff --git a/fractal_tree/obj/Debug/Assembly-CSharp.dll.mdb b/fractal_tree/obj/Debug/Assembly-CSharp.dll.mdb