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 14:57:18 -05:00
parent 1af7457b00
commit 34fd88cae0
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ public class AudioAnalyzer {
int tasksDone = 0; int tasksDone = 0;
int totalTasks = audioData.getSampleCount()/audioData.getReadWindowSize(); int totalTasks = audioData.getSampleCount()/audioData.getReadWindowSize();
bassThresholdMultiplier = 1.5f; bassThresholdMultiplier = 1.7f;
umThresholdMultiplier = 1.5f; umThresholdMultiplier = 1.5f;
bassBinBegin = 1; bassBinBegin = 1;

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

@ -1,5 +1,11 @@
package zero1hd.polyjet.audio.map; package zero1hd.polyjet.audio.map;
<<<<<<< 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.utils.Array; import com.badlogic.gdx.utils.Array;
import zero1hd.polyjet.audio.AudioData; import zero1hd.polyjet.audio.AudioData;
@ -95,7 +101,12 @@ public class GamePlayMap {
playableClip.readIndexUpdate(); playableClip.readIndexUpdate();
if (index != playableClip.getReadIndex()) { if (index != playableClip.getReadIndex()) {
index = playableClip.getReadIndex(); index = playableClip.getReadIndex();
<<<<<<< HEAD
return nextEntityBatch(false); return nextEntityBatch(false);
=======
Gdx.app.debug("GPM", "index: " + index);
return nextEntity(false);
>>>>>>> parent of e4359f4... tuning and adjustments
} else { } else {
return null; return null;
} }

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
); );
} }

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

@ -66,7 +66,7 @@ public class AudioGraph extends Actor {
audioGraph.drawLine(x, audioGraph.getHeight(), x, (int) (audioGraph.getHeight()-(mainGraph.get(dataIndex+x-audioGraph.getWidth()/2)/normalDataG1)*scale)); audioGraph.drawLine(x, audioGraph.getHeight(), x, (int) (audioGraph.getHeight()-(mainGraph.get(dataIndex+x-audioGraph.getWidth()/2)/normalDataG1)*scale));
} catch (NullPointerException | IndexOutOfBoundsException e) { } catch (NullPointerException | IndexOutOfBoundsException e) {
} }
audioGraph.drawLine(0, audioGraph.getHeight() - MathUtils.round(scale*(avgG1/normalDataG1)), audioGraph.getWidth(), audioGraph.getHeight() - MathUtils.round(scale*(avgG1/normalDataG1))); audioGraph.drawLine(0,audioGraph.getHeight() - MathUtils.round(scale*(avgG1/normalDataG1)), audioGraph.getWidth(), audioGraph.getHeight() - MathUtils.round(scale*(avgG1/normalDataG1)));
} }
case 1: case 1: