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

visible actors are defaulted to Visible, SpriteAnimations now has "parent" actors and uses its Visible property

Browse Source 
Former-commit-id: 0e240de4ca38a59724f364df4624c8dc79c0112d
Former-commit-id: b017b24ab7591ea2fd2518308bd5656597c14f47
This commit is contained in:
Song Minjae
2016-12-23 20:49:29 +09:00
parent 106afb4f49
commit 944c71d691
22 changed files with 712 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/net/torvald/terrarum/Terrarum.kt
View File

@@ -111,10 +111,10 @@ constructor(gamename: String) : StateBasedGame(gamename) {
//addState(StateSplash())
//addState(StateMonitorCheck())
//addState(StateFontTester())
addState(StateNoiseTexGen())
//addState(StateNoiseTexGen())
//ingame = StateInGame()
//addState(ingame)
ingame = StateInGame()
addState(ingame)
}
companion object {
@@ -218,17 +218,17 @@ constructor(gamename: String) : StateBasedGame(gamename) {
var hasController = false
val CONTROLLER_DEADZONE = 0.1f
/** Available CPU cores */
val CORES = Runtime.getRuntime().availableProcessors()
/** Available CPU threads */
val THREADS = Runtime.getRuntime().availableProcessors()
/**
* If the game is multithreading.
* True if:
*
* CORES >= 2 and config "multithread" is true
* THREADS >= 2 and config "multithread" is true
*/
val MULTITHREAD: Boolean
get() = CORES >= 2 && getConfigBoolean("multithread")
get() = THREADS >= 2 && getConfigBoolean("multithread")
private lateinit var configDir: String
@@ -432,6 +432,8 @@ fun main(args: Array<String>) {
Terrarum.main(args)
}
// I must say: What the fuck is wrong with you, Slick2D?!
fun blendMul() {
GL11.glEnable(GL11.GL_BLEND)
GL11.glColorMask(true, true, true, true)
@@ -445,8 +447,8 @@ fun blendNormal() {
// TODO seems working as intended (no more whitened-out semitransparent colour), but needs further investigation
GL14.glBlendFuncSeparate(
GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA,
GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA
GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, // blend func for RGB channels
GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA // blend func for alpha channels
)
}