bartek/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Editor] Make MainController holds open items as ViewModels instead of Models themselves

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-03-25 16:54:29 +01:00
parent f6aac2c650
commit 67caf5f614
3 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/main/controller/MainController.kt
View File

@@ -5,7 +5,6 @@ import com.bartlomiejpluta.base.editor.animation.viewmodel.AnimationAssetDataVM
import com.bartlomiejpluta.base.editor.asset.model.Asset
import com.bartlomiejpluta.base.editor.audio.view.importing.ImportSoundFragment
import com.bartlomiejpluta.base.editor.audio.viewmodel.SoundAssetDataVM
import com.bartlomiejpluta.base.editor.code.model.Code
import com.bartlomiejpluta.base.editor.code.model.CodeScope
import com.bartlomiejpluta.base.editor.code.viewmodel.CodeVM
import com.bartlomiejpluta.base.editor.command.context.UndoableScope
@@ -42,7 +41,7 @@ import kotlin.collections.set
class MainController : Controller() {
private val projectContext: ProjectContext by di()
val openItems = observableMapOf<Scope, Any>()
val openItems = observableMapOf<Scope, ItemViewModel<*>>()
fun createEmptyProject() {
val vm = ProjectVM(Project())
@@ -72,7 +71,7 @@ class MainController : Controller() {
handler = vm.handler
}
projectContext.importMap(vm.name, map)
openItems[scope] = map
openItems[scope] = GameMapVM(map)
}
openModal(block = true, resizable = false)
@@ -90,13 +89,13 @@ class MainController : Controller() {
}
fun openMap(uid: String) {
openItem<GameMap, UndoableScope>({ it.uid == uid }) {
openItem<GameMap, GameMapVM, UndoableScope>({ it.uid == uid }) {
val map = projectContext.loadMap(uid)
val vm = GameMapVM(map)
val scope = UndoableScope()
setInScope(vm, scope)
scope to map
scope to vm
}
}
@@ -107,7 +106,7 @@ class MainController : Controller() {
execute: ((String) -> Unit)? = null,
saveable: Boolean = true
) {
val findScript = { script: Code -> script.fileNode.absolutePath == fsNode.absolutePath }
val findScript = { script: CodeVM -> script.fileNode.absolutePath == fsNode.absolutePath }
val updateExistingScope = { scope: CodeScope -> scope.setCaretPosition(line, column) }
openItem(findScript, updateExistingScope) {
@@ -116,36 +115,33 @@ class MainController : Controller() {
val scope = CodeScope(line, column)
setInScope(vm, scope)
scope to code
scope to vm
}
}
fun openQuery(query: Query) {
val findQuery = { q: Query -> q.name == query.name }
val updateQuery = { scope: Scope ->
openItems -= scope
// openItems[scope] = query
// find<QueryVM>(scope).item = query
}
val findQuery = { q: QueryVM -> q.name == query.name }
val updateModel = { vm: QueryVM -> vm.item = query }
openItem(findQuery, updateQuery) {
openItem<Query, QueryVM, Scope>(findQuery, updateViewModel = updateModel) {
val vm = QueryVM(query)
val scope = Scope()
setInScope(vm, scope)
scope to query
scope to vm
}
}
private inline fun <reified T, S : Scope> openItem(
findItem: (item: T) -> Boolean,
private inline fun <reified T, reified VM : ItemViewModel<T>, S : Scope> openItem(
findItem: (item: VM) -> Boolean,
updateExistingScope: (S) -> Unit = {},
createItem: () -> Pair<Scope, T>
updateViewModel: (VM) -> Unit = {},
createItem: () -> Pair<Scope, VM>
) {
@Suppress("UNCHECKED_CAST")
val pair = openItems.entries
.filter { (_, item) -> item is T }
.map { (scope, item) -> (scope as S) to (item as T) }
.filter { (_, item) -> item is VM }
.map { (scope, item) -> (scope as S) to (item as VM) }
.firstOrNull { (_, item) -> findItem(item) }
if (pair == null) {
@@ -155,6 +151,7 @@ class MainController : Controller() {
} else {
val scope = pair.first
updateExistingScope(scope)
updateViewModel(pair.second)
fire(SelectMainViewTabEvent(scope))
}
}
@@ -257,7 +254,7 @@ class MainController : Controller() {
fun closeAsset(asset: Asset) {
when (asset) {
is GameMapAsset -> openItems.entries.firstOrNull { (_, item) -> item is GameMap && item.uid == asset.uid }?.key?.let {
is GameMapAsset -> openItems.entries.firstOrNull { (_, item) -> item is GameMapVM && item.uid == asset.uid }?.key?.let {
openItems.remove(it)
}
@@ -266,12 +263,12 @@ class MainController : Controller() {
}
fun closeScript(fsNode: FileNode) {
openItems.entries.firstOrNull { (_, item) -> item is Code && item.fileNode.absolutePath == fsNode.absolutePath }?.key?.let {
openItems.entries.firstOrNull { (_, item) -> item is CodeVM && item.fileNode.absolutePath == fsNode.absolutePath }?.key?.let {
openItems.remove(it)
}
fsNode.allChildren.forEach { child ->
openItems.entries.firstOrNull { (_, item) -> item is Code && item.fileNode.absolutePath == child.absolutePath }?.key?.let {
openItems.entries.firstOrNull { (_, item) -> item is CodeVM && item.fileNode.absolutePath == child.absolutePath }?.key?.let {
openItems.remove(it)
}
}

20
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/main/view/MainView.kt
View File

@@ -1,12 +1,10 @@
package com.bartlomiejpluta.base.editor.main.view
import com.bartlomiejpluta.base.editor.asset.view.list.AssetsListView
import com.bartlomiejpluta.base.editor.code.model.Code
import com.bartlomiejpluta.base.editor.code.view.build.BuildLogsView
import com.bartlomiejpluta.base.editor.code.view.editor.CodeEditorFragment
import com.bartlomiejpluta.base.editor.code.view.list.ScriptFilesView
import com.bartlomiejpluta.base.editor.code.viewmodel.CodeVM
import com.bartlomiejpluta.base.editor.database.model.Query
import com.bartlomiejpluta.base.editor.database.view.list.TablesListView
import com.bartlomiejpluta.base.editor.database.view.query.QueryResultFragment
import com.bartlomiejpluta.base.editor.database.viewmodel.QueryVM
@@ -15,7 +13,6 @@ import com.bartlomiejpluta.base.editor.event.AppendProcessLogsEvent
import com.bartlomiejpluta.base.editor.event.SelectMainViewTabEvent
import com.bartlomiejpluta.base.editor.main.component.EditorTab
import com.bartlomiejpluta.base.editor.main.controller.MainController
import com.bartlomiejpluta.base.editor.map.model.map.GameMap
import com.bartlomiejpluta.base.editor.map.view.editor.MapFragment
import com.bartlomiejpluta.base.editor.map.viewmodel.GameMapVM
import com.bartlomiejpluta.base.editor.process.view.ProcessLogsView
@@ -149,27 +146,25 @@ class MainView : View("BASE Game Editor") {
}
}
private fun createTab(scope: Scope, item: Any) = when (item) {
is GameMap -> {
val vm = GameMapVM(item)
private fun createTab(scope: Scope, vm: Any) = when (vm) {
is GameMapVM -> {
setInScope(vm, scope)
EditorTab(find<MapFragment>(scope), FontIcon("fa-map")).apply {
projectContext.project
?.maps
?.first { it.uid == item.uid }
?.first { it.uid == vm.uid }
?.let { textProperty().bindBidirectional(it.nameProperty) }
setOnClosed { mainController.openItems.remove(scope) }
}
}
is Code -> {
val vm = CodeVM(item)
is CodeVM -> {
setInScope(vm, scope)
EditorTab(find<CodeEditorFragment>(scope), FontIcon("fa-code")).apply {
textProperty().bind(item.fileNode.nameProperty)
textProperty().bind(vm.fileNode.nameProperty)
setOnClosed {
fragment.shutdown()
@@ -178,12 +173,11 @@ class MainView : View("BASE Game Editor") {
}
}
is Query -> {
val vm = QueryVM(item)
is QueryVM -> {
setInScope(vm, scope)
EditorTab(find<QueryResultFragment>(scope), FontIcon("fa-table")).apply {
textProperty().bind(item.nameProperty)
textProperty().bind(vm.nameProperty)
setOnClosed { mainController.openItems.remove(scope) }
}

3
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/viewmodel/GameMapVM.kt
View File

@@ -10,6 +10,9 @@ import tornadofx.setValue
class GameMapVM(map: GameMap) : ItemViewModel<GameMap>(map) {
val layers: SimpleListProperty<Layer> = bind(GameMap::layers)
val uidProperty = bind(GameMap::uidProperty)
val uid by uidProperty
val tileSetProperty = bind(GameMap::tileSet)
val tileSet by tileSetProperty