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

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
@@ -21,8 +21,6 @@
package com.shatteredpixel.shatteredpixeldungeon.effects;
import android.graphics.RectF;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.watabou.glwrap.Blending;
import com.watabou.glwrap.Texture;
@@ -34,6 +32,7 @@ import com.watabou.noosa.particles.PixelParticle;
import com.watabou.noosa.ui.Component;
import com.watabou.utils.ColorMath;
import com.watabou.utils.Random;
import com.watabou.utils.RectF;
public class Fireball extends Component {
@@ -21,8 +21,6 @@
package com.shatteredpixel.shatteredpixeldungeon.sprites;
import android.graphics.RectF;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
@@ -34,6 +32,7 @@ import com.watabou.noosa.Image;
import com.watabou.noosa.TextureFilm;
import com.watabou.utils.Callback;
import com.watabou.utils.PointF;
import com.watabou.utils.RectF;
public class HeroSprite extends CharSprite {
@@ -160,7 +159,7 @@ public class HeroSprite extends CharSprite {
RectF patch = tiers().get( armorTier );
Image avatar = new Image( cl.spritesheet() );
RectF frame = avatar.texture.uvRect( 1, 0, FRAME_WIDTH, FRAME_HEIGHT );
frame.offset( patch.left, patch.top );
frame.shift( patch.left, patch.top );
avatar.frame( frame );
return avatar;
@@ -21,8 +21,6 @@
package com.shatteredpixel.shatteredpixeldungeon.tiles;
import android.graphics.RectF;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
@@ -31,6 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.plants.Plant;
import com.watabou.noosa.Image;
import com.watabou.noosa.tweeners.ScaleTweener;
import com.watabou.utils.PointF;
import com.watabou.utils.RectF;
import com.watabou.utils.SparseArray;
//TODO add in a proper set of vfx for plants growing/withering, grass burning, discovering traps
@@ -21,8 +21,6 @@
package com.shatteredpixel.shatteredpixeldungeon.ui;
import android.graphics.RectF;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.items.keys.CrystalKey;
@@ -37,6 +35,7 @@ import com.watabou.glwrap.Quad;
import com.watabou.glwrap.Vertexbuffer;
import com.watabou.noosa.NoosaScript;
import com.watabou.noosa.Visual;
import com.watabou.utils.RectF;
import java.nio.FloatBuffer;
import java.util.LinkedHashMap;
@@ -21,8 +21,6 @@
package com.shatteredpixel.shatteredpixeldungeon.windows;
import android.graphics.RectF;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.SPDSettings;
@@ -61,6 +59,7 @@ import com.watabou.noosa.ColorBlock;
import com.watabou.noosa.Image;
import com.watabou.noosa.RenderedText;
import com.watabou.noosa.audio.Sample;
import com.watabou.utils.RectF;
public class WndBag extends WndTabbed {