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

done goofed

Browse Source
This commit is contained in:
Harrison Deng 2017-07-15 14:58:56 -05:00
parent 34fd88cae0
commit 587643a089
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,12 +56,7 @@ public class RhythmMapAlgorithm implements Runnable {
map.beginBuild();
for (int index = 0; index < bassPeaks.size; index++) {
if (bassPeaks.get(index) != 0 || UMPeaks.get(index) != 0) {
<<<<<<< HEAD
if (bassPeaks.get(index) > avgBass) {
=======
int warningTime = (int) ((3/speedMod)*windowPerSecond);
if ((index+warningTime < bassPeaks.size) && bassPeaks.get(index + warningTime) >= avgBass) {
>>>>>>> parent of e4359f4... tuning and adjustments
//TODO basic void circle spawning
float endRadius = (bassPeaks.get(index)/bassMax)*(Polyjet.GAME_AREA_HEIGHT/2f);
@ -69,7 +64,7 @@ public class RhythmMapAlgorithm implements Runnable {
endRadius,
rand.nextFloat()*Polyjet.GAME_AREA_WIDTH,
rand.nextFloat()*Polyjet.GAME_AREA_HEIGHT,
endRadius/(avgSPB*0.5f),
endRadius/(avgSPB*0.6f),
3f/speedMod
);
}