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

move width/height from container to options class

Browse Source
This commit is contained in:
yugecin
2016-09-27 20:52:52 +02:00
parent 2e76d302cd
commit a39ac19bb0
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/yugecin/opsudance/movers/CircleMover.java
View File

@@ -17,7 +17,7 @@
*/
package yugecin.opsudance.movers;
import itdelatrisu.opsu.Container;
import itdelatrisu.opsu.Options;
import itdelatrisu.opsu.Utils;
import itdelatrisu.opsu.objects.GameObject;
@@ -63,7 +63,7 @@ public class CircleMover extends Mover {
double a = ang + SOME_CONSTANT * t;
pos[0] = (startX + (endX - startX) * t) - middlexoffset - Math.cos(a) * radius;
pos[1] = (startY + (endY - startY) * t) - middleyoffset - Math.sin(a) * radius;
if (pos[0] < 0 || Container.width < pos[0] || pos[1] < 0 || Container.height < pos[1]) {
if (pos[0] < 0 || Options.width < pos[0] || pos[1] < 0 || Options.height < pos[1]) {
pass = false;
break;
}

12
src/yugecin/opsudance/spinners/RektSpinner.java
View File

@@ -17,7 +17,7 @@
*/
package yugecin.opsudance.spinners;
import itdelatrisu.opsu.Container;
import itdelatrisu.opsu.Options;
public class RektSpinner extends Spinner {
@@ -25,11 +25,11 @@ public class RektSpinner extends Spinner {
public void init() {
init(new double[][] {
{ 10, 10 },
{ Container.width / 2d, 10 },
{ Container.width - 10, 10 },
{ Container.width - 10, Container.height - 10 },
{ Container.width / 2d, Container.height - 10 },
{ 10, Container.height - 10 }
{ Options.width / 2d, 10 },
{ Options.width - 10, 10 },
{ Options.width - 10, Options.height - 10 },
{ Options.width / 2d, Options.height - 10 },
{ 10, Options.height - 10 }
});
}