valerie
/
hadean
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

bottom-bar
Ivory 2023-01-30 00:35:55 -05:00
parent 175d572903
commit 87a4bf3a99
14 changed files with 0 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/xyz/valnet/engine/App.java
View File

@ -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;

1
src/main/java/xyz/valnet/engine/graphics/ImmediateUI.java
View File

@ -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;

1
src/main/java/xyz/valnet/engine/scenegraph/SceneGraph.java
View File

@ -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 {

33
src/main/java/xyz/valnet/hadean/HadeanGame.java
View File

@ -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<String> strings = new ArrayList<String>();
// 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) {

1
src/main/java/xyz/valnet/hadean/gameobjects/Clock.java
View File

@ -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;

1
src/main/java/xyz/valnet/hadean/gameobjects/SelectionUI.java
View File

@ -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;

1
src/main/java/xyz/valnet/hadean/gameobjects/Tile.java
View File

@ -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;

5
src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/SelectionLayer.java
View File

@ -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<ISelectionChangeListener> listeners = new ArrayList<ISelectionChangeListener>();
private BuildTab buildTab;
@Override
public void start() {
camera = get(Camera.class);
buildTab = get(BuildTab.class);
}
public void subscribe(ISelectionChangeListener listener) {

1
src/main/java/xyz/valnet/hadean/gameobjects/ui/ExclusivityManager.java
View File

@ -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 {

2
src/main/java/xyz/valnet/hadean/gameobjects/ui/tabs/BuildTab.java
View File

@ -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;

1
src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/agents/Agent.java
View File

@ -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;

1
src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Bed.java
View File

@ -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;

2
src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Quarry.java
View File

@ -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

1
src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Wall.java
View File

@ -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;