ydeng/rhythmbullet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tuning and minor map gen changes

Browse Source
This commit is contained in:
Harrison Deng 2017-07-16 13:34:56 -05:00
parent 8db65566c9
commit 8bcea5cfff
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/zero1hd/polyjet/audio/AudioAnalyzer.java
View File

@ -68,9 +68,9 @@ public class AudioAnalyzer {
umThresholdMultiplier = 1.5f; umThresholdMultiplier = 1.5f;
bassBinBegin = 1; bassBinBegin = 1;
bassBinEnd = 25; bassBinEnd = 17;
UMBinBegin = 300; UMBinBegin = 350;
UMBinEnd = 512; UMBinEnd = 512;
bassThresholdCalcRange = thresholdRangeCalc(0.3f); bassThresholdCalcRange = thresholdRangeCalc(0.3f);

7
core/src/zero1hd/polyjet/audio/map/RhythmMapAlgorithm.java
View File

@ -58,9 +58,8 @@ public class RhythmMapAlgorithm implements Runnable {
if (bassPeaks.get(index) != 0 || UMPeaks.get(index) != 0) { if (bassPeaks.get(index) != 0 || UMPeaks.get(index) != 0) {
if (bassPeaks.get(index) >= avgBass) { if (bassPeaks.get(index) >= avgBass) {
//TODO basic void circle spawning //TODO basic void circle spawning
int warningTime = (int) (map.goBack((int) (windowPerSecond*1.5f))/windowPerSecond); float warningTime = map.goBack((int) (windowPerSecond*1.5f))/windowPerSecond;
float endRadius = (bassPeaks.get(index)/bassMax)*(Polyjet.GAME_AREA_HEIGHT/4f);
float endRadius = (bassPeaks.get(index)/bassMax)*(Polyjet.GAME_AREA_HEIGHT/2f);
map.addToMap(Entities.VOID_CIRCLE, map.addToMap(Entities.VOID_CIRCLE,
endRadius, endRadius,
rand.nextFloat()*Polyjet.GAME_AREA_WIDTH, rand.nextFloat()*Polyjet.GAME_AREA_WIDTH,
@ -71,7 +70,7 @@ public class RhythmMapAlgorithm implements Runnable {
map.resetIndex(); map.resetIndex();
} }
if (bassPeaks.get(index) != 0) { if (UMPeaks.get(index) >= avgUM) {
int spawnLocations = (Polyjet.GAME_AREA_WIDTH-8)/8; int spawnLocations = (Polyjet.GAME_AREA_WIDTH-8)/8;
map.addToMap(Entities.BAR, map.addToMap(Entities.BAR,
MathUtils.round(rand.nextFloat()*spawnLocations)*8, MathUtils.round(rand.nextFloat()*spawnLocations)*8,

8
core/src/zero1hd/polyjet/ui/builders/AudioGraph.java
View File

@ -43,11 +43,11 @@ public class AudioGraph extends Actor {
if (Gdx.input.isKeyPressed(Keys.COMMA)) { if (Gdx.input.isKeyPressed(Keys.COMMA)) {
if (scale > 0.05f) { if (scale > 0.05f) {
scale -= 0.05f; scale -= 0.25f;
} }
} else if (Gdx.input.isKeyPressed(Keys.PERIOD)) { } else if (Gdx.input.isKeyPressed(Keys.PERIOD)) {
if (scale < audioGraph.getHeight()) { if (scale < audioGraph.getHeight()+30f) {
scale += 0.05f; scale += 0.25f;
} }
} }
if (Gdx.input.isKeyJustPressed(Keys.M)) { if (Gdx.input.isKeyJustPressed(Keys.M)) {
@ -57,6 +57,8 @@ public class AudioGraph extends Actor {
} else { } else {
displayMode = 0; displayMode = 0;
} }
} else if (Gdx.input.isKeyJustPressed(Keys.SLASH)) {
scale = audioGraph.getHeight();
} }
switch (displayMode) { switch (displayMode) {
case 0: case 0: