Commit 38a5b715 authored by Fjen Undso's avatar Fjen Undso
Browse files

remove unused assets

parent 0c3b091f
......@@ -80,21 +80,12 @@ public class FrozenNumbersGame extends ApplicationAdapter {
assets.load("backgrounds/game-screen.png", Texture.class);
assets.load("sprites/bubble.png", Texture.class);
assets.load("Bubble.png", Texture.class);
assets.load("BubbleTop.png", Texture.class);
// sounds
assets.load("snd/hit.mp3", Sound.class);
assets.load("snd/shot.mp3", Sound.class);
assets.load("snd/load.wav", Sound.class);
assets.load("snd/pop.mp3", Sound.class);
assets.load("panel_blue.png", Texture.class);
assets.load("comb.png", Texture.class);
assets.load("tut_tutorial.png", Texture.class);
assets.load("tut_close.png", Texture.class);
assets.load("border2.png", Texture.class);
assets.load("border.png", Texture.class);
//assets.load("bg.jpg", Texture.class);
assets.finishLoading();
font = new BitmapFont();
......
......@@ -11,7 +11,6 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.GlyphLayout;
import com.badlogic.gdx.graphics.g2d.Sprite;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.scenes.scene2d.Actor;
......@@ -53,11 +52,8 @@ public class GameScreen implements Screen {
ShapeRenderer renderer = new ShapeRenderer();
float bound = 0;
Sprite bg;
Sprite comb;
Vector2 mapoffset;
private Rectangle m_Bounds;
Sprite border;
Sprite panel;
float wWidth, wHeight;
private Hexagon getCurrentHex(Bubble b) {
......@@ -76,19 +72,12 @@ public class GameScreen implements Screen {
bubblradius = wWidth / 14;
panel = new Sprite(FrozenNumbersGame.assets.get("panel_blue.png", Texture.class));
panel.setX(0);
panel.setSize(wWidth, bubblradius * 2 + bubblradius);
m_Bounds = new Rectangle(0, bubblradius, (float) wWidth, (float) wHeight - bubblradius);
bg = new Sprite(FrozenNumbersGame.assets.get("backgrounds/game-screen.png", Texture.class));
bg.setSize(wWidth, wHeight);
bg.setCenter(wWidth / 2.0f, wHeight / 2.0f);
comb = new Sprite(FrozenNumbersGame.assets.get("comb.png", Texture.class));
comb.setSize(bubblradius * 2, bubblradius * 2);
comb.setAlpha(0.0f);
//comb.setColor(Color.BLUE);
hexbulder.setGridHeight(15);
hexbulder.setGridWidth(11);
hexbulder.setRadius(bubblradius);
......@@ -100,8 +89,8 @@ public class GameScreen implements Screen {
mapoffset = new Vector2(0, (wHeight / 2.0f) - (float) test.getCenterY());
bound = wHeight / 2f;//float) map.getByGridCoordinate(0, 6 ).getCenterY();
p1.sPos = new Vector2(new Vector2(wWidth / 2.0f, bubblradius+5));
p2.sPos = new Vector2(new Vector2(wWidth / 2.0f, wHeight - (bubblradius+5)));
p1.sPos = new Vector2(new Vector2(wWidth / 2.0f, bubblradius + 5));
p2.sPos = new Vector2(new Vector2(wWidth / 2.0f, wHeight - (bubblradius + 5)));
}
......@@ -281,32 +270,32 @@ public class GameScreen implements Screen {
if (p1.active != null) {
p1.active.draw(batch);
drawTextCentered(String.valueOf(p1.active.getValue()), p1.active.getPos().x, p1.active.getPos().y,p1.active.getColor());
drawTextCentered(String.valueOf(p1.active.getValue()), p1.active.getPos().x, p1.active.getPos().y, p1.active.getColor());
}
if (p1.next != null) {
p1.next.draw(batch);
drawTextCentered(String.valueOf(p1.next.getValue()), p1.next.getPos().x, p1.next.getPos().y,p1.next.getColor());
drawTextCentered(String.valueOf(p1.next.getValue()), p1.next.getPos().x, p1.next.getPos().y, p1.next.getColor());
}
if (p2.active != null) {
p2.active.draw(batch);
drawTextCentered(String.valueOf(p2.active.getValue()), p2.active.getPos().x, p2.active.getPos().y,p2.active.getColor());
drawTextCentered(String.valueOf(p2.active.getValue()), p2.active.getPos().x, p2.active.getPos().y, p2.active.getColor());
}
if (p2.next != null) {
p2.next.draw(batch);
drawTextCentered(String.valueOf(p2.next.getValue()), p2.next.getPos().x, p2.next.getPos().y,p2.next.getColor());
drawTextCentered(String.valueOf(p2.next.getValue()), p2.next.getPos().x, p2.next.getPos().y, p2.next.getColor());
}
for (Bubble bubble : nachbarn.values()) {
bubble.draw(batch);
drawTextCentered(String.valueOf(bubble.getValue()), bubble.getPos().x, bubble.getPos().y,bubble.getColor());
drawTextCentered(String.valueOf(bubble.getValue()), bubble.getPos().x, bubble.getPos().y, bubble.getColor());
}
FrozenNumbersGame.assets.get("size40.ttf", BitmapFont.class).draw(batch, lastpoint, 10, 40);
FrozenNumbersGame.assets.get("size40.ttf", BitmapFont.class).draw(batch, "Score "+String.valueOf(p1.score), wWidth-140, 40);
Label p2ScoreLabel = new Label("Score "+String.valueOf(p2.score), new Label.LabelStyle(FrozenNumbersGame.assets.get("size40.ttf", BitmapFont.class), Color.WHITE));
FrozenNumbersGame.assets.get("size40.ttf", BitmapFont.class).draw(batch, "Score " + String.valueOf(p1.score), wWidth - 140, 40);
Label p2ScoreLabel = new Label("Score " + String.valueOf(p2.score), new Label.LabelStyle(FrozenNumbersGame.assets.get("size40.ttf", BitmapFont.class), Color.WHITE));
Table container = new Table();
container.setTransform(true);
container.add(p2ScoreLabel);
......@@ -316,7 +305,7 @@ public class GameScreen implements Screen {
batch.end();
}
private void drawTextCentered(String text, float x, float y, Color c ) {
private void drawTextCentered(String text, float x, float y, Color c) {
GlyphLayout layout = new GlyphLayout();
layout.setText(FrozenNumbersGame.assets.get("size40.ttf", BitmapFont.class), text);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment