From 476ef6580f79d9072dc35f3667164e0352c422e9 Mon Sep 17 00:00:00 2001 From: soywiz Date: Sun, 16 Feb 2020 17:06:06 +0100 Subject: [PATCH] Some minesweeper adjustments --- .../com/soywiz/korge/samples/minesweeper/Board.kt | 4 ++-- .../com/soywiz/korge/samples/minesweeper/Process.kt | 5 ++--- .../com/soywiz/korge/samples/minesweeper/main.kt | 10 +++++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/sample-minesweeper/src/commonMain/kotlin/com/soywiz/korge/samples/minesweeper/Board.kt b/sample-minesweeper/src/commonMain/kotlin/com/soywiz/korge/samples/minesweeper/Board.kt index f2de006..9e971b1 100644 --- a/sample-minesweeper/src/commonMain/kotlin/com/soywiz/korge/samples/minesweeper/Board.kt +++ b/sample-minesweeper/src/commonMain/kotlin/com/soywiz/korge/samples/minesweeper/Board.kt @@ -45,8 +45,8 @@ class Board( //timeText = Text("", 50, 50, Text.Align.center, Text.Align.middle, Color.white, Font.fromResource("font.ttf", 40)); val FONT_HEIGHT = 32.0 timeText = text("", textSize = FONT_HEIGHT).xy((bwidth * imageset.height) / 2, -FONT_HEIGHT).apply { - //format = Html.Format(align = Html.Alignment.CENTER, size = FONT_HEIGHT.toInt()) - format = Html.Format(align = Html.Alignment.CENTER) + format = Html.Format(align = Html.Alignment.CENTER, size = FONT_HEIGHT.toInt()) + //format = Html.Format(align = Html.Alignment.CENTER, face = defaultUIFont) } // Se pinta el contador como hijo del tablero //timeText.group.z = this; diff --git a/sample-minesweeper/src/commonMain/kotlin/com/soywiz/korge/samples/minesweeper/Process.kt b/sample-minesweeper/src/commonMain/kotlin/com/soywiz/korge/samples/minesweeper/Process.kt index 710784c..c7dca7f 100644 --- a/sample-minesweeper/src/commonMain/kotlin/com/soywiz/korge/samples/minesweeper/Process.kt +++ b/sample-minesweeper/src/commonMain/kotlin/com/soywiz/korge/samples/minesweeper/Process.kt @@ -148,8 +148,8 @@ class Key2(val views: Views) { class MouseV(val views: Views) { val left: Boolean get() = pressing[0] val right: Boolean get() = pressing[1] || pressing[2] - val x: Int get() = (views.input.mouse.x / views.stage.scaleX).toInt() - val y: Int get() = (views.input.mouse.y / views.stage.scaleY).toInt() + val x: Int get() = (views.stage.localMouseX(views)).toInt() + val y: Int get() = (views.stage.localMouseY(views)).toInt() val pressing = BooleanArray(8) val pressed = BooleanArray(8) val released = BooleanArray(8) @@ -224,4 +224,3 @@ fun BitmapSlice.split(width: Int, height: Int): List { } } } - diff --git a/sample-minesweeper/src/commonMain/kotlin/com/soywiz/korge/samples/minesweeper/main.kt b/sample-minesweeper/src/commonMain/kotlin/com/soywiz/korge/samples/minesweeper/main.kt index e7648c9..e7c0260 100644 --- a/sample-minesweeper/src/commonMain/kotlin/com/soywiz/korge/samples/minesweeper/main.kt +++ b/sample-minesweeper/src/commonMain/kotlin/com/soywiz/korge/samples/minesweeper/main.kt @@ -15,17 +15,17 @@ class MainProcess(parent: Container) : Process(parent) { val lights = arrayListOf() override suspend fun main() { - val light = readImage("light.png") image(readImage("bg.jpg")) - for (n in 0 until 20) { - lights += RandomLight(this, light) - } - + val light = readImage("light.png") val imageset = readImage("buscaminas.png") val imagenes = imageset.split(imageset.height, imageset.height) val click = readSound("click.wav") val boom = readSound("boom.wav") + for (n in 0 until 20) { + lights += RandomLight(this, light) + } + val board = Board(this, imageset, imagenes, click, boom, 22, 15, 40) while (true) {