From d6b6829023a9e77481e505e4f2b52d495b7f7193 Mon Sep 17 00:00:00 2001 From: Recrown Date: Mon, 29 May 2017 12:50:27 -0500 Subject: [PATCH] cleaning for beginning of physics implementation --- .../zero1hd/polyjet/audio/AudioAnalyzer.java | 15 ++-- .../polyjet/audio/RhythmMapAlgorithm.java | 1 - core/src/zero1hd/polyjet/entity/BarBeat.java | 44 ----------- core/src/zero1hd/polyjet/entity/Entities.java | 4 + core/src/zero1hd/polyjet/entity/Entity.java | 71 ------------------ .../zero1hd/polyjet/entity/Projectile.java | 75 ------------------- .../polyjet/ui/stages/GamePlayArea.java | 55 -------------- 7 files changed, 11 insertions(+), 254 deletions(-) delete mode 100755 core/src/zero1hd/polyjet/entity/BarBeat.java delete mode 100755 core/src/zero1hd/polyjet/entity/Entity.java delete mode 100755 core/src/zero1hd/polyjet/entity/Projectile.java diff --git a/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java b/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java index d3cb842..a507642 100755 --- a/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java +++ b/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java @@ -86,11 +86,7 @@ public class AudioAnalyzer { fft.realForward(audioPCM); - System.arraycopy(spectrum, 0, lastSpectrum, 0, spectrum.length); - System.arraycopy(audioPCM, 0, spectrum, 0, spectrum.length); - //Building a PUID (Pseudo unique ID) - if (tasksDone == (seedDigit*totalTasks/9)) { float avg = 0; for (int frame = 0; frame < spectrum.length; frame++) { @@ -104,20 +100,23 @@ public class AudioAnalyzer { seedDigit ++; } + System.arraycopy(spectrum, 0, lastSpectrum, 0, spectrum.length); + System.arraycopy(audioPCM, 0, spectrum, 0, spectrum.length); + float fluxVal = 0; //bass detection fluxVal = 0; for (int i = bassBinBegin; i < bassBinEnd && work; i++) { - fluxVal += ((int) (spectrum[i] - lastSpectrum[i])) > 0 - ? (int) (spectrum[i] - lastSpectrum[i]) : 0; + fluxVal += ((spectrum[i] - lastSpectrum[i])) > 0 + ? (spectrum[i] - lastSpectrum[i]) : 0; } bassSpectralFlux.add(fluxVal); //main detection fluxVal = 0; for (int i = UMBinBegin; i < UMBinEnd && work; i++) { - fluxVal += ((int) (spectrum[i] - lastSpectrum[i])) > 0 - ? (int) (spectrum[i] - lastSpectrum[i]) : 0; + fluxVal += ((spectrum[i] - lastSpectrum[i])) > 0 + ? (spectrum[i] - lastSpectrum[i]) : 0; } UMSpectralFlux.add(fluxVal); tasksDone++; diff --git a/core/src/zero1hd/polyjet/audio/RhythmMapAlgorithm.java b/core/src/zero1hd/polyjet/audio/RhythmMapAlgorithm.java index adc30fd..8554b1e 100755 --- a/core/src/zero1hd/polyjet/audio/RhythmMapAlgorithm.java +++ b/core/src/zero1hd/polyjet/audio/RhythmMapAlgorithm.java @@ -12,6 +12,5 @@ public class RhythmMapAlgorithm implements Runnable { @Override public void run() { - } } diff --git a/core/src/zero1hd/polyjet/entity/BarBeat.java b/core/src/zero1hd/polyjet/entity/BarBeat.java deleted file mode 100755 index f4617b2..0000000 --- a/core/src/zero1hd/polyjet/entity/BarBeat.java +++ /dev/null @@ -1,44 +0,0 @@ -package zero1hd.polyjet.entity; - -import com.badlogic.gdx.graphics.g2d.Batch; -import com.badlogic.gdx.graphics.g2d.NinePatch; - -import zero1hd.polyjet.Polyjet; - -public class BarBeat extends Entity { - NinePatch texture; - float rate; - - public void initiate(float size, float rate, float spawnX, float spawnY, NinePatch texture) { - hitpoints = 1; - this.rate = rate; - setPosition(spawnX, spawnY); - this.texture = texture; - } - - @Override - public void act(float delta) { - if (getY() + getHeight() < Polyjet.GAME_AREA_HEIGHT) { - hitpoints = 0; - } - moveBy(0, -rate*delta); - super.act(delta); - } - - @Override - public void draw(Batch batch, float parentAlpha) { - texture.draw(batch, getX(), getY(), getWidth(), getHeight()); - super.draw(batch, parentAlpha); - } - - @Override - public int getDamageDealt() { - return 10; - } - - @Override - public void reset() { - texture = null; - super.reset(); - } -} diff --git a/core/src/zero1hd/polyjet/entity/Entities.java b/core/src/zero1hd/polyjet/entity/Entities.java index a2fcc4e..ec7b0a1 100755 --- a/core/src/zero1hd/polyjet/entity/Entities.java +++ b/core/src/zero1hd/polyjet/entity/Entities.java @@ -2,4 +2,8 @@ package zero1hd.polyjet.entity; public enum Entities { Bar_Beat, Void_Circle; + + public float x; + public float y; + public float velocity; } diff --git a/core/src/zero1hd/polyjet/entity/Entity.java b/core/src/zero1hd/polyjet/entity/Entity.java deleted file mode 100755 index 8185adc..0000000 --- a/core/src/zero1hd/polyjet/entity/Entity.java +++ /dev/null @@ -1,71 +0,0 @@ -package zero1hd.polyjet.entity; - -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.scenes.scene2d.Actor; -import com.badlogic.gdx.utils.Pool.Poolable; - -public class Entity extends Actor implements Poolable { - private Rectangle hitbox; - protected int hitpoints; - - public Entity() { - hitbox = new Rectangle(); - } - - @Override - public void setSize(float width, float height) { - hitbox.setSize(width, height); - super.setSize(width, height); - } - - @Override - public void act(float delta) { - hitbox.setPosition(getX(), getY()); - super.act(delta); - } - - /** - * @return amount of hp this entity has left. - */ - public int getHitPoints() { - return hitpoints; - } - - /** - * used as a hitbox. - * @return a rectangle used for hit detection - */ - public Rectangle getHitbox() { - return hitbox; - } - - /** - * Returns 0 if not overridden. - * @return the amount of damage dealt. - */ - public int getDamageDealt() { - return 0; - } - - /** - * Doesn't do anything if not overridden. - * @param damageToDeal the amount of damage to deal to this entity. - */ - public void dealDamage(int damageToDeal) { - } - /** - * Default value is 0 if not overridden and setup properly. - * Note: this method is called whether or not this entity is dead. whenever two entities cross, this will be called. - * @return the amount of points this entity is worth - */ - public int getPoints() { - return 0; - } - - @Override - public void reset() { - setPosition(0, 0); - setSize(0, 0); - hitpoints = 0; - } -} diff --git a/core/src/zero1hd/polyjet/entity/Projectile.java b/core/src/zero1hd/polyjet/entity/Projectile.java deleted file mode 100755 index 363f1ce..0000000 --- a/core/src/zero1hd/polyjet/entity/Projectile.java +++ /dev/null @@ -1,75 +0,0 @@ -package zero1hd.polyjet.entity; - -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.Batch; - -import zero1hd.polyjet.Polyjet; - -public class Projectile extends Entity { - float rate; - int damage; - Texture texture; - int hp; - int storedPoints; - - public Projectile() { - super(); - Gdx.app.debug("Projectile", "A new projectile was created."); - } - /** - * - * @param spawnX x spawn location - * @param spawnY y spawn location - * @param rate r/second - * @param hp health this projectile should have - * @param texture texture this projectile should render. - */ - public void initiate(float spawnX, float spawnY, float rate, int hp, Texture texture, float width, float height) { - this.hp = hp; - setX(spawnX); - setY(spawnY); - this.texture = texture; - this.rate = rate; - setSize(width, height); - damage = 1; - } - - public void setDamage(int damage) { - this.damage = damage; - } - - public void printDebug() { - Gdx.app.debug("Projectile", "Coordinates (X,Y): (" + getX() + ", " + getY() + ") Current parent: " + getParent().getName()); - Gdx.app.debug("Projectile", "Width and height: " + getWidth() + "x" + getHeight()); - } - - - @Override - public void act(float delta) { - moveBy(0, delta*rate); - if (getY() > Polyjet.GAME_AREA_HEIGHT) { - hp = 0; - } - super.act(delta); - } - - @Override - public void draw(Batch batch, float parentAlpha) { - batch.draw(texture, getX(), getY(), getWidth(), getHeight()); - super.draw(batch, parentAlpha); - } - - @Override - public void reset() { - texture = null; - storedPoints = 0; - rate = 0; - damage = 0; - setDebug(false); - } - @Override - public int getHitPoints() { - return hp; - } -} diff --git a/core/src/zero1hd/polyjet/ui/stages/GamePlayArea.java b/core/src/zero1hd/polyjet/ui/stages/GamePlayArea.java index 4488d8e..61c6f5a 100755 --- a/core/src/zero1hd/polyjet/ui/stages/GamePlayArea.java +++ b/core/src/zero1hd/polyjet/ui/stages/GamePlayArea.java @@ -4,17 +4,12 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Pixmap.Format; import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.scenes.scene2d.Group; import com.badlogic.gdx.scenes.scene2d.Stage; -import com.badlogic.gdx.utils.Pool; -import com.badlogic.gdx.utils.Pools; import com.badlogic.gdx.utils.viewport.FitViewport; import zero1hd.polyjet.Polyjet; import zero1hd.polyjet.controls.KeyMap; -import zero1hd.polyjet.entity.BarBeat; import zero1hd.polyjet.entity.PolyJetEntity; -import zero1hd.polyjet.entity.Projectile; public class GamePlayArea extends Stage { @@ -29,13 +24,6 @@ public class GamePlayArea extends Stage { private float yTeleport = Polyjet.GAME_AREA_HEIGHT/2; private int score; - private final Pool projectilePool = Pools.get(Projectile.class, 50); - private final Pool barBeatPool = Pools.get(BarBeat.class); - - Group projectile; - - Group foes; - Texture basicLaserTexture; public GamePlayArea(Polyjet core) { super(new FitViewport(Polyjet.GAME_AREA_WIDTH, Polyjet.GAME_AREA_HEIGHT)); @@ -55,13 +43,6 @@ public class GamePlayArea extends Stage { polyJet = new PolyJetEntity(core, 54, "standard"); addActor(polyJet); - - projectile = new Group(); - projectile.setName("basic Projectiles"); - addActor(projectile); - - foes = new Group(); - addActor(foes); } public void init() { @@ -72,23 +53,6 @@ public class GamePlayArea extends Stage { public void act(float delta) { timeCounter+=delta; - for (int projectileID = 0; projectileID < projectile.getChildren().size; projectileID++) { - Projectile currentProjectile = (Projectile) projectile.getChildren().get(projectileID); - if (currentProjectile.getHitPoints() <= 0) { - currentProjectile.printDebug(); - currentProjectile.remove(); - projectilePool.free(currentProjectile); - } - } - - for (int barBeatID = 0; barBeatID < foes.getChildren().size; barBeatID++) { - BarBeat currentBarBeat = (BarBeat) foes.getChildren().get(barBeatID); - if (currentBarBeat.getHitPoints() <= 0) { - currentBarBeat.remove(); - barBeatPool.free(currentBarBeat); - } - } - health -= 2*delta; if (health <= 0) { @@ -128,24 +92,6 @@ public class GamePlayArea extends Stage { } } - public void spawnProjectile(int ID) { - switch (ID) { - case 0: - Projectile currentProjectile = projectilePool.obtain(); - currentProjectile.initiate( - polyJet.getX()+polyJet.getWidth()/2-(0.125f)/2, - polyJet.getY()+polyJet.getHeight()+0.5f, - 100, - 1, - basicLaserTexture, 0.125f, 2f); - projectile.addActor(currentProjectile); - - health -= 5; - break; - } - } - - @Override public boolean keyDown(int keycode) { if (keycode == KeyMap.left) { @@ -180,7 +126,6 @@ public class GamePlayArea extends Stage { polyJet.moveDown = false; } if (keycode == KeyMap.shoot) { - spawnProjectile(0); } return false; }