First commit

unknown · unknown · commit aefa1a125bcb · 2013-01-05T12:07:04.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,20 @@
+#Ignore compiled javascript #
+######################
+./ts/*.js
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
diff --git a/build.bat b/build.bat
@@ -0,0 +1,2 @@
+tsc ./ts/AppStart.ts -out ./ts/gamestart.js
+start ./html/GameStart.html
diff --git a/clean.bat b/clean.bat
@@ -0,0 +1 @@
+rm ./ts/gamestart.js
diff --git a/html/GameStart.html b/html/GameStart.html
@@ -0,0 +1,9 @@
+<html>
+	<head>
+
+	</head>
+	<body>
+		<script type="text/javascript" src="../ts/gamestart.js"></script>
+	</body>	
+
+</html>
diff --git a/makefile b/makefile
@@ -0,0 +1,3 @@
+all: ./ts/AppStart.ts ./ts/Game.ts
+	tsc ./ts/AppStart.ts -out ./ts/gamestart.js
+	start ./html/GameStart.html
diff --git a/ts/Algebra.ts b/ts/Algebra.ts
@@ -0,0 +1,42 @@
+class Point2D {
+	
+	constructor (public x: number = 0, public y: number =0){
+		
+	}
+	
+	distance(p :Point2D){
+		return Math.sqrt(Math.pow(this.x-p.x,2) + Math.pow(this.y -p.y,2));
+	}
+	
+	toString(){
+		return "(" + this.x + "," + this.y + ")";
+	}
+}
+
+class Point3D extends Point2D {
+	constructor (x :number = 0, y:number =0 , public z:number = 0){
+		super(x,y);
+	}
+	
+	distance(p : Point3D){
+		return Math.sqrt(Math.pow(this.x-p.x,2)+Math.pow(this.y-p.y,2)+Math.pow(this.z-p.z,2));
+	}
+	
+	toString(){
+		return "(" + this.x + "," + this.y + "," + this.z + ")";
+	}
+}
+
+var p1: Point2D = new Point2D();
+var p2: Point2D = new Point2D(0,5);
+
+var dis: number = p1.distance(p2);
+
+
+var p3: Point3D = new Point3D();
+var p4: Point3D = new Point3D(0,0,5);
+
+var dis2: number = p3.distance(p4);
+
+alert("First:" + p1.toString() + ":" + dis.toString());
+alert("Second:" + p3.toString() + ":" + dis2.toString());
diff --git a/ts/AppStart.ts b/ts/AppStart.ts
@@ -0,0 +1,21 @@
+
+/// <reference path="Game.ts" />
+
+// Create an start the game
+var game = new Engine.SimpleGame(1000,500);
+
+for(var i = 0; i< 5; i++){
+	var color = new Engine.Color(Math.random()*255,Math.random()*255,Math.random()*255);
+	//alert(color.toString());
+	game.addBlock(new Engine.Block(new Engine.Box(100*i+10,200+Math.random()*100,50,50),color));
+}
+game.addActor(new Engine.Player(100,100,100,100));
+
+//var box1 = new Engine.Box(0,0,10,10);
+//var box2 = new Engine.Box(0,1,10,10);
+//alert(String(box1.collides(box2)));
+//alert(String(box1.collides(new Engine.Box(100,100,10,10))));
+
+//alert(String(Algebra.Util.Equals(1,1.2,.1)));
+
+game.start();
diff --git a/ts/Game.ts b/ts/Game.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+tsc ./ts/AppStart.ts -out ./ts/gamestart.js`
	`2`	`+start ./html/GameStart.html`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
 +<html>
 +	<head>
++
 +	</head>
 +	<body>
 +		<script type="text/javascript" src="../ts/gamestart.js"></script>
 +	</body>
++
 +</html>
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+all: ./ts/AppStart.ts ./ts/Game.ts`
	`2`	`+ tsc ./ts/AppStart.ts -out ./ts/gamestart.js`
	`3`	`+ start ./html/GameStart.html`