curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 19:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

finaly fixing 720p bug (issue #36)

Browse Source
This commit is contained in:
minjaesong
2020-11-21 22:04:59 +09:00
parent e97a74483f
commit 5d46402b27
5 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config_colemak.json
View File

@@ -1,8 +1,8 @@
{ {
"displayfps": 0, "displayfps": 0,
"usevsync": false, "usevsync": false,
"screenwidth": 1110, "screenwidth": 1280,
"screenheight": 740, "screenheight": 720,
"language": "enUS", "language": "enUS",
"notificationshowuptime": 4000, "notificationshowuptime": 4000,
"multithread": true, "multithread": true,

9
src/net/torvald/UnsafePtr.kt
View File

@@ -94,12 +94,11 @@ internal class UnsafePtr(pointer: Long, allocSize: Long) {
} }
private inline fun checkNullPtr(index: Long) { // ignore what IDEA says and do inline this private inline fun checkNullPtr(index: Long) { // ignore what IDEA says and do inline this
// commenting out because of the suspected (or minor?) performance impact. //// commenting out because of the suspected (or minor?) performance impact.
// You may break the glass and use this tool when some fucking incomprehensible bugs ("vittujen vitun bugit") //// You may break the glass and use this tool when some fucking incomprehensible bugs ("vittujen vitun bugit")
// appear (e.g. getting garbage values when it fucking shouldn't) //// appear (e.g. getting garbage values when it fucking shouldn't)
assert(!destroyed) { throw NullPointerException("The pointer is already destroyed ($this)") }
// OOB Check: debugging purposes only -- comment out for the production //assert(!destroyed) { throw NullPointerException("The pointer is already destroyed ($this)") }
//if (index !in 0 until size) throw IndexOutOfBoundsException("Index: $index; alloc size: $size") //if (index !in 0 until size) throw IndexOutOfBoundsException("Index: $index; alloc size: $size")
} }

5
src/net/torvald/gdx/graphics/UnsafeCvecArray.kt
View File

@@ -12,9 +12,8 @@ import net.torvald.UnsafeHelper
*/ */
internal class UnsafeCvecArray(val width: Int, val height: Int) { internal class UnsafeCvecArray(val width: Int, val height: Int) {
val TOTAL_SIZE_IN_BYTES = 16L * width * height private val TOTAL_SIZE_IN_BYTES = 16L * (width + 1) * (height + 1)
private val array = UnsafeHelper.allocate(TOTAL_SIZE_IN_BYTES)
val array = UnsafeHelper.allocate(TOTAL_SIZE_IN_BYTES)
private inline fun toAddr(x: Int, y: Int) = 16L * (y * width + x) private inline fun toAddr(x: Int, y: Int) = 16L * (y * width + x)

8
src/net/torvald/terrarum/AppLoader.java
View File

@@ -208,10 +208,10 @@ public class AppLoader implements ApplicationListener {
public static ArrayListMap debugTimers = new ArrayListMap<String, Long>(); public static ArrayListMap debugTimers = new ArrayListMap<String, Long>();
public static final int defaultW = 1116; public static final int defaultW = 1280;
public static final int defaultH = 744; public static final int defaultH = 720;
public static final int minimumW = 1080; public static final int minimumW = 800;
public static final int minimumH = 722; public static final int minimumH = 600;
public static final String FONT_DIR = "assets/graphics/fonts/terrarum-sans-bitmap"; public static final String FONT_DIR = "assets/graphics/fonts/terrarum-sans-bitmap";

16
src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
View File

@@ -51,10 +51,10 @@ object IngameRenderer : Disposable {
val shaderAtoGrey: ShaderProgram val shaderAtoGrey: ShaderProgram
val shaderPassthru = SpriteBatch.createDefaultShader() val shaderPassthru = SpriteBatch.createDefaultShader()
private val width = AppLoader.screenW private val WIDTH = AppLoader.screenW
private val height = AppLoader.screenH private val HEIGHT = AppLoader.screenH
private val widthf = width.toFloat() private val WIDTHF = WIDTH.toFloat()
private val heightf = height.toFloat() private val HEIGHTF = HEIGHT.toFloat()
private var initDone = false private var initDone = false
@@ -586,13 +586,13 @@ object IngameRenderer : Disposable {
private fun invokeInit() { private fun invokeInit() {
if (!initDone) { if (!initDone) {
batch = SpriteBatch() batch = SpriteBatch()
camera = OrthographicCamera(widthf, heightf) camera = OrthographicCamera(WIDTHF, HEIGHTF)
camera.setToOrtho(true, widthf, heightf) camera.setToOrtho(true, WIDTHF, HEIGHTF)
camera.update() camera.update()
Gdx.gl20.glViewport(0, 0, width, height) Gdx.gl20.glViewport(0, 0, WIDTH, HEIGHT)
resize(width, height) resize(WIDTH, HEIGHT)
initDone = true initDone = true
} }