Created the Entity Manager class and implimented it

Author: jamie nichols

.idea/workspace.xml

@@ -29,6 +29,7 @@ requirejs.config({
         "DirtTile":"app/classes/tiles/DirtTile",
         "Display":"app/classes/display/Display",
         "Entity":"app/classes/entities/Entity",
+        "EntityManager":"app/classes/entities/EntityManager",
         "Game":"app/classes/Game",
         "GameCamera":"app/classes/gfx/GameCamera",
         "GameState":"app/classes/states/GameState",

js/app.js

@@ -9,25 +9,18 @@
  * jamie337nichols
  * [email protected]
  */
-define(['State','Player','World','Tile'],function(State,Player,World,Tile){
-    var ex = 28*Tile.TILEWIDTH;
-    var ey = 28*Tile.TILEHEIGHT;
+define(['State','World'],function(State,World){
 
     var GameState = State.extend({
         init:function(_handler){
             this._super(_handler);
-            this.player = new Player(_handler,43,43);
             this.world = new World("res/worlds/world1.wrd",_handler);
-            this.player.setX(this.world.spawnX);
-            this.player.setY(this.world.spawnY);
         },
 		tick:function(_dt){
             this.world.tick(_dt);
-            this.player.tick(_dt);
         },
 		render:function(_g){
             this.world.render(_g);
-            this.player.render(_g);
         }
     });
 

js/app/classes/States/GameState.js

@@ -0,0 +1,46 @@
+define(['Class'],function(Class){
+
+    var handler,player,entities;
+
+    var EntityManager = Class.extend({
+        init:function(_handler,_player){
+            handler = _handler;
+            player = _player;
+            entities = new Array(player);
+        },
+        tick:function(_dt){
+            entities.sort(compare);
+            for(var i = 0; i<entities.length;i++){
+                var e = entities[i];
+                e.tick(_dt);
+            }
+        },
+        render:function(_g){
+            entities.forEach(function(e){
+                e.render(_g);
+            });
+        },
+        //Getters
+        getPlayer:function(){
+            return player;
+        },
+        getHandler:function(){
+            return handler;
+        },
+        getEntities:function(){
+            return entities;
+        },
+        //Setters
+        addEntity:function(e){
+            entities.push(e);
+        }
+    });
+
+
+    function compare(a,b){
+        if(a.getY()+ a.getHeight()< b.getY()+ b.getHeight())return -1;
+        return 1;
+    }
+
+    return EntityManager;
+});

js/app/classes/entities/EntityManager.js

@@ -9,15 +9,22 @@
  * jamie337nichols
  * [email protected]
  */
-define(['Class','TileLoader','Utils',],function(Class,Tile,Utils){
+define(['Class','TileLoader','Utils','EntityManager','Player','Tree'],function(Class,Tile,Utils,EntityManager,Player,Tree){
 
 
   var World = Class.extend({
         init:function(_path,_handler){
             this.tiles = [];
             this.handler = _handler;
             _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.loadWorld(_path);
+            this.entityManager.getPlayer().setX(this.spawnX);
+            this.entityManager.getPlayer().setY(this.spawnY);
         },
         loadWorld:function(_path){
             var file = Utils.loadFileAsString(_path);
@@ -35,6 +42,7 @@ define(['Class','TileLoader','Utils',],function(Class,Tile,Utils){
             }
         },
         tick:function(_dt) {
+            this.entityManager.tick(_dt);
         },
         render:function(_g){
             var xStart = parseInt(Math.max(0,
@@ -52,7 +60,7 @@ define(['Class','TileLoader','Utils',],function(Class,Tile,Utils){
                     this.getTile(x,y).render(_g,x * Tile.TILEWIDTH - this.handler.getGameCamera().getxOffset(),y * Tile.TILEHEIGHT - this.handler.getGameCamera().getyOffset());
                 }
             }
-
+            this.entityManager.render(_g);
         },
         getTile:function(_x,_y){
             return Tile.tiles[this.tiles[_x][_y]];

js/app/classes/worlds/World.js

@@ -1,5 +1,5 @@
 30 30
-2 0
+3 5
 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 0 0 0 0 0 0 0 0 2