Aman

README.md

@@ -1,67 +1,14 @@
+# [L-System on the web](http://amansachan.com/L-System/)
 
-The objective of this assignment is to create an L System parser and generate interesting looking plants. Start by forking and then cloning this repository: [https://github.com/CIS700-Procedural-Graphics/Project3-LSystems](https://github.com/CIS700-Procedural-Graphics/Project3-LSystems)
+## Project Description
 
-# L-System Parser
+Created an L system incorporating probability, that changes every time
+Various GUI controls were added to give the project more life.
 
-lsystem.js contains classes for L-system, Rule, and LinkedList. Here’s our suggested structure:
+GUI controls let you:
 
-**The Symbol Nodes/Linked List:**
+1. Change the color of the tree
 
-Rather than representing our symbols as a string like in many L-system implementations, we prefer to use a linked list. This allows us to store additional information about each symbol at time of parsing (e.g. what iteration was this symbol added in?) Since we’re adding and replacing symbols at each iteration, we also save on the overhead of creating and destroying strings, since linked lists of course make it easy to add and remove nodes. You should write a Linked List class with Nodes that contain at least the following information:
+2. Change the number of iterations
 
-- The next node in the linked list
-- The previous node in the linked list
-- The grammar symbol at theis point in the overal string
-
-We also recommend that you write the following functions to interact with your linked list:
-
-- A function to symmetrically link two nodes together (e.g. Node A’s next is Node B, and Node B’s prev is Node A)
-- A function to expand one of the symbol nodes of the linked list by replacing it with several new nodes. This function should look at the list of rules associated with the symbol in the linked list’s grammar dictionary, then generate a uniform random number between 0 and 1 in order to determine which of the Rules should be used to expand the symbol node. You will refer to a Rule’s probability and compare it to your random number in order to determine which Rule should be chosen.
-
-**Rules:**
-
-These are containers for the preconditions, postconditions and probability of a single replacement operation. They should operate on a symbol node in your linked list.
-
-**L-system:**
-
-This is the parser, which will loop through your linked list of symbol nodes and apply rules at each iteration.
-
-Implement the following functions in L-System so that you can apply grammar rules to your axiom given some number of iterations. More details and implementation suggestions about  functions can be found in the TODO comments
-
-- `stringToLinkedList(input_string)`
-- `linkedListToString(linkedList)`
-- `replaceNode(linkedList, node, replacementString)`
-- `doIterations(num)`
-
-## Turtle
-
-`turtle.js` has a function called renderSymbol that takes in a single node of a linked list and performs an operation to change the turtle’s state based on the symbol contained in the node. Usually, the turtle’s change in state will result in some sort of rendering output, such as drawing a cylinder when the turtle moves forward. We have provided you with a few example functions to illustrate how to write your own functions to be called by renderSymbol; these functions are rotateTurtle, moveTurtle, moveForward, and makeCylinder. If you inspect the constructor of the Turtle class, you can see how to associate an operation with a grammar symbol.
-
-- Modify turtle.js to support operations associated with the symbols `[` and `]`
-    - When you parse `[` you need to store the current turtle state somewhere
-    - When you parse `]` you need to set your turtle’s state to the most recently stored state. Think of this a pushing and popping turtle states on and off a stack. For example, given `F[+F][-F]`, the turtle should draw a Y shape. Note that your program must be capable of storing many turtle states at once in a stack.
-
-- In addition to operations for `[` and `]`, you must invent operations for any three symbols of your choosing.
-
-
-## Interactivity
-
-Using dat.GUI and the examples provided in the reference code, make some aspect of your demo an interactive variable. For example, you could modify:
-
-1. the axiom
-2. Your input grammer rules and their probability
-3. the angle of rotation of the turtle
-4. the size or color or material of the cylinder the turtle draws, etc!
-
-## L-System Plants
-
-Design a grammar for a new procedural plant! As the preceding parts of this assignment are basic computer science tasks, this is where you should spend the bulk of your time on this assignment. Come up with new grammar rules and include screenshots of your plants in your README. For inspiration, take a look at Example 7: Fractal Plant in Wikipedia: https://en.wikipedia.org/wiki/L-system Your procedural plant must have the following features
-
-1. Grow in 3D. Take advantage of three.js! 
-2. Have flowers or leaves that are added as a part of the grammar
-3. Variation. Different instances of your plant should look distinctly different!
-4. A twist. Broccoli trees are cool and all, but we hope to see sometime a little more surprising in your grammars
-
-# Publishing Your code
-
-Running `npm run deploy` will automatically build your project and push it to gh-pages where it will be visible at `username.github.io/repo-name`. NOTE: You MUST commit AND push all changes to your MASTER branch before doing this or you may lose your work. The `git` command must also be available in your terminal or command prompt. If you're using Windows, it's a good idea to use Git Bash.
+3. Change the starting axiom

src/framework.js

@@ -1,4 +1,3 @@
-
 const THREE = require('three');
 const OrbitControls = require('three-orbit-controls')(THREE)
 import Stats from 'stats-js'
@@ -69,4 +68,4 @@ function init(callback, update) {
 
 export default {
   init: init
-}
+}

src/lsystem.js

@@ -1,61 +1,163 @@
 // A class that represents a symbol replacement rule to
 // be used when expanding an L-system grammar.
-function Rule(prob, str) {
+function Rule(prob, str)
+{
 	this.probability = prob; // The probability that this Rule will be used when replacing a character in the grammar string
 	this.successorString = str; // The string that will replace the char that maps to this Rule
+
+	//you get the probability, and the replacement string, and using a condition based on that probability use the rule
+	if(prob > Math.random())
+	{
+		//actually carry out the rule
+		return str;
+	}
+	else
+	{
+		return this;
+	}
 }
 
 // TODO: Implement a linked list class and its requisite functions
 // as described in the homework writeup
+var LinkedList = function(){
+	 this.first = null; // variables first and last will not be directly accessible because theyre not bound to "this"
+	 this.last =null; //even thought theyre not directly accessible, they exist
+
+	 //The actual data held by linked list elements; used for push pop and remove but we actually return the variable LL
+			var Node = function(value){
+      this.grammar = value;
+			// this.flag_replace = false;
+      this.next = null; // next is initially just an empty object
+			this.previous = null;
+   };
 
-// TODO: Turn the string into linked list 
-export function stringToLinkedList(input_string) {
+   this.push = function(value){
+      var node = new Node(value);
+      if(this.first == null)
+			{
+         this.first = node;
+				 this.last = node;
+      }
+			else
+			{
+        //  symlink(last, node);
+				this.last.next = node;
+				node.previous = this.last;
+        this.last = node;
+      }
+			return node;
+   };
+
+   this.pop = function(){
+      var popped_value = this.first.grammar;
+      this.first = this.first.next;
+      return popped_value;
+   };
+	 return this;
+};
+
+// TODO: Turn the string into linked list
+export function StringToLinkedList(input_string)
+{
 	// ex. assuming input_string = "F+X"
-	// you should return a linked list where the head is 
+	// you should return a linked list where the head is
 	// at Node('F') and the tail is at Node('X')
 	var ll = new LinkedList();
+	for (var i = 0; i < input_string.length; i++)
+	{
+  	ll.push(input_string[i]);
+	}
 	return ll;
 }
 
 // TODO: Return a string form of the LinkedList
-export function linkedListToString(linkedList) {
+export function linkedListToString(linkedList)
+{
 	// ex. Node1("F")->Node2("X") should be "FX"
 	var result = "";
+	var current = linkedList.first;
+	while (current)
+	{ // while not null
+		result = result + current.grammar;
+    current = current.next;
+	}
 	return result;
 }
 
-// TODO: Given the node to be replaced, 
+// TODO: Given the node to be replaced,
 // insert a sub-linked-list that represents replacementString
-function replaceNode(linkedList, node, replacementString) {
+function replaceNode(linkedList, node, replacementString)
+{
+	//link the previous node to the one after the current node
+	var ll = StringToLinkedList(replacementString);
+	if(node == linkedList.first)
+	{
+		console.log("replace first");
+		linkedList.first = ll.first;
+
+		node.next.previous = ll.last;
+		ll.last.next = node.next;
+	}
+	else if(node == linkedList.last)
+	{
+		linkedList.last = ll.last;
+
+		node.previous.next = ll.first;
+		ll.first.prev = node.previous;
+	}
+	else
+	{
+		node.previous.next = ll.first;
+		ll.first.prev = node.previous;
+
+		node.next.previous = ll.last;
+		ll.last.next = node.next;
+	}
 }
 
 export default function Lsystem(axiom, grammar, iterations) {
 	// default LSystem
-	this.axiom = "FX";
+	this.axiom = "FFF+T";
 	this.grammar = {};
+
+	//All the grammar rules
 	this.grammar['X'] = [
-		new Rule(1.0, '[-FX][+FX]')
+		// new Rule(0.8, '[-FT][+FT]')
+		new Rule(0.5, 'F-[[X]+X]+F[+FX]-X'),
+		new Rule(0.5, 'FF'),
+		new Rule(0.5, 'X'),
+		new Rule(0.5, 'F[+FX][-FX]'),
+		new Rule(0.5, 'F[-FX][+FX]'),
+		new Rule(1.0, 'LA'),
+		new Rule(0.6, 'L'),
+		new Rule(0.5, 'F+[[X]-X]-F[-FX]+X')
+	];
+	this.grammar['F'] = [
+		new Rule(0.3, 'F')
 	];
-	this.iterations = 0; 
-
+	this.grammar['T'] = [
+		new Rule(0.6, '[FX][aFX][aFX][aFX][aFX][aFX][aFX][aFX][aFX][aFX][aFX][aFX][aFX]')
+	];
+	this.iterations = 0;
+
 	// Set up the axiom string
 	if (typeof axiom !== "undefined") {
 		this.axiom = axiom;
 	}
 
-	// Set up the grammar as a dictionary that 
+	// Set up the grammar as a dictionary that
 	// maps a single character (symbol) to a Rule.
 	if (typeof grammar !== "undefined") {
 		this.grammar = Object.assign({}, grammar);
 	}
-	
-	// Set up iterations (the number of times you 
+
+	// Set up iterations (the number of times you
 	// should expand the axiom in DoIterations)
 	if (typeof iterations !== "undefined") {
 		this.iterations = iterations;
 	}
 
-	// A function to alter the axiom string stored 
+	// A function to alter the axiom string stored
 	// in the L-system
 	this.updateAxiom = function(axiom) {
 		// Setup axiom
@@ -65,12 +167,62 @@ export default function Lsystem(axiom, grammar, iterations) {
 	}
 
 	// TODO
-	// This function returns a linked list that is the result 
+	// This function returns a linked list that is the result
 	// of expanding the L-system's axiom n times.
 	// The implementation we have provided you just returns a linked
 	// list of the axiom.
-	this.doIterations = function(n) {	
+	this.DoIterations = function(n) {
+		var grammar_replacement_rule_index = 0;
+		var count_x = 0;
 		var lSystemLL = StringToLinkedList(this.axiom);
+		for(var i =0; i < n; i++)
+		{
+			//call replace node on every character in the string
+			var temp = lSystemLL.first;
+
+			while(temp) {
+				var tempNext = temp.next;
+
+				var grammar_symbol = temp.grammar;
+				if((i >=1))
+				{
+					if((grammar_symbol == "X"))
+					{
+						count_x++;
+						var grammar_replacement_rule = this.grammar[grammar_symbol][count_x%7];
+						var grammar_replacement = grammar_replacement_rule.successorString;
+						grammar_symbol = grammar_replacement;
+					}
+					else if((grammar_symbol == "T") || (grammar_symbol == "F"))
+					{
+						var grammar_replacement_rule = this.grammar[grammar_symbol][0];
+						var grammar_replacement = grammar_replacement_rule.successorString;
+						grammar_symbol = grammar_replacement;
+					}
+
+				}
+				else if((grammar_symbol == "X") || (grammar_symbol == "T") || (grammar_symbol == "F"))
+				{
+					var grammar_replacement_rule = this.grammar[grammar_symbol][0];
+					var grammar_replacement = grammar_replacement_rule.successorString;
+					grammar_symbol = grammar_replacement;
+				}
+
+				if(i == n-1)
+				{
+					if((grammar_symbol == "X"))
+					{
+						var grammar_replacement_rule = this.grammar[grammar_symbol][5];
+						var grammar_replacement = grammar_replacement_rule.successorString;
+						grammar_symbol = grammar_replacement;
+					}
+				}
+
+				replaceNode(lSystemLL, temp, grammar_symbol);
+
+				temp = tempNext;
+			}
+		}
 		return lSystemLL;
 	}
-}
+}