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

make mirrored curves work

Browse Source
This commit is contained in:
yugecin 2016-12-25 18:05:00 +01:00
parent 9ec2d1a5a8
commit b37e03b3be
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/itdelatrisu/opsu/render/CurveRenderState.java
View File

@ -287,14 +287,13 @@ public class CurveRenderState {
*/ */
private void createVertexBuffer(int bufferID) { private void createVertexBuffer(int bufferID) {
int arrayBufferBinding = GL11.glGetInteger(GL15.GL_ARRAY_BUFFER_BINDING); int arrayBufferBinding = GL11.glGetInteger(GL15.GL_ARRAY_BUFFER_BINDING);
FloatBuffer buff = BufferUtils.createByteBuffer(4 * (4 + 2) * (2 * curve.length * mirrors - 1) * (NewCurveStyleState.DIVIDES + 2)).asFloatBuffer(); FloatBuffer buff = BufferUtils.createByteBuffer(4 * (4 + 2) * (2 * curve.length - 1) * mirrors * (NewCurveStyleState.DIVIDES + 2)).asFloatBuffer();
if (curve.length > 0) { if (curve.length > 0) {
fillCone(buff, curve[0].x, curve[0].y, 0); fillCone(buff, curve[0].x, curve[0].y, 0);
} }
for (int mirror = 0; mirror < mirrors; mirror++) { for (int mirror = 0; mirror < mirrors; mirror++) {
//final float angle = 360f * mirror / mirrors; final float angle = 360f * mirror / mirrors;
final float angle = 180f;
for (int i = 1; i < curve.length; ++i) { for (int i = 1; i < curve.length; ++i) {
float x = curve[i].x; float x = curve[i].x;
float y = curve[i].y; float y = curve[i].y;
@ -344,9 +343,12 @@ public class CurveRenderState {
if (clearFirst) { if (clearFirst) {
GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT); GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT);
} }
renderCurve(from, to, 0); int max = mirrors;
if (mirrors > 1 && Options.isMirror()) { if (!Options.isMirror()) {
renderCurve(from, to, 1); max = 1;
}
for (int i = 0; i < max; i++) {
renderCurve(from, to, i);
} }
GL11.glFlush(); GL11.glFlush();
GL20.glDisableVertexAttribArray(staticState.texCoordLoc); GL20.glDisableVertexAttribArray(staticState.texCoordLoc);
@ -355,11 +357,16 @@ public class CurveRenderState {
} }
private void renderCurve(int from, int to, int mirror) { private void renderCurve(int from, int to, int mirror) {
if (from > 0) {
from -= mirror;
}
to -= mirror;
for (int i = from * 2; i < to * 2 - 1; ++i) { for (int i = from * 2; i < to * 2 - 1; ++i) {
if (spliceFrom <= i && i <= spliceTo) { if (spliceFrom <= i && i <= spliceTo) {
continue; continue;
} }
GL11.glDrawArrays(GL11.GL_TRIANGLE_FAN, i * (NewCurveStyleState.DIVIDES + 2) + mirror * curve.length, NewCurveStyleState.DIVIDES + 2); final int index = i + curve.length * 2 * mirror;// + mirror * curve.length / 2;
GL11.glDrawArrays(GL11.GL_TRIANGLE_FAN, index * (NewCurveStyleState.DIVIDES + 2), NewCurveStyleState.DIVIDES + 2);
} }
} }