Code cleanup and refactoring

Hilligans · Nov 27, 2023 · cd1652e · cd1652e
1 parent 7d37f6c
commit cd1652e
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 66 deletions.
diff --git a/src/main/java/dev/hilligans/ourcraft/ClientMain.java b/src/main/java/dev/hilligans/ourcraft/ClientMain.java
@@ -47,12 +47,4 @@ public static void main(String[] args) throws IOException {
         }
         client.startClient();
     }
-
-    public static int getWindowX() {
-        return client == null ? 0 : client.windowX;
-    }
-
-    public static int getWindowY() {
-        return client == null ? 0 : client.windowY;
-    }
 }
diff --git a/src/main/java/dev/hilligans/ourcraft/client/Client.java b/src/main/java/dev/hilligans/ourcraft/client/Client.java
@@ -55,8 +55,6 @@ public class Client implements IClientPacketHandler {
 
     public int playerId;
 
-    public int windowX = 1600;
-    public int windowY = 800;
     public boolean joinServer = true;
     public boolean valid = false;
     public boolean screenShot = false;
@@ -180,7 +178,8 @@ public void closeScreen() {
     }
 
     public void openScreen(Screen screen1) {
-        screen1.setWindow(graphicsEngine.getWindows().get(0));
+        RenderWindow renderWindow = graphicsEngine.getWindows().get(0);
+        screen1.setWindow(renderWindow);
         gameInstance.EVENT_BUS.postEvent(new OpenScreenEvent(screen1,screen));
         //glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
         if(screen != null) {
@@ -199,7 +198,7 @@ public void openScreen(Screen screen1) {
             }
             playerData.openContainer = container;
         }
-        screen1.resize(windowX,windowY);
+        screen1.resize(renderWindow.getWindowWidth(),renderWindow.getWindowHeight());
         sendPacket(new COpenScreen(screen1));
     }
 

diff --git a/src/main/java/dev/hilligans/ourcraft/client/ScreenShot.java b/src/main/java/dev/hilligans/ourcraft/client/ScreenShot.java
@@ -51,8 +51,8 @@ public static void largeScreenshot(int width, int height, Client client) {
 
         glBindFramebuffer(GL_FRAMEBUFFER, 0);
         glViewport(0,0,1920,1080);
-        client.windowX = 1920;
-        client.windowY = 1080;
+       // client.windowX = 1920;
+       // client.windowY = 1080;
 
         writeImage(bufferedImage);
     }

diff --git a/src/main/java/dev/hilligans/ourcraft/client/rendering/ScreenBase.java b/src/main/java/dev/hilligans/ourcraft/client/rendering/ScreenBase.java
@@ -94,7 +94,7 @@ public void resize(int x, int y) {
     public void addWidget(Widget widget) {
         widgets.add(widget);
         widget.screenBase = this;
-        widget.onScreenResize(client.windowX,client.windowY);
+        widget.onScreenResize(window.getWindowWidth(),window.getWindowHeight());
     }
 
     @Override
@@ -107,5 +107,9 @@ public void setWindow(RenderWindow renderWindow) {
         buildContentForWindow(renderWindow);
     }
 
+    public RenderWindow getWindow() {
+        return window;
+    }
+
     public void buildContentForWindow(RenderWindow window) {}
 }
diff --git a/src/main/java/dev/hilligans/ourcraft/client/rendering/graphics/RenderWindow.java b/src/main/java/dev/hilligans/ourcraft/client/rendering/graphics/RenderWindow.java
@@ -27,9 +27,6 @@ public abstract class RenderWindow {
 
     public String queuedPipeline;
 
-    public double mouseX;
-    public double mouseY;
-
     public RenderWindow(IGraphicsEngine<?,?,?> graphicsEngine) {
         this.graphicsEngine = graphicsEngine;
         if(graphicsEngine != null) {
@@ -89,9 +86,9 @@ public InputHandler getInputProvider() {
         return inputHandler;
     }
 
-    public abstract float getWindowWidth();
+    public abstract int getWindowWidth();
 
-    public abstract float getWindowHeight();
+    public abstract int getWindowHeight();
 
     public abstract boolean isWindowFocused();
 
@@ -102,7 +99,7 @@ public Logger getLogger() {
     }
 
     public float getAspectRatio() {
-        return getWindowWidth() / getWindowHeight();
+        return (float) getWindowWidth() / getWindowHeight();
     }
 
     public void setMouseCursor(Image image) {}

diff --git a/...v/hilligans/ourcraft/client/rendering/graphics/fixedfunctiongl/FixedFunctionGLWindow.java b/...v/hilligans/ourcraft/client/rendering/graphics/fixedfunctiongl/FixedFunctionGLWindow.java
@@ -14,13 +14,13 @@ public class FixedFunctionGLWindow extends RenderWindow {
     public boolean shouldClose = false;
     public boolean mouseLocked = false;
     public boolean windowFocused = true;
-    public float width;
-    public float height;
+    public int width;
+    public int height;
 
     public FixedFunctionGLWindow(Client client, FixedFunctionGLEngine engine) {
         super(engine);
         this.camera = new FreeCamera(this);
-        window = glfwCreateWindow(client.windowX,client.windowY,"Ourcraft",NULL,NULL);
+        window = glfwCreateWindow(1920,1080,"Ourcraft",NULL,NULL);
         if(window == NULL) {
 
             glfwTerminate();
@@ -59,12 +59,12 @@ public Client getClient() {
     }
 
     @Override
-    public float getWindowWidth() {
+    public int getWindowWidth() {
         return width;
     }
 
     @Override
-    public float getWindowHeight() {
+    public int getWindowHeight() {
         return height;
     }
 

diff --git a/...igans/ourcraft/client/rendering/graphics/implementations/splitwindows/FloatingWindow.java b/...igans/ourcraft/client/rendering/graphics/implementations/splitwindows/FloatingWindow.java
@@ -45,12 +45,12 @@ public Client getClient() {
     }
 
     @Override
-    public float getWindowWidth() {
+    public int getWindowWidth() {
         return 0;
     }
 
     @Override
-    public float getWindowHeight() {
+    public int getWindowHeight() {
         return 0;
     }
 

diff --git a/...illigans/ourcraft/client/rendering/graphics/implementations/splitwindows/SplitWindow.java b/...illigans/ourcraft/client/rendering/graphics/implementations/splitwindows/SplitWindow.java
@@ -48,12 +48,12 @@ public Client getClient() {
     }
 
     @Override
-    public float getWindowWidth() {
+    public int getWindowWidth() {
         return 0;
     }
 
     @Override
-    public float getWindowHeight() {
+    public int getWindowHeight() {
         return 0;
     }
 

diff --git a/src/main/java/dev/hilligans/ourcraft/client/rendering/graphics/opengl/OpenGLWindow.java b/src/main/java/dev/hilligans/ourcraft/client/rendering/graphics/opengl/OpenGLWindow.java
@@ -18,8 +18,8 @@ public class OpenGLWindow extends RenderWindow {
     public boolean shouldClose = false;
     public boolean mouseLocked = false;
     public boolean windowFocused = true;
-    public float width;
-    public float height;
+    public int width;
+    public int height;
     public Vector4f clearColor = new Vector4f();
 
     public OpenGLWindow(Client client, OpenGLEngine engine, String name, int width, int height) {
@@ -78,12 +78,12 @@ public Client getClient() {
     }
 
     @Override
-    public float getWindowWidth() {
+    public int getWindowWidth() {
         return width;
     }
 
     @Override
-    public float getWindowHeight() {
+    public int getWindowHeight() {
         return height;
     }
 
@@ -103,27 +103,9 @@ public void setClearColor(float r, float g, float b, float a) {
     }
 
     public void registerCallbacks() {
-        glfwSetCursorPosCallback(window, (window, xpos, ypos) -> {
-            mouseX = xpos;
-            mouseY = ypos;
-            if(mouseLocked) {
-                double halfWindowX = (double) getWindowWidth() / 2;
-                double halfWindowY = (double) getWindowHeight() / 2;
-
-                double deltaX = xpos - halfWindowX;
-                double deltaY = ypos - halfWindowY;
-
-                if(camera != null) {
-                 //   camera.addRotation((float) (deltaY / camera.getSensitivity()), (float) (deltaX / camera.getSensitivity()));
-                }
-                glfwSetCursorPos(window, halfWindowX, halfWindowY);
-            }
-        });
         glfwSetWindowSizeCallback(window, (window, w, h) -> {
             width = w;
             height = h;
-            client.windowX = w;
-            client.windowY = h;
             GL30.glViewport(0,0,w,h);
         });
 

diff --git a/src/main/java/dev/hilligans/ourcraft/client/rendering/graphics/tasks/GUIRenderTask.java b/src/main/java/dev/hilligans/ourcraft/client/rendering/graphics/tasks/GUIRenderTask.java
@@ -28,15 +28,15 @@ public void draw(RenderWindow window, GraphicsContext graphicsContext, IGraphics
 
                 if (client.playerData.f3) {
                   //  stringRenderer.drawStringInternal(window,screenStack,"1",0,0,0.5f);
-                    stringRenderer.drawStringInternal(window, screenStack, "FPS:" + window.frameTracker.getFPS(), client.windowX / 2, 29, 0.5f);
+                    stringRenderer.drawStringInternal(window, screenStack, "FPS:" + window.frameTracker.getFPS(), window.getWindowWidth() / 2, 29, 0.5f);
                   /*  stringRenderer.drawStringInternal(window, screenStack, "Biome:" + client.clientWorld.biomeMap.getBiome((int) Camera.pos.x, (int) Camera.pos.z).name, client.windowX / 2, 58, 0.5f);
                     stringRenderer.drawStringInternal(window, screenStack, "VelY:" + Camera.velY, client.windowX / 2, 87, 0.5f);
                     Runtime runtime = Runtime.getRuntime();
                     long usedMB = (runtime.totalMemory() - runtime.freeMemory()) / 1024 / 1024;
                     stringRenderer.drawStringInternal(window, screenStack, "Memory:" + usedMB + "MB", client.windowX / 2, 126, 0.5f);
                     */
-                    stringRenderer.drawStringInternal(window, screenStack, "Pitch:" + Math.toDegrees(window.camera.getPitch()), client.windowX / 2, 155, 0.5f);
-                    stringRenderer.drawStringInternal(window, screenStack, "Yaw:" + Math.toDegrees(window.camera.getYaw()), client.windowX / 2, 184, 0.5f);
+                    stringRenderer.drawStringInternal(window, screenStack, "Pitch:" + Math.toDegrees(window.camera.getPitch()), window.getWindowWidth() / 2, 155, 0.5f);
+                    stringRenderer.drawStringInternal(window, screenStack, "Yaw:" + Math.toDegrees(window.camera.getYaw()), window.getWindowWidth() / 2, 184, 0.5f);
                     /*
                     stringRenderer.drawStringInternal(window, screenStack, "Sounds:" + client.soundEngine.sounds.size(), client.windowX / 2, 213, 0.5f);
                     stringRenderer.drawStringInternal(window, screenStack, "Render Calls:" + GLRenderer.drawCalls, client.windowX / 2, 242, 0.5f);
@@ -48,9 +48,9 @@ public void draw(RenderWindow window, GraphicsContext graphicsContext, IGraphics
                     stringRenderer.drawStringInternal(window, screenStack, "Chunks:" + client.chunks, client.windowX / 2, 329, 0.5f);
 
                    */
-                    stringRenderer.drawStringInternal(window,screenStack, "X:" + client.rWindow.camera.getCameraPos().x, client.windowX / 2, 358,0.5f);
-                    stringRenderer.drawStringInternal(window,screenStack, "Y:" + client.rWindow.camera.getCameraPos().y, client.windowX / 2, 387,0.5f);
-                    stringRenderer.drawStringInternal(window,screenStack, "Z:" + client.rWindow.camera.getCameraPos().z, client.windowX / 2, 416,0.5f);
+                    stringRenderer.drawStringInternal(window,screenStack, "X:" + client.rWindow.camera.getCameraPos().x, window.getWindowWidth() / 2, 358,0.5f);
+                    stringRenderer.drawStringInternal(window,screenStack, "Y:" + client.rWindow.camera.getCameraPos().y, window.getWindowWidth() / 2, 387,0.5f);
+                    stringRenderer.drawStringInternal(window,screenStack, "Z:" + client.rWindow.camera.getCameraPos().z, window.getWindowWidth() / 2, 416,0.5f);
                 }
               //  ItemStack stack = client.playerData.inventory.getItem(client.playerData.handSlot);
              //   if (stack != null && stack.item != null) {

diff --git a/src/main/java/dev/hilligans/ourcraft/client/rendering/graphics/vulkan/VulkanWindow.java b/src/main/java/dev/hilligans/ourcraft/client/rendering/graphics/vulkan/VulkanWindow.java
@@ -217,12 +217,12 @@ public InputHandler getInputProvider() {
     }
 
     @Override
-    public float getWindowWidth() {
+    public int getWindowWidth() {
         return glfwWidth;
     }
 
     @Override
-    public float getWindowHeight() {
+    public int getWindowHeight() {
         return glfwHeight;
     }
 

diff --git a/src/main/java/dev/hilligans/ourcraft/container/Container.java b/src/main/java/dev/hilligans/ourcraft/container/Container.java
@@ -110,12 +110,14 @@ public void setTextureSize(int x, int y) {
     }
 
     public void resize() {
-        int newX = (int)(ClientMain.getWindowX() / 2 - textureX * Settings.guiSize / 2);
-        int newY = (int)(ClientMain.getWindowY() / 2 - textureY * Settings.guiSize / 2);
-        for(Slot slot : slots) {
-            slot.x = (int)(newX + slot.startX * Settings.guiSize);
-            slot.y = (int)(newY + slot.startY * Settings.guiSize);
-        }
+        //TODO implement
+        //throw new RuntimeException("implement");
+        //int newX = (int)(ClientMain.getWindowX() / 2 - textureX * Settings.guiSize / 2);
+        //int newY = (int)(ClientMain.getWindowY() / 2 - textureY * Settings.guiSize / 2);
+        //for(Slot slot : slots) {
+        //    slot.x = (int)(newX + slot.startX * Settings.guiSize);
+        //    slot.y = (int)(newY + slot.startY * Settings.guiSize);
+        //}
     }
 
     public void addPlayerInventorySlots(int startX, int startY, IInventory inventory, int startIndex) {