diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2d58001..044b574 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,17 @@
-
+
-
+
-
+
+
+
+
+
+
+
@@ -95,7 +101,9 @@
-
+
+
+
1648974204548
@@ -125,7 +133,21 @@
1650884746927
-
+
+ 1650968172741
+
+
+
+ 1650968172741
+
+
+ 1650968189571
+
+
+
+ 1650968189571
+
+
@@ -148,7 +170,8 @@
-
+
+
diff --git a/src/main/java/GLWindow.java b/src/main/java/GLWindow.java
index 1058d46..00e6feb 100644
--- a/src/main/java/GLWindow.java
+++ b/src/main/java/GLWindow.java
@@ -43,8 +43,7 @@
glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
window = glfwCreateWindow(GLConfigVariable.WIDTH, GLConfigVariable.HEIGHT, GLConfigVariable.TITLE_NAME, GLConfigVariable.IS_FULL_SCREEN ? glfwGetPrimaryMonitor() : NULL, NULL);
- if (window == NULL)
- throw new RuntimeException("Failed to create the window.");
+ if (window == NULL) throw new RuntimeException("Failed to create the window.");
glfwMakeContextCurrent(window);
glfwSwapInterval(1);
diff --git a/src/main/java/JumpingGame.java b/src/main/java/JumpingGame.java
index 3416d47..223460a 100644
--- a/src/main/java/JumpingGame.java
+++ b/src/main/java/JumpingGame.java
@@ -25,6 +25,7 @@
public void init() {
model = new JumpingGameModel();
+
JumpingGameModel jumpingGameModel = (JumpingGameModel) model;
jumpingGameModel.run(2);
@@ -63,7 +64,7 @@
JumpingGameModel jumpingGameModel = (JumpingGameModel) model;
if(jumpingGameModel.getClear()){
JFrame jFrame = new JFrame();
- JOptionPane.showMessageDialog(jFrame, "Clear");
+ JOptionPane.showMessageDialog(jFrame, "Clear!");
init();
}
}
diff --git a/src/main/java/entities/modelExtentions/Stage.java b/src/main/java/entities/modelExtentions/Stage.java
index fd92434..9906bb6 100644
--- a/src/main/java/entities/modelExtentions/Stage.java
+++ b/src/main/java/entities/modelExtentions/Stage.java
@@ -22,8 +22,6 @@
for (int i = 0; i < lines.size(); i++) data = lines.get(i).split(",");
for (int i = 0; i < data.length; i++) values.add(Integer.parseInt(data[i]));
- for (int v : values) System.out.println(v);
-
} catch (IOException e) {
System.out.println("Failed to load stage.txt");
}
diff --git a/src/main/java/views/Texture.java b/src/main/java/views/Texture.java
index bc950a7..d525319 100644
--- a/src/main/java/views/Texture.java
+++ b/src/main/java/views/Texture.java
@@ -67,18 +67,6 @@
return id;
}
- public String getName() {
- return name;
- }
-
- public void bind() {
- glBindTexture(GL_TEXTURE_2D, id);
- }
-
- public void debind() {
- glBindTexture(GL_TEXTURE_2D, 0);
- }
-
public void delete() {
glDeleteTextures(id);
}
diff --git a/src/main/java/views/TileMapRenderer.java b/src/main/java/views/TileMapRenderer.java
index 2bd1016..028cc19 100644
--- a/src/main/java/views/TileMapRenderer.java
+++ b/src/main/java/views/TileMapRenderer.java
@@ -46,15 +46,10 @@
for (int i = 0; i < 120; i++) {
double x = 32 * newTile.getScaleValue() * (i + space);
-
- if (stage.isFlag(i)){
- isOpen = !isOpen;
- System.out.println(isOpen);
- }
+ if (stage.isFlag(i))isOpen = !isOpen;
if (isOpen) addNewTile(x, TileType.OPEN);
else addNewTile(x, TileType.CLOSE);
-
}
}
@@ -69,6 +64,5 @@
break;
}
tiles.add(newTile);
- System.out.println("New tile created.");
}
}
\ No newline at end of file
diff --git a/target/classes/GLWindow.class b/target/classes/GLWindow.class
index 86fcb85..d5b8bf0 100644
--- a/target/classes/GLWindow.class
+++ b/target/classes/GLWindow.class
Binary files differ
diff --git a/target/classes/views/Texture.class b/target/classes/views/Texture.class
index 55ffd70..477f632 100644
--- a/target/classes/views/Texture.class
+++ 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
index 04ff27b..c1256b5 100644
--- a/target/classes/views/TileMapRenderer$1.class
+++ b/target/classes/views/TileMapRenderer$1.class
Binary files differ
diff --git a/target/classes/views/TileMapRenderer.class b/target/classes/views/TileMapRenderer.class
index d968ea7..104fb44 100644
--- a/target/classes/views/TileMapRenderer.class
+++ b/target/classes/views/TileMapRenderer.class
Binary files differ