azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix couple problems in Tetris sample.

Browse Source
This commit is contained in:
Nikolay Igotti
2019-04-16 19:27:30 +03:00
parent bebad1c069
commit 3b1783a48d
1 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/tetris/src/tetrisMain/kotlin/SDL_Visualizer.kt
+28 -10
View File
@@ -31,7 +31,7 @@ class SDL_Visualizer(val width: Int, val height: Int): GameFieldVisualizer, User
private val NEXT_LABEL_WIDTH = 85 private val NEXT_LABEL_WIDTH = 85
private val TETRISES_LABEL_WIDTH = 162 private val TETRISES_LABEL_WIDTH = 162
private val ratio: Float private var ratio: Float
private fun stretch(value: Int) = (value.toFloat() * ratio + 0.5).toInt() private fun stretch(value: Int) = (value.toFloat() * ratio + 0.5).toInt()
@@ -114,8 +114,8 @@ class SDL_Visualizer(val width: Int, val height: Int): GameFieldVisualizer, User
private var displayHeight: Int = 0 private var displayHeight: Int = 0
private val fieldWidth: Int private val fieldWidth: Int
private val fieldHeight: Int private val fieldHeight: Int
private val windowX: Int private var windowX: Int
private val windowY: Int private var windowY: Int
private val window: CPointer<SDL_Window> private val window: CPointer<SDL_Window>
private val renderer: CPointer<SDL_Renderer> private val renderer: CPointer<SDL_Renderer>
private val texture: CPointer<SDL_Texture> private val texture: CPointer<SDL_Texture>
@@ -124,8 +124,7 @@ class SDL_Visualizer(val width: Int, val height: Int): GameFieldVisualizer, User
init { init {
if (SDL_Init(SDL_INIT_EVERYTHING) != 0) { if (SDL_Init(SDL_INIT_EVERYTHING) != 0) {
println("SDL_Init Error: ${get_SDL_Error()}") throw Error("SDL_Init Error: ${get_SDL_Error()}")
throw Error()
} }
platform = SDL_GetPlatform()!!.toKString() platform = SDL_GetPlatform()!!.toKString()
@@ -160,7 +159,8 @@ class SDL_Visualizer(val width: Int, val height: Int): GameFieldVisualizer, User
windowY = (displayHeight - windowHeight) / 2 windowY = (displayHeight - windowHeight) / 2
ratio = 1.0f ratio = 1.0f
} }
val window = SDL_CreateWindow("Tetris", windowX, windowY, windowWidth, windowHeight, SDL_WINDOW_SHOWN) val window = SDL_CreateWindow("Tetris", windowX, windowY, windowWidth, windowHeight,
SDL_WINDOW_SHOWN or SDL_WINDOW_ALLOW_HIGHDPI)
if (window == null) { if (window == null) {
println("SDL_CreateWindow Error: ${get_SDL_Error()}") println("SDL_CreateWindow Error: ${get_SDL_Error()}")
SDL_Quit() SDL_Quit()
@@ -177,11 +177,29 @@ class SDL_Visualizer(val width: Int, val height: Int): GameFieldVisualizer, User
} }
this.renderer = renderer this.renderer = renderer
// Workaround for Mojave SDL bug, see https://bugzilla.libsdl.org/show_bug.cgi?id=4272 memScoped {
SDL_PumpEvents() val realWidth = alloc<IntVar>()
SDL_SetWindowSize(window, windowWidth, windowHeight) val realHeight = alloc<IntVar>()
SDL_GetRendererOutputSize(renderer, realWidth.ptr, realHeight.ptr)
if (platform != "iOS" && windowHeight != realHeight.value) {
println("DPI differs ${realWidth.value} x ${realHeight.value} vs $windowWidth x $windowHeight")
ratio = realHeight.value.toFloat() / windowHeight
}
}
texture = loadImage(window, renderer, "tetris_all.bmp") texture = loadImage(window, renderer, findFile("tetris_all.bmp"))
}
private fun findFile(name: String): String {
memScoped {
val dirs = listOf(".", SDL_GetBasePath()?.toKString() ?: "/")
val statBuffer = alloc<stat>()
dirs.forEach {
val candidate = "$it/$name"
if (stat(candidate, statBuffer.ptr) == 0) return candidate
}
throw Error("name not found")
}
} }
private fun loadImage(win: CPointer<SDL_Window>, ren: CPointer<SDL_Renderer>, imagePath: String): CPointer<SDL_Texture> { private fun loadImage(win: CPointer<SDL_Window>, ren: CPointer<SDL_Renderer>, imagePath: String): CPointer<SDL_Texture> {