v0.9.3: added casts to buffer methods to prevent JDK 9+ issues

This commit is contained in:
Evan Debenham
2021-05-09 17:19:15 -04:00
parent 9412eb81f4
commit ef8750b326
15 changed files with 51 additions and 34 deletions
@@ -30,6 +30,7 @@ import com.watabou.noosa.NoosaScript;
import com.watabou.noosa.Visual;
import com.watabou.utils.PointF;
import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.FloatBuffer;
@@ -113,8 +114,8 @@ public class CircleArc extends Visual {
dirty = false;
float v[] = new float[4];
indices.position( 0 );
vertices.position( 0 );
((Buffer)indices).position( 0 );
((Buffer)vertices).position( 0 );
v[0] = 0;
v[1] = 0;
@@ -144,8 +145,8 @@ public class CircleArc extends Visual {
indices.put( (short)(1 + i * 2) );
indices.put( (short)(2 + i * 2) );
}
indices.position( 0 );
((Buffer)indices).position( 0 );
}
@Override
@@ -31,6 +31,7 @@ import com.watabou.noosa.NoosaScript;
import com.watabou.noosa.Visual;
import com.watabou.utils.PointF;
import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.FloatBuffer;
@@ -99,8 +100,8 @@ public class Flare extends Visual {
indices.put( (short)(1 + i * 2) );
indices.put( (short)(2 + i * 2) );
}
indices.position( 0 );
((Buffer)indices).position( 0 );
}
public Flare color( int color, boolean lightMode ) {
@@ -56,6 +56,7 @@ import com.watabou.utils.Point;
import com.watabou.utils.PointF;
import com.watabou.utils.Random;
import java.nio.Buffer;
import java.nio.FloatBuffer;
import java.util.Calendar;
@@ -289,8 +290,8 @@ public class SurfaceScene extends PixelScene {
vertices[12] = 0;
vertices[13] = 1;
verticesBuffer.position( 0 );
((Buffer)verticesBuffer).position( 0 );
verticesBuffer.put( vertices );
}
@@ -56,6 +56,8 @@ import com.watabou.utils.Callback;
import com.watabou.utils.PointF;
import com.watabou.utils.Random;
import java.nio.Buffer;
public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip.Listener {
// Color constants for floating text
@@ -639,7 +641,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
if (renderShadow) {
if (dirty) {
verticesBuffer.position(0);
((Buffer)verticesBuffer).position(0);
verticesBuffer.put(vertices);
if (buffer == null)
buffer = new Vertexbuffer(verticesBuffer);
@@ -43,6 +43,8 @@ import com.watabou.noosa.particles.Emitter;
import com.watabou.utils.PointF;
import com.watabou.utils.Random;
import java.nio.Buffer;
public class ItemSprite extends MovieClip {
public static final int SIZE = 16;
@@ -272,7 +274,7 @@ public class ItemSprite extends MovieClip {
if (renderShadow) {
if (dirty) {
verticesBuffer.position(0);
((Buffer)verticesBuffer).position(0);
verticesBuffer.put(vertices);
if (buffer == null)
buffer = new Vertexbuffer(verticesBuffer);
@@ -37,6 +37,7 @@ import com.watabou.noosa.NoosaScript;
import com.watabou.noosa.Visual;
import com.watabou.utils.RectF;
import java.nio.Buffer;
import java.nio.FloatBuffer;
import java.util.LinkedHashMap;
@@ -97,8 +98,8 @@ public class KeyDisplay extends Visual {
if (dirty){
updateVertices();
quads.limit(quads.position());
((Buffer)quads).limit(quads.position());
if (buffer == null)
buffer = new Vertexbuffer(quads);
else