curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-14 23:56:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

terrain glow tex drawing

Browse Source
This commit is contained in:
minjaesong
2019-08-15 19:42:16 +09:00
parent fe97231db6
commit 1a1a9c52d3
2 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -403,7 +403,7 @@ object IngameRenderer : Disposable {
} }
setCameraPosition(0f, 0f) setCameraPosition(0f, 0f)
BlocksDrawer.drawWall(batch.projectionMatrix) BlocksDrawer.drawWall(batch.projectionMatrix, false)
batch.inUse { batch.inUse {
moveCameraToWorldCoord() moveCameraToWorldCoord()
@@ -412,7 +412,7 @@ object IngameRenderer : Disposable {
} }
setCameraPosition(0f, 0f) setCameraPosition(0f, 0f)
BlocksDrawer.drawTerrain(batch.projectionMatrix) BlocksDrawer.drawTerrain(batch.projectionMatrix, false)
batch.inUse { batch.inUse {
///////////////// /////////////////
@@ -515,7 +515,7 @@ object IngameRenderer : Disposable {
} }
setCameraPosition(0f, 0f) setCameraPosition(0f, 0f)
// BlocksDrawer.renderWhateverGlow_WALL BlocksDrawer.drawWall(batch.projectionMatrix, true)
batch.inUse { batch.inUse {
moveCameraToWorldCoord() moveCameraToWorldCoord()
@@ -524,7 +524,7 @@ object IngameRenderer : Disposable {
} }
setCameraPosition(0f, 0f) setCameraPosition(0f, 0f)
// BlocksDrawer.renderWhateverGlow_TERRAIN BlocksDrawer.drawTerrain(batch.projectionMatrix, true)
batch.inUse { batch.inUse {
///////////////// /////////////////

33
src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt
View File

@@ -50,6 +50,7 @@ internal object BlocksDrawer {
val tileItemTerrain: TextureRegionPack val tileItemTerrain: TextureRegionPack
val tileItemWall: TextureRegionPack val tileItemWall: TextureRegionPack
val tilesFluid: TextureRegionPack val tilesFluid: TextureRegionPack
val tilesGlow: TextureRegionPack
//val tileItemWall = Image(TILE_SIZE * 16, TILE_SIZE * GameWorld.TILES_SUPPORTED / 16) // 4 MB //val tileItemWall = Image(TILE_SIZE * 16, TILE_SIZE * GameWorld.TILES_SUPPORTED / 16) // 4 MB
@@ -124,6 +125,7 @@ internal object BlocksDrawer {
//TODO make wire work with the TileAtlas system //TODO make wire work with the TileAtlas system
tilesWire = TextureRegionPack(ModMgr.getGdxFile("basegame", "blocks/wire.tga"), TILE_SIZE, TILE_SIZE) tilesWire = TextureRegionPack(ModMgr.getGdxFile("basegame", "blocks/wire.tga"), TILE_SIZE, TILE_SIZE)
tilesFluid = TextureRegionPack(Texture(CreateTileAtlas.atlasFluid), TILE_SIZE, TILE_SIZE) tilesFluid = TextureRegionPack(Texture(CreateTileAtlas.atlasFluid), TILE_SIZE, TILE_SIZE)
tilesGlow = TextureRegionPack(Texture(CreateTileAtlas.atlasGlow), TILE_SIZE, TILE_SIZE)
printdbg(this, "Making terrain and wall item textures...") printdbg(this, "Making terrain and wall item textures...")
@@ -205,17 +207,17 @@ internal object BlocksDrawer {
drawTiles(FLUID) drawTiles(FLUID)
} }
internal fun drawWall(projectionMatrix: Matrix4) { internal fun drawWall(projectionMatrix: Matrix4, drawGlow: Boolean) {
gdxSetBlendNormal() gdxSetBlendNormal()
renderUsingBuffer(WALL, projectionMatrix) renderUsingBuffer(WALL, projectionMatrix, drawGlow)
} }
internal fun drawTerrain(projectionMatrix: Matrix4) { internal fun drawTerrain(projectionMatrix: Matrix4, drawGlow: Boolean) {
gdxSetBlendNormal() gdxSetBlendNormal()
renderUsingBuffer(TERRAIN, projectionMatrix) renderUsingBuffer(TERRAIN, projectionMatrix, drawGlow)
renderUsingBuffer(FLUID, projectionMatrix) renderUsingBuffer(FLUID, projectionMatrix, drawGlow)
} }
var drawWires = 0 var drawWires = 0
@@ -228,7 +230,7 @@ internal object BlocksDrawer {
Gdx.gl.glBlendFunc(GL20.GL_DST_COLOR, GL20.GL_ONE_MINUS_SRC_ALPHA) Gdx.gl.glBlendFunc(GL20.GL_DST_COLOR, GL20.GL_ONE_MINUS_SRC_ALPHA)
// let's just not MUL on terrain, make it FLUID only... // let's just not MUL on terrain, make it FLUID only...
renderUsingBuffer(FLUID, projectionMatrix) renderUsingBuffer(FLUID, projectionMatrix, false)
@@ -237,7 +239,7 @@ internal object BlocksDrawer {
this.drawWires = drawWires this.drawWires = drawWires
if (drawWires != 0) { if (drawWires != 0) {
//println("Wires! draw: $drawWires") // use F10 instead //println("Wires! draw: $drawWires") // use F10 instead
renderUsingBuffer(WIRE, projectionMatrix) renderUsingBuffer(WIRE, projectionMatrix, false)
} }
} }
@@ -570,7 +572,7 @@ internal object BlocksDrawer {
private var _tilesBufferAsTex: Texture = Texture(1, 1, Pixmap.Format.RGBA8888) private var _tilesBufferAsTex: Texture = Texture(1, 1, Pixmap.Format.RGBA8888)
private fun renderUsingBuffer(mode: Int, projectionMatrix: Matrix4) { private fun renderUsingBuffer(mode: Int, projectionMatrix: Matrix4, drawGlow: Boolean) {
//Gdx.gl.glClearColor(.094f, .094f, .094f, 0f) //Gdx.gl.glClearColor(.094f, .094f, .094f, 0f)
//Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT) //Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT)
@@ -613,9 +615,17 @@ internal object BlocksDrawer {
_tilesBufferAsTex.dispose() _tilesBufferAsTex.dispose()
_tilesBufferAsTex = Texture(tilesBuffer) _tilesBufferAsTex = Texture(tilesBuffer)
_tilesBufferAsTex.setFilter(Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest) _tilesBufferAsTex.setFilter(Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest)
tilesTerrainBlend.texture.bind(2)
_tilesBufferAsTex.bind(1) // trying 1 and 0... if (drawGlow) {
tileAtlas.texture.bind(0) // for some fuck reason, it must be bound as last tilesGlow.texture.bind(2)
_tilesBufferAsTex.bind(1) // trying 1 and 0...
tilesGlow.texture.bind(0) // for some fuck reason, it must be bound as last
}
else {
tilesTerrainBlend.texture.bind(2)
_tilesBufferAsTex.bind(1) // trying 1 and 0...
tileAtlas.texture.bind(0) // for some fuck reason, it must be bound as last
}
shader.begin() shader.begin()
shader.setUniformMatrix("u_projTrans", projectionMatrix)//camera.combined) shader.setUniformMatrix("u_projTrans", projectionMatrix)//camera.combined)
@@ -727,6 +737,7 @@ internal object BlocksDrawer {
printStackTrace(this) printStackTrace(this)
weatherTerrains.forEach { it.dispose() } weatherTerrains.forEach { it.dispose() }
tilesGlow.dispose()
tilesWire.dispose() tilesWire.dispose()
tileItemTerrain.dispose() tileItemTerrain.dispose()
tileItemWall.dispose() tileItemWall.dispose()