diff --git a/src/main/java/Main.java b/src/main/java/Main.java index e91d4af..7f58425 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,5 +1,5 @@ import entities.Const; -import entities.Vec2; +import entities.Pair; import org.lwjgl.glfw.*; import org.lwjgl.opengl.*; import views.PlayerRenderer; @@ -37,7 +37,7 @@ initWindow(); initRender(); - playerRenderer = new PlayerRenderer("resources/test.png", new Vec2(640, 480)); + playerRenderer = new PlayerRenderer("resources/test.png", new Pair<>(640d, 480d)); // メインループ while (!glfwWindowShouldClose(hWnd)) { diff --git a/src/main/java/entities/Image2D.java b/src/main/java/entities/Image2D.java index 278530e..163c273 100644 --- a/src/main/java/entities/Image2D.java +++ b/src/main/java/entities/Image2D.java @@ -1,5 +1,7 @@ package entities; +import org.lwjgl.system.CallbackI; + import static org.lwjgl.opengl.GL11.*; //--------------------------------------------------------------- @@ -7,8 +9,8 @@ public class Image2D { private int id; // テクスチャのID - private Vec2 wh; // スプライトの幅高 - private Vec2 position; // スプライトの座標(画面座標) + private Pair wh; // スプライトの幅高 + private Pair position; // スプライトの座標(画面座標) private Color color; // スプライトの色 private double rotation; // 回転(度) private double scale; // 拡大 @@ -23,13 +25,13 @@ else this.id = 0; - this.position = new Vec2(x, y); + this.position = new Pair<>(x, y); this.color = new Color(1, 1, 1, 1); if (tex != null) - wh = new Vec2(tex.getWidth(), tex.getHeight()); + wh = new Pair<>((double)tex.getWidth(), (double)tex.getHeight()); else - wh = new Vec2(30, 30); + wh = new Pair<>(30d, 30d); rotation = 0.0; scale = 1.0; @@ -57,7 +59,7 @@ glMatrixMode(GL_MODELVIEW); // 行列の設定 glLoadIdentity(); // 単位行列化 - glTranslated(position.getX(), position.getY(), 0); // 移動 + glTranslated(position.getFirst(), position.getSecond(), 0); // 移動 glRotated(rotation, 0, 0, 1); // 回転 glScaled(scale, scale, 1); // 拡縮 @@ -76,13 +78,13 @@ // ポリゴンの作成とテクスチャの適応 glBegin(GL_TRIANGLE_STRIP); glTexCoord2d(0, 0); - glVertex2d(-wh.getX() / 2, wh.getY() / 2); + glVertex2d(-wh.getFirst() / 2, wh.getSecond() / 2); glTexCoord2d(0, 1); - glVertex2d(-wh.getX() / 2, -wh.getY() / 2); + glVertex2d(-wh.getFirst() / 2, -wh.getSecond() / 2); glTexCoord2d(1, 0); - glVertex2d(wh.getX() / 2, wh.getY() / 2); + glVertex2d(wh.getFirst() / 2, wh.getSecond() / 2); glTexCoord2d(1, 1); - glVertex2d(wh.getX() / 2, -wh.getY() / 2); + glVertex2d(wh.getFirst() / 2, -wh.getSecond() / 2); glEnd(); // 行列の破棄 diff --git a/src/main/java/entities/Vec2.java b/src/main/java/entities/Vec2.java deleted file mode 100644 index 3d7b0cd..0000000 --- a/src/main/java/entities/Vec2.java +++ /dev/null @@ -1,22 +0,0 @@ -package entities; - -//--------------------------------------------------------------- -public class Vec2 extends Pair { - - //--------------------------------------------------------------- - //--------------------------------------------------------------- - public Vec2(double x, double y) { - super(x, y); - } - - //--------------------------------------------------------------- - //--------------------------------------------------------------- - public Double getX() { - return this.getFirst(); - } - - public Double getY() { - return this.getSecond(); - } - //--------------------------------------------------------------- -} diff --git a/src/main/java/views/PlayerRenderer.java b/src/main/java/views/PlayerRenderer.java index 68e359b..2ce4485 100644 --- a/src/main/java/views/PlayerRenderer.java +++ b/src/main/java/views/PlayerRenderer.java @@ -1,8 +1,8 @@ package views; import entities.Image2D; +import entities.Pair; import entities.Texture; -import entities.Vec2; //--------------------------------------------------------------- // @@ -14,9 +14,9 @@ //--------------------------------------------------------------- //--------------------------------------------------------------- // - public PlayerRenderer(String path, Vec2 position) { + public PlayerRenderer(String path, Pair position) { texture = new Texture("player", path); - img = new Image2D(texture, position.getX(), position.getY()); + img = new Image2D(texture, position.getFirst(), position.getSecond()); } //---------------------------------------------------------------