restruct, cleaner hierarchy; much nicer code

This commit is contained in:
Ondřej Hruška
2014-04-08 16:01:07 +02:00
parent 5e79c3ac03
commit 5e35bfe958
21 changed files with 169 additions and 138 deletions
+1 -1
View File
@@ -144,7 +144,7 @@ public class App implements AppAccess {
*/
Log.f2("Initializing Event Bus...");
eventBus = new EventBus();
eventBus.logSending = true;
eventBus.detailedLogging = true;
initChannels();
/*
+2 -2
View File
@@ -2,8 +2,8 @@ package mightypork.rogue;
import mightypork.gamecore.control.GameLoop;
import mightypork.gamecore.gui.renderers.Renderable;
import mightypork.gamecore.input.Action;
import mightypork.gamecore.render.Renderable;
import mightypork.rogue.events.ActionRequest;
import mightypork.rogue.events.ActionRequest.RequestType;
import mightypork.rogue.util.Utils;
@@ -56,7 +56,7 @@ public class MainLoop extends GameLoop implements ActionRequest.Listener {
public void execute()
{
Res.getEffect("gui.shutter").play(1);
Utils.runAsThread(new TaskTakeScreenshot(disp()));
Utils.runAsThread(new TaskTakeScreenshot());
}
};
+3 -3
View File
@@ -7,13 +7,13 @@ import mightypork.gamecore.audio.players.LoopPlayer;
import mightypork.gamecore.control.AppAccess;
import mightypork.gamecore.loading.AsyncResourceLoader;
import mightypork.gamecore.render.fonts.DeferredFont;
import mightypork.gamecore.render.fonts.DeferredFont.FontStyle;
import mightypork.gamecore.render.fonts.FontBank;
import mightypork.gamecore.render.fonts.GLFont;
import mightypork.gamecore.render.fonts.DeferredFont.FontStyle;
import mightypork.gamecore.render.textures.TextureBank;
import mightypork.gamecore.render.textures.TxQuad;
import mightypork.gamecore.render.textures.FilteredTexture.Filter;
import mightypork.gamecore.render.textures.FilteredTexture.Wrap;
import mightypork.gamecore.render.textures.TextureBank;
import mightypork.gamecore.render.textures.TxQuad;
import org.newdawn.slick.opengl.Texture;
+2 -2
View File
@@ -17,8 +17,8 @@ public class TaskTakeScreenshot implements Runnable {
private final Screenshot scr;
public TaskTakeScreenshot(DisplaySystem disp) {
scr = disp.takeScreenshot();
public TaskTakeScreenshot() {
scr = DisplaySystem.takeScreenshot();
}
@@ -12,8 +12,10 @@ import mightypork.gamecore.gui.renderers.TextRenderer;
import mightypork.gamecore.gui.renderers.TextRenderer.Align;
import mightypork.gamecore.gui.screens.Screen;
import mightypork.gamecore.gui.screens.ScreenLayer;
import mightypork.gamecore.input.InputSystem;
import mightypork.gamecore.input.KeyStroke;
import mightypork.gamecore.input.Keys;
import mightypork.gamecore.render.DisplaySystem;
import mightypork.rogue.Res;
import mightypork.utils.math.animation.AnimDouble;
import mightypork.utils.math.animation.Easing;
@@ -37,8 +39,8 @@ public class LayerFlyingCat extends ScreenLayer implements Updateable, MouseButt
public LayerFlyingCat(Screen screen) {
super(screen);
xPos.setTo(disp().getWidth() / 2);
yPos.setTo(disp().getHeight() / 2);
xPos.setTo(DisplaySystem.getWidth() / 2);
yPos.setTo(DisplaySystem.getHeight() / 2);
cat = new ImageRenderer(Res.getTxQuad("test.kitten"));
cat.setContext(c_centered(c_box(this, c_n(size), c_n(size)), c_n(xPos), c_n(yPos)));
@@ -46,8 +48,8 @@ public class LayerFlyingCat extends ScreenLayer implements Updateable, MouseButt
//@formatter:off
final RectConstraint flyingFontBox = c_centered(
c_box(this, c_n(0), c_n(64)),
input().c_mouse_x(),
input().c_mouse_y()
InputSystem.mouseX,
InputSystem.mouseY
);
//@formatter:on
@@ -59,8 +61,8 @@ public class LayerFlyingCat extends ScreenLayer implements Updateable, MouseButt
@Override
public void run()
{
xPos.fadeTo(disp().getWidth() / 2, 2);
yPos.fadeTo(disp().getHeight() / 2, 2);
xPos.fadeTo(DisplaySystem.getWidth() / 2, 2);
yPos.fadeTo(DisplaySystem.getHeight() / 2, 2);
}
});
}