Speiger
/
SimpleJavaEngine
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git

This commit is contained in:
Speiger 2021-10-01 11:53:29 +02:00
parent 94f5c178d2 6e57f72ac2
commit 65cc8979c0
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/speiger/src/coreengine/application/Application.java
View File

@ -47,7 +47,7 @@ public abstract class Application
protected FontManager fonts = new FontManager(); protected FontManager fonts = new FontManager();
protected ProjectionBuffer projectionBuffer; protected ProjectionBuffer projectionBuffer;
protected GuiManager uiManager; protected GuiManager uiManager;
public void run() public void run()
{ {
GLFWErrorCallback.createPrint(System.err).set(); GLFWErrorCallback.createPrint(System.err).set();
@ -110,12 +110,14 @@ public abstract class Application
public abstract Window createWindow(WindowProvider provider) throws Exception; public abstract Window createWindow(WindowProvider provider) throws Exception;
public void preinit() {} public void preinit() {}
public abstract void init(File file); public abstract void init(File file);
public void preUpdate() {}
public abstract void update(); public abstract void update();
public abstract void render(float particalTicks); public abstract void render(float particalTicks);
public abstract void destroy(); public abstract void destroy();
protected final void updateInternal() protected final void updateInternal()
{ {
preUpdate();
if(uiManager != null) if(uiManager != null)
{ {
clientProfiler.start("UI"); clientProfiler.start("UI");
@ -178,6 +180,11 @@ public abstract class Application
return timer; return timer;
} }
public FontManager getFonts()
{
return fonts;
}
public GuiManager getUiManager() public GuiManager getUiManager()
{ {
return uiManager; return uiManager;
@ -192,4 +199,9 @@ public abstract class Application
{ {
return gpuProfiler; return gpuProfiler;
} }
}
public long getFrame()
{
return executor.frame;
}
}

7
src/main/java/speiger/src/coreengine/math/misc/Facing.java
View File

@ -20,6 +20,7 @@ public enum Facing
final Axis axis; final Axis axis;
final Vec2i offset; final Vec2i offset;
final boolean positive; final boolean positive;
final Rotation rotation;
private Facing(int direction, int rotation, String display, Axis axis, Vec2i offset) private Facing(int direction, int rotation, String display, Axis axis, Vec2i offset)
{ {
@ -29,6 +30,7 @@ public enum Facing
this.axis = axis; this.axis = axis;
this.offset = offset; this.offset = offset;
positive = index < 2; positive = index < 2;
this.rotation = Rotation.fromFacing(this);
} }
public int getIndex() public int getIndex()
@ -88,6 +90,11 @@ public enum Facing
return getRotation(); return getRotation();
} }
public Rotation toRotation()
{
return rotation;
}
public Facing rotate(int amount) public Facing rotate(int amount)
{ {
return byIndex(index + amount); return byIndex(index + amount);

1
src/main/java/speiger/src/coreengine/rendering/gui/GuiManager.java
View File

@ -156,6 +156,7 @@ public abstract class GuiManager implements IWindowListener
protected Vec2i start() protected Vec2i start()
{ {
GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT);
GLUtils.DEBTH_TEST.push(false); GLUtils.DEBTH_TEST.push(false);
GLUtils.CULL_FACE.push(false); GLUtils.CULL_FACE.push(false);
GLUtils.BLEND.setFunction(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA).push(true); GLUtils.BLEND.setFunction(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA).push(true);

2
src/main/java/speiger/src/coreengine/utils/tasks/MainThreadTaskProcessor.java
View File

@ -69,7 +69,7 @@ public class MainThreadTaskProcessor
ITask task = tasks.dequeue(); ITask task = tasks.dequeue();
try try
{ {
task.execute(); task.execute();
} }
catch(InterruptedException e) catch(InterruptedException e)
{ {