Various Changes
Started work on getting Endless Mode to work. Some level tweaks. Made it so you can't change colours when in a pause menu.
This commit is contained in:
ESloman
parent
03f5bea581
commit
71d9c3afba
8 changed files with 588 additions and 12 deletions
27
core/assets/endlessblocks/endless1.tmx
Normal file
27
core/assets/endlessblocks/endless1.tmx
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<map version="1.0" orientation="orthogonal" renderorder="right-down" width="50" height="8" tilewidth="64" tileheight="64" nextobjectid="31">
|
||||||
|
<tileset firstgid="1" name="platformSet" tilewidth="64" tileheight="64" tilecount="3" columns="3">
|
||||||
|
<image source="../spritesheets/platformSet.png" width="192" height="64"/>
|
||||||
|
</tileset>
|
||||||
|
<tileset firstgid="4" name="player" tilewidth="64" tileheight="64" tilecount="1" columns="1">
|
||||||
|
<image source="../textures/player_red.png" width="64" height="64"/>
|
||||||
|
</tileset>
|
||||||
|
<layer name="PLATFORM" width="50" height="8">
|
||||||
|
<data encoding="base64" compression="zlib">
|
||||||
|
eJxjYBgFo2AUDARgIoAHC2AmgKkB0P2Oyy5GApge4YnL7pEIALMwAF8=
|
||||||
|
</data>
|
||||||
|
</layer>
|
||||||
|
<objectgroup name="PLAYER">
|
||||||
|
<object id="24" gid="4" x="0" y="320" width="64" height="64"/>
|
||||||
|
</objectgroup>
|
||||||
|
<objectgroup name="BOUNDARY">
|
||||||
|
<object id="23" x="0" y="-192">
|
||||||
|
<polyline points="0,0 0,1024 3328,1024 3328,0 0,0"/>
|
||||||
|
</object>
|
||||||
|
</objectgroup>
|
||||||
|
<objectgroup name="FAILBOUNDARY">
|
||||||
|
<object id="29" x="0" y="704">
|
||||||
|
<polyline points="0,0 3328,0 3328,128 0,128 0,0"/>
|
||||||
|
</object>
|
||||||
|
</objectgroup>
|
||||||
|
</map>
|
||||||
27
core/assets/endlessblocks/endless2.tmx
Normal file
27
core/assets/endlessblocks/endless2.tmx
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<map version="1.0" orientation="orthogonal" renderorder="right-down" width="50" height="8" tilewidth="64" tileheight="64" nextobjectid="30">
|
||||||
|
<tileset firstgid="1" name="platformSet" tilewidth="64" tileheight="64" tilecount="3" columns="3">
|
||||||
|
<image source="../spritesheets/platformSet.png" width="192" height="64"/>
|
||||||
|
</tileset>
|
||||||
|
<tileset firstgid="4" name="player" tilewidth="64" tileheight="64" tilecount="1" columns="1">
|
||||||
|
<image source="../textures/player_red.png" width="64" height="64"/>
|
||||||
|
</tileset>
|
||||||
|
<layer name="PLATFORM" width="50" height="8">
|
||||||
|
<data encoding="base64" compression="zlib">
|
||||||
|
eJxjYBgFo2AUDBbAhIZBgBENEwPQ9WDDIMCMBWNzB8wtxNhFCSDWTkoBNj9TyyxKzRtKAACkFABW
|
||||||
|
</data>
|
||||||
|
</layer>
|
||||||
|
<objectgroup name="PLAYER">
|
||||||
|
<object id="22" gid="4" x="0" y="256" width="64" height="64"/>
|
||||||
|
</objectgroup>
|
||||||
|
<objectgroup name="BOUNDARY">
|
||||||
|
<object id="21" x="0" y="-277.333">
|
||||||
|
<polyline points="0,85.3333 0,1109.33 3328,1109.33 3328,85.3333 0,85.3333"/>
|
||||||
|
</object>
|
||||||
|
</objectgroup>
|
||||||
|
<objectgroup name="FAILBOUNDARY">
|
||||||
|
<object id="29" x="0" y="704">
|
||||||
|
<polyline points="0,0 3328,0 3328,128 0,128 0,0"/>
|
||||||
|
</object>
|
||||||
|
</objectgroup>
|
||||||
|
</map>
|
||||||
27
core/assets/endlessblocks/endless3.tmx
Normal file
27
core/assets/endlessblocks/endless3.tmx
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<map version="1.0" orientation="orthogonal" renderorder="right-down" width="50" height="8" tilewidth="64" tileheight="64" nextobjectid="31">
|
||||||
|
<tileset firstgid="1" name="platformSet" tilewidth="64" tileheight="64" tilecount="3" columns="3">
|
||||||
|
<image source="../spritesheets/platformSet.png" width="192" height="64"/>
|
||||||
|
</tileset>
|
||||||
|
<tileset firstgid="4" name="player" tilewidth="64" tileheight="64" tilecount="1" columns="1">
|
||||||
|
<image source="../textures/player_red.png" width="64" height="64"/>
|
||||||
|
</tileset>
|
||||||
|
<layer name="PLATFORM" width="50" height="8">
|
||||||
|
<data encoding="base64" compression="zlib">
|
||||||
|
eJxjYBgFQwEwo2EQYELDuNQxomFcerGpI9ZedIBuFiMOdaNg4AB6POKKy4EG5KYhbGkQV/rHlX9w5SFyzRluAACcKwCU
|
||||||
|
</data>
|
||||||
|
</layer>
|
||||||
|
<objectgroup name="PLAYER">
|
||||||
|
<object id="24" gid="4" x="0" y="64" width="64" height="64"/>
|
||||||
|
</objectgroup>
|
||||||
|
<objectgroup name="BOUNDARY">
|
||||||
|
<object id="23" x="0" y="-192">
|
||||||
|
<polyline points="0,0 0,1024 3328,1024 3328,0 0,0"/>
|
||||||
|
</object>
|
||||||
|
</objectgroup>
|
||||||
|
<objectgroup name="FAILBOUNDARY">
|
||||||
|
<object id="29" x="0" y="704">
|
||||||
|
<polyline points="0,0 3328,0 3328,128 0,128 0,0"/>
|
||||||
|
</object>
|
||||||
|
</objectgroup>
|
||||||
|
</map>
|
||||||
467
core/src/com/game/Screens/EndlessMode.java
Normal file
467
core/src/com/game/Screens/EndlessMode.java
Normal file
|
|
@ -0,0 +1,467 @@
|
||||||
|
package com.game.screens;
|
||||||
|
import com.badlogic.gdx.Gdx;
|
||||||
|
import com.badlogic.gdx.Input;
|
||||||
|
import com.badlogic.gdx.audio.Sound;
|
||||||
|
import com.badlogic.gdx.graphics.OrthographicCamera;
|
||||||
|
import com.badlogic.gdx.graphics.Texture;
|
||||||
|
import com.badlogic.gdx.graphics.g2d.BitmapFont;
|
||||||
|
import com.badlogic.gdx.maps.MapLayer;
|
||||||
|
import com.badlogic.gdx.maps.MapProperties;
|
||||||
|
import com.badlogic.gdx.maps.objects.PolylineMapObject;
|
||||||
|
import com.badlogic.gdx.maps.objects.TextureMapObject;
|
||||||
|
import com.badlogic.gdx.maps.tiled.TiledMap;
|
||||||
|
import com.badlogic.gdx.maps.tiled.TiledMapTileLayer;
|
||||||
|
import com.badlogic.gdx.maps.tiled.TmxMapLoader;
|
||||||
|
import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer;
|
||||||
|
import com.badlogic.gdx.math.Polyline;
|
||||||
|
import com.badlogic.gdx.math.Vector2;
|
||||||
|
import com.badlogic.gdx.physics.box2d.*;
|
||||||
|
import com.badlogic.gdx.scenes.scene2d.ui.Image;
|
||||||
|
import com.badlogic.gdx.scenes.scene2d.ui.Skin;
|
||||||
|
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
|
||||||
|
import com.badlogic.gdx.scenes.scene2d.ui.Window;
|
||||||
|
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
|
||||||
|
import com.game.App;
|
||||||
|
import com.game.managers.ScreenManager;
|
||||||
|
import com.game.misc.Box2dUtils;
|
||||||
|
import com.game.misc.Vars;
|
||||||
|
import com.game.screens.AbstractScreen;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import static com.game.misc.Vars.PPM;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by Elliot on 16/02/2016.
|
||||||
|
*/
|
||||||
|
public class EndlessMode extends AbstractScreen {
|
||||||
|
|
||||||
|
private Skin skin;
|
||||||
|
|
||||||
|
// TODO, remove
|
||||||
|
public boolean isDebug = false;
|
||||||
|
|
||||||
|
// Physics related
|
||||||
|
private World world;
|
||||||
|
private Box2DDebugRenderer b2dr; // TODO, remove
|
||||||
|
private OrthographicCamera b2dCam; // TODO, remove
|
||||||
|
|
||||||
|
// TileMap and Map Renderer
|
||||||
|
private TiledMap tile1;
|
||||||
|
private TiledMap tile2;
|
||||||
|
private TiledMap tileMap;
|
||||||
|
private OrthogonalTiledMapRenderer tmr;
|
||||||
|
private float mapWidth, mapHeight;
|
||||||
|
private Vector2 tileSize;
|
||||||
|
|
||||||
|
// All Actors in level
|
||||||
|
private com.game.actor.Player player;
|
||||||
|
private ArrayList<com.game.actor.Platform> platforms = new ArrayList<com.game.actor.Platform>();
|
||||||
|
|
||||||
|
// Intro window
|
||||||
|
private boolean hasPlayedOnce = false;
|
||||||
|
private boolean isIntro;
|
||||||
|
private Window introWindow;
|
||||||
|
private Image introBackground;
|
||||||
|
private TextButton butProceed;
|
||||||
|
|
||||||
|
// Pause window
|
||||||
|
private boolean isPaused;
|
||||||
|
private Window pauseWindow;
|
||||||
|
private Image pauseBackground;
|
||||||
|
private Image pauseGlow;
|
||||||
|
private TextButton butContinue, butReset, butExit;
|
||||||
|
private Vector2 buttonSize;
|
||||||
|
|
||||||
|
// Endgame window
|
||||||
|
private boolean isEnd;
|
||||||
|
private boolean isSuccess;
|
||||||
|
private Window endgameWindow;
|
||||||
|
private TextButton butNext;
|
||||||
|
private Image failureBackground, successBackground;
|
||||||
|
|
||||||
|
private int levelNumber;
|
||||||
|
|
||||||
|
private Sound jumpSound = Gdx.audio.newSound(Gdx.files.internal("sounds/jumping.mp3"));
|
||||||
|
private Sound colourchangeSound = Gdx.audio.newSound(Gdx.files.internal("sounds/colourchange.mp3"));
|
||||||
|
|
||||||
|
public EndlessMode(App app) {
|
||||||
|
super(app);
|
||||||
|
|
||||||
|
skin = new Skin();
|
||||||
|
world = new World(new Vector2(0, com.game.misc.Vars.GRAVITY.y), true);
|
||||||
|
world.setContactListener(cl);
|
||||||
|
|
||||||
|
b2dr = new Box2DDebugRenderer(); // TODO, remove
|
||||||
|
|
||||||
|
b2dCam = new OrthographicCamera();
|
||||||
|
b2dCam.setToOrtho(false, com.game.misc.Vars.SCREEN_WIDTH / PPM, com.game.misc.Vars.SCREEN_HEIGHT / PPM);
|
||||||
|
|
||||||
|
isIntro = true;
|
||||||
|
isPaused = false;
|
||||||
|
|
||||||
|
buttonSize = new Vector2(50, 50);
|
||||||
|
|
||||||
|
isEnd = false;
|
||||||
|
isSuccess = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void show() {
|
||||||
|
super.show();
|
||||||
|
|
||||||
|
skin.add("default-font", app.assets.get("badaboom60.ttf", BitmapFont.class));
|
||||||
|
skin.load(Gdx.files.internal("spritesheets/uiskin.json"));
|
||||||
|
|
||||||
|
initLevel();
|
||||||
|
initIntroWindow();
|
||||||
|
initPauseWindow();
|
||||||
|
initEndgameWindow(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void update(float dt) {
|
||||||
|
if (!isPaused && !isEnd && !isIntro) {
|
||||||
|
world.step(dt, 6, 2);
|
||||||
|
|
||||||
|
com.game.misc.CameraUtils.lerpToTarget(cam, player.getPos().scl(PPM).x, 0);
|
||||||
|
com.game.misc.CameraUtils.lerpToTarget(b2dCam, player.getPos().x, player.getPos().y);
|
||||||
|
b2dCam.zoom = 5f;
|
||||||
|
|
||||||
|
Vector2 start = new Vector2(cam.viewportWidth / 2, cam.viewportHeight / 2);
|
||||||
|
com.game.misc.CameraUtils.setBoundary(cam, start, new Vector2(mapWidth * tileSize.x - start.x * 2, mapHeight * tileSize.y - start.y * 2));
|
||||||
|
|
||||||
|
player.update(dt);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pauseWindow.isVisible() != isPaused) {
|
||||||
|
pauseWindow.setVisible(isPaused);
|
||||||
|
pauseGlow.setVisible(isPaused);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (endgameWindow.isVisible() != isEnd) {
|
||||||
|
initEndgameWindow(isSuccess);
|
||||||
|
|
||||||
|
endgameWindow.setVisible(isEnd);
|
||||||
|
endgameWindow.setVisible(isEnd);
|
||||||
|
}
|
||||||
|
|
||||||
|
stage.act(dt);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void render(float dt) {
|
||||||
|
super.render(dt);
|
||||||
|
|
||||||
|
app.sb.setProjectionMatrix(cam.combined);
|
||||||
|
|
||||||
|
if (!isDebug) {
|
||||||
|
app.sb.begin();
|
||||||
|
app.sb.draw(app.assets.get("textures/position0.png", Texture.class), cam.position.x - cam.viewportWidth / 2, cam.position.y - cam.viewportHeight / 2);
|
||||||
|
app.sb.draw(app.assets.get("textures/position1.png", Texture.class), cam.position.x - cam.viewportWidth / 2, cam.position.y - (cam.viewportHeight / 2) + 75);
|
||||||
|
app.sb.draw(app.assets.get("textures/position2.png", Texture.class), cam.position.x - cam.viewportWidth / 2, cam.position.y - (cam.viewportHeight / 2) - 150);
|
||||||
|
player.render(app.sb);
|
||||||
|
app.sb.end();
|
||||||
|
|
||||||
|
tmr.setView(cam);
|
||||||
|
tmr.render();
|
||||||
|
} else {
|
||||||
|
b2dr.render(world, b2dCam.combined);
|
||||||
|
}
|
||||||
|
|
||||||
|
stage.draw();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void handleInput() {
|
||||||
|
if (Gdx.input.isKeyPressed(Input.Keys.SPACE)) {
|
||||||
|
jumpSound.play();
|
||||||
|
player.jump();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Gdx.input.isKeyJustPressed(Input.Keys.ESCAPE)) {
|
||||||
|
isPaused = !isPaused;
|
||||||
|
System.out.println("isPaused: " + isPaused);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Gdx.input.isKeyJustPressed(Input.Keys.NUM_1)) {
|
||||||
|
if (!isPaused) {
|
||||||
|
colourchangeSound.play();
|
||||||
|
player.setCurColour(com.game.actor.Base.Colours.RED);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Gdx.input.isKeyJustPressed(Input.Keys.NUM_2)) {
|
||||||
|
if (!isPaused) {
|
||||||
|
colourchangeSound.play();
|
||||||
|
player.setCurColour(com.game.actor.Base.Colours.GREEN);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Gdx.input.isKeyJustPressed(Input.Keys.NUM_3)) {
|
||||||
|
if (!isPaused) {
|
||||||
|
colourchangeSound.play();
|
||||||
|
player.setCurColour(com.game.actor.Base.Colours.BLUE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (Gdx.input.isKeyJustPressed(Input.Keys.NUM_4)) {
|
||||||
|
if (!isPaused) {
|
||||||
|
player.setCurColour(com.game.actor.Base.Colours.YELLOW);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Gdx.input.isKeyJustPressed(Input.Keys.V)) {
|
||||||
|
isDebug = !isDebug;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void dispose() {
|
||||||
|
super.dispose();
|
||||||
|
world.dispose();
|
||||||
|
b2dr.dispose();
|
||||||
|
tileMap.dispose();
|
||||||
|
tmr.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initLevel() {
|
||||||
|
tileMap = new TmxMapLoader().load("endlessblocks/endless1.tmx");
|
||||||
|
MapProperties mapProp = tileMap.getProperties();
|
||||||
|
mapWidth = mapProp.get("width", Integer.class);
|
||||||
|
mapHeight = mapProp.get("height", Integer.class);
|
||||||
|
tileSize = new Vector2(mapProp.get("tilewidth", Integer.class), mapProp.get("tileheight", Integer.class));
|
||||||
|
|
||||||
|
|
||||||
|
TiledMapTileLayer platformLayer = (TiledMapTileLayer) tileMap.getLayers().get("PLATFORM");
|
||||||
|
|
||||||
|
MapLayer boundaryLayer = tileMap.getLayers().get("BOUNDARY");
|
||||||
|
PolylineMapObject polylineObj = (PolylineMapObject) boundaryLayer.getObjects().get(0);
|
||||||
|
initBoundary(polylineObj, "BOUNDARY", false);
|
||||||
|
|
||||||
|
tmr = new OrthogonalTiledMapRenderer(tileMap);
|
||||||
|
|
||||||
|
boundaryLayer = tileMap.getLayers().get("FAILBOUNDARY");
|
||||||
|
polylineObj = (PolylineMapObject) boundaryLayer.getObjects().get(0);
|
||||||
|
initBoundary(polylineObj, "FAILBOUNDARY", true);
|
||||||
|
|
||||||
|
MapLayer playerLayer = tileMap.getLayers().get("PLAYER");
|
||||||
|
TextureMapObject playerObj = (TextureMapObject) playerLayer.getObjects().get(0);
|
||||||
|
player = new com.game.actor.Player(world, new Vector2(playerObj.getX(), playerObj.getY()), new Vector2(60, 60), com.game.actor.Base.Colours.NONE);
|
||||||
|
|
||||||
|
for (int row = 0; row < platformLayer.getHeight(); row++) {
|
||||||
|
for (int col = 0; col < platformLayer.getWidth(); col++) {
|
||||||
|
TiledMapTileLayer.Cell cell = platformLayer.getCell(col, row);
|
||||||
|
|
||||||
|
if (cell == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (cell.getTile() == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cell.getTile().getId() == 1) {
|
||||||
|
platforms.add(new com.game.actor.Platform(world, new Vector2((col + 0.5f) * tileSize.x, (row + 0.5f) * tileSize.y), new Vector2(tileSize.x, tileSize.y), com.game.actor.Base.Colours.RED, com.game.misc.Vars.BIT_RED, com.game.misc.Vars.BIT_PLAYER));
|
||||||
|
} else if (cell.getTile().getId() == 2) {
|
||||||
|
platforms.add(new com.game.actor.Platform(world, new Vector2((col + 0.5f) * tileSize.x, (row + 0.5f) * tileSize.y), new Vector2(tileSize.x, tileSize.y), com.game.actor.Base.Colours.GREEN, com.game.misc.Vars.BIT_GREEN, com.game.misc.Vars.BIT_PLAYER));
|
||||||
|
} else if (cell.getTile().getId() == 3) {
|
||||||
|
platforms.add(new com.game.actor.Platform(world, new Vector2((col + 0.5f) * tileSize.x, (row + 0.5f) * tileSize.y), new Vector2(tileSize.x, tileSize.y), com.game.actor.Base.Colours.BLUE, com.game.misc.Vars.BIT_BLUE, com.game.misc.Vars.BIT_PLAYER));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initBoundary(PolylineMapObject polylineObj, String userData, boolean isSensor)
|
||||||
|
{
|
||||||
|
Polyline r = polylineObj.getPolyline();
|
||||||
|
BodyDef bd = new BodyDef();
|
||||||
|
bd.type = BodyDef.BodyType.StaticBody;
|
||||||
|
|
||||||
|
Body body = world.createBody(bd);
|
||||||
|
|
||||||
|
float[] v = r.getTransformedVertices();
|
||||||
|
Vector2[] finalV = new Vector2[v.length / 2];
|
||||||
|
|
||||||
|
for(int i = 0; i < v.length / 2; ++i)
|
||||||
|
{
|
||||||
|
finalV[i] = new Vector2();
|
||||||
|
finalV[i].x = v[i * 2] / PPM;
|
||||||
|
finalV[i].y = v[i * 2 + 1] / PPM;
|
||||||
|
}
|
||||||
|
|
||||||
|
Box2dUtils.makeChain(body, finalV, userData, isSensor, Vars.BIT_MISC, Vars.BIT_PLAYER);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initIntroWindow() {
|
||||||
|
isPaused = true;
|
||||||
|
introWindow = new Window("Level " + levelNumber, skin);
|
||||||
|
introWindow.getTitleLabel().setPosition(350, 500);
|
||||||
|
introBackground = new Image(app.assets.get("textures/level1Intro.png", Texture.class));
|
||||||
|
introWindow.setBackground(introBackground.getDrawable());
|
||||||
|
introWindow.setSize(700, 500);
|
||||||
|
introWindow.setPosition(280, 50);
|
||||||
|
introWindow.setVisible(true);
|
||||||
|
|
||||||
|
butProceed = new TextButton("PROCEED", skin, "default");
|
||||||
|
butProceed.setPosition((introWindow.getWidth() / 4) * 3, buttonSize.y + 360);
|
||||||
|
butProceed.setSize(buttonSize.x, buttonSize.y);
|
||||||
|
butProceed.addListener(new ClickListener() {
|
||||||
|
@Override
|
||||||
|
public void clicked(com.badlogic.gdx.scenes.scene2d.InputEvent event, float x, float y) {
|
||||||
|
introWindow.setVisible(false);
|
||||||
|
isIntro = false;
|
||||||
|
isPaused = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
introWindow.addActor(butProceed);
|
||||||
|
|
||||||
|
|
||||||
|
if (!hasPlayedOnce) {
|
||||||
|
stage.addActor(introWindow);
|
||||||
|
hasPlayedOnce = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initPauseWindow() {
|
||||||
|
pauseWindow = new Window("Paused", skin);
|
||||||
|
pauseWindow.getTitleLabel().setPosition(350, 500);
|
||||||
|
pauseBackground = new Image(app.assets.get("textures/pauseBackground.png", Texture.class));
|
||||||
|
pauseWindow.setBackground(pauseBackground.getDrawable());
|
||||||
|
pauseWindow.setSize(700, 500);
|
||||||
|
pauseWindow.setPosition(280, 50);
|
||||||
|
pauseWindow.setVisible(false);
|
||||||
|
|
||||||
|
butContinue = new TextButton("Continue", skin, "default");
|
||||||
|
butContinue.setPosition((pauseWindow.getWidth() / 2) - buttonSize.x / 2, buttonSize.y + 240);
|
||||||
|
butContinue.setSize(buttonSize.x, buttonSize.y);
|
||||||
|
butContinue.addListener(new ClickListener() {
|
||||||
|
@Override
|
||||||
|
public void clicked(com.badlogic.gdx.scenes.scene2d.InputEvent event, float x, float y) {
|
||||||
|
isPaused = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
butReset = new TextButton("Reset", skin, "default");
|
||||||
|
butReset.setPosition((pauseWindow.getWidth() / 2) - buttonSize.x / 2, buttonSize.y + 140);
|
||||||
|
butReset.setSize(buttonSize.x, buttonSize.y);
|
||||||
|
butReset.addListener(new ClickListener() {
|
||||||
|
@Override
|
||||||
|
public void clicked(com.badlogic.gdx.scenes.scene2d.InputEvent event, float x, float y) {
|
||||||
|
app.sm.setPlayScreen(levelNumber);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
butExit = new TextButton("Exit", skin, "default");
|
||||||
|
butExit.setPosition((pauseWindow.getWidth() / 2) - buttonSize.x / 2, buttonSize.y + 40);
|
||||||
|
butExit.setSize(buttonSize.x, buttonSize.y);
|
||||||
|
butExit.addListener(new ClickListener() {
|
||||||
|
@Override
|
||||||
|
public void clicked(com.badlogic.gdx.scenes.scene2d.InputEvent event, float x, float y) {
|
||||||
|
app.sm.setScreen(ScreenManager.Screen.MENU);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
pauseGlow = new Image(app.assets.get("textures/pauseGlow.png", Texture.class));
|
||||||
|
pauseGlow.setVisible(false);
|
||||||
|
|
||||||
|
pauseWindow.addActor(butContinue);
|
||||||
|
pauseWindow.addActor(butReset);
|
||||||
|
pauseWindow.addActor(butExit);
|
||||||
|
|
||||||
|
stage.addActor(pauseGlow);
|
||||||
|
stage.addActor(pauseWindow);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initEndgameWindow(boolean success) {
|
||||||
|
isPaused = true;
|
||||||
|
if (success) {
|
||||||
|
endgameWindow = new Window("Success", skin);
|
||||||
|
successBackground = new Image(app.assets.get("textures/successBackground.png", Texture.class));
|
||||||
|
endgameWindow.setBackground(successBackground.getDrawable());
|
||||||
|
|
||||||
|
butNext = new TextButton("Next", skin, "default");
|
||||||
|
butNext.setPosition((pauseWindow.getWidth() / 2) - buttonSize.x / 2, buttonSize.y + 240);
|
||||||
|
butNext.setSize(buttonSize.x, buttonSize.y);
|
||||||
|
butNext.addListener(new ClickListener() {
|
||||||
|
@Override
|
||||||
|
public void clicked(com.badlogic.gdx.scenes.scene2d.InputEvent event, float x, float y) {
|
||||||
|
app.sm.setPlayScreen(levelNumber + 1);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
endgameWindow.addActor(butNext);
|
||||||
|
} else {
|
||||||
|
endgameWindow = new Window("Failure", skin);
|
||||||
|
failureBackground = new Image(app.assets.get("textures/failureBackground.png", Texture.class));
|
||||||
|
endgameWindow.setBackground(failureBackground.getDrawable());
|
||||||
|
}
|
||||||
|
endgameWindow.getTitleLabel().setPosition(350, 500);
|
||||||
|
endgameWindow.setSize(700, 500);
|
||||||
|
endgameWindow.setPosition(280, 50);
|
||||||
|
endgameWindow.setVisible(false);
|
||||||
|
|
||||||
|
endgameWindow.addActor(butReset);
|
||||||
|
endgameWindow.addActor(butExit);
|
||||||
|
|
||||||
|
stage.addActor(pauseGlow);
|
||||||
|
stage.addActor(endgameWindow);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Accessors
|
||||||
|
|
||||||
|
// Mutators
|
||||||
|
|
||||||
|
// Contact Listener
|
||||||
|
ContactListener cl = new ContactListener() {
|
||||||
|
@Override
|
||||||
|
public void beginContact(Contact contact) {
|
||||||
|
Fixture fa = contact.getFixtureA();
|
||||||
|
Fixture fb = contact.getFixtureB();
|
||||||
|
|
||||||
|
if (fa == null || fb == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (fa.getUserData() == null || fb.getUserData() == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fa.getUserData().equals("PLAYER") && fb.getUserData().equals("PLATFORM") ||
|
||||||
|
fb.getUserData().equals("PLAYER") && fa.getUserData().equals("PLATFORM")) {
|
||||||
|
if (player.getCurAction() != com.game.actor.Player.Action.IDLE) {
|
||||||
|
player.setAction(com.game.actor.Player.Action.IDLE);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fa.getUserData().equals("PLAYER") && fb.getUserData().equals("PASSBOUNDARY") ||
|
||||||
|
fb.getUserData().equals("PLAYER") && fa.getUserData().equals("PASSBOUNDARY")) {
|
||||||
|
isEnd = true;
|
||||||
|
isSuccess = true;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fa.getUserData().equals("PLAYER") && fb.getUserData().equals("FAILBOUNDARY") ||
|
||||||
|
fb.getUserData().equals("PLAYER") && fa.getUserData().equals("FAILBOUNDARY")) {
|
||||||
|
isEnd = true;
|
||||||
|
isSuccess = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void endContact(Contact contact) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void preSolve(Contact contact, Manifold oldManifold) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void postSolve(Contact contact, ContactImpulse impulse) {
|
||||||
|
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -100,6 +100,17 @@ public class LevelSelect extends AbstractScreen {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
butEndless = new TextButton("Endless Mode", skin, "default");
|
||||||
|
butEndless.setPosition((stage.getWidth() / 2) - buttonSize.x / 2, buttonSize.y + 120);
|
||||||
|
butEndless.setSize(buttonSize.x, buttonSize.y);
|
||||||
|
butEndless.addListener(new ClickListener() {
|
||||||
|
@Override
|
||||||
|
public void clicked (com.badlogic.gdx.scenes.scene2d.InputEvent event, float x, float y) {
|
||||||
|
app.sm.setScreen(ScreenManager.Screen.ENDLESSMODE);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
stage.addActor(butEndless);
|
||||||
stage.addActor(butBack);
|
stage.addActor(butBack);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -112,6 +112,7 @@ public class Loading extends AbstractScreen {
|
||||||
|
|
||||||
app.assets.load("textures/player_green.png", Texture.class);
|
app.assets.load("textures/player_green.png", Texture.class);
|
||||||
app.assets.load("textures/player_blue.png", Texture.class);
|
app.assets.load("textures/player_blue.png", Texture.class);
|
||||||
|
app.assets.load("textures/player_yellow.png", Texture.class);
|
||||||
|
|
||||||
app.assets.load("sounds/jumping.mp3", Sound.class);
|
app.assets.load("sounds/jumping.mp3", Sound.class);
|
||||||
app.assets.load("sounds/colourchange.mp3", Sound.class);
|
app.assets.load("sounds/colourchange.mp3", Sound.class);
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,8 @@ public class Play extends AbstractScreen {
|
||||||
private OrthographicCamera b2dCam; // TODO, remove
|
private OrthographicCamera b2dCam; // TODO, remove
|
||||||
|
|
||||||
// TileMap and Map Renderer
|
// TileMap and Map Renderer
|
||||||
|
private TiledMap tile1;
|
||||||
|
private TiledMap tile2;
|
||||||
private TiledMap tileMap;
|
private TiledMap tileMap;
|
||||||
private OrthogonalTiledMapRenderer tmr;
|
private OrthogonalTiledMapRenderer tmr;
|
||||||
private float mapWidth, mapHeight;
|
private float mapWidth, mapHeight;
|
||||||
|
|
@ -62,6 +64,7 @@ public class Play extends AbstractScreen {
|
||||||
private ArrayList<Platform> platforms = new ArrayList<Platform>();
|
private ArrayList<Platform> platforms = new ArrayList<Platform>();
|
||||||
|
|
||||||
// Intro window
|
// Intro window
|
||||||
|
private boolean hasPlayedOnce = false;
|
||||||
private boolean isIntro;
|
private boolean isIntro;
|
||||||
private Window introWindow;
|
private Window introWindow;
|
||||||
private Image introBackground;
|
private Image introBackground;
|
||||||
|
|
@ -194,31 +197,37 @@ public class Play extends AbstractScreen {
|
||||||
|
|
||||||
if(Gdx.input.isKeyJustPressed(Input.Keys.ESCAPE))
|
if(Gdx.input.isKeyJustPressed(Input.Keys.ESCAPE))
|
||||||
{
|
{
|
||||||
isPaused = !isPaused;
|
|
||||||
isPaused = !isPaused;
|
isPaused = !isPaused;
|
||||||
System.out.println("isPaused: " + isPaused);
|
System.out.println("isPaused: " + isPaused);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_1))
|
if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_1))
|
||||||
{
|
{
|
||||||
colourchangeSound.play();
|
if(!isPaused) {
|
||||||
player.setCurColour(Base.Colours.RED);
|
colourchangeSound.play();
|
||||||
|
player.setCurColour(Base.Colours.RED);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_2))
|
if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_2))
|
||||||
{
|
{
|
||||||
colourchangeSound.play();
|
if(!isPaused) {
|
||||||
player.setCurColour(Base.Colours.GREEN);
|
colourchangeSound.play();
|
||||||
|
player.setCurColour(Base.Colours.GREEN);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_3))
|
if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_3)) {
|
||||||
{
|
if (!isPaused) {
|
||||||
colourchangeSound.play();
|
colourchangeSound.play();
|
||||||
player.setCurColour(Base.Colours.BLUE);
|
player.setCurColour(Base.Colours.BLUE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_4))
|
if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_4))
|
||||||
{
|
{
|
||||||
player.setCurColour(Base.Colours.YELLOW);
|
if(!isPaused) {
|
||||||
|
player.setCurColour(Base.Colours.YELLOW);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Gdx.input.isKeyJustPressed(Input.Keys.V)) { isDebug = !isDebug; }
|
if(Gdx.input.isKeyJustPressed(Input.Keys.V)) { isDebug = !isDebug; }
|
||||||
|
|
@ -303,7 +312,7 @@ public class Play extends AbstractScreen {
|
||||||
{
|
{
|
||||||
introWindow = new Window("Level "+levelNumber, skin);
|
introWindow = new Window("Level "+levelNumber, skin);
|
||||||
introWindow.getTitleLabel().setPosition(350, 500);
|
introWindow.getTitleLabel().setPosition(350, 500);
|
||||||
introBackground = new Image(app.assets.get("textures/level"+levelNumber+"Intro.png", Texture.class));
|
introBackground = new Image(app.assets.get("textures/level1Intro.png", Texture.class));
|
||||||
introWindow.setBackground(introBackground.getDrawable());
|
introWindow.setBackground(introBackground.getDrawable());
|
||||||
introWindow.setSize(700, 500);
|
introWindow.setSize(700, 500);
|
||||||
introWindow.setPosition(280, 50);
|
introWindow.setPosition(280, 50);
|
||||||
|
|
@ -317,12 +326,17 @@ public class Play extends AbstractScreen {
|
||||||
public void clicked(com.badlogic.gdx.scenes.scene2d.InputEvent event, float x, float y) {
|
public void clicked(com.badlogic.gdx.scenes.scene2d.InputEvent event, float x, float y) {
|
||||||
introWindow.setVisible(false);
|
introWindow.setVisible(false);
|
||||||
isIntro = false;
|
isIntro = false;
|
||||||
|
isPaused = false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
introWindow.addActor(butProceed);
|
introWindow.addActor(butProceed);
|
||||||
|
|
||||||
stage.addActor(introWindow);
|
|
||||||
|
if(!hasPlayedOnce){
|
||||||
|
stage.addActor(introWindow);
|
||||||
|
hasPlayedOnce = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void initPauseWindow()
|
private void initPauseWindow()
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ public class ScreenManager {
|
||||||
LEADERBOARD,
|
LEADERBOARD,
|
||||||
LEVELSELECT,
|
LEVELSELECT,
|
||||||
PLAY,
|
PLAY,
|
||||||
|
ENDLESSMODE
|
||||||
}
|
}
|
||||||
|
|
||||||
public ScreenManager(final App app)
|
public ScreenManager(final App app)
|
||||||
|
|
@ -34,6 +35,7 @@ public class ScreenManager {
|
||||||
screens.put(Screen.MENU, new Menu(app));
|
screens.put(Screen.MENU, new Menu(app));
|
||||||
screens.put(Screen.LEADERBOARD, new Leaderboard(app));
|
screens.put(Screen.LEADERBOARD, new Leaderboard(app));
|
||||||
screens.put(Screen.LEVELSELECT, new LevelSelect(app));
|
screens.put(Screen.LEVELSELECT, new LevelSelect(app));
|
||||||
|
screens.put(Screen.ENDLESSMODE, new EndlessMode(app));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPlayScreen(int levelNumber)
|
public void setPlayScreen(int levelNumber)
|
||||||
|
|
|
||||||
Reference in a new issue