Implimented collision detection on all entities

Author: jamie nichols

.idea/workspace.xml

@@ -41,7 +41,23 @@ define(['Class','Rectangle'],function(Class,Rectangle){
         getHeight:function(){
             return this.height;
         },
-
+        getCollisionBounds:function(xOffset,yOffset){
+            return new Rectangle(parseInt(this.x+this.bounds.x + xOffset),
+                                 parseInt(this.y+this.bounds.y+ yOffset),
+                                 this.bounds.width,this.bounds.height);
+        },
+        checkEntityCollisions:function(xOffset,yOffset){
+            var candidates = this.handler.getWorld().getEntityManager().getEntities();
+            for(var i=0;i<candidates.length;i++){
+                var e = candidates[i];
+                if(e!=this){
+                    if(e.getCollisionBounds(0,0).intersects(this.getCollisionBounds(xOffset,yOffset))){
+                        return true;
+                    }
+                }
+            }
+            return false;
+        },
         //Setters
         setX:function(_x){
             this.x = _x;

js/app/classes/entities/Entity.js

@@ -25,8 +25,10 @@ define(['Entity',"Tile"],function(Entity,Tile){
             this.yMove = 0;
         },
         move:function(){
-            this.moveX();
-            this.moveY();
+            if(!this.checkEntityCollisions(this.xMove,0))
+                this.moveX();
+            if(!this.checkEntityCollisions(0,this.yMove))
+                this.moveY();
         },
         moveX:function(){
             if(this.xMove>0){

js/app/classes/entities/creatures/Creature.js

@@ -3,9 +3,10 @@ define(['StaticEntity','Assets','Tile'],function(StaticEntity,Assets,Tile){
 	var Tree = StaticEntity.extend({
 		init:function(_handler,_x,_y){
 			this._super(_handler,_x,_y,Tile.TILEWIDTH * 5,Tile.TILEHEIGHT*5);
-			this.bounds.x = 65;
-			this.bounds.y = 52;
-			this.bounds.width = this.bounds.height = 30;
+			this.bounds.x = 45;
+			this.bounds.y = 135;
+			this.bounds.width = 60;
+			this.bounds.height = 5;
 		},
 		tick:function(){},
 		render:function(_g){

js/app/classes/entities/statics/Tree.js

@@ -16,8 +16,18 @@ define(['Class'],function(Class){
           this.y = _y;
           this.width = _width;
           this.height = _height;
+      },
+      intersects:function(_rect){
+          if(   this.x < _rect.x + _rect.width &&
+                this.x + this.width > _rect.x &&
+                this.y < _rect.y + _rect.height &&
+                this.y + this.height> _rect.y){
+              return true;
+          }
+          return false;
       }
   });
 
+
     return Rectangle;
 });

js/app/classes/gfx/shapes/Rectangle.js

@@ -19,9 +19,7 @@ define(['Class','TileLoader','Utils','EntityManager','Player','Tree'],function(C
             _handler.setWorld(this);
             this.entityManager = new EntityManager(_handler,new Player(_handler,100,100));
             this.entityManager.addEntity(new Tree(_handler,100,400));
-            this.entityManager.addEntity(new Tree(_handler,200,500));
-            this.entityManager.addEntity(new Tree(_handler,200,450));
-            this.entityManager.addEntity(new Tree(_handler,300,700));
+            this.entityManager.addEntity(new Tree(_handler,300,400));
             this.loadWorld(_path);
             this.entityManager.getPlayer().setX(this.spawnX);
             this.entityManager.getPlayer().setY(this.spawnY);
@@ -70,6 +68,9 @@ define(['Class','TileLoader','Utils','EntityManager','Player','Tree'],function(C
         },
         getHeight:function(){
             return this.height;
+        },
+        getEntityManager:function(){
+            return this.entityManager;
         }
     });
 

js/app/classes/worlds/World.js

@@ -11,7 +11,7 @@
 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 2
 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 2
 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 2
-2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 2
+2 0 0 0 2 2 2 2 2 2 2 2 2 2 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 2
 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 2
 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 2
 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 2