konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.6.3: replaced android.graphics.rectF with a local version

Browse Source
This commit is contained in:
Evan Debenham
2018-01-19 17:46:27 -05:00
parent 9966195e66
commit 07158daed2
18 changed files with 178 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SPD-classes/src/main/java/com/watabou/noosa/BitmapText.java
+3 -3
View File
@@ -21,16 +21,16 @@
package com.watabou.noosa;
import java.nio.FloatBuffer;
import android.graphics.Bitmap;
import com.watabou.gltextures.SmartTexture;
import com.watabou.gltextures.TextureCache;
import com.watabou.glwrap.Matrix;
import com.watabou.glwrap.Quad;
import com.watabou.glwrap.Vertexbuffer;
import com.watabou.utils.RectF;
import android.graphics.Bitmap;
import android.graphics.RectF;
import java.nio.FloatBuffer;
public class BitmapText extends Visual {
SPD-classes/src/main/java/com/watabou/noosa/BitmapTextMultiline.java
+4 -5
View File
@@ -21,13 +21,12 @@
package com.watabou.noosa;
import java.util.ArrayList;
import java.util.regex.Pattern;
import android.graphics.RectF;
import com.watabou.glwrap.Quad;
import com.watabou.utils.PointF;
import com.watabou.utils.RectF;
import java.util.ArrayList;
import java.util.regex.Pattern;
public class BitmapTextMultiline extends BitmapText {
SPD-classes/src/main/java/com/watabou/noosa/Image.java
+4 -5
View File
@@ -21,14 +21,13 @@
package com.watabou.noosa;
import java.nio.FloatBuffer;
import android.graphics.RectF;
import com.watabou.gltextures.TextureCache;
import com.watabou.gltextures.SmartTexture;
import com.watabou.gltextures.TextureCache;
import com.watabou.glwrap.Quad;
import com.watabou.glwrap.Vertexbuffer;
import com.watabou.utils.RectF;
import java.nio.FloatBuffer;
public class Image extends Visual {
SPD-classes/src/main/java/com/watabou/noosa/MovieClip.java
+1 -1
View File
@@ -21,7 +21,7 @@
package com.watabou.noosa;
import android.graphics.RectF;
import com.watabou.utils.RectF;
public class MovieClip extends Image {
SPD-classes/src/main/java/com/watabou/noosa/NinePatch.java
+2 -3
View File
@@ -21,14 +21,13 @@
package com.watabou.noosa;
import java.nio.FloatBuffer;
import com.watabou.gltextures.SmartTexture;
import com.watabou.gltextures.TextureCache;
import com.watabou.glwrap.Quad;
import com.watabou.glwrap.Vertexbuffer;
import com.watabou.utils.RectF;
import android.graphics.RectF;
import java.nio.FloatBuffer;
public class NinePatch extends Visual {
SPD-classes/src/main/java/com/watabou/noosa/RenderedText.java
+2 -1
View File
@@ -24,11 +24,12 @@ package com.watabou.noosa;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.RectF;
import android.graphics.Typeface;
import com.watabou.gltextures.SmartTexture;
import com.watabou.glwrap.Matrix;
import com.watabou.glwrap.Texture;
import com.watabou.utils.RectF;
import java.util.HashSet;
import java.util.Iterator;
SPD-classes/src/main/java/com/watabou/noosa/SkinnedBlock.java
+1 -2
View File
@@ -22,8 +22,7 @@
package com.watabou.noosa;
import com.watabou.glwrap.Texture;
import android.graphics.RectF;
import com.watabou.utils.RectF;
public class SkinnedBlock extends Image {
SPD-classes/src/main/java/com/watabou/noosa/TextureFilm.java
+3 -4
View File
@@ -21,12 +21,11 @@
package com.watabou.noosa;
import java.util.HashMap;
import com.watabou.gltextures.SmartTexture;
import com.watabou.gltextures.TextureCache;
import com.watabou.utils.RectF;
import android.graphics.RectF;
import java.util.HashMap;
public class TextureFilm {
@@ -90,7 +89,7 @@ public class TextureFilm {
for (int i=0; i < rows; i++) {
for (int j=0; j < cols; j++) {
RectF rect = new RectF( j * uw, i * vh, (j+1) * uw, (i+1) * vh );
rect.offset( patch.left, patch.top );
rect.shift( patch.left, patch.top );
add( i * cols + j, rect );
}
}
SPD-classes/src/main/java/com/watabou/noosa/Tilemap.java
+1 -2
View File
@@ -21,13 +21,12 @@
package com.watabou.noosa;
import android.graphics.RectF;
import com.watabou.gltextures.SmartTexture;
import com.watabou.gltextures.TextureCache;
import com.watabou.glwrap.Quad;
import com.watabou.glwrap.Vertexbuffer;
import com.watabou.utils.Rect;
import com.watabou.utils.RectF;
import java.nio.FloatBuffer;
import java.util.Arrays;
SPD-classes/src/main/java/com/watabou/noosa/particles/BitmaskEmitter.java
+1 -3
View File
@@ -21,12 +21,10 @@
package com.watabou.noosa.particles;
import android.graphics.RectF;
import com.watabou.gltextures.SmartTexture;
import com.watabou.noosa.Image;
import com.watabou.noosa.particles.Emitter;
import com.watabou.utils.Random;
import com.watabou.utils.RectF;
public class BitmaskEmitter extends Emitter {