Lancaster-University/EEEEEEEEEEEEEEEAAAAAAAAAA-A-Reckless-Disregard-for-Mercy
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

More UI changes

Browse source
This commit is contained in:
Ash Reynolds 2016-02-16 16:10:25 +00:00
parent ec583e75be
commit 61322d04d4
2 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/src/com/game/Screens/Loading.java
View file

@ -13,7 +13,6 @@ import com.badlogic.gdx.graphics.g2d.freetype.FreetypeFontLoader;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.badlogic.gdx.math.Interpolation; import com.badlogic.gdx.math.Interpolation;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.scenes.scene2d.ui.Image;
import com.game.App; import com.game.App;
import com.game.managers.ScreenManager; import com.game.managers.ScreenManager;

49
core/src/com/game/Screens/Play.java
View file

@ -85,8 +85,10 @@ public class Play extends AbstractScreen {
private Image failureBackground, successBackground; private Image failureBackground, successBackground;
// Progress bar // Progress bar
private float percent;
private Rectangle progressRect; private Rectangle progressRect;
private Texture progressTexture;
private float percent;
private float progressX;
private int levelNumber; private int levelNumber;
@ -126,6 +128,7 @@ public class Play extends AbstractScreen {
skin.load(Gdx.files.internal("spritesheets/uiskin.json")); skin.load(Gdx.files.internal("spritesheets/uiskin.json"));
progressRect = new Rectangle(stage.getWidth() - 550, (stage.getHeight() - 50), 0, 25); progressRect = new Rectangle(stage.getWidth() - 550, (stage.getHeight() - 50), 0, 25);
progressTexture = app.assets.get("textures/player_red.png", Texture.class);
initLevel(); initLevel();
initIntroWindow(); initIntroWindow();
@ -146,10 +149,8 @@ public class Play extends AbstractScreen {
Vector2 start = new Vector2(cam.viewportWidth / 2, cam.viewportHeight / 2); Vector2 start = new Vector2(cam.viewportWidth / 2, cam.viewportHeight / 2);
CameraUtils.setBoundary(cam, start, new Vector2(mapWidth * tileSize.x - start.x * 2, mapHeight * tileSize.y - start.y * 2)); CameraUtils.setBoundary(cam, start, new Vector2(mapWidth * tileSize.x - start.x * 2, mapHeight * tileSize.y - start.y * 2));
percent = Interpolation.linear.apply(percent, 500, 0.3f ); percent = Interpolation.linear.apply(percent, (player.getPos().x * PPM) / (mapWidth * tileSize.x), 0.2f );
System.out.println(mapWidth - player.getPos().x); progressX = (progressRect.x + 500 * percent) - player.getSize().x / 2;
progressRect.width = 0 + 500 * percent;
if (progressRect.width >= 499) { progressRect.width = 500; }
player.update(dt); player.update(dt);
} }
@ -179,9 +180,9 @@ public class Play extends AbstractScreen {
if(!isDebug) if(!isDebug)
{ {
app.sb.begin(); 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/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/position1.png", Texture.class), (cam.position.x - cam.viewportWidth / 2) * .1f, 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); app.sb.draw(app.assets.get("textures/position2.png", Texture.class), (cam.position.x - cam.viewportWidth / 2) * .01f, cam.position.y - (cam.viewportHeight / 2) - 150);
player.render(app.sb); player.render(app.sb);
app.sb.end(); app.sb.end();
@ -199,7 +200,8 @@ public class Play extends AbstractScreen {
app.sr.end(); app.sr.end();
app.sb.begin(); app.sb.begin();
app.sb.draw(app.assets.get("spritesheets/platformSet.png", Texture.class), 100, 100); app.sb.draw(app.assets.get("spritesheets/platformSet.png", Texture.class), 100, (stage.getHeight() - 50));
app.sb.draw(progressTexture, progressX, progressRect.y, 30, 30);
app.sb.end(); app.sb.end();
} }
else else
@ -224,33 +226,34 @@ public class Play extends AbstractScreen {
System.out.println("isPaused: " + isPaused); System.out.println("isPaused: " + isPaused);
} }
if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_1)) if(!isPaused && !isEnd && !isIntro)
{ {
if(!isPaused) { if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_1))
{
colourchangeSound.play(); colourchangeSound.play();
player.setCurColour(Base.Colours.RED); player.setCurColour(Base.Colours.RED);
progressTexture = app.assets.get("textures/player_red.png", Texture.class);
} }
}
if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_2)) if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_2))
{ {
if(!isPaused) {
colourchangeSound.play(); colourchangeSound.play();
player.setCurColour(Base.Colours.GREEN); player.setCurColour(Base.Colours.GREEN);
progressTexture = app.assets.get("textures/player_green.png", Texture.class);
} }
}
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);
progressTexture = app.assets.get("textures/player_blue.png", Texture.class);
} }
}
if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_4)) if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_4))
{ {
if(!isPaused) {
player.setCurColour(Base.Colours.YELLOW); player.setCurColour(Base.Colours.YELLOW);
progressTexture = app.assets.get("textures/player_yellow.png", Texture.class);
} }
} }
if(Gdx.input.isKeyJustPressed(Input.Keys.V)) { isDebug = !isDebug; } if(Gdx.input.isKeyJustPressed(Input.Keys.V)) { isDebug = !isDebug; }
@ -490,6 +493,7 @@ public class Play extends AbstractScreen {
{ {
isEnd = true; isEnd = true;
isSuccess = true; isSuccess = true;
System.out.println("Success");
return; return;
} }
@ -498,6 +502,7 @@ public class Play extends AbstractScreen {
{ {
isEnd = true; isEnd = true;
isSuccess = false; isSuccess = false;
System.out.println("Failure");
return; return;
} }