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 0000000..fc4adc1 Binary files /dev/null and b/android/assets/3840x2160/Shooter1.png differ diff --git a/android/assets/particles/3pStar.png b/android/assets/particles/3pStar.png new file mode 100755 index 0000000..fce6a34 Binary files /dev/null and b/android/assets/particles/3pStar.png differ diff --git a/android/assets/particles/firework-exp-s.p b/android/assets/particles/firework-exp-s.p new file mode 100755 index 0000000..eeb443b --- /dev/null +++ b/android/assets/particles/firework-exp-s.p @@ -0,0 +1,188 @@ +firework2 +- Delay - +active: false +- Duration - +lowMin: 300.0 +lowMax: 300.0 +- Count - +min: 20 +max: 150 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 500.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 0.0 +scaling2: 1.0 +scaling3: 1.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.5 +timeline2: 0.84246576 +timeline3: 1.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 750.0 +highMax: 1200.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Life Offset - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: point +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.5 +highMax: 1.5 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 8.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.10273973 +- Angle - +active: true +lowMin: 0.0 +lowMax: 360.0 +highMin: 0.0 +highMax: 360.0 +relative: false +scalingCount: 1 +scaling0: 0.0 +timelineCount: 1 +timeline0: 0.0 +- Rotation - +active: true +lowMin: 1.0 +lowMax: 360.0 +highMin: 180.0 +highMax: 180.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -7.5 +highMax: -9.5 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 0.50980395 +scaling2: 0.78431374 +scaling3: 1.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.10958904 +timeline2: 0.25342464 +timeline3: 0.48630136 +- Tint - +colorsCount: 15 +colors0: 1.0 +colors1: 0.047058824 +colors2: 0.047058824 +colors3: 0.047058824 +colors4: 0.047058824 +colors5: 1.0 +colors6: 0.047058824 +colors7: 1.0 +colors8: 0.2 +colors9: 1.0 +colors10: 0.972549 +colors11: 0.047058824 +colors12: 1.0 +colors13: 0.047058824 +colors14: 0.047058824 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.2897402 +timeline2: 0.5006605 +timeline3: 0.74372524 +timeline4: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.64912283 +scaling1: 1.0 +scaling2: 0.75 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.43150684 +timeline2: 0.8 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +4PStar.png diff --git a/android/assets/particles/firework-exp.p b/android/assets/particles/firework-exp.p new file mode 100755 index 0000000..4efd16e --- /dev/null +++ b/android/assets/particles/firework-exp.p @@ -0,0 +1,367 @@ +firework1 +- Delay - +active: false +- Duration - +lowMin: 250.0 +lowMax: 250.0 +- Count - +min: 20 +max: 150 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 600.0 +highMax: 600.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.50022554 +timeline2: 1.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1000.0 +highMax: 1500.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: point +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.5 +highMax: 1.5 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 6.0 +highMax: 14.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.10273973 +- Angle - +active: true +lowMin: 0.0 +lowMax: 360.0 +highMin: 0.0 +highMax: 360.0 +relative: false +scalingCount: 1 +scaling0: 0.0 +timelineCount: 1 +timeline0: 0.0 +- Rotation - +active: true +lowMin: 1.0 +lowMax: 360.0 +highMin: 180.0 +highMax: 180.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -7.5 +highMax: -9.5 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 0.50980395 +scaling2: 0.78431374 +scaling3: 1.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.10958904 +timeline2: 0.25342464 +timeline3: 0.48630136 +- Tint - +colorsCount: 15 +colors0: 1.0 +colors1: 0.047058824 +colors2: 0.047058824 +colors3: 1.0 +colors4: 0.99607843 +colors5: 0.047058824 +colors6: 0.047058824 +colors7: 1.0 +colors8: 0.2 +colors9: 0.047058824 +colors10: 0.05490196 +colors11: 1.0 +colors12: 1.0 +colors13: 0.047058824 +colors14: 0.9843137 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.2897402 +timeline2: 0.5006605 +timeline3: 0.74372524 +timeline4: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.64912283 +scaling1: 1.0 +scaling2: 0.75 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.43150684 +timeline2: 0.8 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +4PStar.png + + +firework2 +- Delay - +active: false +- Duration - +lowMin: 300.0 +lowMax: 300.0 +- Count - +min: 20 +max: 150 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 500.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 0.0 +scaling2: 1.0 +scaling3: 1.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.5 +timeline2: 0.84246576 +timeline3: 1.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 750.0 +highMax: 1200.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Life Offset - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: point +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.5 +highMax: 1.5 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 8.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.10273973 +- Angle - +active: true +lowMin: 0.0 +lowMax: 360.0 +highMin: 0.0 +highMax: 360.0 +relative: false +scalingCount: 1 +scaling0: 0.0 +timelineCount: 1 +timeline0: 0.0 +- Rotation - +active: true +lowMin: 1.0 +lowMax: 360.0 +highMin: 180.0 +highMax: 180.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -7.5 +highMax: -9.5 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 0.50980395 +scaling2: 0.78431374 +scaling3: 1.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.10958904 +timeline2: 0.25342464 +timeline3: 0.48630136 +- Tint - +colorsCount: 15 +colors0: 1.0 +colors1: 0.047058824 +colors2: 0.047058824 +colors3: 0.047058824 +colors4: 0.047058824 +colors5: 1.0 +colors6: 0.047058824 +colors7: 1.0 +colors8: 0.2 +colors9: 1.0 +colors10: 0.972549 +colors11: 0.047058824 +colors12: 1.0 +colors13: 0.047058824 +colors14: 0.047058824 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.2897402 +timeline2: 0.5006605 +timeline3: 0.74372524 +timeline4: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.64912283 +scaling1: 1.0 +scaling2: 0.75 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.43150684 +timeline2: 0.8 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +4PStar.png diff --git a/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java b/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java index e72e801..963fd7a 100755 --- a/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java +++ b/core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java @@ -57,8 +57,8 @@ public class RhythmMapAlgorithm implements Runnable { map.beginBuild(); for (int index = 0; index < bassPeaks.size; index++) { if (bassPeaks.get(index) != 0 || UMPeaks.get(index) != 0) { + //If there is a value of some sorts that is not zero, we generate some beat for the map if (bassPeaks.get(index) >= 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); + } +}