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

moved things a lot just so that splash screen shows up WHILE things load

Browse Source
This commit is contained in:
Minjae Song
2018-12-25 01:38:23 +09:00
parent 47da7d5b81
commit d7664c7f46
29 changed files with 434 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt
View File

@@ -135,7 +135,7 @@ class BasicDebugInfoWindow : UICanvas() {
var dbgCnt = 12
Terrarum.debugTimers.forEach { t, u ->
AppLoader.debugTimers.forEach { t, u ->
printLine(batch, dbgCnt, "$ccM$t $ccG$u$ccY ns")
dbgCnt++
}

2
src/net/torvald/terrarum/ui/UICanvas.kt
View File

@@ -63,7 +63,7 @@ abstract class UICanvas(
get() = relativeMouseX in 0..width - 1 && relativeMouseY in 0..height - 1
/** If mouse is hovering over it and mouse is down */
val mousePushed: Boolean
get() = mouseUp && Gdx.input.isButtonPressed(Terrarum.getConfigInt("mouseprimary"))
get() = mouseUp && Gdx.input.isButtonPressed(AppLoader.getConfigInt("mouseprimary"))
/** Called by the screen */

3
src/net/torvald/terrarum/ui/UIItem.kt
View File

@@ -3,6 +3,7 @@ package net.torvald.terrarum.ui
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.Camera
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.Terrarum
@@ -53,7 +54,7 @@ abstract class UIItem(var parentUI: UICanvas) { // do not replace parentUI to UI
get() = relativeMouseX in 0..width - 1 && relativeMouseY in 0..height - 1
/** If mouse is hovering over it and mouse is down */
open val mousePushed: Boolean
get() = mouseUp && Gdx.input.isButtonPressed(Terrarum.getConfigInt("mouseprimary")!!)
get() = mouseUp && Gdx.input.isButtonPressed(AppLoader.getConfigInt("mouseprimary")!!)
/** UI to call (show up) while mouse is up */