Merge pull request #27 from nitta-lab/fix/models

Fork: 1

c-okada / JumpingGame

forked from nitta-lab/JumpingGame

Browse code Merge pull request #27 from nitta-lab/fix/models_field Fix/models field MyTest develop master
commit bf82c04e154e3d8f06cda0dbab704edbd5a8b1a4 2 parents 1316be5 + 2397add fujii kouta authored on 7 Dec 2021

Patch

Unified Split

Showing 20 changed files

Ignore Space Show notes View

■■■■■

jumpGame.iml

     <orderEntry type="library" name="Maven: org.lwjgl:lwjgl-opengl:natives-windows:3.2.3" level="project" />
     <orderEntry type="library" name="Maven: org.lwjgl:lwjgl-stb:natives-windows:3.2.3" level="project" />
     <orderEntry type="library" name="Maven: org.joml:joml:1.9.24" level="project" />
     <orderEntry type="library" name="org.junit.jupiter:junit-jupiter:5.4.2" level="project" />
+    <orderEntry type="library" name="Statistic-3.4.2" level="project" />
   </component>
 </module>

                Ignore Space
               Show notes
              View
            
          
          6 ■■■■■
          src/main/java/JumpGame.java
             import models.IModel;
import models.JumpGameModel;
import org.lwjgl.glfw.GLFW;
import org.lwjgl.glfw.GLFWKeyCallback;
import views.BackgroundRenderer;
import views.IView;
import views.PlayerRenderer;
import views.TileMapRenderer;
 
import static org.lwjgl.glfw.Callbacks.glfwFreeCallbacks;
import static org.lwjgl.glfw.GLFW.*;
import static org.lwjgl.opengl.GL11.*;
import static org.lwjgl.system.MemoryUtil.NULL;
 
import java.util.ArrayList;
 
public class JumpGame {
    //---------------------------------------------------------------
    //
    public void gravity(double y) {
        JumpGameModel jumpGameModel = (JumpGameModel) model;
        jumpGameModel.updateGravity(y); //重力の更新
        jumpGameModel.gravity(y); //重力の更新
        jumpGameModel.updateGroundFlag();//地面の判定切り替え
    }
 
    //---------------------------------------------------------------
 import models.IModel;
 import models.JumpGameModel;
-import org.lwjgl.glfw.GLFW;
 import org.lwjgl.glfw.GLFWKeyCallback;
 import views.BackgroundRenderer;
 import views.IView;
 import views.PlayerRenderer;
 import views.TileMapRenderer;
-import static org.lwjgl.glfw.Callbacks.glfwFreeCallbacks;
 import static org.lwjgl.glfw.GLFW.*;
-import static org.lwjgl.opengl.GL11.*;
-import static org.lwjgl.system.MemoryUtil.NULL;
 import java.util.ArrayList;
 public class JumpGame {
     //---------------------------------------------------------------
     //
     public void gravity(double y) {
         JumpGameModel jumpGameModel = (JumpGameModel) model;
+        jumpGameModel.updateGravity(y); //重力の更新
+        jumpGameModel.gravity(y); //重力の更新
         jumpGameModel.updateGroundFlag();//地面の判定切り替え
     }
     //---------------------------------------------------------------

Ignore Space Show notes View src/main/java/entities/Acceleration.java

Ignore Space Show notes View src/main/java/entities/Clear.java

Ignore Space Show notes View src/main/java/entities/Force.java

Ignore Space Show notes View src/main/java/entities/Gameover.java

Ignore Space Show notes View src/main/java/entities/Ground.java

Ignore Space Show notes View src/main/java/entities/Mass.java

Ignore Space Show notes View src/main/java/entities/Move.java

Ignore Space Show notes View src/main/java/entities/Onground.java

Ignore Space Show notes View src/main/java/entities/Pair.java

Ignore Space Show notes View src/main/java/entities/Position.java

Ignore Space Show notes View src/main/java/entities/Time.java

Ignore Space Show notes View src/main/java/entities/Velocity.java

Show notes View src/main/java/entities/modelExtentions/Flags.java 100644 → 0

Ignore Space Show notes View src/main/java/entities/modelExtentions/Stage.java 0 → 100644

Ignore Space Show notes View src/main/java/models/JumpGameModel.java

Ignore Space Show notes View src/main/java/views/PlayerRenderer.java

Ignore Space Show notes View src/main/java/views/TileMapRenderer.java

Ignore Space Show notes View src/main/java/views/TileRenderer.java

Show line notes below