Merge branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
This commit is contained in:
commit
65cc8979c0
|
@ -110,12 +110,14 @@ public abstract class Application
|
|||
public abstract Window createWindow(WindowProvider provider) throws Exception;
|
||||
public void preinit() {}
|
||||
public abstract void init(File file);
|
||||
public void preUpdate() {}
|
||||
public abstract void update();
|
||||
public abstract void render(float particalTicks);
|
||||
public abstract void destroy();
|
||||
|
||||
protected final void updateInternal()
|
||||
{
|
||||
preUpdate();
|
||||
if(uiManager != null)
|
||||
{
|
||||
clientProfiler.start("UI");
|
||||
|
@ -178,6 +180,11 @@ public abstract class Application
|
|||
return timer;
|
||||
}
|
||||
|
||||
public FontManager getFonts()
|
||||
{
|
||||
return fonts;
|
||||
}
|
||||
|
||||
public GuiManager getUiManager()
|
||||
{
|
||||
return uiManager;
|
||||
|
@ -192,4 +199,9 @@ public abstract class Application
|
|||
{
|
||||
return gpuProfiler;
|
||||
}
|
||||
|
||||
public long getFrame()
|
||||
{
|
||||
return executor.frame;
|
||||
}
|
||||
}
|
|
@ -20,6 +20,7 @@ public enum Facing
|
|||
final Axis axis;
|
||||
final Vec2i offset;
|
||||
final boolean positive;
|
||||
final Rotation rotation;
|
||||
|
||||
private Facing(int direction, int rotation, String display, Axis axis, Vec2i offset)
|
||||
{
|
||||
|
@ -29,6 +30,7 @@ public enum Facing
|
|||
this.axis = axis;
|
||||
this.offset = offset;
|
||||
positive = index < 2;
|
||||
this.rotation = Rotation.fromFacing(this);
|
||||
}
|
||||
|
||||
public int getIndex()
|
||||
|
@ -88,6 +90,11 @@ public enum Facing
|
|||
return getRotation();
|
||||
}
|
||||
|
||||
public Rotation toRotation()
|
||||
{
|
||||
return rotation;
|
||||
}
|
||||
|
||||
public Facing rotate(int amount)
|
||||
{
|
||||
return byIndex(index + amount);
|
||||
|
|
|
@ -156,6 +156,7 @@ public abstract class GuiManager implements IWindowListener
|
|||
|
||||
protected Vec2i start()
|
||||
{
|
||||
GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT);
|
||||
GLUtils.DEBTH_TEST.push(false);
|
||||
GLUtils.CULL_FACE.push(false);
|
||||
GLUtils.BLEND.setFunction(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA).push(true);
|
||||
|
|
Loading…
Reference in New Issue