diff --git a/src/main/java/xyz/valnet/engine/App.java b/src/main/java/xyz/valnet/engine/App.java index 8fbbcf7..b2f5a55 100644 --- a/src/main/java/xyz/valnet/engine/App.java +++ b/src/main/java/xyz/valnet/engine/App.java @@ -25,7 +25,8 @@ public class App { // The window handle private long window; - private int width = 1024, height = 576; + // private int width = 1024, height = 576; + private int width = 1600, height = 900; private Matrix4f matrix = Matrix4f.orthographic(0, width, height, 0, 0, 100); public static int mouseX, mouseY; @@ -69,7 +70,7 @@ public class App { glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE); // the window will be resizable // Create the window - window = glfwCreateWindow(width, height, "Hello World!", NULL, NULL); + window = glfwCreateWindow(width, height, "Val Engine", NULL, NULL); if ( window == NULL ) throw new RuntimeException("Failed to create the GLFW window"); @@ -94,11 +95,6 @@ public class App { game.scrollUp(); else if(yOffset < 0) game.scrollDown(); - - // if(yOffset > 0) - // game.scrollLeft(); - // else if(yOffset < 0) - // game.scrollRight(); }); glfwSetMouseButtonCallback(window, (long window, int button, int action, int mods) -> { diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/Camera.java b/src/main/java/xyz/valnet/hadean/gameobjects/Camera.java index 451d33e..8a4fe82 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/Camera.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/Camera.java @@ -216,7 +216,7 @@ public class Camera extends GameObject implements ITransient, IMouseCaptureArea @Override public void scrollUp() { tileWidth *= 2; - tileWidth = Math.min(tileWidth, 32); + tileWidth = Math.min(tileWidth, 64); } } diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/BuildLayer.java b/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/BuildLayer.java index 6027a48..03ebcc6 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/BuildLayer.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/BuildLayer.java @@ -122,7 +122,7 @@ public class BuildLayer extends GameObject implements IMouseCaptureArea, ITransi @Override public List getGuiBoxes() { - return List.of(active ? new Box(0, 0, 1024, 576) : Box.none); + return List.of(active ? new Box(0, 0, App., 576) : Box.none); } @Override diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/ui/SelectionUI.java b/src/main/java/xyz/valnet/hadean/gameobjects/ui/SelectionUI.java index be09385..6230064 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/ui/SelectionUI.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/ui/SelectionUI.java @@ -132,7 +132,7 @@ public class SelectionUI extends ImmediateUI implements ISelectionChangeListener if(details.length == 0) { text("No details available."); } else for(Detail detail : details) { - text(detail.toString(30)); + text(detail.toString(20)); } }); } else { diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Tree.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Tree.java index 8966b69..90e2c9b 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Tree.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Tree.java @@ -111,6 +111,7 @@ public class Tree extends WorldObject implements ISelectable, IWorkable { @Override protected void beforeRemoved() { + super.beforeRemoved(); Vector2i pos = getWorldPosition().xy(); add(new Log(pos.x, pos.y)); } diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/WorldObject.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/WorldObject.java index b75bdc7..7371846 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/WorldObject.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/WorldObject.java @@ -68,13 +68,14 @@ public abstract class WorldObject extends GameObject implements IWorldObject { tile.placeThing(this); } - if(linkedTiles.size() == 0 && inScene()) { - remove(this); - } + // ?? this shouldnt bew pivotal to anything? + // if(linkedTiles.size() == 0 && inScene()) { + // remove(this); + // } - if(linkedTiles.size() != 0 && !inScene()) { - add(this); - } + // if(linkedTiles.size() != 0 && !inScene()) { + // add(this); + // } } @@ -133,4 +134,11 @@ public abstract class WorldObject extends GameObject implements IWorldObject { return new Box(x, y, w, h); } + @Override + protected void beforeRemoved() { + for(Tile tile : this.getTiles()) { + tile.removeThing(this); + } + } + } diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/agents/pawn/Pawn.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/agents/pawn/Pawn.java index 136bd77..6768c76 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/agents/pawn/Pawn.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/agents/pawn/Pawn.java @@ -240,6 +240,6 @@ public class Pawn extends Agent { @Override public boolean isWalkable() { // TODO thiss could be an interesting mechanic, but it may be bad - return false; + return true; } }