Got collision detection to work

davepagurek · davepagurek · commit 18ac31298516 · 2016-02-27T11:59:58.000-08:00
diff --git a/index.html b/index.html
@@ -5,10 +5,10 @@
       Learnathon Platformer
     </title>
     <link rel='stylesheet' type='text/css' href='css/style.css' />
-  </head>
-  <body>
-    <script type='text/javascript' src='lib/p5.min.js'></script>
+    <script type='text/javascript' src='lib/p5.js'></script>
     <script type='text/javascript' src='lib/p5.play.js'></script>
     <script type='text/javascript' src='src/platformer.js'></script>
+  </head>
+  <body>
   </body>
 </html>
diff --git a/setup.sh b/setup.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+rm -rf lib
 mkdir -p lib
-wget -P lib 'https://github.com/processing/p5.js/releases/download/0.4.22/p5.min.js' 
-wget -P lib 'https://raw.githubusercontent.com/molleindustria/p5.play/master/lib/p5.play.js' 
+wget -P lib 'https://raw.githubusercontent.com/molleindustria/p5.play/ed41d31c0ab6eaba89669de07ceaa29c888ed120/examples/lib/p5.js' 
+wget -P lib 'https://raw.githubusercontent.com/molleindustria/p5.play/ed41d31c0ab6eaba89669de07ceaa29c888ed120/examples/lib/p5.play.js' 
diff --git a/src/platformer.js b/src/platformer.js
@@ -1,44 +1,63 @@
 var game = {
   blockSize: 30,
+  ground: null,
+  solids: null,
+  physics: null,
   objects: []
 };
 
 function makeClasses() {
+  game.solids = new Group();
+  game.physics = new Group();
+  game.ground = new Group();
+
   game.Block = function(x, y, w, h) {
     this.sprite = createSprite(x, y, w, h);
   };
   game.Block.prototype = {
-    tick: function() {},
-    collideWith: function(target) {}
+    tick: function() { },
+    interact: function() { },
+    collideWith: function(target) { }
   };
 
   game.Ground = function(x, y, w, h) {
     game.Block.call(this, x, y, w, h);
     this.sprite.shapeColor = color(80, 180, 100);
-    //this.sprite.immovable = true;
+    this.sprite.immovable = true;
+    game.solids.add(this.sprite);
+    game.ground.add(this.sprite);
   };
   game.Ground.prototype = {
     tick: function() {
       game.Block.prototype.tick.call(this);
     },
+    interact: function() {
+      game.Block.prototype.interact.call(this);
+    },
     collideWith: function(target) {
-      console.log(target);
       game.Block.prototype.collideWith.call(this, target);
-      target.sprite.velocity.y = 0;
     }
   };
 
   game.PhysicsObject = function(x, y, w, h) {
     game.Block.call(this, x, y, w, h);
-    this.gravity = createVector(0, 0.2);
+    game.solids.add(this.sprite);
+    game.physics.add(this.sprite);
+    this.gravity = createVector(0, 1);
   };
   game.PhysicsObject.prototype = {
     tick: function() {
       game.Block.prototype.tick.call(this);
       this.sprite.velocity.add(this.gravity);
     },
+    interact: function() {
+      game.Block.prototype.interact.call(this);
+    },
     collideWith: function(target) {
       game.Block.prototype.collideWith.call(this, target);
+      if (this.sprite.touching.bottom) {
+        this.sprite.velocity.y = this.gravity.y;
+      }
     }
   };
 
@@ -50,6 +69,10 @@ function makeClasses() {
   game.Player.prototype = {
     tick: function() {
       game.PhysicsObject.prototype.tick.call(this);
+    },
+    interact: function() {
+      game.PhysicsObject.prototype.interact.call(this);
+      console.log(this.sprite.velocity.y);
       if (keyDown('RIGHT_ARROW')) {
         this.sprite.velocity.x = 5;
       } else if (keyDown('LEFT_ARROW')) {
@@ -58,8 +81,12 @@ function makeClasses() {
         this.sprite.velocity.x = 0;
       }
 
-      if (keyWentDown('UP_ARROW') && this.sprite.velocity.y == 0) {
-        this.sprite.velocity.y = this.jump.y;
+      if (keyWentDown('UP_ARROW')) {
+        this.sprite.position.y += 2;
+        if (this.sprite.touching.bottom) {
+          this.sprite.velocity.y = this.jump.y;
+        }
+        this.sprite.position.y -= 2;
       }
     },
     collideWith: function(target) {
@@ -69,24 +96,27 @@ function makeClasses() {
 }
 
 function setup() {
+  createCanvas(800, 500);
   makeClasses();
-  createCanvas(800, 600);
-  objects = [new game.Player(400, 300), new game.Ground(200, 400, 300, 30)];
+  game.objects = [new game.Player(400, 300), new game.Ground(400, 400, 300, 80)];
 }
 
+var n=0;
 function draw() {
   background(255, 220, 180);
-  objects.forEach(function(obj) {
+  game.objects.forEach(function(obj) {
     obj.tick();
   });
-  for (var i=0; i<objects.length; i++) {
-    for (var j=i+1; j<objects.length; j++) {
-      if (objects[i].sprite.overlap(objects[j].sprite)) {
-        console.log("touching");
-        objects[i].collideWith(objects[j]);
-        objects[j].collideWith(objects[i]);
+  for (var i=0; i<game.objects.length; i++) {
+    for (var j=i+1; j<game.objects.length; j++) {
+      if (game.objects[i].sprite.collide(game.objects[j].sprite)) {
+        game.objects[i].collideWith(game.objects[j]);
+        game.objects[j].collideWith(game.objects[i]);
       };
     }
   }
+  game.objects.forEach(function(obj) {
+    obj.interact();
+  });
   drawSprites();
 }
