diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..30ddc78 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1646804917199 + + + 1648974204548 + + + 1648975130088 + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/models/JumpGameModel.java b/src/main/java/models/JumpGameModel.java new file mode 100644 index 0000000..5c98ecb --- /dev/null +++ b/src/main/java/models/JumpGameModel.java @@ -0,0 +1,110 @@ +package models; + +import entities.*; +import entities.modelExtentions.Stage; + +import java.util.*; + +public class JumpGameModel implements IModel{ + private Gameover gameover; + private Time time; + private Onground onground; + private Ground ground; + private Clear clear; + private Position position; + private Velocity velocity; + private Move move; + private Acceleration acceleration; + private Mass mass; + private Force force; + + private Stage stage; //added + + public JumpGameModel() { + gameover = new Gameover(); + time = new Time(); + onground = new Onground(); + ground = new Ground(onground); + clear = new Clear(); + position = new Position(onground,clear,gameover,ground); + velocity = new Velocity(position,onground); + move = new Move(velocity); + acceleration = new Acceleration(velocity,onground); + mass = new Mass(acceleration); + force = new Force(acceleration); + stage = new Stage(); // added + } + public void gravity(double y) { + this.force.gravity(y); + this.time.gravity(y); + } + public void openHole() { + this.ground.openHole(); + } + public void closeHole() { + this.ground.closeHole(); + } + public void moveY(double y) { + this.move.moveY(y); + } + public void moveX(double x) { + this.move.moveX(x); + } + public void setMass(double x) { + this.mass.setMass(x); + } + public Pair getAcceleration() { + return acceleration.getValue(); + } + public Pair getMove() { + return move.getValue(); + } + public double getMass() { + return mass.getValue(); + } + public boolean getClear() { + return clear.getValue(); + } + public boolean getGround() { + return ground.getValue(); + } + public Pair getForce() { + return force.getValue(); + } + public Pair getVelocity() { + return velocity.getValue(); + } + public Pair getPosition() { + return position.getValue(); + } + public boolean getOnground() { + return onground.getValue(); + } + public double getTime() { + return time.getValue(); + } + public boolean getGameover() { + return gameover.getValue(); + } + //--------------------------------------------------------------- + //--------------------------------------------------------------- + // added + public Stage getStage() { + return stage; + } + + //--------------------------------------------------------------- + // 地面のフラグ更新 + public void updateGroundFlag() { + double x = position.getValue().getLeft(); + + if (stage.isOpenFlag(x)) ground.openHole(); + if (stage.isCloseFlag(x)) ground.closeHole(); + +// System.out.print("x: " + x + "/"); +// System.out.println("Ground: " + ground.getValue() + "/"); +// System.out.print("Clear: " + clear.getClear() + "/"); +// System.out.println("GameOver: " + gameover.getGameover()); + + } +} \ No newline at end of file diff --git a/target/classes/GLWindow.class b/target/classes/GLWindow.class new file mode 100644 index 0000000..bcf1cce --- /dev/null +++ b/target/classes/GLWindow.class Binary files differ diff --git a/target/classes/GameEngine.class b/target/classes/GameEngine.class new file mode 100644 index 0000000..f92d03d --- /dev/null +++ b/target/classes/GameEngine.class Binary files differ diff --git a/target/classes/JumpGame$1.class b/target/classes/JumpGame$1.class new file mode 100644 index 0000000..d960a73 --- /dev/null +++ b/target/classes/JumpGame$1.class Binary files differ diff --git a/target/classes/JumpGame.class b/target/classes/JumpGame.class new file mode 100644 index 0000000..c3e55cc --- /dev/null +++ b/target/classes/JumpGame.class Binary files differ diff --git a/target/classes/Main.class b/target/classes/Main.class new file mode 100644 index 0000000..84789aa --- /dev/null +++ b/target/classes/Main.class Binary files differ diff --git a/target/classes/entities/Acceleration.class b/target/classes/entities/Acceleration.class new file mode 100644 index 0000000..0fccb01 --- /dev/null +++ b/target/classes/entities/Acceleration.class Binary files differ diff --git a/target/classes/entities/Clear.class b/target/classes/entities/Clear.class new file mode 100644 index 0000000..3185412 --- /dev/null +++ b/target/classes/entities/Clear.class Binary files differ diff --git a/target/classes/entities/Force.class b/target/classes/entities/Force.class new file mode 100644 index 0000000..0844a3b --- /dev/null +++ b/target/classes/entities/Force.class Binary files differ diff --git a/target/classes/entities/Gameover.class b/target/classes/entities/Gameover.class new file mode 100644 index 0000000..3679e22 --- /dev/null +++ b/target/classes/entities/Gameover.class Binary files differ diff --git a/target/classes/entities/Ground.class b/target/classes/entities/Ground.class new file mode 100644 index 0000000..3defb58 --- /dev/null +++ b/target/classes/entities/Ground.class Binary files differ diff --git a/target/classes/entities/Mass.class b/target/classes/entities/Mass.class new file mode 100644 index 0000000..57803d1 --- /dev/null +++ b/target/classes/entities/Mass.class Binary files differ diff --git a/target/classes/entities/Move.class b/target/classes/entities/Move.class new file mode 100644 index 0000000..ada3806 --- /dev/null +++ b/target/classes/entities/Move.class Binary files differ diff --git a/target/classes/entities/Onground.class b/target/classes/entities/Onground.class new file mode 100644 index 0000000..8c41ae3 --- /dev/null +++ b/target/classes/entities/Onground.class Binary files differ diff --git a/target/classes/entities/Pair.class b/target/classes/entities/Pair.class new file mode 100644 index 0000000..9fcadf0 --- /dev/null +++ b/target/classes/entities/Pair.class Binary files differ diff --git a/target/classes/entities/Position.class b/target/classes/entities/Position.class new file mode 100644 index 0000000..e222e1d --- /dev/null +++ b/target/classes/entities/Position.class Binary files differ diff --git a/target/classes/entities/Time.class b/target/classes/entities/Time.class new file mode 100644 index 0000000..d265d22 --- /dev/null +++ b/target/classes/entities/Time.class Binary files differ diff --git a/target/classes/entities/Velocity.class b/target/classes/entities/Velocity.class new file mode 100644 index 0000000..f097e46 --- /dev/null +++ b/target/classes/entities/Velocity.class Binary files differ diff --git a/target/classes/entities/config/GLConfigVariable.class b/target/classes/entities/config/GLConfigVariable.class new file mode 100644 index 0000000..482307a --- /dev/null +++ b/target/classes/entities/config/GLConfigVariable.class Binary files differ diff --git a/target/classes/entities/modelExtentions/Stage.class b/target/classes/entities/modelExtentions/Stage.class new file mode 100644 index 0000000..bafd1c6 --- /dev/null +++ b/target/classes/entities/modelExtentions/Stage.class Binary files differ diff --git a/target/classes/models/IModel.class b/target/classes/models/IModel.class new file mode 100644 index 0000000..37fe2c3 --- /dev/null +++ b/target/classes/models/IModel.class Binary files differ diff --git a/target/classes/models/JumpGameModel.class b/target/classes/models/JumpGameModel.class new file mode 100644 index 0000000..b933322 --- /dev/null +++ b/target/classes/models/JumpGameModel.class Binary files differ diff --git a/target/classes/views/Color.class b/target/classes/views/Color.class new file mode 100644 index 0000000..f2ee3ba --- /dev/null +++ b/target/classes/views/Color.class Binary files differ diff --git a/target/classes/views/IView.class b/target/classes/views/IView.class new file mode 100644 index 0000000..79019e8 --- /dev/null +++ b/target/classes/views/IView.class Binary files differ diff --git a/target/classes/views/Image2D.class b/target/classes/views/Image2D.class new file mode 100644 index 0000000..30e5d6a --- /dev/null +++ b/target/classes/views/Image2D.class Binary files differ diff --git a/target/classes/views/PlayerRenderer.class b/target/classes/views/PlayerRenderer.class new file mode 100644 index 0000000..88d5982 --- /dev/null +++ b/target/classes/views/PlayerRenderer.class Binary files differ diff --git a/target/classes/views/Sprite.class b/target/classes/views/Sprite.class new file mode 100644 index 0000000..54fba89 --- /dev/null +++ b/target/classes/views/Sprite.class Binary files differ diff --git a/target/classes/views/Texture.class b/target/classes/views/Texture.class new file mode 100644 index 0000000..b538ba7 --- /dev/null +++ b/target/classes/views/Texture.class Binary files differ diff --git a/target/classes/views/TileMapRenderer$1.class b/target/classes/views/TileMapRenderer$1.class new file mode 100644 index 0000000..1fe3bef --- /dev/null +++ b/target/classes/views/TileMapRenderer$1.class Binary files differ diff --git a/target/classes/views/TileMapRenderer.class b/target/classes/views/TileMapRenderer.class new file mode 100644 index 0000000..f869cdc --- /dev/null +++ b/target/classes/views/TileMapRenderer.class Binary files differ diff --git a/target/classes/views/TileRenderer.class b/target/classes/views/TileRenderer.class new file mode 100644 index 0000000..1135757 --- /dev/null +++ b/target/classes/views/TileRenderer.class Binary files differ diff --git a/target/classes/views/TileType.class b/target/classes/views/TileType.class new file mode 100644 index 0000000..08f177e --- /dev/null +++ b/target/classes/views/TileType.class Binary files differ