diff --git a/src/main/java/entities/ModelType.java b/src/main/java/entities/ModelType.java deleted file mode 100644 index 193b2e6..0000000 --- a/src/main/java/entities/ModelType.java +++ /dev/null @@ -1,17 +0,0 @@ -package entities; - -//--------------------------------------------------------------- -// モデルのタイプ識別 -public class ModelType { - - public static final int GROUND_MODEL = 0; - public static final int PLAYER_MODEL = 1; - public static final int GAME_MODEL = 2; - - //--------------------------------------------------------------- - //--------------------------------------------------------------- - private ModelType() { - - } - //--------------------------------------------------------------- -} diff --git a/src/main/java/models/JumpGameModel.java b/src/main/java/models/JumpGameModel.java index 73d975e..b0617aa 100644 --- a/src/main/java/models/JumpGameModel.java +++ b/src/main/java/models/JumpGameModel.java @@ -68,6 +68,7 @@ //--------------------------------------------------------------- // public void updateGravity(double gravity) { + this.time.gravity(gravity); this.force.gravity(gravity); System.out.println("swapWindow Gravity"); } diff --git a/src/main/java/views/TileMapRenderer.java b/src/main/java/views/TileMapRenderer.java index 05d9fb6..71aff43 100644 --- a/src/main/java/views/TileMapRenderer.java +++ b/src/main/java/views/TileMapRenderer.java @@ -14,7 +14,7 @@ private double offsetY = 256d; private TileRenderer newTile = new TileRenderer("resources/tile.png", null, 2); private ArrayList tiles = new ArrayList<>(); - private int tileLen = 150; + private int tileLen = 150; // //--------------------------------------------------------------- //--------------------------------------------------------------- @@ -44,6 +44,21 @@ for (TileRenderer tile : tiles) tile.delete(); } + + //-------------------------------------------------------------- + //--------------------------------------------------------------- + // 初期タイル作成 + private void initTiles() { + + for (int i = 0; i < tileLen; i++) { + double x = 32 * newTile.getScaleValue() * i; + + newTile = new TileRenderer("resources/tile.png", new Pair<>(x, offsetY)); + newTile.setScaleValue(2); + tiles.add(newTile); + } + } + //-------------------------------------------------------------- // タイルをフラグに応じて生成する private void createTile(TileType tileType) { @@ -62,13 +77,4 @@ } //--------------------------------------------------------------- - // 初期タイル作成 - private void initTiles() { - for (double x = 0; x <= GLConfigVariable.WIDTH; x += 32 * newTile.getScaleValue()) { - newTile = new TileRenderer("resources/tile.png", new Pair<>(x, offsetY)); - newTile.setScaleValue(2); - tiles.add(newTile); - } - } - //--------------------------------------------------------------- } \ No newline at end of file