Reorganise

codeincontext · Feb 5, 2011 · 0677857 · 0677857
1 parent c092de5
commit 0677857
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 53 deletions.
diff --git a/balls.html b/balls.html
diff --git a/css/style.css b/css/style.css
@@ -0,0 +1,3 @@
+canvas {
+  border: 10px solid #999;
+}
diff --git a/game.html b/game.html
@@ -0,0 +1,21 @@
+<!doctype html> 
+<html> 
+<head> 
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 
+    <title>Balls with canvas</title>
+    <link rel="stylesheet" href="css/style.css" type="text/css" media="screen">
+</head> 
+<body> 
+  <section class="content">
+
+    <h2>Hit some balls!</h2>
+    <canvas id="myCanvas" width="500" height="500">
+    </canvas>
+
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
+    <script src="js/cue.js"></script>
+    <script src="js/game.js"></script>
+
+  </section>
+</body>
+</html>
diff --git a/js/comms.js b/js/comms.js
diff --git a/js/cue.js b/js/cue.js
@@ -0,0 +1,40 @@
+function Cue (x, y) {
+  this.x = x;
+  this.y = y;
+  this.vx = 0;
+  this.vy = 0;
+  this.move=move;
+  function move(){
+    friction = 0.995
+    this.vx *= friction;
+    this.vy *= friction;
+    if (this.vy < 0.1 && this.vy > -0.1 && this.vx < 0.1 && this.vx > -0.1) {this.vx = 0; this.vy = 0;}
+    // displace the ball
+    if( this.x<20 || this.x>width-20) this.vx=-this.vx;
+    if( this.y<20 || this.y>height-20) this.vy=-this.vy;
+    this.x+=this.vx;
+    this.y+=this.vy;
+  };
+  this.checkCollision = false;
+}
+
+function calculateCuePull(){
+	// dx and dy are the x and y components of the cue vector
+	var distX = mx - cue.x;
+	var distY = my - cue.y;
+
+	// h is the distance of the cue pull
+	var h = Math.sqrt(Math.pow(distX, 2) + Math.pow(distY, 2));
+
+	// If the cue is being pulled further than the maxCuePull
+	if (h>maxCuePull){
+		// scaleMultiplier is the amount that the x and y coordinates must scale down by to make the pull equal the maxCuePull
+		var scaleMultiplier = maxCuePull/h;
+		// Scale the x and y components of the pull down
+		distX = distX*scaleMultiplier;
+		distY = distY*scaleMultiplier;
+	}
+
+	mx = (cue.x+distX);
+	my = (cue.y+distY);
+}
diff --git a/balls.js → js/game.js b/balls.js → js/game.js
@@ -1,3 +1,5 @@
+var cue = new Cue(100,100);
+
 var context;
 var mx;
 var my;
@@ -6,29 +8,22 @@ var shooting = false;
 var maxCuePull = 125;
 var cueSpeedMultiplier = 0.05;
 
-function Cue (x, y) {
-  this.x = x;
-  this.y = y;
-  this.vx = 0;
-  this.vy = 0;
-  this.move = false;
-  this.checkCollision = false;
-}
-var cue = new Cue(100,100);
+var width = 500;
+var height = 500;
+
+// var balls = new Array();
+// balls[0] = new Ball; 
 
 function init(){
-  context= myCanvas.getContext('2d');
+  context = myCanvas.getContext('2d');
   setInterval(tick,10);
 }
 function tick(){
   draw();
-  if( cue.x<50 || cue.x>250) cue.vx=-cue.vx;
-  if( cue.y<50 || cue.y>250) cue.vy=-cue.vy;
-  cue.x+=cue.vx;
-  cue.y+=cue.vy;
+  cue.move();
 }
 function draw(){
-  context.clearRect(0,0, 500,500);
+  context.clearRect(0,0, width,height);
 
   if (shooting) {
     context.strokeStyle = '#f00';
@@ -55,26 +50,7 @@ function dist(x, y, X, Y){
   if (dist1<0) {dist1 = -dist1;}
   return dist1;
 }
-function calculateCuePull(){
-	// dx and dy are the x and y components of the cue vector
-	var distX = mx - cue.x;
-	var distY = my - cue.y;
-
-	// h is the distance of the cue pull
-	var h = Math.sqrt(Math.pow(distX, 2) + Math.pow(distY, 2));
 
-	// If the cue is being pulled further than the maxCuePull
-	if (h>maxCuePull){
-		// scaleMultiplier is the amount that the x and y coordinates must scale down by to make the pull equal the maxCuePull
-		var scaleMultiplier = maxCuePull/h;
-		// Scale the x and y components of the pull down
-		distX = distX*scaleMultiplier;
-		distY = distY*scaleMultiplier;
-	}
-
-	mx = (cue.x+distX);
-	my = (cue.y+distY);
-}
 $('canvas').mousedown(function(e){
   mx = e.pageX - offset.left
   my = e.pageY - offset.top

diff --git a/client.html → spike/client.html b/client.html → spike/client.html
diff --git a/client.js → spike/client.js b/client.js → spike/client.js
diff --git a/echo.rb → spike/echo.rb b/echo.rb → spike/echo.rb
diff --git a/server.rb → spike/server.rb b/server.rb → spike/server.rb