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

add camera & terrain defaults to world objects.

pull/1/head
Valerie 2022-05-29 02:58:52 -04:00
parent d713bd69d5
commit 65e51597fa
4 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/xyz/valnet/hadean/gameobjects/Log.java
View File

@ -10,9 +10,6 @@ import xyz.valnet.hadean.util.Assets;
public class Log extends WorldObject implements ITileThing, ISelectable, IHaulable { public class Log extends WorldObject implements ITileThing, ISelectable, IHaulable {
private Camera camera;
private Terrain terrain;
private boolean haul = false; private boolean haul = false;
public Log(int x, int y) { public Log(int x, int y) {
@ -20,12 +17,6 @@ public class Log extends WorldObject implements ITileThing, ISelectable, IHaulab
this.y = y; this.y = y;
} }
@Override
public void start() {
camera = get(Camera.class);
terrain = get(Terrain.class);
}
@Override @Override
public void render() { public void render() {
Drawing.setLayer(Layers.GROUND); Drawing.setLayer(Layers.GROUND);

10
src/main/java/xyz/valnet/hadean/gameobjects/Stockpile.java
View File

@ -2,7 +2,6 @@ package xyz.valnet.hadean.gameobjects;
import xyz.valnet.engine.graphics.Drawing; import xyz.valnet.engine.graphics.Drawing;
import xyz.valnet.engine.math.Vector4f; import xyz.valnet.engine.math.Vector4f;
import xyz.valnet.engine.scenegraph.GameObject;
import xyz.valnet.hadean.Layers; import xyz.valnet.hadean.Layers;
import xyz.valnet.hadean.Tile; import xyz.valnet.hadean.Tile;
import xyz.valnet.hadean.util.Action; import xyz.valnet.hadean.util.Action;
@ -10,20 +9,11 @@ import xyz.valnet.hadean.util.Assets;
public class Stockpile extends WorldObject implements ITileThing, ISelectable { public class Stockpile extends WorldObject implements ITileThing, ISelectable {
private Camera camera;
private Terrain terrain;
public Stockpile(int x, int y) { public Stockpile(int x, int y) {
this.x = x; this.x = x;
this.y = y; this.y = y;
} }
@Override
public void start() {
camera = get(Camera.class);
terrain = get(Terrain.class);
}
@Override @Override
public void render() { public void render() {
Drawing.setLayer(Layers.GROUND); Drawing.setLayer(Layers.GROUND);

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

@ -8,7 +8,6 @@ import xyz.valnet.hadean.util.Action;
import xyz.valnet.hadean.util.Assets; import xyz.valnet.hadean.util.Assets;
public class Tree extends WorldObject implements ITileThing, ISelectable, IWorkable { public class Tree extends WorldObject implements ITileThing, ISelectable, IWorkable {
private Camera camera;
private boolean chopFlag = false; private boolean chopFlag = false;
@ -19,10 +18,6 @@ public class Tree extends WorldObject implements ITileThing, ISelectable, IWorka
this.y = y; this.y = y;
} }
public void start() {
camera = get(Camera.class);
}
@Override @Override
public void render() { public void render() {
Assets.flat.pushColor(new Vector4f(1 - getProgress(), 1 - getProgress(), 1 - getProgress(), 1.0f)); Assets.flat.pushColor(new Vector4f(1 - getProgress(), 1 - getProgress(), 1 - getProgress(), 1.0f));

9
src/main/java/xyz/valnet/hadean/gameobjects/WorldObject.java
View File

@ -7,4 +7,13 @@ public class WorldObject extends GameObject {
protected float x; protected float x;
protected float y; protected float y;
protected Camera camera;
protected Terrain terrain;
@Override
public void start() {
camera = get(Camera.class);
terrain = get(Terrain.class);
}
} }