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

[Editor] Add support for providing tile size in TileSet import modal

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2022-08-22 15:53:16 +02:00
parent c3a55053bb
commit cb2b688a88
3 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/asset/TileSetAssetData.kt
View File

@@ -17,6 +17,12 @@ class TileSetAssetData {
val columnsProperty = SimpleIntegerProperty(1)
var columns by columnsProperty
val tileWidthProperty = SimpleIntegerProperty(1)
var tileWidth by tileWidthProperty
val tileHeightProperty = SimpleIntegerProperty(1)
var tileHeight by tileHeightProperty
val fileProperty = SimpleObjectProperty<File>()
var file by fileProperty
}

39
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/view/importing/ImportTileSetFragment.kt
View File

@@ -22,6 +22,27 @@ class ImportTileSetFragment : Fragment("Import Tile Set") {
else -> file.inputStream().use { imagePreview.value = Image(it) }
}
}
dataVM.tileWidthProperty.addListener { _, _, width ->
dataVM.columns = (imagePreview.value?.width?.toInt() ?: 1) / width.toInt()
}
dataVM.tileHeightProperty.addListener { _, _, height ->
dataVM.rows = (imagePreview.value?.height?.toInt() ?: 1) / height.toInt()
}
dataVM.columnsProperty.addListener { _, _, columns ->
dataVM.tileWidth = (imagePreview.value?.width?.toInt() ?: 1) / columns.toInt()
}
dataVM.rowsProperty.addListener { _, _, rows ->
dataVM.tileHeight = (imagePreview.value?.height?.toInt() ?: 1) / rows.toInt()
}
imagePreview.addListener { _, _, _ ->
dataVM.columns = 1
dataVM.rows = 1
}
}
fun onComplete(consumer: (TileSetAssetData) -> Unit) {
@@ -69,6 +90,7 @@ class ImportTileSetFragment : Fragment("Import Tile Set") {
}
field("Tile Set Rows") {
enableWhen(imagePreview.isNotNull)
spinner(min = 1, max = Integer.MAX_VALUE, property = dataVM.rowsProperty, editable = true) {
required()
editor.textFormatter = TextFieldUtil.integerFormatter(dataVM.rows)
@@ -76,11 +98,28 @@ class ImportTileSetFragment : Fragment("Import Tile Set") {
}
field("Tile Set Columns") {
enableWhen(imagePreview.isNotNull)
spinner(min = 1, max = Integer.MAX_VALUE, property = dataVM.columnsProperty, editable = true) {
required()
editor.textFormatter = TextFieldUtil.integerFormatter(dataVM.columns)
}
}
field("Tile width") {
enableWhen(imagePreview.isNotNull)
spinner(min = 1, max = Integer.MAX_VALUE, property = dataVM.tileWidthProperty, editable = true) {
required()
editor.textFormatter = TextFieldUtil.integerFormatter(dataVM.rows)
}
}
field("Tile height") {
enableWhen(imagePreview.isNotNull)
spinner(min = 1, max = Integer.MAX_VALUE, property = dataVM.tileHeightProperty, editable = true) {
required()
editor.textFormatter = TextFieldUtil.integerFormatter(dataVM.columns)
}
}
}
}
}

6
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/tileset/viewmodel/TileSetAssetDataVM.kt
View File

@@ -15,6 +15,12 @@ class TileSetAssetDataVM : ItemViewModel<TileSetAssetData>(TileSetAssetData()) {
val columnsProperty = bind(TileSetAssetData::columnsProperty)
var columns by columnsProperty
val tileWidthProperty = bind(TileSetAssetData::tileWidthProperty)
var tileWidth by tileWidthProperty
val tileHeightProperty = bind(TileSetAssetData::tileHeightProperty)
var tileHeight by tileHeightProperty
val fileProperty = bind(TileSetAssetData::fileProperty)
var file by fileProperty
}