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

[Editor] Rename "Character Set" to "Entity Set"

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-03-01 23:37:04 +01:00
parent 5531cc2c66
commit ee3ce79e9f
16 changed files with 92 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/asset/component/AssetTreeCell.kt
View File

@@ -2,7 +2,7 @@ package com.bartlomiejpluta.base.editor.asset.component
import com.bartlomiejpluta.base.editor.asset.model.Asset import com.bartlomiejpluta.base.editor.asset.model.Asset
import com.bartlomiejpluta.base.editor.asset.model.AssetCategory import com.bartlomiejpluta.base.editor.asset.model.AssetCategory
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAsset import com.bartlomiejpluta.base.editor.entityset.asset.EntitySet
import com.bartlomiejpluta.base.editor.image.asset.ImageAsset import com.bartlomiejpluta.base.editor.image.asset.ImageAsset
import com.bartlomiejpluta.base.editor.map.asset.GameMapAsset import com.bartlomiejpluta.base.editor.map.asset.GameMapAsset
import com.bartlomiejpluta.base.editor.tileset.asset.TileSetAsset import com.bartlomiejpluta.base.editor.tileset.asset.TileSetAsset
@@ -63,7 +63,7 @@ class AssetTreeCell(renameAsset: (asset: Asset, name: String) -> Asset, deleteAs
is GameMapAsset -> FontIcon("fa-map") is GameMapAsset -> FontIcon("fa-map")
is TileSetAsset -> FontIcon("fa-th") is TileSetAsset -> FontIcon("fa-th")
is ImageAsset -> FontIcon("fa-image") is ImageAsset -> FontIcon("fa-image")
is CharacterSetAsset -> FontIcon("fa-male") is EntitySet -> FontIcon("fa-male")
else -> null else -> null
} }
} }

8
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/asset/view/list/AssetsListView.kt
View File

@@ -27,8 +27,8 @@ class AssetsListView : View() {
menuitem("Import Image...") { mainController.importImage() } menuitem("Import Image...") { mainController.importImage() }
} }
private val characterSets = AssetCategory("Character Sets").apply { private val entitySet = AssetCategory("Entity Sets").apply {
menuitem("Import Character Set...") { mainController.importCharacterSet() } menuitem("Import Entity Set...") { mainController.importEntitySet() }
} }
private val rootItem = AssetCategory( private val rootItem = AssetCategory(
@@ -36,7 +36,7 @@ class AssetsListView : View() {
maps, maps,
tileSets, tileSets,
images, images,
characterSets entitySet
) )
) )
@@ -47,7 +47,7 @@ class AssetsListView : View() {
Bindings.bindContent(maps.items, it.maps) Bindings.bindContent(maps.items, it.maps)
Bindings.bindContent(tileSets.items, it.tileSets) Bindings.bindContent(tileSets.items, it.tileSets)
Bindings.bindContent(images.items, it.images) Bindings.bindContent(images.items, it.images)
Bindings.bindContent(characterSets.items, it.characterSets) Bindings.bindContent(entitySet.items, it.entitySets)
root.root.expandAll() root.root.expandAll()
} }
} }

7
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/characterset/asset/CharacterSetAsset.kt
View File

@@ -1,7 +0,0 @@
package com.bartlomiejpluta.base.editor.characterset.asset
import com.bartlomiejpluta.base.editor.asset.model.Asset
import com.bartlomiejpluta.base.editor.project.model.Project
class CharacterSetAsset(project: Project, uid: String, source: String, name: String, val rows: Int, val columns: Int) :
Asset(project.characterSetsDirectoryProperty, uid, source, name)

20
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/characterset/viewmodel/CharacterSetAssetDataVM.kt
View File

@@ -1,20 +0,0 @@
package com.bartlomiejpluta.base.editor.characterset.viewmodel
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAssetData
import tornadofx.ItemViewModel
import tornadofx.getValue
import tornadofx.setValue
class CharacterSetAssetDataVM : ItemViewModel<CharacterSetAssetData>(CharacterSetAssetData()) {
val nameProperty = bind(CharacterSetAssetData::nameProperty)
var name by nameProperty
val fileProperty = bind(CharacterSetAssetData::fileProperty)
var file by fileProperty
val rowsProperty = bind(CharacterSetAssetData::rowsProperty)
var rows by rowsProperty
val columnsProperty = bind(CharacterSetAssetData::columnsProperty)
var columns by columnsProperty
}

7
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/entityset/asset/EntitySet.kt Normal file
View File

@@ -0,0 +1,7 @@
package com.bartlomiejpluta.base.editor.entityset.asset
import com.bartlomiejpluta.base.editor.asset.model.Asset
import com.bartlomiejpluta.base.editor.project.model.Project
class EntitySet(project: Project, uid: String, source: String, name: String, val rows: Int, val columns: Int) :
Asset(project.entitySetsDirectoryProperty, uid, source, name)

4
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/characterset/asset/CharacterSetAssetData.kt → editor/src/main/kotlin/com/bartlomiejpluta/base/editor/entityset/asset/EntitySetAssetData.kt
View File

@@ -1,4 +1,4 @@
package com.bartlomiejpluta.base.editor.characterset.asset package com.bartlomiejpluta.base.editor.entityset.asset
import javafx.beans.property.SimpleIntegerProperty import javafx.beans.property.SimpleIntegerProperty
import javafx.beans.property.SimpleObjectProperty import javafx.beans.property.SimpleObjectProperty
@@ -7,7 +7,7 @@ import tornadofx.getValue
import tornadofx.setValue import tornadofx.setValue
import java.io.File import java.io.File
class CharacterSetAssetData { class EntitySetAssetData {
val nameProperty = SimpleStringProperty() val nameProperty = SimpleStringProperty()
var name by nameProperty var name by nameProperty

26
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/characterset/view/importing/ImportCharacterSetFragment.kt → editor/src/main/kotlin/com/bartlomiejpluta/base/editor/entityset/view/importing/ImportEntitySetFragment.kt
View File

@@ -1,7 +1,7 @@
package com.bartlomiejpluta.base.editor.characterset.view.importing package com.bartlomiejpluta.base.editor.entityset.view.importing
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAssetData import com.bartlomiejpluta.base.editor.entityset.asset.EntitySetAssetData
import com.bartlomiejpluta.base.editor.characterset.viewmodel.CharacterSetAssetDataVM import com.bartlomiejpluta.base.editor.entityset.viewmodel.EntitySetAssetDataVM
import com.bartlomiejpluta.base.editor.util.fx.TextFieldUtil import com.bartlomiejpluta.base.editor.util.fx.TextFieldUtil
import javafx.beans.property.SimpleObjectProperty import javafx.beans.property.SimpleObjectProperty
import javafx.scene.Cursor import javafx.scene.Cursor
@@ -9,11 +9,11 @@ import javafx.scene.image.Image
import javafx.stage.FileChooser import javafx.stage.FileChooser
import tornadofx.* import tornadofx.*
class ImportCharacterSetFragment : Fragment("Import Spite") { class ImportEntitySetFragment : Fragment("Import Entity Set") {
private val dataVM = find<CharacterSetAssetDataVM>() private val dataVM = find<EntitySetAssetDataVM>()
private val imagePreview = SimpleObjectProperty<Image?>() private val imagePreview = SimpleObjectProperty<Image?>()
private var onCompleteConsumer: ((CharacterSetAssetData) -> Unit)? = null private var onCompleteConsumer: ((EntitySetAssetData) -> Unit)? = null
init { init {
dataVM.fileProperty.addListener { _, _, file -> dataVM.fileProperty.addListener { _, _, file ->
@@ -24,26 +24,26 @@ class ImportCharacterSetFragment : Fragment("Import Spite") {
} }
} }
fun onComplete(consumer: (CharacterSetAssetData) -> Unit) { fun onComplete(consumer: (EntitySetAssetData) -> Unit) {
this.onCompleteConsumer = consumer this.onCompleteConsumer = consumer
} }
override val root = form { override val root = form {
prefHeight = 480.0 prefHeight = 480.0
fieldset("Import Character Set") { fieldset("Import Entity Set") {
hbox { hbox {
vbox { vbox {
scrollpane { scrollpane {
prefWidth = 300.0 prefWidth = 300.0
prefHeightProperty().bind(this@form.heightProperty()) prefHeightProperty().bind(this@form.heightProperty())
imageview(imagePreview) imageview(imagePreview)
tooltip = tooltip("Click to choose Character Set file") tooltip = tooltip("Click to choose Entity Set file")
cursor = Cursor.HAND cursor = Cursor.HAND
setOnMouseClicked { setOnMouseClicked {
dataVM.file = chooseFile( dataVM.file = chooseFile(
title = "Select Character Set", title = "Select Entity Set",
filters = arrayOf(FileChooser.ExtensionFilter("PNG Images (*.png)", "*.png")) filters = arrayOf(FileChooser.ExtensionFilter("PNG Images (*.png)", "*.png"))
).getOrNull(0) ).getOrNull(0)
} }
@@ -61,21 +61,21 @@ class ImportCharacterSetFragment : Fragment("Import Spite") {
vbox { vbox {
paddingLeft = 20.0 paddingLeft = 20.0
field("Character Set Name") { field("Entity Set Name") {
textfield(dataVM.nameProperty) { textfield(dataVM.nameProperty) {
required() required()
trimWhitespace() trimWhitespace()
} }
} }
field("Character Set Rows") { field("Entity Set Rows") {
spinner(min = 1, max = Integer.MAX_VALUE, property = dataVM.rowsProperty, editable = true) { spinner(min = 1, max = Integer.MAX_VALUE, property = dataVM.rowsProperty, editable = true) {
required() required()
editor.textFormatter = TextFieldUtil.integerFormatter(dataVM.rows) editor.textFormatter = TextFieldUtil.integerFormatter(dataVM.rows)
} }
} }
field("Character Set Columns") { field("Entity Set Columns") {
spinner(min = 1, max = Integer.MAX_VALUE, property = dataVM.columnsProperty, editable = true) { spinner(min = 1, max = Integer.MAX_VALUE, property = dataVM.columnsProperty, editable = true) {
required() required()
editor.textFormatter = TextFieldUtil.integerFormatter(dataVM.columns) editor.textFormatter = TextFieldUtil.integerFormatter(dataVM.columns)

20
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/entityset/viewmodel/EntitySetAssetDataVM.kt Normal file
View File

@@ -0,0 +1,20 @@
package com.bartlomiejpluta.base.editor.entityset.viewmodel
import com.bartlomiejpluta.base.editor.entityset.asset.EntitySetAssetData
import tornadofx.ItemViewModel
import tornadofx.getValue
import tornadofx.setValue
class EntitySetAssetDataVM : ItemViewModel<EntitySetAssetData>(EntitySetAssetData()) {
val nameProperty = bind(EntitySetAssetData::nameProperty)
var name by nameProperty
val fileProperty = bind(EntitySetAssetData::fileProperty)
var file by fileProperty
val rowsProperty = bind(EntitySetAssetData::rowsProperty)
var rows by rowsProperty
val columnsProperty = bind(EntitySetAssetData::columnsProperty)
var columns by columnsProperty
}

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

@@ -1,12 +1,12 @@
package com.bartlomiejpluta.base.editor.main.controller package com.bartlomiejpluta.base.editor.main.controller
import com.bartlomiejpluta.base.editor.asset.model.Asset import com.bartlomiejpluta.base.editor.asset.model.Asset
import com.bartlomiejpluta.base.editor.characterset.view.importing.ImportCharacterSetFragment
import com.bartlomiejpluta.base.editor.characterset.viewmodel.CharacterSetAssetDataVM
import com.bartlomiejpluta.base.editor.code.model.Code import com.bartlomiejpluta.base.editor.code.model.Code
import com.bartlomiejpluta.base.editor.code.model.CodeScope import com.bartlomiejpluta.base.editor.code.model.CodeScope
import com.bartlomiejpluta.base.editor.code.viewmodel.CodeVM import com.bartlomiejpluta.base.editor.code.viewmodel.CodeVM
import com.bartlomiejpluta.base.editor.command.context.UndoableScope import com.bartlomiejpluta.base.editor.command.context.UndoableScope
import com.bartlomiejpluta.base.editor.entityset.view.importing.ImportEntitySetFragment
import com.bartlomiejpluta.base.editor.entityset.viewmodel.EntitySetAssetDataVM
import com.bartlomiejpluta.base.editor.event.SelectMainViewTabEvent import com.bartlomiejpluta.base.editor.event.SelectMainViewTabEvent
import com.bartlomiejpluta.base.editor.file.model.FileNode import com.bartlomiejpluta.base.editor.file.model.FileNode
import com.bartlomiejpluta.base.editor.image.view.importing.ImportImageFragment import com.bartlomiejpluta.base.editor.image.view.importing.ImportImageFragment
@@ -153,14 +153,14 @@ class MainController : Controller() {
} }
} }
fun importCharacterSet() { fun importEntitySet() {
val vm = CharacterSetAssetDataVM() val vm = EntitySetAssetDataVM()
val scope = Scope() val scope = Scope()
setInScope(vm, scope) setInScope(vm, scope)
find<ImportCharacterSetFragment>(scope).apply { find<ImportEntitySetFragment>(scope).apply {
onComplete { onComplete {
projectContext.importCharacterSet(it) projectContext.importEntitySet(it)
} }
openModal(block = true, resizable = false) openModal(block = true, resizable = false)

4
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/main/view/MainMenuView.kt
View File

@@ -51,9 +51,9 @@ class MainMenuView : View() {
} }
} }
item("Character Set...") { item("Entity Set...") {
action { action {
mainController.importCharacterSet() mainController.importEntitySet()
} }
} }
} }

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

@@ -1,11 +1,11 @@
package com.bartlomiejpluta.base.editor.project.context package com.bartlomiejpluta.base.editor.project.context
import com.bartlomiejpluta.base.editor.asset.model.Asset import com.bartlomiejpluta.base.editor.asset.model.Asset
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAsset
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAssetData
import com.bartlomiejpluta.base.editor.code.model.Code import com.bartlomiejpluta.base.editor.code.model.Code
import com.bartlomiejpluta.base.editor.code.model.CodeType import com.bartlomiejpluta.base.editor.code.model.CodeType
import com.bartlomiejpluta.base.editor.code.service.JavaClassService import com.bartlomiejpluta.base.editor.code.service.JavaClassService
import com.bartlomiejpluta.base.editor.entityset.asset.EntitySet
import com.bartlomiejpluta.base.editor.entityset.asset.EntitySetAssetData
import com.bartlomiejpluta.base.editor.file.model.FileNode import com.bartlomiejpluta.base.editor.file.model.FileNode
import com.bartlomiejpluta.base.editor.image.asset.ImageAsset import com.bartlomiejpluta.base.editor.image.asset.ImageAsset
import com.bartlomiejpluta.base.editor.image.asset.ImageAssetData import com.bartlomiejpluta.base.editor.image.asset.ImageAssetData
@@ -164,13 +164,13 @@ class DefaultProjectContext : ProjectContext {
File(it.imagesDirectory, asset.source).inputStream().use { fis -> Image(fis) } File(it.imagesDirectory, asset.source).inputStream().use { fis -> Image(fis) }
} ?: throw IllegalStateException("There is no open project in the context") } ?: throw IllegalStateException("There is no open project in the context")
override fun importCharacterSet(data: CharacterSetAssetData) { override fun importEntitySet(data: EntitySetAssetData) {
project?.let { project?.let {
UID.next(it.characterSets.map(Asset::uid)).let { uid -> UID.next(it.entitySets.map(Asset::uid)).let { uid ->
val source = "$uid.${data.file.extension}" val source = "$uid.${data.file.extension}"
val targetFile = File(it.characterSetsDirectory, source) val targetFile = File(it.entitySetsDirectory, source)
data.file.copyTo(targetFile) data.file.copyTo(targetFile)
it.characterSets += CharacterSetAsset(it, uid, source, data.name, data.rows, data.columns) it.entitySets += EntitySet(it, uid, source, data.name, data.rows, data.columns)
save() save()
} }

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

@@ -1,8 +1,8 @@
package com.bartlomiejpluta.base.editor.project.context package com.bartlomiejpluta.base.editor.project.context
import com.bartlomiejpluta.base.editor.asset.model.Asset import com.bartlomiejpluta.base.editor.asset.model.Asset
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAssetData
import com.bartlomiejpluta.base.editor.code.model.Code import com.bartlomiejpluta.base.editor.code.model.Code
import com.bartlomiejpluta.base.editor.entityset.asset.EntitySetAssetData
import com.bartlomiejpluta.base.editor.file.model.FileNode import com.bartlomiejpluta.base.editor.file.model.FileNode
import com.bartlomiejpluta.base.editor.image.asset.ImageAsset import com.bartlomiejpluta.base.editor.image.asset.ImageAsset
import com.bartlomiejpluta.base.editor.image.asset.ImageAssetData import com.bartlomiejpluta.base.editor.image.asset.ImageAssetData
@@ -33,7 +33,7 @@ interface ProjectContext {
fun findImageAsset(uid: String): ImageAsset fun findImageAsset(uid: String): ImageAsset
fun loadImage(uid: String): Image fun loadImage(uid: String): Image
fun importCharacterSet(data: CharacterSetAssetData) fun importEntitySet(data: EntitySetAssetData)
fun deleteAsset(asset: Asset) fun deleteAsset(asset: Asset)
fun loadScript(fileNode: FileNode): Code fun loadScript(fileNode: FileNode): Code

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

@@ -1,6 +1,6 @@
package com.bartlomiejpluta.base.editor.project.model package com.bartlomiejpluta.base.editor.project.model
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAsset import com.bartlomiejpluta.base.editor.entityset.asset.EntitySet
import com.bartlomiejpluta.base.editor.file.model.FileSystemNode import com.bartlomiejpluta.base.editor.file.model.FileSystemNode
import com.bartlomiejpluta.base.editor.image.asset.ImageAsset import com.bartlomiejpluta.base.editor.image.asset.ImageAsset
import com.bartlomiejpluta.base.editor.map.asset.GameMapAsset import com.bartlomiejpluta.base.editor.map.asset.GameMapAsset
@@ -29,9 +29,9 @@ class Project {
val maps = observableListOf<GameMapAsset>() val maps = observableListOf<GameMapAsset>()
val tileSets = observableListOf<TileSetAsset>() val tileSets = observableListOf<TileSetAsset>()
val images = observableListOf<ImageAsset>() val images = observableListOf<ImageAsset>()
val characterSets = observableListOf<CharacterSetAsset>() val entitySets = observableListOf<EntitySet>()
val assetLists = listOf(maps, tileSets, images, characterSets) val assetLists = listOf(maps, tileSets, images, entitySets)
val mapsDirectoryProperty = SimpleObjectProperty<File>() val mapsDirectoryProperty = SimpleObjectProperty<File>()
var mapsDirectory by mapsDirectoryProperty var mapsDirectory by mapsDirectoryProperty
@@ -45,8 +45,8 @@ class Project {
var imagesDirectory by imagesDirectoryProperty var imagesDirectory by imagesDirectoryProperty
private set private set
val characterSetsDirectoryProperty = SimpleObjectProperty<File>() val entitySetsDirectoryProperty = SimpleObjectProperty<File>()
var characterSetsDirectory by characterSetsDirectoryProperty var entitySetsDirectory by entitySetsDirectoryProperty
private set private set
val codeDirectoryProperty = SimpleObjectProperty<File>() val codeDirectoryProperty = SimpleObjectProperty<File>()
@@ -78,7 +78,7 @@ class Project {
mapsDirectory = File(it, MAPS_DIR) mapsDirectory = File(it, MAPS_DIR)
tileSetsDirectory = File(it, TILE_SETS_DIR) tileSetsDirectory = File(it, TILE_SETS_DIR)
imagesDirectory = File(it, IMAGES_DIR) imagesDirectory = File(it, IMAGES_DIR)
characterSetsDirectory = File(it, CHARACTER_SETS_DIR) entitySetsDirectory = File(it, ENTITY_SETS_DIR)
codeDirectory = File(it, CODE_DIR) codeDirectory = File(it, CODE_DIR)
buildDirectory = File(it, BUILD_DIR) buildDirectory = File(it, BUILD_DIR)
buildClassesDirectory = File(it, BUILD_CLASSES_DIR) buildClassesDirectory = File(it, BUILD_CLASSES_DIR)
@@ -92,7 +92,7 @@ class Project {
mapsDirectory?.mkdirs() mapsDirectory?.mkdirs()
tileSetsDirectory?.mkdirs() tileSetsDirectory?.mkdirs()
imagesDirectory?.mkdirs() imagesDirectory?.mkdirs()
characterSetsDirectory?.mkdirs() entitySetsDirectory?.mkdirs()
codeDirectory?.mkdirs() codeDirectory?.mkdirs()
} }
@@ -103,7 +103,7 @@ class Project {
const val MAPS_DIR = "maps" const val MAPS_DIR = "maps"
const val TILE_SETS_DIR = "tilesets" const val TILE_SETS_DIR = "tilesets"
const val IMAGES_DIR = "images" const val IMAGES_DIR = "images"
const val CHARACTER_SETS_DIR = "charsets" const val ENTITY_SETS_DIR = "entsets"
const val CODE_DIR = "code" const val CODE_DIR = "code"
const val BUILD_DIR = "build" const val BUILD_DIR = "build"
const val BUILD_CLASSES_DIR = "$BUILD_DIR/classes" const val BUILD_CLASSES_DIR = "$BUILD_DIR/classes"

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

@@ -1,6 +1,6 @@
package com.bartlomiejpluta.base.editor.project.serial package com.bartlomiejpluta.base.editor.project.serial
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAsset import com.bartlomiejpluta.base.editor.entityset.asset.EntitySet
import com.bartlomiejpluta.base.editor.image.asset.ImageAsset import com.bartlomiejpluta.base.editor.image.asset.ImageAsset
import com.bartlomiejpluta.base.editor.map.asset.GameMapAsset import com.bartlomiejpluta.base.editor.map.asset.GameMapAsset
import com.bartlomiejpluta.base.editor.project.model.Project import com.bartlomiejpluta.base.editor.project.model.Project
@@ -20,7 +20,7 @@ class ProtobufProjectDeserializer : ProjectDeserializer {
project.maps.addAll(proto.mapsList.map { deserializeMap(project, it) }) project.maps.addAll(proto.mapsList.map { deserializeMap(project, it) })
project.tileSets.addAll(proto.tileSetsList.map { deserializeTileSet(project, it) }) project.tileSets.addAll(proto.tileSetsList.map { deserializeTileSet(project, it) })
project.images.addAll(proto.imagesList.map { deserializeImage(project, it) }) project.images.addAll(proto.imagesList.map { deserializeImage(project, it) })
project.characterSets.addAll(proto.characterSetsList.map { deserializeCharacterSet(project, it) }) project.entitySets.addAll(proto.entitySetsList.map { deserializeEntitySet(project, it) })
return project return project
} }
@@ -47,13 +47,12 @@ class ProtobufProjectDeserializer : ProjectDeserializer {
name = image.name name = image.name
) )
private fun deserializeCharacterSet(project: Project, characterSetAsset: ProjectProto.CharacterSetAsset) = private fun deserializeEntitySet(project: Project, entitySetAsset: ProjectProto.EntitySetAsset) = EntitySet(
CharacterSetAsset( project = project,
project = project, uid = entitySetAsset.uid,
uid = characterSetAsset.uid, source = entitySetAsset.source,
source = characterSetAsset.source, name = entitySetAsset.name,
name = characterSetAsset.name, rows = entitySetAsset.rows,
rows = characterSetAsset.rows, columns = entitySetAsset.columns
columns = characterSetAsset.columns )
)
} }

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

@@ -1,6 +1,6 @@
package com.bartlomiejpluta.base.editor.project.serial package com.bartlomiejpluta.base.editor.project.serial
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAsset import com.bartlomiejpluta.base.editor.entityset.asset.EntitySet
import com.bartlomiejpluta.base.editor.image.asset.ImageAsset import com.bartlomiejpluta.base.editor.image.asset.ImageAsset
import com.bartlomiejpluta.base.editor.map.asset.GameMapAsset import com.bartlomiejpluta.base.editor.map.asset.GameMapAsset
import com.bartlomiejpluta.base.editor.project.model.Project import com.bartlomiejpluta.base.editor.project.model.Project
@@ -19,7 +19,7 @@ class ProtobufProjectSerializer : ProjectSerializer {
proto.addAllMaps(item.maps.map(this::serializeMap)) proto.addAllMaps(item.maps.map(this::serializeMap))
proto.addAllTileSets(item.tileSets.map(this::serializeTileSet)) proto.addAllTileSets(item.tileSets.map(this::serializeTileSet))
proto.addAllImages(item.images.map(this::serializeImage)) proto.addAllImages(item.images.map(this::serializeImage))
proto.addAllCharacterSets(item.characterSets.map(this::serializeCharacterSet)) proto.addAllEntitySets(item.entitySets.map(this::serializeEntitySet))
proto.build().writeTo(output) proto.build().writeTo(output)
} }
@@ -43,11 +43,11 @@ class ProtobufProjectSerializer : ProjectSerializer {
.setName(image.name) .setName(image.name)
.build() .build()
private fun serializeCharacterSet(characterSet: CharacterSetAsset) = ProjectProto.CharacterSetAsset.newBuilder() private fun serializeEntitySet(entitySet: EntitySet) = ProjectProto.EntitySetAsset.newBuilder()
.setUid(characterSet.uid) .setUid(entitySet.uid)
.setSource(characterSet.source) .setSource(entitySet.source)
.setName(characterSet.name) .setName(entitySet.name)
.setRows(characterSet.rows) .setRows(entitySet.rows)
.setColumns(characterSet.columns) .setColumns(entitySet.columns)
.build() .build()
} }

4
proto/src/main/proto/project.proto
View File

@@ -9,7 +9,7 @@ message Project {
repeated GameMapAsset maps = 3; repeated GameMapAsset maps = 3;
repeated TileSetAsset tileSets = 4; repeated TileSetAsset tileSets = 4;
repeated ImageAsset images = 5; repeated ImageAsset images = 5;
repeated CharacterSetAsset characterSets = 6; repeated EntitySetAsset entitySets = 6;
} }
message GameMapAsset { message GameMapAsset {
@@ -32,7 +32,7 @@ message ImageAsset {
required string name = 3; required string name = 3;
} }
message CharacterSetAsset { message EntitySetAsset {
required string uid = 1; required string uid = 1;
required string source = 2; required string source = 2;
required string name = 3; required string name = 3;