curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-13 15:16:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

test impl of "collision interpolator'; new number font for itemslots

Browse Source
This commit is contained in:
minjaesong
2019-07-07 20:53:20 +09:00
parent 01e475814b
commit b66ca70d6c
9 changed files with 94 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/spriteanimation/HasAssembledSprite.kt
View File

@@ -20,7 +20,7 @@ interface HasAssembledSprite {
fun reassembleSprite(sprite: SpriteAnimation, spriteGlow: SpriteAnimation? = null) {
_rebuild(ADProperties(Gdx.files.internal(animDescPath).read()), sprite)
if (spriteGlow != null)
if (animDescPathGlow != null && spriteGlow != null)
_rebuild(ADProperties(Gdx.files.internal(animDescPathGlow).read()), spriteGlow)
}

2
src/net/torvald/spriteanimation/SpriteAnimation.kt
View File

@@ -122,7 +122,7 @@ class SpriteAnimation(@Transient val parentActor: ActorWBMovable) {
* @param scale
*/
fun render(batch: SpriteBatch, posX: Float, posY: Float, scale: Float = 1f) {
if (cellWidth == 0 || cellHeight == 0) {
assert(cellWidth == 0 || cellHeight == 0) {
throw Error("Sprite width or height is set to zero! ($cellWidth, $cellHeight); master: $parentActor")
}