LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.7.2d: moved the base halo class to SPD-classes

Browse Source
This commit is contained in:
Evan Debenham 2019-04-26 16:48:50 -04:00
parent dc8f6a1dbf
commit 971e421fa1
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Halo.java → SPD-classes/src/main/java/com/watabou/noosa/Halo.java
View File

@ -8,7 +8,7 @@
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -19,18 +19,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*/ */
package com.shatteredpixel.shatteredpixeldungeon.effects; package com.watabou.noosa;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Paint; import android.graphics.Paint;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.watabou.gltextures.SmartTexture; import com.watabou.gltextures.SmartTexture;
import com.watabou.gltextures.TextureCache; import com.watabou.gltextures.TextureCache;
import com.watabou.noosa.Image;
//TODO externalize bitmap stuff to SPD-classes
public class Halo extends Image { public class Halo extends Image {
private static final Object CACHE_KEY = Halo.class; private static final Object CACHE_KEY = Halo.class;
@ -69,7 +66,6 @@ public class Halo extends Image {
public Halo point( float x, float y ) { public Halo point( float x, float y ) {
this.x = x - (width()/2f); this.x = x - (width()/2f);
this.y = y - (height()/2f); this.y = y - (height()/2f);
PixelScene.align(this);
return this; return this;
} }

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/ShieldHalo.java
View File

@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.effects;
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
import com.watabou.glwrap.Blending; import com.watabou.glwrap.Blending;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
import com.watabou.noosa.Halo;
import com.watabou.utils.PointF; import com.watabou.utils.PointF;
public class ShieldHalo extends Halo { public class ShieldHalo extends Halo {

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/TorchHalo.java
View File

@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.effects;
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
import com.watabou.glwrap.Blending; import com.watabou.glwrap.Blending;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
import com.watabou.noosa.Halo;
public class TorchHalo extends Halo { public class TorchHalo extends Halo {

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java
View File

@ -24,7 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Wandmaker; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Wandmaker;
import com.shatteredpixel.shatteredpixeldungeon.effects.Halo; import com.watabou.noosa.Halo;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle;
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter;
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.PrisonPainter; import com.shatteredpixel.shatteredpixeldungeon.levels.painters.PrisonPainter;