From 87a4bf3a99cb47ba3a1d072b80854f284184ecce Mon Sep 17 00:00:00 2001 From: Ivory Date: Mon, 30 Jan 2023 00:35:55 -0500 Subject: [PATCH] cleanup --- src/main/java/xyz/valnet/engine/App.java | 2 -- .../valnet/engine/graphics/ImmediateUI.java | 1 - .../valnet/engine/scenegraph/SceneGraph.java | 1 - .../java/xyz/valnet/hadean/HadeanGame.java | 33 ------------------- .../xyz/valnet/hadean/gameobjects/Clock.java | 1 - .../hadean/gameobjects/SelectionUI.java | 1 - .../xyz/valnet/hadean/gameobjects/Tile.java | 1 - .../inputlayer/SelectionLayer.java | 5 --- .../gameobjects/ui/ExclusivityManager.java | 1 - .../hadean/gameobjects/ui/tabs/BuildTab.java | 2 -- .../worldobjects/agents/Agent.java | 1 - .../worldobjects/constructions/Bed.java | 1 - .../worldobjects/constructions/Quarry.java | 2 -- .../worldobjects/constructions/Wall.java | 1 - 14 files changed, 53 deletions(-) diff --git a/src/main/java/xyz/valnet/engine/App.java b/src/main/java/xyz/valnet/engine/App.java index 2178a01..8fbbcf7 100644 --- a/src/main/java/xyz/valnet/engine/App.java +++ b/src/main/java/xyz/valnet/engine/App.java @@ -9,9 +9,7 @@ import static org.lwjgl.system.MemoryUtil.*; import java.nio.IntBuffer; -import org.lwjgl.glfw.GLFWCursorPosCallback; import org.lwjgl.glfw.GLFWErrorCallback; -import org.lwjgl.glfw.GLFWMouseButtonCallback; import org.lwjgl.glfw.GLFWVidMode; import org.lwjgl.openal.AL; import org.lwjgl.openal.ALC; diff --git a/src/main/java/xyz/valnet/engine/graphics/ImmediateUI.java b/src/main/java/xyz/valnet/engine/graphics/ImmediateUI.java index 2982e6a..a9f89d6 100644 --- a/src/main/java/xyz/valnet/engine/graphics/ImmediateUI.java +++ b/src/main/java/xyz/valnet/engine/graphics/ImmediateUI.java @@ -9,7 +9,6 @@ import java.util.Set; import java.util.Stack; import xyz.valnet.engine.math.Box; -import xyz.valnet.engine.math.Vector2f; import xyz.valnet.engine.math.Vector2i; import xyz.valnet.engine.math.Vector4i; import xyz.valnet.engine.scenegraph.GameObject; diff --git a/src/main/java/xyz/valnet/engine/scenegraph/SceneGraph.java b/src/main/java/xyz/valnet/engine/scenegraph/SceneGraph.java index 6628a2c..d811d80 100644 --- a/src/main/java/xyz/valnet/engine/scenegraph/SceneGraph.java +++ b/src/main/java/xyz/valnet/engine/scenegraph/SceneGraph.java @@ -16,7 +16,6 @@ import java.util.stream.Collectors; import xyz.valnet.engine.App; import xyz.valnet.engine.math.Box; -import xyz.valnet.engine.math.Vector4f; import xyz.valnet.hadean.gameobjects.ui.tabs.DebugTab; public abstract class SceneGraph implements IScene { diff --git a/src/main/java/xyz/valnet/hadean/HadeanGame.java b/src/main/java/xyz/valnet/hadean/HadeanGame.java index e8d50de..761972e 100644 --- a/src/main/java/xyz/valnet/hadean/HadeanGame.java +++ b/src/main/java/xyz/valnet/hadean/HadeanGame.java @@ -1,14 +1,10 @@ package xyz.valnet.hadean; -import java.util.ArrayList; -import java.util.List; - import xyz.valnet.engine.App; import xyz.valnet.engine.Game; import xyz.valnet.engine.graphics.Color; import xyz.valnet.engine.graphics.Drawing; import xyz.valnet.engine.math.Matrix4f; -import xyz.valnet.engine.math.Vector4f; import xyz.valnet.hadean.scenes.GameScene; import xyz.valnet.hadean.util.Assets; @@ -33,13 +29,8 @@ public class HadeanGame extends Game { super.render(); if(!debugView) return; - Drawing.setLayer(99); - renderDebugInfo(); } - private static Runtime runtime = Runtime.getRuntime(); - private static Color fontColor = Color.red; - public float getAverageFPS() { return averageFPS; } @@ -48,30 +39,6 @@ public class HadeanGame extends Game { return measuredFPS; } - private void renderDebugInfo() { - - long allocated = runtime.totalMemory(); - long max = runtime.maxMemory(); - int left = 770; - int top = 10; - - List strings = new ArrayList(); - // strings.add(" === [ DEBUG ] ==="); - // strings.add("FPS: " + Math.round(averageFPS) + "/" + measuredFPS + " | AVG/MEASURED"); - // strings.add("Mouse: <" + App.mouseX + ", " + App.mouseY + ">"); - // strings.add(); - // strings.add("dTime: " + dTime); - - for(String str : strings) { - Assets.flat.pushColor(Color.black); - Assets.font.drawString(str, left + 1, top + 1); - Assets.flat.swapColor(fontColor); - Assets.font.drawString(str, left, top); - Assets.flat.popColor(); - top += 16; - } - } - // receive the updated matrix every frame for the actual window. @Override public void updateViewMatrix(Matrix4f matrix) { diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/Clock.java b/src/main/java/xyz/valnet/hadean/gameobjects/Clock.java index 750de9d..3885039 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/Clock.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/Clock.java @@ -1,7 +1,6 @@ package xyz.valnet.hadean.gameobjects; import xyz.valnet.engine.graphics.Drawing; -import xyz.valnet.engine.math.Vector4f; import xyz.valnet.engine.scenegraph.GameObject; import xyz.valnet.hadean.util.Assets; import xyz.valnet.hadean.util.Layers; diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/SelectionUI.java b/src/main/java/xyz/valnet/hadean/gameobjects/SelectionUI.java index 9dffa06..4cdccf0 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/SelectionUI.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/SelectionUI.java @@ -35,7 +35,6 @@ public class SelectionUI extends ImmediateUI implements ISelectionChangeListener private SelectionLayer selectionManager; private final int width = 300, height = 200; - private final int padding = 0; private boolean opened = false; private float openness = 0f; diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java b/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java index dbb620f..2746d83 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java @@ -7,7 +7,6 @@ import java.util.Set; import xyz.valnet.engine.graphics.Color; import xyz.valnet.engine.math.Vector2i; -import xyz.valnet.engine.math.Vector4f; import xyz.valnet.engine.math.Vector4i; import xyz.valnet.engine.scenegraph.GameObject; import xyz.valnet.hadean.gameobjects.worldobjects.FarmPlot; diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/SelectionLayer.java b/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/SelectionLayer.java index 6cb0bd1..e40aa0d 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/SelectionLayer.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/SelectionLayer.java @@ -11,13 +11,11 @@ import xyz.valnet.engine.math.Box; import xyz.valnet.engine.math.Vector2f; import xyz.valnet.engine.math.Vector2i; import xyz.valnet.engine.math.Vector4f; -import xyz.valnet.engine.math.Vector4i; import xyz.valnet.engine.scenegraph.GameObject; import xyz.valnet.engine.scenegraph.IMouseCaptureArea; import xyz.valnet.engine.scenegraph.ITransient; import xyz.valnet.hadean.gameobjects.Camera; import xyz.valnet.hadean.gameobjects.ui.ExclusivityManager; -import xyz.valnet.hadean.gameobjects.ui.tabs.BuildTab; import xyz.valnet.hadean.interfaces.ISelectable; import xyz.valnet.hadean.interfaces.ISelectionChangeListener; import xyz.valnet.hadean.util.Assets; @@ -32,12 +30,9 @@ public class SelectionLayer extends GameObject implements IMouseCaptureArea, ITr private float animationAmplitude = 0.2f; private List listeners = new ArrayList(); - private BuildTab buildTab; - @Override public void start() { camera = get(Camera.class); - buildTab = get(BuildTab.class); } public void subscribe(ISelectionChangeListener listener) { diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/ui/ExclusivityManager.java b/src/main/java/xyz/valnet/hadean/gameobjects/ui/ExclusivityManager.java index 9ff9f4e..3e7771f 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/ui/ExclusivityManager.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/ui/ExclusivityManager.java @@ -6,7 +6,6 @@ import xyz.valnet.engine.scenegraph.IKeyboardListener; import xyz.valnet.engine.scenegraph.ITransient; import xyz.valnet.hadean.gameobjects.ui.tabs.BuildTab; import xyz.valnet.hadean.gameobjects.ui.tabs.MenuTab; -import xyz.valnet.hadean.gameobjects.ui.tabs.Tab; import xyz.valnet.hadean.util.Assets; public class ExclusivityManager extends GameObject implements ITransient, IKeyboardListener { diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/ui/tabs/BuildTab.java b/src/main/java/xyz/valnet/hadean/gameobjects/ui/tabs/BuildTab.java index ab71a10..4d54b5a 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/ui/tabs/BuildTab.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/ui/tabs/BuildTab.java @@ -29,8 +29,6 @@ import xyz.valnet.hadean.interfaces.ISelectionChangeListener; import xyz.valnet.hadean.util.Assets; import xyz.valnet.hadean.util.Layers; -import static xyz.valnet.engine.util.Math.lerp; - public class BuildTab extends Tab implements ISelectionChangeListener, IBuildLayerListener { private SelectionLayer selection; diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/agents/Agent.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/agents/Agent.java index 9be9a46..31f2b29 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/agents/Agent.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/agents/Agent.java @@ -10,7 +10,6 @@ import xyz.valnet.engine.graphics.Color; import xyz.valnet.engine.graphics.Drawing; import xyz.valnet.engine.math.Vector2f; import xyz.valnet.engine.math.Vector2i; -import xyz.valnet.engine.math.Vector4f; import xyz.valnet.engine.shaders.SimpleShader; import xyz.valnet.hadean.HadeanGame; import xyz.valnet.hadean.gameobjects.Terrain; diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Bed.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Bed.java index 8e2a2a0..ac14300 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Bed.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Bed.java @@ -2,7 +2,6 @@ package xyz.valnet.hadean.gameobjects.worldobjects.constructions; import xyz.valnet.engine.graphics.Color; import xyz.valnet.engine.math.Vector2i; -import xyz.valnet.engine.math.Vector4f; import xyz.valnet.hadean.gameobjects.Job; import xyz.valnet.hadean.gameobjects.JobBoard; import xyz.valnet.hadean.gameobjects.worldobjects.Buildable; diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Quarry.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Quarry.java index 450bfff..7989a0f 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Quarry.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Quarry.java @@ -2,7 +2,6 @@ package xyz.valnet.hadean.gameobjects.worldobjects.constructions; import xyz.valnet.engine.graphics.Color; import xyz.valnet.engine.math.Vector2i; -import xyz.valnet.engine.math.Vector4f; import xyz.valnet.hadean.gameobjects.Job; import xyz.valnet.hadean.gameobjects.JobBoard; import xyz.valnet.hadean.gameobjects.worldobjects.items.Boulder; @@ -15,7 +14,6 @@ import xyz.valnet.hadean.util.Layers; @BuildableMetadata(category = "Buildings", name = "Quarry", type = BuildableMetadata.Type.SINGLE) public class Quarry extends Construction { - private float work = 0; private Job digJob = null; @Override diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Wall.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Wall.java index 58c2458..25dc9c8 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Wall.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Wall.java @@ -5,7 +5,6 @@ import java.util.EnumSet; import xyz.valnet.engine.graphics.Color; import xyz.valnet.engine.graphics.Tile16.Direction; import xyz.valnet.engine.math.Vector2i; -import xyz.valnet.engine.math.Vector4f; import xyz.valnet.hadean.HadeanGame; import xyz.valnet.hadean.gameobjects.Job; import xyz.valnet.hadean.gameobjects.JobBoard;