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

simplified a structure of UIs a bit

Browse Source
This commit is contained in:
minjaesong
2017-07-16 23:15:32 +09:00
parent 98409f09c0
commit dad876308c
29 changed files with 321 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/net/torvald/terrarum/Ingame.kt
View File

@@ -466,7 +466,7 @@ class Ingame(val batch: SpriteBatch) : Screen {
KeyToggler.update()
GameController.processInput(delta)
GameController.update(delta)
if (!paused) {
@@ -483,12 +483,6 @@ class Ingame(val batch: SpriteBatch) : Screen {
world.globalLight = WeatherMixer.globalLightNow
///////////////////////////
// input-related updates //
///////////////////////////
uiContainer.forEach { it.processInput(delta) }
////////////////////////////
// camera-related updates //
////////////////////////////
@@ -608,11 +602,14 @@ class Ingame(val batch: SpriteBatch) : Screen {
// mix lighpmap canvas to this canvas (Colors -- RGB channel)
if (!KeyToggler.isOn(Input.Keys.F6)) { // F6 to disable lightmap draw
setCameraPosition(0f, 0f)
batch.shader = null
batch.shader = Terrarum.shaderBayer
batch.shader.setUniformf("rcount", 64f)
batch.shader.setUniformf("gcount", 64f)
batch.shader.setUniformf("bcount", 64f) // de-banding
val lightTex = blurWriteBuffer.colorBufferTexture // TODO zoom!
lightTex.setFilter(Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest)
lightTex.setFilter(Texture.TextureFilter.Linear, Texture.TextureFilter.Linear)
if (KeyToggler.isOn(KEY_LIGHTMAP_RENDER)) blendNormal()
else blendMul()
@@ -671,14 +668,17 @@ class Ingame(val batch: SpriteBatch) : Screen {
// --> blendNormal() <-- introduced by childs of ActorWithBody //
// mix lighpmap canvas to this canvas (UV lights -- A channel)
// mix lighpmap canvas to this canvas (UV lights -- A channel written on RGB as greyscale image)
if (!KeyToggler.isOn(Input.Keys.F6)) { // F6 to disable lightmap draw
setCameraPosition(0f, 0f)
batch.shader = null
batch.shader = Terrarum.shaderBayer
batch.shader.setUniformf("rcount", 64f)
batch.shader.setUniformf("gcount", 64f)
batch.shader.setUniformf("bcount", 64f) // de-banding
val lightTex = blurWriteBuffer.colorBufferTexture // TODO zoom!
lightTex.setFilter(Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest)
lightTex.setFilter(Texture.TextureFilter.Linear, Texture.TextureFilter.Linear)
if (KeyToggler.isOn(KEY_LIGHTMAP_RENDER)) blendNormal()
else blendMul()
@@ -702,22 +702,6 @@ class Ingame(val batch: SpriteBatch) : Screen {
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT)
// draw skybox
/*WeatherMixer.render(camera)
batch.inUse {
batch.color = Color.WHITE
blendNormal()
Gdx.gl.glActiveTexture(GL20.GL_TEXTURE0) // reset active textureunit to zero (i don't know tbh, but it won't work without this)
batch.shader = null
}*/
// draw blended world
val worldTex = worldDrawFrameBuffer.colorBufferTexture // WORLD: light_color must be applied beforehand
val glowTex = worldGlowFrameBuffer.colorBufferTexture // GLOW: light_uvlight must be applied beforehand
@@ -776,7 +760,6 @@ class Ingame(val batch: SpriteBatch) : Screen {
val blendedTex = worldBlendFrameBuffer.colorBufferTexture
blendedTex.setFilter(Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest)
batch.color = Color.WHITE
//batch.shader = Terrarum.shaderBayer
batch.shader = null
blendNormal()
batch.draw(blendedTex, 0f, 0f, blendedTex.width.toFloat(), blendedTex.height.toFloat())