From 247d87e9d1ee785f816128c6374dc3918731cda2 Mon Sep 17 00:00:00 2001 From: Recrown Date: Mon, 24 Jul 2017 23:39:37 -0500 Subject: [PATCH] began working on win screen --- .gitignore | 1 + android/assets/3840x2160/Shooter1.png | Bin 0 -> 3939 bytes android/assets/particles/3pStar.png | Bin 0 -> 852 bytes android/assets/particles/firework-exp-s.p | 188 +++++++++ android/assets/particles/firework-exp.p | 367 ++++++++++++++++++ .../polyjet/audio/map/RhythmMapAlgorithm.java | 2 +- .../polyjet/screens/CreativeDebugScreen.java | 2 +- .../zero1hd/polyjet/screens/EndScreen.java | 8 + .../zero1hd/polyjet/ui/pages/StatPage.java | 44 +++ 9 files changed, 610 insertions(+), 2 deletions(-) create mode 100755 android/assets/3840x2160/Shooter1.png create mode 100755 android/assets/particles/3pStar.png create mode 100755 android/assets/particles/firework-exp-s.p create mode 100755 android/assets/particles/firework-exp.p create mode 100755 core/src/zero1hd/polyjet/screens/EndScreen.java create mode 100755 core/src/zero1hd/polyjet/ui/pages/StatPage.java diff --git a/.gitignore b/.gitignore index f4e6957..4b01033 100755 --- a/.gitignore +++ b/.gitignore @@ -111,6 +111,7 @@ gradle-app.setting ## OS Specific .DS_Store +._* Thumbs.db ## Gource diff --git a/android/assets/3840x2160/Shooter1.png b/android/assets/3840x2160/Shooter1.png new file mode 100755 index 0000000000000000000000000000000000000000..fc4adc1f9eca7bf4bebfc3fbc5814b9e2175cca1 GIT binary patch literal 3939 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 literal 0 HcmV?d00001 diff --git a/android/assets/particles/3pStar.png b/android/assets/particles/3pStar.png new file mode 100755 index 0000000000000000000000000000000000000000..fce6a34bd6491c90b0afcab5a6206af0603ba569 GIT binary patch literal 852 zcmV-a1FQUrP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^MlX|MGF00P8GL_t(&L(Q45j}$==g%Jn@0)arBKq8O` zBm#jrf#457AP@)y0)fCG5Xh5A1mXk&fj}S-2m}I&Kp-F?fe=FYvAmB=ZF+|{v(sHo zxR-pHyVqSamD!ozs@_AZ)#_hy(s*64W+!eKuM5`f#4F=bQj5U*76{Wg=Gg>prJyGhuaPyk6W|F6()Jx&!HDk>r??tJv!p&>OnhB^i z(2wExeK?*HZhjNiOmI#(T@-G96V^;{O*q{WZhjNiOhB#S^ia6@O;|GlwT4sIhQOK$ zK8mq^30}yXNuM7gC#W=;v^3PTZOcXiYd2iBm{bf4y6C3)zH2&52uc0#5uu zptxXGO^I96zzI1qT9R-qeN#(dsp`b7Iie=v@{ysT4Q+drVjZWGXK&l(vBsJOOA;>c zCKqS^1wkx5BahTK5gM1Sq41xH*~G0mK;RRBw%uXs3aY%RoqzWC=pWewnbV@gttki~ z5S1Tud6&KjDm(V>+&QM;R|0y;Pa;&FH?B9C_+N%76Gk6~V~9TRikQ3;3!!-87lZMR zRN1oe$= avgBass) { - //TODO basic void circle spawning float warningTime = map.goBack((int) (windowPerSecond*1.5f))/windowPerSecond; float endRadius = (bassPeaks.get(index)/bassMax)*(Main.GAME_AREA_HEIGHT/4f); map.addToMap(Entities.VOID_CIRCLE, diff --git a/core/src/zero1hd/polyjet/screens/CreativeDebugScreen.java b/core/src/zero1hd/polyjet/screens/CreativeDebugScreen.java index ded7ee7..9574786 100755 --- a/core/src/zero1hd/polyjet/screens/CreativeDebugScreen.java +++ b/core/src/zero1hd/polyjet/screens/CreativeDebugScreen.java @@ -35,7 +35,7 @@ public class CreativeDebugScreen extends ScreenAdapter { @Override public void render(float delta) { - Gdx.gl.glClearColor(1f, 1f, 1f, 1f); + Gdx.gl.glClearColor(0.2f, 0.2f, 0.2f, 1f); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT | GL20.GL_DEPTH_BUFFER_BIT); gamePlayArea.getViewport().apply(); diff --git a/core/src/zero1hd/polyjet/screens/EndScreen.java b/core/src/zero1hd/polyjet/screens/EndScreen.java new file mode 100755 index 0000000..5ac2b2c --- /dev/null +++ b/core/src/zero1hd/polyjet/screens/EndScreen.java @@ -0,0 +1,8 @@ +package zero1hd.polyjet.screens; + +import com.badlogic.gdx.ScreenAdapter; + +public class EndScreen extends ScreenAdapter { + public EndScreen() { + } +} diff --git a/core/src/zero1hd/polyjet/ui/pages/StatPage.java b/core/src/zero1hd/polyjet/ui/pages/StatPage.java new file mode 100755 index 0000000..7448c2d --- /dev/null +++ b/core/src/zero1hd/polyjet/ui/pages/StatPage.java @@ -0,0 +1,44 @@ +package zero1hd.polyjet.ui.pages; + +import com.badlogic.gdx.scenes.scene2d.ui.Label; +import com.badlogic.gdx.scenes.scene2d.ui.Skin; +import com.badlogic.gdx.scenes.scene2d.ui.Table; + +public class StatPage extends Page { + private Table table; + private Label winLabel; + + private Label finalScore, damageTaken, enemiesKilled, shotsTaken, shotsMissed, accuracy; + public StatPage(Skin skin, int score, int damageTake, int enemiesKilled, int shotsTaken, int shotsMissed, int accuracy) { + table = new Table(skin); + addActor(table); + table.setFillParent(true); + + winLabel = new Label("Win!", skin); + table.add(winLabel); + table.row(); + + this.finalScore = new Label("Your score: " + score, skin, "sub-font", skin.getColor("default")); + table.add(this.finalScore); + table.row(); + + this.damageTaken = new Label("Damage Taken: " + damageTake, skin, "sub-font", skin.getColor("default")); + table.add(this.damageTaken); + table.row(); + + this.enemiesKilled = new Label("Enemies slayed: " + enemiesKilled, skin, "sub-font", skin.getColor("default")); + table.add(this.enemiesKilled); + table.row(); + + this.shotsTaken = new Label("Shots taken: " + shotsTaken, skin, "sub-font", skin.getColor("default")); + table.add(this.shotsTaken); + table.row(); + + this.shotsMissed = new Label("Shots missed: " + shotsMissed, skin, "sub-font", skin.getColor("default")); + table.add(this.shotsMissed); + table.row(); + + this.accuracy = new Label("Accuracy: " + accuracy, skin, "sub-font", skin.getColor("default")); + table.add(this.accuracy); + } +}