From f96160614f3e118457d479c77aa4bab397241d77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?=
 <noreply.git@mx.bartlomiejpluta.com>
Date: Sun, 7 Feb 2021 16:07:29 +0100
Subject: [PATCH] [Editor] Refactor brush code

---
 .../com/bartlomiejpluta/base/editor/model/map/brush/Brush.kt  | 4 ++--
 .../base/editor/render/canvas/tileset/TileSetSelection.kt     | 1 +
 .../bartlomiejpluta/base/editor/view/map/MapToolbarView.kt    | 3 +++
 .../com/bartlomiejpluta/base/editor/view/map/MapView.kt       | 1 +
 .../com/bartlomiejpluta/base/editor/viewmodel/map/BrushVM.kt  | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/brush/Brush.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/brush/Brush.kt
index 35180ffe..f58dc9f0 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/brush/Brush.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/brush/Brush.kt
@@ -12,7 +12,7 @@ import tornadofx.setValue
 class Brush {
    val brush: ObservableList<Tile>
 
-   val rowsProperty = SimpleIntegerProperty(this, "", 0)
+   val rowsProperty = SimpleIntegerProperty(0)
    var rows by rowsProperty
       private set
 
@@ -87,7 +87,7 @@ class Brush {
       this.range = range
    }
 
-   fun withBrushMode(mode: BrushMode) = clone().apply {
+   fun withMode(mode: BrushMode) = clone().apply {
       this.mode = mode
    }
 
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/tileset/TileSetSelection.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/tileset/TileSetSelection.kt
index dac96d2b..3ceae219 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/tileset/TileSetSelection.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/tileset/TileSetSelection.kt
@@ -62,6 +62,7 @@ class TileSetSelection(private val gameMapVM: GameMapVM, private val brushVM: Br
       }
 
       brushVM.item = Brush.of(brushArray)
+      brushVM.commit()
    }
 
    override fun render(gc: GraphicsContext) {
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapToolbarView.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapToolbarView.kt
index f7ea8ac7..7a9a35f2 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapToolbarView.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapToolbarView.kt
@@ -101,6 +101,7 @@ class MapToolbarView : View() {
 
          action {
             brushVM.item = brushVM.withMode(BrushMode.PAINTING_MODE)
+            brushVM.commit()
          }
       }
 
@@ -109,6 +110,7 @@ class MapToolbarView : View() {
 
          action {
             brushVM.item = brushVM.withMode(BrushMode.ERASING_MODE)
+            brushVM.commit()
          }
       }
 
@@ -121,6 +123,7 @@ class MapToolbarView : View() {
 
          valueProperty().addListener { _, _, newValue ->
             brushVM.item = brushVM.withRange(newValue.toInt())
+            brushVM.commit()
          }
 
          brushVM.itemProperty.addListener { _, _, brush ->
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapView.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapView.kt
index acef6685..754ec3de 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapView.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapView.kt
@@ -39,6 +39,7 @@ class MapView : View() {
 
    init {
       brushVM.item = mapVM.tileSet.baseBrush
+      brushVM.commit()
 
       subscribe<RedrawMapRequestEvent> { mapPane.render() }
    }
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/BrushVM.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/BrushVM.kt
index 83890f14..1fd53d8d 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/BrushVM.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/BrushVM.kt
@@ -25,5 +25,5 @@ class BrushVM : ItemViewModel<Brush>(Brush.of(arrayOf(arrayOf()))) {
 
    fun withRange(range: Int) = item.withRange(range)
 
-   fun withMode(mode: BrushMode) = item.withBrushMode(mode)
+   fun withMode(mode: BrushMode) = item.withMode(mode)
 }
\ No newline at end of file