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

[Editor] Make the project back stores maps as lists

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-02-11 19:46:47 +01:00
parent eebda465b9
commit b496d047cd
6 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ class MainView : View("BASE Game Editor") {
Tab().apply { Tab().apply {
val vm = GameMapVM(map) val vm = GameMapVM(map)
setInScope(vm, scope) setInScope(vm, scope)
projectContext.project?.maps?.get(map.uid)?.let { textProperty().bindBidirectional(it.nameProperty) } projectContext.project?.maps?.first { it.uid == map.uid }?.let { textProperty().bindBidirectional(it.nameProperty) }
content = find<MapFragment>(scope).root content = find<MapFragment>(scope).root
setOnClosed { mainController.openMaps.remove(scope) } setOnClosed { mainController.openMaps.remove(scope) }
} }

3
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/main/view/ProjectStructureView.kt
View File

@@ -3,6 +3,7 @@ package com.bartlomiejpluta.base.editor.main.view
import com.bartlomiejpluta.base.editor.map.asset.GameMapAsset import com.bartlomiejpluta.base.editor.map.asset.GameMapAsset
import com.bartlomiejpluta.base.editor.project.context.ProjectContext import com.bartlomiejpluta.base.editor.project.context.ProjectContext
import com.bartlomiejpluta.base.editor.util.fx.BindingUtil import com.bartlomiejpluta.base.editor.util.fx.BindingUtil
import javafx.beans.binding.Bindings
import javafx.beans.property.SimpleStringProperty import javafx.beans.property.SimpleStringProperty
import javafx.collections.ObservableList import javafx.collections.ObservableList
import javafx.scene.control.TreeItem import javafx.scene.control.TreeItem
@@ -21,7 +22,7 @@ class ProjectStructureView : View() {
projectContext.projectProperty.addListener { _, _, project -> projectContext.projectProperty.addListener { _, _, project ->
project?.let { project?.let {
structureRoot.nameProperty.bind(it.nameProperty) structureRoot.nameProperty.bind(it.nameProperty)
BindingUtil.bindMapValues(structureMaps.items, project.maps) Bindings.bindContent(structureMaps.items, project.maps)
root.refresh() root.refresh()
} }
} }

4
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/project/context/DefaultProjectContext.kt
View File

@@ -71,10 +71,10 @@ class DefaultProjectContext : ProjectContext {
override fun importMap(name: String, map: GameMap) { override fun importMap(name: String, map: GameMap) {
project?.let { project?.let {
UID.next(it.maps.keys).let { uid -> UID.next(it.maps.map(Asset::uid)).let { uid ->
val asset = GameMapAsset(uid, name, map.rows, map.columns) val asset = GameMapAsset(uid, name, map.rows, map.columns)
map.uid = uid map.uid = uid
it.maps[uid] = asset it.maps += asset
save() save()
File(mapsDirectory, asset.source).outputStream().use { fos -> mapSerializer.serialize(map, fos) } File(mapsDirectory, asset.source).outputStream().use { fos -> mapSerializer.serialize(map, fos) }

3
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/project/model/Project.kt
View File

@@ -5,7 +5,6 @@ import javafx.beans.property.SimpleObjectProperty
import javafx.beans.property.SimpleStringProperty import javafx.beans.property.SimpleStringProperty
import tornadofx.getValue import tornadofx.getValue
import tornadofx.observableListOf import tornadofx.observableListOf
import tornadofx.observableMapOf
import tornadofx.setValue import tornadofx.setValue
import java.io.File import java.io.File
@@ -16,5 +15,5 @@ class Project {
val sourceDirectoryProperty = SimpleObjectProperty<File>() val sourceDirectoryProperty = SimpleObjectProperty<File>()
val sourceDirectory by sourceDirectoryProperty val sourceDirectory by sourceDirectoryProperty
val maps = observableMapOf<String, GameMapAsset>() val maps = observableListOf<GameMapAsset>()
} }

3
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/project/serial/ProtobufProjectDeserializer.kt
View File

@@ -4,7 +4,6 @@ import com.bartlomiejpluta.base.editor.map.asset.GameMapAsset
import com.bartlomiejpluta.base.editor.project.model.Project import com.bartlomiejpluta.base.editor.project.model.Project
import com.bartlomiejpluta.base.proto.ProjectProto import com.bartlomiejpluta.base.proto.ProjectProto
import org.springframework.stereotype.Component import org.springframework.stereotype.Component
import java.io.File
import java.io.InputStream import java.io.InputStream
@Component @Component
@@ -14,7 +13,7 @@ class ProtobufProjectDeserializer : ProjectDeserializer {
val proto = ProjectProto.Project.parseFrom(input) val proto = ProjectProto.Project.parseFrom(input)
val project = Project() val project = Project()
project.name = proto.name project.name = proto.name
project.maps.putAll(proto.mapsList.map { it.uid to deserializeMap(it) }) project.maps.addAll(proto.mapsList.map(this::deserializeMap))
return project return project
} }

2
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/project/serial/ProtobufProjectSerializer.kt
View File

@@ -12,7 +12,7 @@ class ProtobufProjectSerializer : ProjectSerializer {
override fun serialize(item: Project, output: OutputStream) { override fun serialize(item: Project, output: OutputStream) {
val proto = ProjectProto.Project.newBuilder() val proto = ProjectProto.Project.newBuilder()
proto.name = item.name proto.name = item.name
proto.addAllMaps(item.maps.values.map(this::serializeMap)) proto.addAllMaps(item.maps.map(this::serializeMap))
proto.build().writeTo(output) proto.build().writeTo(output)
} }