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

[Editor] Improve the object layer appearance on canvas

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2022-08-29 16:27:55 +02:00
parent 8920f55a40
commit fd0db9214c
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/map/canvas/MapCanvas.kt
View File

@@ -9,11 +9,6 @@ import com.bartlomiejpluta.base.editor.render.model.Renderable
import javafx.scene.canvas.GraphicsContext import javafx.scene.canvas.GraphicsContext
import javafx.scene.image.WritableImage import javafx.scene.image.WritableImage
import javafx.scene.paint.Color import javafx.scene.paint.Color
import javafx.scene.text.TextAlignment
import java.lang.Integer.max
import java.lang.Integer.min
import kotlin.math.pow
import kotlin.math.roundToInt
class MapCanvas(val map: GameMapVM, private val editorStateVM: EditorStateVM, private val painter: MapPainter) : class MapCanvas(val map: GameMapVM, private val editorStateVM: EditorStateVM, private val painter: MapPainter) :
@@ -148,11 +143,10 @@ class MapCanvas(val map: GameMapVM, private val editorStateVM: EditorStateVM, pr
} }
private fun renderObjectLayer(gc: GraphicsContext, objectLayer: ObjectLayer) { private fun renderObjectLayer(gc: GraphicsContext, objectLayer: ObjectLayer) {
if (editorStateVM.selectedLayer !is ObjectLayer) { if (editorStateVM.selectedLayer is ObjectLayer) {
return renderObjectPassageMap(gc, objectLayer)
} }
renderObjectPassageMap(gc, objectLayer)
renderObjects(gc, objectLayer) renderObjects(gc, objectLayer)
} }
@@ -169,10 +163,19 @@ class MapCanvas(val map: GameMapVM, private val editorStateVM: EditorStateVM, pr
val alpha = gc.globalAlpha val alpha = gc.globalAlpha
val fill = gc.fill val fill = gc.fill
gc.globalAlpha = 0.6 gc.globalAlpha = OBJECT_FILL_ALPHA
gc.fill = OBJECT_COLOR gc.fill = OBJECT_COLOR
gc.fillOval( gc.fillRect(
mapObject.x * tileWidth + OBJECT_MARGIN,
mapObject.y * tileHeight + OBJECT_MARGIN,
tileWidth - 2 * OBJECT_MARGIN,
tileHeight - 2 * OBJECT_MARGIN
)
gc.globalAlpha = 1.0
gc.stroke = OBJECT_COLOR
gc.strokeRect(
mapObject.x * tileWidth + OBJECT_MARGIN, mapObject.x * tileWidth + OBJECT_MARGIN,
mapObject.y * tileHeight + OBJECT_MARGIN, mapObject.y * tileHeight + OBJECT_MARGIN,
tileWidth - 2 * OBJECT_MARGIN, tileWidth - 2 * OBJECT_MARGIN,
@@ -226,6 +229,7 @@ class MapCanvas(val map: GameMapVM, private val editorStateVM: EditorStateVM, pr
private val BACKGROUND_COLOR2 = Color.color(0.8, 0.8, 0.8, 1.0) private val BACKGROUND_COLOR2 = Color.color(0.8, 0.8, 0.8, 1.0)
private val OBJECT_COLOR = Color.WHITE private val OBJECT_COLOR = Color.WHITE
private const val OBJECT_FILL_ALPHA = 0.3
private const val OBJECT_MARGIN = 4 private const val OBJECT_MARGIN = 4
} }
} }