Skip to content

Commit 971e421

Browse files
committed
v0.7.2d: moved the base halo class to SPD-classes
1 parent dc8f6a1 commit 971e421

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Halo.java renamed to SPD-classes/src/main/java/com/watabou/noosa/Halo.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* This program is free software: you can redistribute it and/or modify
99
* it under the terms of the GNU General Public License as published by
1010
* the Free Software Foundation, either version 3 of the License, or
11-
* (at your option) any later version.
11+
* (at your option) any later version.
1212
*
1313
* This program is distributed in the hope that it will be useful,
1414
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,18 +19,15 @@
1919
* along with this program. If not, see <http://www.gnu.org/licenses/>
2020
*/
2121

22-
package com.shatteredpixel.shatteredpixeldungeon.effects;
22+
package com.watabou.noosa;
2323

2424
import android.graphics.Bitmap;
2525
import android.graphics.Canvas;
2626
import android.graphics.Paint;
2727

28-
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
2928
import com.watabou.gltextures.SmartTexture;
3029
import com.watabou.gltextures.TextureCache;
31-
import com.watabou.noosa.Image;
3230

33-
//TODO externalize bitmap stuff to SPD-classes
3431
public class Halo extends Image {
3532

3633
private static final Object CACHE_KEY = Halo.class;
@@ -69,7 +66,6 @@ public Halo( float radius, int color, float brightness ) {
6966
public Halo point( float x, float y ) {
7067
this.x = x - (width()/2f);
7168
this.y = y - (height()/2f);
72-
PixelScene.align(this);
7369
return this;
7470
}
7571

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/ShieldHalo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
2525
import com.watabou.glwrap.Blending;
2626
import com.watabou.noosa.Game;
27+
import com.watabou.noosa.Halo;
2728
import com.watabou.utils.PointF;
2829

2930
public class ShieldHalo extends Halo {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/TorchHalo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
2525
import com.watabou.glwrap.Blending;
2626
import com.watabou.noosa.Game;
27+
import com.watabou.noosa.Halo;
2728

2829
public class TorchHalo extends Halo {
2930

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.shatteredpixel.shatteredpixeldungeon.Assets;
2525
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
2626
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Wandmaker;
27-
import com.shatteredpixel.shatteredpixeldungeon.effects.Halo;
27+
import com.watabou.noosa.Halo;
2828
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle;
2929
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter;
3030
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.PrisonPainter;

0 commit comments

Comments
 (0)