Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-05 15:28:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added a "Clear animation" button to the viewer.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2021-03-26 18:22:35 +01:00
parent 1c44ce4620
commit 610a2bb64a
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/src/main/kotlin/world/phantasmal/web/viewer/controllers/ViewerToolbarController.kt
View File

@ -23,6 +23,7 @@ class ViewerToolbarController(private val store: ViewerStore) : Controller() {
private val _result = mutableVal<PwResult<*>?>(null) private val _result = mutableVal<PwResult<*>?>(null)
val showSkeleton: Val<Boolean> = store.showSkeleton val showSkeleton: Val<Boolean> = store.showSkeleton
val clearCurrentAnimationButtonEnabled = store.currentNinjaMotion.isNotNull()
val resultDialogVisible: Val<Boolean> = _resultDialogVisible val resultDialogVisible: Val<Boolean> = _resultDialogVisible
val result: Val<PwResult<*>?> = _result val result: Val<PwResult<*>?> = _result
val resultMessage: Val<String> = result.map { val resultMessage: Val<String> = result.map {
@ -36,6 +37,10 @@ class ViewerToolbarController(private val store: ViewerStore) : Controller() {
store.setShowSkeleton(show) store.setShowSkeleton(show)
} }
suspend fun clearCurrentAnimation() {
store.setCurrentAnimation(null)
}
suspend fun openFiles(files: List<File>) { suspend fun openFiles(files: List<File>) {
val result = PwResult.build<Unit>(logger) val result = PwResult.build<Unit>(logger)
var success = false var success = false

7
web/src/main/kotlin/world/phantasmal/web/viewer/stores/ViewerStore.kt
View File

@ -177,10 +177,15 @@ class ViewerStore(
_currentNinjaMotion.value = njm _currentNinjaMotion.value = njm
} }
suspend fun setCurrentAnimation(animation: AnimationModel) { suspend fun setCurrentAnimation(animation: AnimationModel?) {
_currentAnimation.value = animation _currentAnimation.value = animation
if (animation == null) {
_currentNinjaMotion.value = null
} else {
loadAnimation(animation) loadAnimation(animation)
} }
}
fun setShowSkeleton(show: Boolean) { fun setShowSkeleton(show: Boolean) {
_showSkeleton.value = show _showSkeleton.value = show

5
web/src/main/kotlin/world/phantasmal/web/viewer/widgets/ViewerToolbar.kt
View File

@ -26,6 +26,11 @@ class ViewerToolbar(private val ctrl: ViewerToolbarController) : Widget() {
checked = ctrl.showSkeleton, checked = ctrl.showSkeleton,
onChange = ctrl::setShowSkeleton, onChange = ctrl::setShowSkeleton,
), ),
Button(
text = "Clear animation",
enabled = ctrl.clearCurrentAnimationButtonEnabled,
onClick = { scope.launch { ctrl.clearCurrentAnimation() } },
),
) )
)) ))
addDisposable(ResultDialog( addDisposable(ResultDialog(