Merge pull request #6 from oskarh/set-player-from-tiled

Set player from tiled

Author: oskarh

android/assets/level1.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="240" height="13" tilewidth="16" tileheight="16" nextobjectid="153">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="240" height="13" tilewidth="16" tileheight="16" nextobjectid="156">
  <tileset firstgid="1" name="tileset_gutter" tilewidth="16" tileheight="16" spacing="2" margin="1" tilecount="924">
   <image source="tileset_gutter.png" width="594" height="504"/>
   <tile id="0">
@@ -234,4 +234,7 @@
   <object id="151" x="864" y="176" width="16" height="16"/>
   <object id="152" x="2352" y="176" width="16" height="16"/>
  </objectgroup>
+ <objectgroup name="Player">
+  <object id="153" x="32" y="176" width="16" height="16"/>
+ </objectgroup>
 </map>

core/src/com/brentaureli/mariobros/Screens/PlayScreen.java

@@ -90,8 +90,7 @@ public PlayScreen(MarioBros game){
 
         creator = new B2WorldCreator(this);
 
-        //create mario in our game world
-        player = new Mario(this);
+        player = creator.getMario();
 
         world.setContactListener(new WorldContactListener());
 

core/src/com/brentaureli/mariobros/Sprites/Mario.java

@@ -55,7 +55,7 @@ public enum State { FALLING, JUMPING, STANDING, RUNNING, GROWING, DEAD }
 
     private Array<FireBall> fireballs;
 
-    public Mario(PlayScreen screen){
+    public Mario(PlayScreen screen, float x, float y){
         //initialize default values
         this.screen = screen;
         this.world = screen.getWorld();
@@ -99,7 +99,7 @@ public Mario(PlayScreen screen){
         marioDead = new TextureRegion(screen.getAtlas().findRegion("little_mario"), 96, 0, 16, 16);
 
         //define mario in Box2d
-        defineMario();
+        defineMario(x, y);
 
         //set initial values for marios location, width and height. And initial frame as marioStand.
         setBounds(0, 0, 16 / MarioBros.PPM, 16 / MarioBros.PPM);
@@ -129,7 +129,7 @@ public void update(float dt){
                 fireballs.removeValue(ball, true);
         }
 
-        if (getBody().getPosition().y < 0) {
+        if (getBody().getPosition().y < 0 && !(currentState == State.DEAD)) {
             currentState = State.DEAD;
             previousState = State.DEAD;
             stateTimer = 4;
@@ -336,9 +336,9 @@ public void defineBigMario(){
         timeToDefineBigMario = false;
     }
 
-    public void defineMario(){
+    public void defineMario(float x, float y){
         BodyDef bdef = new BodyDef();
-        bdef.position.set(32 / MarioBros.PPM, 32 / MarioBros.PPM);
+        bdef.position.set(x / MarioBros.PPM, y / MarioBros.PPM);
         bdef.type = BodyDef.BodyType.DynamicBody;
         b2body = world.createBody(bdef);
 

core/src/com/brentaureli/mariobros/Tools/B2WorldCreator.java

@@ -13,10 +13,11 @@
 import com.brentaureli.mariobros.MarioBros;
 import com.brentaureli.mariobros.Screens.PlayScreen;
 import com.brentaureli.mariobros.Sprites.Enemies.Enemy;
+import com.brentaureli.mariobros.Sprites.Enemies.Goomba;
 import com.brentaureli.mariobros.Sprites.Enemies.Turtle;
+import com.brentaureli.mariobros.Sprites.Mario;
 import com.brentaureli.mariobros.Sprites.TileObjects.Brick;
 import com.brentaureli.mariobros.Sprites.TileObjects.Coin;
-import com.brentaureli.mariobros.Sprites.Enemies.Goomba;
 
 /**
  * Created by brentaureli on 8/28/15.
@@ -29,9 +30,10 @@ public class B2WorldCreator {
     public static final String COINS_LAYER = "Coins";
     public static final String GOOMBAS_LAYER = "Goombas";
     public static final String TURTLES_LAYER = "Turtles";
+    private static final String PLAYER_LAYER = "Player";
 
-    private Array<Goomba> goombas;
-    private Array<Turtle> turtles;
+    private Mario mario;
+    Array<Enemy> enemies = new Array<Enemy>();
 
     public B2WorldCreator(PlayScreen screen){
         World world = screen.getWorld();
@@ -41,8 +43,29 @@ public B2WorldCreator(PlayScreen screen){
         PolygonShape shape = new PolygonShape();
         FixtureDef fdef = new FixtureDef();
         Body body;
+        enemies = new Array<Enemy>();
 
         //create ground bodies/fixtures
+        createGround(world, map, bdef, shape, fdef);
+
+        //create pipe bodies/fixtures
+        createPipes(world, map, bdef, shape, fdef);
+
+        //create brick bodies/fixtures
+        createBricks(screen, map);
+
+        //create coin bodies/fixtures
+        createCoins(screen, map);
+
+        //create all goombas
+        createGoombas(screen, map);
+        createTurtles(screen, map);
+
+        mario = createPlayer(screen, map);
+    }
+
+    private void createGround(World world, TiledMap map, BodyDef bdef, PolygonShape shape, FixtureDef fdef) {
+        Body body;
         for(MapObject object : map.getLayers().get(GROUND_LAYER).getObjects().getByType(RectangleMapObject.class)){
             Rectangle rect = ((RectangleMapObject) object).getRectangle();
 
@@ -55,8 +78,10 @@ public B2WorldCreator(PlayScreen screen){
             fdef.shape = shape;
             body.createFixture(fdef);
         }
+    }
 
-        //create pipe bodies/fixtures
+    private void createPipes(World world, TiledMap map, BodyDef bdef, PolygonShape shape, FixtureDef fdef) {
+        Body body;
         for(MapObject object : map.getLayers().get(PIPES_LAYER).getObjects().getByType(RectangleMapObject.class)){
             Rectangle rect = ((RectangleMapObject) object).getRectangle();
 
@@ -75,34 +100,49 @@ public B2WorldCreator(PlayScreen screen){
                     | MarioBros.FIREBALL_BIT;
             body.createFixture(fdef);
         }
+    }
 
-        //create brick bodies/fixtures
+    private void createBricks(PlayScreen screen, TiledMap map) {
         for(MapObject object : map.getLayers().get(BRICKS_LAYER).getObjects().getByType(RectangleMapObject.class)){
             new Brick(screen, object);
         }
+    }
 
-        //create coin bodies/fixtures
+    private void createCoins(PlayScreen screen, TiledMap map) {
         for(MapObject object : map.getLayers().get(COINS_LAYER).getObjects().getByType(RectangleMapObject.class)){
             new Coin(screen, object);
         }
+    }
 
-        //create all goombas
-        goombas = new Array<Goomba>();
+    private void createGoombas(PlayScreen screen, TiledMap map) {
+        Array<Goomba> goombas = new Array<Goomba>();
         for(MapObject object : map.getLayers().get(GOOMBAS_LAYER).getObjects().getByType(RectangleMapObject.class)){
             Rectangle rect = ((RectangleMapObject) object).getRectangle();
             goombas.add(new Goomba(screen, rect.getX() / MarioBros.PPM, rect.getY() / MarioBros.PPM));
         }
-        turtles = new Array<Turtle>();
+        enemies.addAll(goombas);
+    }
+
+    private void createTurtles(PlayScreen screen, TiledMap map) {
+        Array<Turtle> turtles = new Array<Turtle>();
         for(MapObject object : map.getLayers().get(TURTLES_LAYER).getObjects().getByType(RectangleMapObject.class)){
             Rectangle rect = ((RectangleMapObject) object).getRectangle();
             turtles.add(new Turtle(screen, rect.getX() / MarioBros.PPM, rect.getY() / MarioBros.PPM));
         }
+        enemies.addAll(turtles);
+    }
+
+    private Mario createPlayer(PlayScreen screen, TiledMap map) {
+        Rectangle playerPosition = map.getLayers().get(PLAYER_LAYER).getObjects().getByType(RectangleMapObject.class).first().getRectangle();
+        Mario player = new Mario(screen, playerPosition.getX(), playerPosition.getY());
+        return player;
+    }
+
+    public Mario getMario() {
+        return mario;
     }
 
     public Array<Enemy> getEnemies(){
-        Array<Enemy> enemies = new Array<Enemy>();
-        enemies.addAll(goombas);
-        enemies.addAll(turtles);
         return enemies;
     }
 }