From 9ec2d1a5a8ca0ef5431c358c05f45f8f67cdcd4d Mon Sep 17 00:00:00 2001 From: yugecin Date: Sun, 25 Dec 2016 17:30:09 +0100 Subject: [PATCH] attempts to merge mirrored curves --- src/itdelatrisu/opsu/Utils.java | 11 +++ .../opsu/objects/curves/Curve.java | 5 +- .../opsu/render/CurveRenderState.java | 78 ++++++++++++------- src/itdelatrisu/opsu/states/Game.java | 2 + 4 files changed, 67 insertions(+), 29 deletions(-) diff --git a/src/itdelatrisu/opsu/Utils.java b/src/itdelatrisu/opsu/Utils.java index 5c90b836..57bd11e1 100644 --- a/src/itdelatrisu/opsu/Utils.java +++ b/src/itdelatrisu/opsu/Utils.java @@ -661,4 +661,15 @@ public class Utils { }; } + public static float[] mirrorPoint(float x, float y, float degrees) { + double dx = x - Options.width / 2d; + double dy = y - Options.height / 2d; + double ang = Math.atan2(dy, dx) + (degrees * Math.PI / 180d); + double d = Math.sqrt(dx * dx + dy * dy); + return new float[]{ + (float) (Options.width / 2d + Math.cos(ang) * d), + (float) (Options.height / 2d + Math.sin(ang) * d) + }; + } + } diff --git a/src/itdelatrisu/opsu/objects/curves/Curve.java b/src/itdelatrisu/opsu/objects/curves/Curve.java index abb2519a..18f54f62 100644 --- a/src/itdelatrisu/opsu/objects/curves/Curve.java +++ b/src/itdelatrisu/opsu/objects/curves/Curve.java @@ -31,6 +31,7 @@ import org.lwjgl.opengl.GLContext; import org.newdawn.slick.Color; import org.newdawn.slick.Image; import org.newdawn.slick.util.Log; +import yugecin.opsudance.objects.curves.FakeCombinedCurve; /** * Representation of a curve. @@ -149,14 +150,14 @@ public abstract class Curve { // mmsliders else { if (renderState == null) - renderState = new CurveRenderState(hitObject, curve); + renderState = new CurveRenderState(hitObject, curve, this instanceof FakeCombinedCurve); renderState.draw(color, borderColor, from, to); } } public void splice(int from, int to) { if (renderState == null) - renderState = new CurveRenderState(hitObject, curve); + renderState = new CurveRenderState(hitObject, curve, this instanceof FakeCombinedCurve); renderState.splice(from, to); } diff --git a/src/itdelatrisu/opsu/render/CurveRenderState.java b/src/itdelatrisu/opsu/render/CurveRenderState.java index a7df129c..405af1ce 100644 --- a/src/itdelatrisu/opsu/render/CurveRenderState.java +++ b/src/itdelatrisu/opsu/render/CurveRenderState.java @@ -18,6 +18,7 @@ package itdelatrisu.opsu.render; import itdelatrisu.opsu.GameImage; +import itdelatrisu.opsu.Options; import itdelatrisu.opsu.Utils; import itdelatrisu.opsu.beatmap.HitObject; import itdelatrisu.opsu.objects.Circle; @@ -31,7 +32,6 @@ import org.lwjgl.BufferUtils; import org.lwjgl.opengl.EXTFramebufferObject; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL13; -import org.lwjgl.opengl.GL14; import org.lwjgl.opengl.GL15; import org.lwjgl.opengl.GL20; import org.newdawn.slick.Color; @@ -69,6 +69,8 @@ public class CurveRenderState { private int spliceFrom; private int spliceTo; + private final int mirrors; + /** * Set the width and height of the container that Curves get drawn into. * Should be called before any curves are drawn. @@ -102,9 +104,14 @@ public class CurveRenderState { * @param hitObject the HitObject that represents this curve, just used as a unique ID * @param curve the points along the curve to be drawn */ - public CurveRenderState(HitObject hitObject, Vec2f[] curve) { + public CurveRenderState(HitObject hitObject, Vec2f[] curve, boolean isKnorkeSlider) { this.hitObject = hitObject; this.curve = curve; + if (isKnorkeSlider) { + this.mirrors = Options.getMergingSlidersMirrorPool(); + } else { + this.mirrors = 1; + } initFBO(); } @@ -280,28 +287,33 @@ public class CurveRenderState { */ private void createVertexBuffer(int bufferID) { int arrayBufferBinding = GL11.glGetInteger(GL15.GL_ARRAY_BUFFER_BINDING); - FloatBuffer buff = BufferUtils.createByteBuffer(4 * (4 + 2) * (2 * curve.length - 1) * (NewCurveStyleState.DIVIDES + 2)).asFloatBuffer(); + FloatBuffer buff = BufferUtils.createByteBuffer(4 * (4 + 2) * (2 * curve.length * mirrors - 1) * (NewCurveStyleState.DIVIDES + 2)).asFloatBuffer(); if (curve.length > 0) { - fillCone(buff, curve[0].x, curve[0].y); + fillCone(buff, curve[0].x, curve[0].y, 0); } - for (int i = 1; i < curve.length; ++i) { - float x = curve[i].x; - float y = curve[i].y; - fillCone(buff, x, y); - float last_x = curve[i - 1].x; - float last_y = curve[i - 1].y; - double diff_x = x - last_x; - double diff_y = y - last_y; - float dist = Utils.distance(x, y, last_x, last_y); - if (dist < Circle.diameter / 8) { - x = (float) (x - diff_x / 2); - y = (float) (y - diff_y / 2); - } else { - // don't mind me - x = -100f; - y = -100f; + + for (int mirror = 0; mirror < mirrors; mirror++) { + //final float angle = 360f * mirror / mirrors; + final float angle = 180f; + for (int i = 1; i < curve.length; ++i) { + float x = curve[i].x; + float y = curve[i].y; + fillCone(buff, x, y, angle); + float last_x = curve[i - 1].x; + float last_y = curve[i - 1].y; + double diff_x = x - last_x; + double diff_y = y - last_y; + float dist = Utils.distance(x, y, last_x, last_y); + if (dist < Circle.diameter / 8) { + x = (float) (x - diff_x / 2); + y = (float) (y - diff_y / 2); + } else { + // don't mind me + x = -100f; + y = -100f; + } + fillCone(buff, x, y, angle); } - fillCone(buff, x, y); } buff.flip(); GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, bufferID); @@ -332,11 +344,9 @@ public class CurveRenderState { if (clearFirst) { GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT); } - for (int i = from * 2; i < to * 2 - 1; ++i) { - if (spliceFrom <= i && i <= spliceTo) { - continue; - } - GL11.glDrawArrays(GL11.GL_TRIANGLE_FAN, i * (NewCurveStyleState.DIVIDES + 2), NewCurveStyleState.DIVIDES + 2); + renderCurve(from, to, 0); + if (mirrors > 1 && Options.isMirror()) { + renderCurve(from, to, 1); } GL11.glFlush(); GL20.glDisableVertexAttribArray(staticState.texCoordLoc); @@ -344,6 +354,15 @@ public class CurveRenderState { restoreRenderState(state); } + private void renderCurve(int from, int to, int mirror) { + for (int i = from * 2; i < to * 2 - 1; ++i) { + if (spliceFrom <= i && i <= spliceTo) { + continue; + } + GL11.glDrawArrays(GL11.GL_TRIANGLE_FAN, i * (NewCurveStyleState.DIVIDES + 2) + mirror * curve.length, NewCurveStyleState.DIVIDES + 2); + } + } + /** * Fill {@code buff} with the texture coordinates and positions for a cone * that has its center at the coordinates {@code (x1,y1)}. @@ -351,7 +370,12 @@ public class CurveRenderState { * @param x1 x-coordinate of the cone * @param y1 y-coordinate of the cone */ - protected void fillCone(FloatBuffer buff, float x1, float y1) { + protected void fillCone(FloatBuffer buff, float x1, float y1, float angle) { + if (mirrors > 1) { + float[] m = Utils.mirrorPoint(x1, y1, angle); + x1 = m[0]; + y1 = m[1]; + } float divx = containerWidth / 2.0f; float divy = containerHeight / 2.0f; float offx = -1.0f; diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java index f9f0a238..c3239624 100644 --- a/src/itdelatrisu/opsu/states/Game.java +++ b/src/itdelatrisu/opsu/states/Game.java @@ -1692,12 +1692,14 @@ public class Game extends BasicGameState { if (Options.isMergingSliders() && knorkesliders != null) { knorkesliders.draw(Color.white, this.slidercurveFrom, this.slidercurveTo); + /* if (Options.isMirror()) { g.pushTransform(); g.rotate(Options.width / 2f, Options.height / 2f, 180f); knorkesliders.draw(Color.white, this.slidercurveFrom, this.slidercurveTo); g.popTransform(); } + */ } // include previous object in follow points