curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-14 20:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

adproperties now has transforms list; assembler can make transformed skeleton

Browse Source 
new fun: LinearSearch(By)
This commit is contained in:
minjaesong
2019-01-06 22:43:50 +09:00
parent 32afb2e2e5
commit 344e4ebdab
8 changed files with 145 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/net/torvald/terrarum/Terrarum.kt
View File

@@ -724,3 +724,18 @@ fun interpolateLinear(scale: Double, startValue: Double, endValue: Double): Doub
}
return (1.0 - scale) * startValue + scale * endValue
}
fun <T> List<T>.linearSearch(selector: (T) -> Boolean): Int? {
this.forEachIndexed { index, it ->
if (selector.invoke(it)) return index
}
return null
}
fun <T> List<T>.linearSearchBy(selector: (T) -> Boolean): T? {
this.forEach {
if (selector.invoke(it)) return it
}
return null
}

10
src/net/torvald/terrarum/tests/ADLParsingTest.kt
View File

@@ -32,15 +32,15 @@ class ADLParsingTest {
# skeleton_stand is used for testing purpose
ANIM_RUN=DELAY 0.15;ROW 2;SKELETON SKELETON_STAND
ANIM_RUN_1=LEG_RIGHT 1,-1;LEG_LEFT -1,0
ANIM_RUN_2=ALL 0,-1;LEG_RIGHT 0,1;LEG_LEFT 0,-1
ANIM_RUN_3=LEG_RIGHT -1,0;LEG_LEFT 1,-1
ANIM_RUN_4=ALL 0,-1;LEG_RIGHT 0,-1;LEG_LEFT 0,1
ANIM_RUN_1=LEG_RIGHT 1,1;FOOT_RIGHT 1,1;LEG_LEFT -1,0;FOOT_LEFT -1,0
ANIM_RUN_2=ALL 0,1;LEG_RIGHT 0,-1;FOOT_RIGHT 0,-1;LEG_LEFT 0,1;FOOT_LEFT 0,1
ANIM_RUN_3=LEG_RIGHT -1,0;FOOT_RIGHT -1,0;LEG_LEFT 1,1;FOOT_LEFT 1,1
ANIM_RUN_4=ALL 0,1;LEG_RIGHT 0,1;LEG_LEFT 0,-1
ANIM_IDLE=DELAY 2;ROW 1;SKELETON SKELETON_STAND
ANIM_IDLE_1=
! ANIM_IDLE_1 will not make any transformation
ANIM_IDLE_2=UPPER_TORSO 0,-1
ANIM_IDLE_2=UPPER_TORSO 0,-1;HEAD 0,-1;ARM_REST_LEFT 0,-1;HAND_REST_LEFT 0,-1;ARM_REST_RIGHT 0,-1;HAND_REST_RIGHT 0,-1
""".trimIndent()
operator fun invoke() {

4
src/net/torvald/terrarum/tests/SpriteAssemblerTest.kt
View File

@@ -1,7 +1,7 @@
package net.torvald.terrarum.tests
import net.torvald.spriteassembler.ADProperties
import net.torvald.spriteassembler.AssembleFrameGdxPixmap
import net.torvald.spriteassembler.AssembleFrameAWT
import java.io.StringReader
/**
@@ -11,7 +11,7 @@ class SpriteAssemblerTest {
operator fun invoke() {
val properties = ADProperties(StringReader(ADLParsingTest().TEST_STR))
AssembleFrameGdxPixmap.invoke(properties, "ANIM_RUN_1")
AssembleFrameAWT.invoke(properties, "ANIM_RUN_1")
}
}