From 3505b38789c58d302fe0e5eba87abe052be49337 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sat, 7 Oct 2017 22:21:37 +0900 Subject: [PATCH] Houston, we have a render (again) --- assets/graphics/fonts/numeric_small.tga | 4 +-- src/net/torvald/terrarum/Ingame.kt | 30 +++++++++++++------ src/net/torvald/terrarum/Terrarum.kt | 12 +------- src/net/torvald/terrarum/TitleScreen.kt | 2 -- .../terrarum/worlddrawer/BlocksDrawerNew.kt | 9 +++--- .../graphics/fonts/telegraph/5x5_ibm_bcd.psd | 3 ++ .../graphics/fonts/telegraph/5x5_kana.psd | 3 ++ 7 files changed, 35 insertions(+), 28 deletions(-) create mode 100644 work_files/graphics/fonts/telegraph/5x5_ibm_bcd.psd create mode 100644 work_files/graphics/fonts/telegraph/5x5_kana.psd diff --git a/assets/graphics/fonts/numeric_small.tga b/assets/graphics/fonts/numeric_small.tga index c792a9ee0..87c967392 100644 --- a/assets/graphics/fonts/numeric_small.tga +++ b/assets/graphics/fonts/numeric_small.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:667a8c5fa366c42b873c196b866571ee0c35c0992a3114d88593d37e0979d4a6 -size 1644 +oid sha256:b048720507ec71e3718c78fb00e3758da10c365ee2b7e47ebff41e13a5875520 +size 13484 diff --git a/src/net/torvald/terrarum/Ingame.kt b/src/net/torvald/terrarum/Ingame.kt index 8ae8561ad..d643f9dbb 100644 --- a/src/net/torvald/terrarum/Ingame.kt +++ b/src/net/torvald/terrarum/Ingame.kt @@ -590,26 +590,38 @@ class Ingame(val batch: SpriteBatch) : Screen { processBlur(lightmapFboA, lightmapFboB, LightmapRenderer.DRAW_FOR_RGB) worldDrawFrameBuffer.inAction(camera, batch) { + + + // draw-with-poly doesn't want to co-op with peasant spriteBatch... + batch.inUse { batch.shader = null - - - - batch.color = Color.WHITE blendNormal() + } - setCameraPosition(0f, 0f) - BlocksDrawer.renderWall(batch) + + setCameraPosition(0f, 0f) + BlocksDrawer.renderWall(batch) + + + + batch.inUse { moveCameraToWorldCoord() actorsRenderBehind.forEach { it.drawBody(batch) } particlesContainer.forEach { it.drawBody(batch) } - setCameraPosition(0f, 0f) - BlocksDrawer.renderTerrain(batch) + } + + setCameraPosition(0f, 0f) + BlocksDrawer.renderTerrain(batch) + + + + batch.inUse { ///////////////// // draw actors // ///////////////// @@ -626,7 +638,7 @@ class Ingame(val batch: SpriteBatch) : Screen { ///////////////////////////// setCameraPosition(0f, 0f) - BlocksDrawer.renderFront(batch, false) + //BlocksDrawer.renderFront(batch, false) // --> blendNormal() <-- by BlocksDrawer.renderFront FeaturesDrawer.drawEnvOverlay(batch) diff --git a/src/net/torvald/terrarum/Terrarum.kt b/src/net/torvald/terrarum/Terrarum.kt index 1554b7754..37ff35a9e 100644 --- a/src/net/torvald/terrarum/Terrarum.kt +++ b/src/net/torvald/terrarum/Terrarum.kt @@ -1,12 +1,8 @@ package net.torvald.terrarum -import com.badlogic.gdx.Game import com.badlogic.gdx.Gdx import com.badlogic.gdx.Screen -import com.badlogic.gdx.backends.lwjgl.LwjglApplication -import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration import com.badlogic.gdx.graphics.* -import com.badlogic.gdx.graphics.g2d.BitmapFont import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.glutils.FrameBuffer import com.badlogic.gdx.graphics.glutils.ShaderProgram @@ -14,11 +10,7 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer import com.badlogic.gdx.utils.GdxRuntimeException import com.google.gson.JsonArray import com.google.gson.JsonPrimitive -import net.torvald.random.HQRNG -import net.torvald.terrarum.Terrarum.RENDER_FPS -import net.torvald.terrarum.TerrarumAppLoader import net.torvald.terrarum.gameactors.floorInt -import net.torvald.terrarum.gamecontroller.IngameController import net.torvald.terrarum.imagefont.TinyAlphNum import net.torvald.terrarum.imagefont.Watch7SegMain import net.torvald.terrarum.imagefont.WatchDotAlph @@ -35,9 +27,7 @@ import org.lwjgl.BufferUtils import org.lwjgl.input.Controllers import java.io.File import java.io.IOException -import java.lang.management.ManagementFactory -import java.nio.IntBuffer -import java.util.* + /** * Slick2d Version Created by minjaesong on 2015-12-30. diff --git a/src/net/torvald/terrarum/TitleScreen.kt b/src/net/torvald/terrarum/TitleScreen.kt index 19acd2a82..6f601166c 100644 --- a/src/net/torvald/terrarum/TitleScreen.kt +++ b/src/net/torvald/terrarum/TitleScreen.kt @@ -272,8 +272,6 @@ class TitleScreen(val batch: SpriteBatch) : Screen { BlocksDrawer.renderWall(batch) BlocksDrawer.renderTerrain(batch) - Gdx.gl.glActiveTexture(GL20.GL_TEXTURE0) // don't know why it is needed; it really depresses me - FeaturesDrawer.drawEnvOverlay(batch) diff --git a/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt b/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt index b8857cda6..7aa4d6d5c 100644 --- a/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt +++ b/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt @@ -398,6 +398,7 @@ object BlocksDrawer { } @Deprecated("It's broken right now; don't use it") + // FIXME biatch fun renderFront(batch: SpriteBatch, drawWires: Boolean) { // blend mul Gdx.gl.glEnable(GL20.GL_TEXTURE_2D) @@ -734,15 +735,15 @@ object BlocksDrawer { val tilesBufferAsTex = Texture(tilesBuffer) tilesBufferAsTex.setFilter(Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest) - tilesBufferAsTex.bind(2) - tileAtlas.texture.bind(1) // for some fuck reason, it must be bound as last + tilesBufferAsTex.bind(1) // trying 1 and 0... + tileAtlas.texture.bind(0) // for some fuck reason, it must be bound as last shader.begin() shader.setUniformMatrix("u_projTrans", projectionMatrix)//camera.combined) shader.setUniformf("colourFilter", vertexColour) shader.setUniformf("screenDimension", Gdx.graphics.width.toFloat(), Gdx.graphics.height.toFloat()) - shader.setUniformi("tilesAtlas", 1) - shader.setUniformi("tilemap", 2) + shader.setUniformi("tilesAtlas", 0) + shader.setUniformi("tilemap", 1) shader.setUniformi("tilemapDimension", tilesBuffer.width, tilesBuffer.height) shader.setUniformf("tilesInAxes", tilesInHorizontal.toFloat(), tilesInVertical.toFloat()) shader.setUniformi("cameraTranslation", WorldCamera.x fmod TILE_SIZE, WorldCamera.y fmod TILE_SIZE) diff --git a/work_files/graphics/fonts/telegraph/5x5_ibm_bcd.psd b/work_files/graphics/fonts/telegraph/5x5_ibm_bcd.psd new file mode 100644 index 000000000..8ed002752 --- /dev/null +++ b/work_files/graphics/fonts/telegraph/5x5_ibm_bcd.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67434445ff340769355af1e786547751ef78d9e3d28c31f1508eb774d6870d23 +size 37625 diff --git a/work_files/graphics/fonts/telegraph/5x5_kana.psd b/work_files/graphics/fonts/telegraph/5x5_kana.psd new file mode 100644 index 000000000..2fb5c6161 --- /dev/null +++ b/work_files/graphics/fonts/telegraph/5x5_kana.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4043fc85b243912f317863dd8f7d5db7ab3743c3bfe5f9db423dc10c36120f54 +size 25737