diff --git a/src/net/torvald/spriteanimation/Animatable.kt b/src/net/torvald/spriteanimation/HasAssembledSprite.kt similarity index 85% rename from src/net/torvald/spriteanimation/Animatable.kt rename to src/net/torvald/spriteanimation/HasAssembledSprite.kt index 0335b8291..febca283e 100644 --- a/src/net/torvald/spriteanimation/Animatable.kt +++ b/src/net/torvald/spriteanimation/HasAssembledSprite.kt @@ -1,6 +1,6 @@ package net.torvald.spriteanimation -import com.badlogic.gdx.files.FileHandle +import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Texture import net.torvald.spriteassembler.ADProperties import net.torvald.spriteassembler.AssembleSheetPixmap @@ -11,16 +11,16 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack */ interface HasAssembledSprite { - var animDesc: FileHandle + var animDescPath: String // FIXME sometimes the animmation is invisible (row and nFrames mismatch -- row is changed to 1 but it's drawing 3rd frame?) fun reassembleSprite(sprite: SpriteAnimation) { - _rebuild(ADProperties(animDesc.read()), sprite) + _rebuild(ADProperties(Gdx.files.internal(animDescPath).read()), sprite) } - /*fun rebuild(animDesc: String, spriteAnimation: SpriteAnimation) { - _rebuild(ADProperties(StringReader(animDesc)), spriteAnimation) + /*fun rebuild(animDescPath: String, spriteAnimation: SpriteAnimation) { + _rebuild(ADProperties(StringReader(animDescPath)), spriteAnimation) } fun rebuild(animDesc: FileHandle, spriteAnimation: SpriteAnimation) { diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/IngamePlayer.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/IngamePlayer.kt index 6a292c18a..afdbd546a 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/IngamePlayer.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/IngamePlayer.kt @@ -1,6 +1,5 @@ package net.torvald.terrarum.modulebasegame.gameactors -import com.badlogic.gdx.files.FileHandle import net.torvald.spriteanimation.HasAssembledSprite import net.torvald.terrarum.Terrarum import net.torvald.terrarum.modulebasegame.gameworld.time_t @@ -12,7 +11,7 @@ import net.torvald.terrarum.modulebasegame.gameworld.time_t * Created by minjaesong on 2015-12-31. */ -class IngamePlayer(override var animDesc: FileHandle, born: time_t) : ActorHumanoid(born), HasAssembledSprite { +class IngamePlayer(override var animDescPath: String, born: time_t) : ActorHumanoid(born), HasAssembledSprite { /** * Creates new Player instance with empty elements (sprites, actorvalue, etc.). diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilder.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilder.kt index 0cc1c676f..6774505bb 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilder.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilder.kt @@ -1,6 +1,5 @@ package net.torvald.terrarum.modulebasegame.gameactors -import com.badlogic.gdx.Gdx import net.torvald.terrarum.Terrarum import net.torvald.terrarum.gameactors.AVKey import net.torvald.terrarum.gameactors.Actor @@ -14,7 +13,7 @@ object PlayerBuilder { operator fun invoke(): Actor { val world = (Terrarum.ingame!! as Ingame).gameworld - val p: Actor = IngamePlayer(Gdx.files.internal("lol"), world.time.TIME_T) + val p: Actor = IngamePlayer("lol", world.time.TIME_T) InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json") // attach sprite diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt index 8697ca7ff..ac3ad8301 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt @@ -1,6 +1,5 @@ package net.torvald.terrarum.modulebasegame.gameactors -import com.badlogic.gdx.Gdx import net.torvald.terrarum.ModMgr import net.torvald.terrarum.blockproperties.Block import net.torvald.terrarum.gameactors.AVKey @@ -15,7 +14,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack object PlayerBuilderSigrid { operator fun invoke(): IngamePlayer { - val p = IngamePlayer(Gdx.files.internal("lol"), - 9223372036854775807L) // XD + val p = IngamePlayer("lol", - 9223372036854775807L) // XD p.referenceID = 0x51621D // the only constant of this procedural universe diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderTestSubject1.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderTestSubject1.kt index 75a7a84c5..e40e80102 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderTestSubject1.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderTestSubject1.kt @@ -10,7 +10,7 @@ import net.torvald.terrarum.worlddrawer.FeaturesDrawer */ object PlayerBuilderTestSubject1 { operator fun invoke(): IngamePlayer { - val p: IngamePlayer = IngamePlayer(ModMgr.getGdxFile("basegame", "sprites/test_sprite.properties"), -589141658L) // random value thrown + val p: IngamePlayer = IngamePlayer(ModMgr.getPath("basegame", "sprites/test_sprite.properties"), -589141658L) // random value thrown InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json")