diff --git a/src/main/java/JumpGame.java b/src/main/java/JumpGame.java index 86e3f11..9927138 100644 --- a/src/main/java/JumpGame.java +++ b/src/main/java/JumpGame.java @@ -1,45 +1,31 @@ -import models.GroundModel; import models.IModel; -import entities.ModelType; -import models.PlayerModel; +import models.JumpGameModel; import views.IView; import views.PlayerRenderer; import views.TileMapRenderer; -import views.TileRenderer; import java.util.ArrayList; public class JumpGame { //--------------------------------------------------------------- -// private Time time = new Time(); -// private Gameover gameover = new Gameover(position); -// private Clear clear = new Clear(position); //--------------------------------------------------------------- // new - private int i = 0; private ArrayList views = new ArrayList<>(); - private ArrayList models = new ArrayList<>(); + private IModel model = new JumpGameModel(); //--------------------------------------------------------------- //--------------------------------------------------------------- // public void gravity(double y) { // this.time.gravity(y); - PlayerModel playerModel = (PlayerModel) models.get(ModelType.PLAYER_MODEL); - playerModel.updateGravity(y); + JumpGameModel jumpGameModel = (JumpGameModel) model; + jumpGameModel.updateGravity(y); } //--------------------------------------------------------------- // 初期化 public void init() { - - // model - models.add(new GroundModel()); - - GroundModel groundModel = (GroundModel) models.get(ModelType.GROUND_MODEL); - models.add(new PlayerModel(groundModel.getGround())); - // view views.add(new TileMapRenderer()); views.add(new PlayerRenderer("resources/chicken.png")); @@ -50,8 +36,9 @@ public void update() { // Viewの更新 - for (IModel model : models) { - for (IView view : views) view.display(model); + for (IView view : views){ + view.update(model); + view.display(); } // Modelの更新