BlackForestBytes/ColorRunner
21
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added [R]eset

Browse Source
This commit is contained in:
Mike Schwörer 2014-08-11 21:36:01 +02:00
parent 453d50f1c0
commit a2d19985e7
4 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/de/samdev/colorrunner/game/renderer/AbstractGameRenderer.java
View File

@ -48,6 +48,12 @@ public abstract class AbstractGameRenderer {
cam.update(); cam.update();
updateCamMatrices(); updateCamMatrices();
} }
if (lookAtX < cam.position.x - cam.viewportWidth/2) {
cam.position.x += lookAtX - cam.position.x + cam.viewportWidth/2;
cam.update();
updateCamMatrices();
}
} }
public Rectangle getCamViewRectangle() { public Rectangle getCamViewRectangle() {

18
core/src/de/samdev/colorrunner/game/world/CRGameWorld.java
View File

@ -24,8 +24,8 @@ import de.samdev.colorrunner.input.GameInputListener;
public class CRGameWorld implements GameInputListener { public class CRGameWorld implements GameInputListener {
public PlayerEntity player; public PlayerEntity player;
public List<CRGameEntity> entities = new ArrayList<CRGameEntity>(); public List<CRGameEntity> entities;
public List<MapSection> sections = new ArrayList<MapSection>(); public List<MapSection> sections;
public FPSCounter fps = new FPSCounter(); public FPSCounter fps = new FPSCounter();
@ -34,9 +34,16 @@ public class CRGameWorld implements GameInputListener {
public Rectangle camViewBoundaries = new Rectangle(); public Rectangle camViewBoundaries = new Rectangle();
public CRGameWorld() { public CRGameWorld() {
reinitialize();
}
private void reinitialize() {
entities = new ArrayList<CRGameEntity>();
sections = new ArrayList<MapSection>();
addEntity(player = new PlayerEntity(this, 40, 290)); addEntity(player = new PlayerEntity(this, 40, 290));
mapRightBoundary = appendMap(CRMapStorage.map_start, new Vector2(mapRightBoundary, 0)); mapRightBoundary = appendMap(CRMapStorage.map_start, new Vector2(0, 0));
expandMap(); expandMap();
} }
@ -133,4 +140,9 @@ public class CRGameWorld implements GameInputListener {
public void doFly() { public void doFly() {
player.fly(); player.fly();
} }
@Override
public void reset() {
reinitialize();
}
} }

7
core/src/de/samdev/colorrunner/input/CRGameInputProcessor.java
View File

@ -6,6 +6,7 @@ import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.input.GestureDetector.GestureListener; import com.badlogic.gdx.input.GestureDetector.GestureListener;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import de.samdev.colorrunner.CRGame;
import de.samdev.colorrunner.game.world.SwipeDirection; import de.samdev.colorrunner.game.world.SwipeDirection;
public class CRGameInputProcessor implements InputProcessor, GestureListener { public class CRGameInputProcessor implements InputProcessor, GestureListener {
@ -47,6 +48,12 @@ public class CRGameInputProcessor implements InputProcessor, GestureListener {
owner.doJump(); owner.doJump();
return true; return true;
} }
if (keycode == Input.Keys.R && CRGame.DEBUG) {
owner.reset();
return true;
}
return false; return false;
} }

1
core/src/de/samdev/colorrunner/input/GameInputListener.java
View File

@ -6,4 +6,5 @@ public interface GameInputListener {
public void doJump(); public void doJump();
public void doFly(); public void doFly();
public void switchColor(SwipeDirection sd); public void switchColor(SwipeDirection sd);
public void reset();
} }