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

Merge branch 'master' into kockout-wdata

Browse Source
This commit is contained in:
yugecin
2018-10-28 17:32:59 +01:00
parent 6076e6e9c9 559e609b81
commit 6ca1f6e800
11 changed files with 93 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/itdelatrisu/opsu/states/Game.java
View File

@@ -71,6 +71,7 @@ import yugecin.opsudance.utils.GLHelper;
import static itdelatrisu.opsu.GameImage.*;
import static itdelatrisu.opsu.ui.Colors.*;
import static java.lang.System.arraycopy;
import static org.lwjgl.input.Keyboard.*;
import static yugecin.opsudance.options.Options.*;
import static yugecin.opsudance.core.InstanceContainer.*;
@@ -1784,22 +1785,36 @@ public class Game extends ComplexOpsuState {
}
if (knorkesliders == null) {
// let's create knorkesliders
List<Vec2f> curvepoints = new ArrayList<>();
for (GameObject gameObject : gameObjects) {
if (gameObject.isSlider()) {
((Slider) gameObject).baseSliderFrom = curvepoints.size();
curvepoints.addAll(Arrays.asList(((Slider) gameObject).getCurve().getCurvePoints()));
int totalpoints = 0;
ArrayList<Slider> sliders = new ArrayList<>();
for (GameObject o : gameObjects) {
if (o.isSlider()) {
final Slider s = (Slider) o;
final int len = s.getCurvePointsCount();
if (len > 0) {
sliders.add(s);
s.curveStartIndex = totalpoints;
totalpoints += s.getCurvePointsCount();
}
}
}
if (curvepoints.size() > 0) {
knorkesliders = new FakeCombinedCurve(curvepoints.toArray(new Vec2f[curvepoints.size()]));
if (totalpoints > 0) {
Vec2f[] combinedcurve = new Vec2f[totalpoints];
int idx = 0;
for (Slider s : sliders) {
int len = s.getCurvePointsCount();
arraycopy(s.getCurvePoints(), 0, combinedcurve, idx, len);
idx += len;
}
knorkesliders = new FakeCombinedCurve(combinedcurve);
}
} else {
int base = 0;
int startIndex = 0;
for (GameObject gameObject : gameObjects) {
if (gameObject.isSlider()) {
((Slider) gameObject).baseSliderFrom = base;
base += ((Slider) gameObject).getCurve().getCurvePoints().length;
final Slider s = (Slider) gameObject;
s.curveStartIndex = startIndex;
startIndex += s.getCurvePointsCount();
}
}
}