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

[Editor] Add cursor position to the status bar

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-02-07 17:44:59 +01:00
parent 98a890ddbb
commit dd8f501e84
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapPainter.kt
View File

@@ -21,9 +21,6 @@ class MapPainter(
private val tileWidth = mapVM.tileSet.tileWidth.toDouble() private val tileWidth = mapVM.tileSet.tileWidth.toDouble()
private val tileHeight = mapVM.tileSet.tileHeight.toDouble() private val tileHeight = mapVM.tileSet.tileHeight.toDouble()
private var mouseRow = -1
private var mouseColumn = -1
private var currentTrace: MapPaintingTrace? = null private var currentTrace: MapPaintingTrace? = null
override fun render(gc: GraphicsContext) { override fun render(gc: GraphicsContext) {
@@ -38,8 +35,8 @@ class MapPainter(
} }
private fun renderTile(gc: GraphicsContext, row: Int, column: Int, centerRow: Int, centerColumn: Int, tile: Tile?) { private fun renderTile(gc: GraphicsContext, row: Int, column: Int, centerRow: Int, centerColumn: Int, tile: Tile?) {
val x = tileWidth * (mouseColumn - centerColumn + column) val x = tileWidth * (editorStateVM.cursorColumn - centerColumn + column)
val y = tileHeight * (mouseRow - centerRow + row) val y = tileHeight * (editorStateVM.cursorRow - centerRow + row)
when { when {
tile != null -> renderPaintingBrushTile(gc, tile, x, y) tile != null -> renderPaintingBrushTile(gc, tile, x, y)
@@ -56,8 +53,8 @@ class MapPainter(
} }
override fun handleMouseInput(event: MapMouseEvent) { override fun handleMouseInput(event: MapMouseEvent) {
mouseRow = event.row editorStateVM.cursorRowProperty.value = event.row
mouseColumn = event.column editorStateVM.cursorColumnProperty.value = event.column
when (event.type) { when (event.type) {
MouseEvent.MOUSE_PRESSED -> beginTrace(event) MouseEvent.MOUSE_PRESSED -> beginTrace(event)
@@ -70,7 +67,7 @@ class MapPainter(
if (event.button == MouseButton.PRIMARY && editorStateVM.selectedLayer >= 0) { if (event.button == MouseButton.PRIMARY && editorStateVM.selectedLayer >= 0) {
currentTrace = MapPaintingTrace(mapVM, "Paint trace").apply { currentTrace = MapPaintingTrace(mapVM, "Paint trace").apply {
brushVM.forEach { row, column, centerRow, centerColumn, tile -> brushVM.forEach { row, column, centerRow, centerColumn, tile ->
paint(editorStateVM.selectedLayer, mouseRow - centerRow + row, mouseColumn - centerColumn + column, tile) paint(editorStateVM.selectedLayer, editorStateVM.cursorRow - centerRow + row, editorStateVM.cursorColumn - centerColumn + column, tile)
} }
} }
} }
@@ -80,7 +77,7 @@ class MapPainter(
if (event.button == MouseButton.PRIMARY) { if (event.button == MouseButton.PRIMARY) {
currentTrace?.apply { currentTrace?.apply {
brushVM.forEach { row, column, centerRow, centerColumn, tile -> brushVM.forEach { row, column, centerRow, centerColumn, tile ->
paint(editorStateVM.selectedLayer, mouseRow - centerRow + row, mouseColumn - centerColumn + column, tile) paint(editorStateVM.selectedLayer, editorStateVM.cursorRow - centerRow + row, editorStateVM.cursorColumn - centerColumn + column, tile)
} }
} }
} }

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

@@ -10,15 +10,25 @@ class MapStatusBarView : View() {
private val editorStateVM = find<EditorStateVM>() private val editorStateVM = find<EditorStateVM>()
override val root = hbox { override val root = hbox {
spacing = 1.0 spacing = 50.0
paddingAll = 5.0 paddingAll = 5.0
this += FontIcon("fa-search-minus") hbox {
this += FontIcon("fa-search-minus")
slider(0.5..5.0) { slider(0.5..5.0) {
bind(editorStateVM.zoomProperty) bind(editorStateVM.zoomProperty)
}
this += FontIcon("fa-search-plus")
} }
this += FontIcon("fa-search-plus") label(
Bindings.format(
"Cursor: %d, %d",
editorStateVM.cursorColumnProperty.add(1),
editorStateVM.cursorRowProperty.add(1)
)
)
} }
} }

6
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/EditorStateVM.kt
View File

@@ -19,4 +19,10 @@ class EditorStateVM : ViewModel() {
val zoomProperty = SimpleDoubleProperty(1.0) val zoomProperty = SimpleDoubleProperty(1.0)
var zoom by zoomProperty var zoom by zoomProperty
val cursorRowProperty = SimpleIntegerProperty(-1)
val cursorRow by cursorRowProperty
val cursorColumnProperty = SimpleIntegerProperty(-1)
val cursorColumn by cursorColumnProperty
} }