From 425cb82133f70243b095f5949d59f034693675b2 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 6 Jan 2019 22:45:51 +0900 Subject: [PATCH] TODO added: when the transform joint is "ALL" --- src/net/torvald/spriteassembler/ADProperties.kt | 6 +++++- src/net/torvald/spriteassembler/AssembleFrameJava.kt | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/net/torvald/spriteassembler/ADProperties.kt b/src/net/torvald/spriteassembler/ADProperties.kt index 7bf9f55ce..da456734b 100644 --- a/src/net/torvald/spriteassembler/ADProperties.kt +++ b/src/net/torvald/spriteassembler/ADProperties.kt @@ -49,7 +49,11 @@ class ADProperties { private val animFrameSuffixRegex = Regex("""_[0-9]+""") - private val ALL_JOINT = Joint("ALL", ADPropertyObject.Vector2i(0, 0)) + private val ALL_JOINT = Joint(ALL_JOINT_SELECT_KEY, ADPropertyObject.Vector2i(0, 0)) + + companion object { + const val ALL_JOINT_SELECT_KEY = "ALL" + } constructor(reader: Reader) { javaProp.load(reader) diff --git a/src/net/torvald/spriteassembler/AssembleFrameJava.kt b/src/net/torvald/spriteassembler/AssembleFrameJava.kt index 733e80fa7..4600ecfa5 100644 --- a/src/net/torvald/spriteassembler/AssembleFrameJava.kt +++ b/src/net/torvald/spriteassembler/AssembleFrameJava.kt @@ -69,6 +69,8 @@ object AssembleFrameBase { // process transform queue transforms.forEach { transform -> + // TODO when the transform.joint.name == ADProperties.ALL_JOINT_SELECT_KEY + val jointToMoveIndex = transformOutput.linearSearch { it.first == transform.joint.name }!! transformOutput[jointToMoveIndex] = transformOutput[jointToMoveIndex].first to transform.getTransformVector() }