Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix pitch changes (hopefully)

Browse Source
This commit is contained in:
MatteoS
2015-11-16 21:21:28 +01:00
parent 13e0bdb81e
commit d0069c20e5
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/org/newdawn/slick/Music.java
View File

@@ -325,6 +325,7 @@ public class Music {
currentMusic = this;
sound.playAsMusic(pitch, volume, loop);
setVolume(volume);
setPitch(pitch);
if (requiredPosition != -1) {
setPosition(requiredPosition);
}
@@ -444,6 +445,14 @@ public class Music {
return;
}
if (pitchTime > 0) {
pitchTime -= delta;
if (pitchTime < 0) {
pitchTime = 0;
}
float offset = (pitchEnd - pitchStart) * (1 - (pitchTime / (float)pitchDuration));
setPitch(pitchStart + offset);
}
if (fadeTime > 0) {
fadeTime -= delta;
if (fadeTime < 0) {
@@ -457,15 +466,6 @@ public class Music {
float offset = (fadeEndGain - fadeStartGain) * (1 - (fadeTime / (float)fadeDuration));
setVolume(fadeStartGain + offset);
}
if (pitchTime > 0) {
pitchTime -= delta;
if (pitchTime < 0) {
pitchTime = 0;
}
float offset = (pitchEnd - pitchStart) * (1 - (pitchTime / (float)pitchDuration));
setPitch(pitchStart + offset);
}
}
/**