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

Revert "tuning and adjustments"

Browse Source 
This reverts commit e4359f41b2fc35283fe732911bb68166a8588a2a.
This commit is contained in:
Harrison Deng 2017-07-15 15:03:29 -05:00
parent 587643a089
commit 0299c6ca14
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/zero1hd/polyjet/audio/map/GamePlayMap.java
View File

@ -1,6 +1,12 @@
package zero1hd.polyjet.audio.map; package zero1hd.polyjet.audio.map;
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.audio.Music;
import com.badlogic.gdx.math.MathUtils;
>>>>>>> parent of e4359f4... tuning and adjustments
======= =======
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.audio.Music; import com.badlogic.gdx.audio.Music;
@ -101,9 +107,12 @@ public class GamePlayMap {
playableClip.readIndexUpdate(); playableClip.readIndexUpdate();
if (index != playableClip.getReadIndex()) { if (index != playableClip.getReadIndex()) {
index = playableClip.getReadIndex(); index = playableClip.getReadIndex();
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
return nextEntityBatch(false); return nextEntityBatch(false);
======= =======
=======
>>>>>>> parent of e4359f4... tuning and adjustments
Gdx.app.debug("GPM", "index: " + index); Gdx.app.debug("GPM", "index: " + index);
return nextEntity(false); return nextEntity(false);
>>>>>>> parent of e4359f4... tuning and adjustments >>>>>>> parent of e4359f4... tuning and adjustments

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

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