java/rogue-savage-rats
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactoring, nicer structure but blank screen now. some bug in caching?

Browse Source
This commit is contained in:
ondra
2014-04-15 11:12:07 +02:00
parent a641cba9e1
commit 086a630fb9
77 changed files with 648 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mightypork/gamecore/audio/SoundSystem.java
+1 -1
View File
@@ -13,7 +13,7 @@ import mightypork.gamecore.control.bus.events.ResourceLoadRequest;
import mightypork.gamecore.control.timing.Updateable;
import mightypork.utils.math.Calc.Buffers;
import mightypork.utils.math.constraints.vect.Vect;
import mightypork.utils.math.constraints.vect.VectVar;
import mightypork.utils.math.constraints.vect.mutable.VectVar;
import org.lwjgl.openal.AL;
import org.lwjgl.openal.AL10;
src/mightypork/gamecore/audio/players/LoopPlayer.java
+1 -1
View File
@@ -5,7 +5,7 @@ import mightypork.gamecore.audio.DeferredAudio;
import mightypork.gamecore.audio.Volume;
import mightypork.gamecore.control.timing.Pauseable;
import mightypork.gamecore.control.timing.Updateable;
import mightypork.utils.math.constraints.num.NumAnimated;
import mightypork.utils.math.constraints.num.mutable.NumAnimated;
import org.lwjgl.openal.AL10;
src/mightypork/gamecore/control/BaseApp.java
+1 -1
View File
@@ -11,7 +11,6 @@ import mightypork.gamecore.audio.SoundSystem;
import mightypork.gamecore.control.bus.EventBus;
import mightypork.gamecore.control.bus.events.*;
import mightypork.gamecore.control.interf.Destroyable;
import mightypork.gamecore.control.timing.Pollable;
import mightypork.gamecore.control.timing.Updateable;
import mightypork.gamecore.gui.screens.ScreenRegistry;
import mightypork.gamecore.input.InputSystem;
@@ -21,6 +20,7 @@ import mightypork.utils.annotations.DefaultImpl;
import mightypork.utils.files.InstanceLock;
import mightypork.utils.logging.Log;
import mightypork.utils.logging.LogWriter;
import mightypork.utils.math.constraints.Pollable;
/**
src/mightypork/gamecore/control/bus/events/LayoutChangeEvent.java
+1 -1
View File
@@ -2,7 +2,7 @@ package mightypork.gamecore.control.bus.events;
import mightypork.gamecore.control.bus.events.types.ImmediateEvent;
import mightypork.gamecore.control.timing.Pollable;
import mightypork.utils.math.constraints.Pollable;
/**
src/mightypork/gamecore/control/bus/events/MouseButtonEvent.java
+1 -1
View File
@@ -1,7 +1,7 @@
package mightypork.gamecore.control.bus.events;
import mightypork.utils.math.constraints.rect.RectBound;
import mightypork.utils.math.constraints.rect.proxy.RectBound;
import mightypork.utils.math.constraints.vect.Vect;
src/mightypork/gamecore/control/timing/Pollable.java
-15
View File
@@ -1,15 +0,0 @@
package mightypork.gamecore.control.timing;
/**
* Can be asked to update it's state
*
* @author MightyPork
*/
public interface Pollable {
/**
* Update internal state
*/
void poll();
}
src/mightypork/gamecore/control/timing/Poller.java
-47
View File
@@ -1,47 +0,0 @@
package mightypork.gamecore.control.timing;
import java.util.LinkedHashSet;
import java.util.Set;
/**
* Used to poll a number of {@link Pollable}s
*
* @author MightyPork
*/
public class Poller implements Pollable {
private final Set<Pollable> pollables = new LinkedHashSet<>();
/**
* Add a pollable
*
* @param p pollable
*/
public void add(Pollable p)
{
pollables.add(p);
}
/**
* Remove a pollalbe
*
* @param p pollable
*/
public void remove(Pollable p)
{
pollables.remove(p);
}
@Override
public void poll()
{
for (final Pollable p : pollables) {
p.poll();
}
}
}
src/mightypork/gamecore/gui/components/BusEnabledPainter.java
-18
View File
@@ -10,13 +10,10 @@ import mightypork.gamecore.control.bus.EventBus;
import mightypork.gamecore.control.bus.clients.ClientHub;
import mightypork.gamecore.input.InputSystem;
import mightypork.gamecore.render.DisplaySystem;
import mightypork.utils.math.constraints.rect.Rect;
import mightypork.utils.math.constraints.rect.RectBound;
public abstract class BusEnabledPainter extends SimplePainter implements ClientHub, Component, AppAccess {
private RectBound context;
private boolean enabled;
private boolean visible = true;
@@ -27,21 +24,6 @@ public abstract class BusEnabledPainter extends SimplePainter implements ClientH
this.subModule = new AppSubModule(app);
}
@Override
public void setRect(RectBound context)
{
this.context = context;
}
@Override
public Rect getRect()
{
return context.getRect();
}
@Override
public EventBus getEventBus()
{
src/mightypork/gamecore/gui/components/Component.java
+1 -1
View File
@@ -5,7 +5,7 @@ import mightypork.gamecore.control.bus.clients.ToggleableClient;
import mightypork.gamecore.control.interf.Enableable;
import mightypork.gamecore.gui.Hideable;
import mightypork.utils.math.constraints.rect.Rect;
import mightypork.utils.math.constraints.rect.RectBound;
import mightypork.utils.math.constraints.rect.proxy.RectBound;
/**
src/mightypork/gamecore/gui/components/PluggableRenderable.java
+2 -2
View File
@@ -1,9 +1,9 @@
package mightypork.gamecore.gui.components;
import mightypork.utils.math.constraints.rect.PluggableRectBound;
import mightypork.utils.math.constraints.rect.Rect;
import mightypork.utils.math.constraints.rect.RectBound;
import mightypork.utils.math.constraints.rect.proxy.PluggableRectBound;
import mightypork.utils.math.constraints.rect.proxy.RectBound;
/**
src/mightypork/gamecore/gui/components/SimplePainter.java
+10 -24
View File
@@ -2,11 +2,11 @@ package mightypork.gamecore.gui.components;
import mightypork.utils.annotations.DefaultImpl;
import mightypork.utils.math.constraints.rect.Rect;
import mightypork.utils.math.constraints.rect.RectAdapter;
import mightypork.utils.math.constraints.rect.RectBound;
import mightypork.utils.math.constraints.rect.RectBoundAdapter;
import mightypork.utils.math.constraints.rect.RectCache;
import mightypork.utils.math.constraints.rect.*;
import mightypork.utils.math.constraints.rect.caching.AbstractRectCache;
import mightypork.utils.math.constraints.rect.caching.RectCache;
import mightypork.utils.math.constraints.rect.proxy.RectBound;
import mightypork.utils.math.constraints.rect.proxy.RectBoundAdapter;
/**
@@ -14,7 +14,7 @@ import mightypork.utils.math.constraints.rect.RectCache;
*
* @author MightyPork
*/
public abstract class SimplePainter extends RectAdapter implements PluggableRenderable {
public abstract class SimplePainter extends AbstractRectCache implements PluggableRenderable {
private RectCache source;
@@ -29,41 +29,27 @@ public abstract class SimplePainter extends RectAdapter implements PluggableRend
@Override
public void setRect(RectBound rect)
{
System.out.println("SP set rect");
this.source = new RectBoundAdapter(rect).cached();
}
@Override
protected Rect getSource()
public Rect getCacheSource()
{
return source;
}
/**
* Poll bounds
*/
@Override
public final void poll()
{
System.out.println("SP poll, source: "+source);
source.poll();
super.poll();
onPoll();
}
@Override
public abstract void render();
/**
* Called after painter was polled; contained constraints can now poll too.
* Called after constraint was changed; contained constraints can now poll too.
*/
@Override
@DefaultImpl
public void onPoll()
public void onChange()
{
}
}
src/mightypork/gamecore/gui/components/layout/AbstractLayout.java
+1 -1
View File
@@ -9,7 +9,7 @@ import mightypork.gamecore.gui.components.BusEnabledPainter;
import mightypork.gamecore.gui.components.PluggableRenderable;
import mightypork.gamecore.gui.components.Renderable;
import mightypork.gamecore.gui.components.SimplePainter;
import mightypork.utils.math.constraints.rect.RectBound;
import mightypork.utils.math.constraints.rect.proxy.RectBound;
/**
src/mightypork/gamecore/gui/components/layout/ColumnHolder.java
+2 -2
View File
@@ -3,8 +3,8 @@ package mightypork.gamecore.gui.components.layout;
import mightypork.gamecore.control.AppAccess;
import mightypork.gamecore.gui.components.PluggableRenderable;
import mightypork.utils.math.constraints.rect.RectBound;
import mightypork.utils.math.constraints.rect.TiledRect;
import mightypork.utils.math.constraints.rect.builders.TiledRect;
import mightypork.utils.math.constraints.rect.proxy.RectBound;
/**
src/mightypork/gamecore/gui/components/layout/RowHolder.java
+2 -2
View File
@@ -3,8 +3,8 @@ package mightypork.gamecore.gui.components.layout;
import mightypork.gamecore.control.AppAccess;
import mightypork.gamecore.gui.components.PluggableRenderable;
import mightypork.utils.math.constraints.rect.RectBound;
import mightypork.utils.math.constraints.rect.TiledRect;
import mightypork.utils.math.constraints.rect.builders.TiledRect;
import mightypork.utils.math.constraints.rect.proxy.RectBound;
/**
src/mightypork/gamecore/gui/screens/Screen.java
+1 -1
View File
@@ -12,7 +12,7 @@ import mightypork.gamecore.input.KeyStroke;
import mightypork.gamecore.render.Render;
import mightypork.utils.annotations.DefaultImpl;
import mightypork.utils.math.constraints.rect.Rect;
import mightypork.utils.math.constraints.rect.RectBound;
import mightypork.utils.math.constraints.rect.proxy.RectBound;
import mightypork.utils.math.constraints.vect.Vect;
src/mightypork/gamecore/gui/screens/ScreenLayer.java
+1 -1
View File
@@ -9,7 +9,7 @@ import mightypork.gamecore.input.KeyBindingPool;
import mightypork.gamecore.input.KeyStroke;
import mightypork.utils.annotations.DefaultImpl;
import mightypork.utils.math.constraints.rect.Rect;
import mightypork.utils.math.constraints.rect.RectBound;
import mightypork.utils.math.constraints.rect.proxy.RectBound;
import mightypork.utils.math.constraints.vect.Vect;
src/mightypork/gamecore/input/InputSystem.java
+1 -1
View File
@@ -10,7 +10,7 @@ import mightypork.gamecore.control.timing.Updateable;
import mightypork.rogue.events.ActionRequest;
import mightypork.rogue.events.ActionRequest.RequestType;
import mightypork.utils.math.constraints.vect.Vect;
import mightypork.utils.math.constraints.vect.VectVar;
import mightypork.utils.math.constraints.vect.mutable.VectVar;
import org.lwjgl.LWJGLException;
import org.lwjgl.input.Keyboard;
src/mightypork/gamecore/render/DisplaySystem.java
+1 -1
View File
@@ -11,7 +11,7 @@ import mightypork.gamecore.control.bus.events.ScreenChangeEvent;
import mightypork.gamecore.control.timing.FpsMeter;
import mightypork.utils.logging.Log;
import mightypork.utils.math.constraints.rect.Rect;
import mightypork.utils.math.constraints.rect.RectBound;
import mightypork.utils.math.constraints.rect.proxy.RectBound;
import mightypork.utils.math.constraints.vect.Vect;
import org.lwjgl.BufferUtils;
src/mightypork/gamecore/render/Render.java
+1 -1
View File
@@ -10,7 +10,7 @@ import mightypork.utils.files.FileUtils;
import mightypork.utils.logging.Log;
import mightypork.utils.math.color.RGB;
import mightypork.utils.math.constraints.rect.Rect;
import mightypork.utils.math.constraints.rect.RectDigest;
import mightypork.utils.math.constraints.rect.caching.RectDigest;
import mightypork.utils.math.constraints.vect.Vect;
import mightypork.utils.math.constraints.vect.VectConst;