mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-06-11 02:54:04 +09:00
renderFront is fixed
This commit is contained in:
@@ -592,7 +592,7 @@ class Ingame(val batch: SpriteBatch) : Screen {
|
|||||||
worldDrawFrameBuffer.inAction(camera, batch) {
|
worldDrawFrameBuffer.inAction(camera, batch) {
|
||||||
|
|
||||||
|
|
||||||
// draw-with-poly doesn't want to co-op with peasant spriteBatch...
|
// draw-with-poly doesn't want to co-op with peasant spriteBatch... (it hides sprites)
|
||||||
|
|
||||||
batch.inUse {
|
batch.inUse {
|
||||||
batch.shader = null
|
batch.shader = null
|
||||||
@@ -636,10 +636,16 @@ class Ingame(val batch: SpriteBatch) : Screen {
|
|||||||
/////////////////////////////
|
/////////////////////////////
|
||||||
// draw map related stuffs //
|
// draw map related stuffs //
|
||||||
/////////////////////////////
|
/////////////////////////////
|
||||||
|
}
|
||||||
|
|
||||||
setCameraPosition(0f, 0f)
|
|
||||||
//BlocksDrawer.renderFront(batch, false)
|
|
||||||
|
|
||||||
|
|
||||||
|
setCameraPosition(0f, 0f)
|
||||||
|
BlocksDrawer.renderFront(batch, false)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
batch.inUse {
|
||||||
// --> blendNormal() <-- by BlocksDrawer.renderFront
|
// --> blendNormal() <-- by BlocksDrawer.renderFront
|
||||||
FeaturesDrawer.drawEnvOverlay(batch)
|
FeaturesDrawer.drawEnvOverlay(batch)
|
||||||
|
|
||||||
|
|||||||
@@ -271,6 +271,7 @@ class TitleScreen(val batch: SpriteBatch) : Screen {
|
|||||||
// draw tiles //
|
// draw tiles //
|
||||||
BlocksDrawer.renderWall(batch)
|
BlocksDrawer.renderWall(batch)
|
||||||
BlocksDrawer.renderTerrain(batch)
|
BlocksDrawer.renderTerrain(batch)
|
||||||
|
BlocksDrawer.renderFront(batch, false)
|
||||||
|
|
||||||
|
|
||||||
FeaturesDrawer.drawEnvOverlay(batch)
|
FeaturesDrawer.drawEnvOverlay(batch)
|
||||||
|
|||||||
@@ -397,26 +397,28 @@ object BlocksDrawer {
|
|||||||
renderUsingBuffer(TERRAIN, batch.projectionMatrix)
|
renderUsingBuffer(TERRAIN, batch.projectionMatrix)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated("It's broken right now; don't use it")
|
|
||||||
// FIXME biatch
|
|
||||||
fun renderFront(batch: SpriteBatch, drawWires: Boolean) {
|
fun renderFront(batch: SpriteBatch, drawWires: Boolean) {
|
||||||
// blend mul
|
// blend mul
|
||||||
Gdx.gl.glEnable(GL20.GL_TEXTURE_2D)
|
Gdx.gl.glEnable(GL20.GL_TEXTURE_2D)
|
||||||
Gdx.gl.glEnable(GL20.GL_BLEND)
|
Gdx.gl.glEnable(GL20.GL_BLEND)
|
||||||
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)
|
||||||
|
|
||||||
|
|
||||||
drawTiles(TERRAIN, true) // blendmul tiles
|
drawTiles(TERRAIN, true) // blendmul tiles
|
||||||
renderUsingBuffer(TERRAIN, batch.projectionMatrix)
|
renderUsingBuffer(TERRAIN, batch.projectionMatrix)
|
||||||
|
|
||||||
if (drawWires) {
|
|
||||||
drawTiles(WIRE, false)
|
|
||||||
renderUsingBuffer(WIRE, batch.projectionMatrix)
|
|
||||||
}
|
|
||||||
|
|
||||||
// blend normal
|
// blend normal
|
||||||
Gdx.gl.glEnable(GL20.GL_TEXTURE_2D)
|
Gdx.gl.glEnable(GL20.GL_TEXTURE_2D)
|
||||||
Gdx.gl.glEnable(GL20.GL_BLEND)
|
Gdx.gl.glEnable(GL20.GL_BLEND)
|
||||||
Gdx.gl.glBlendFunc(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA)
|
Gdx.gl.glBlendFunc(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA)
|
||||||
|
|
||||||
|
if (drawWires) {
|
||||||
|
drawTiles(WIRE, false)
|
||||||
|
renderUsingBuffer(WIRE, batch.projectionMatrix)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private val tileDrawLightThreshold = 2f / LightmapRenderer.MUL
|
private val tileDrawLightThreshold = 2f / LightmapRenderer.MUL
|
||||||
@@ -522,6 +524,9 @@ object BlocksDrawer {
|
|||||||
if (isBlendMul(thisTile)) {
|
if (isBlendMul(thisTile)) {
|
||||||
writeToBuffer(mode, x - for_x_start, y - for_y_start, thisTileX, thisTileY)
|
writeToBuffer(mode, x - for_x_start, y - for_y_start, thisTileX, thisTileY)
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
writeToBuffer(mode, x - for_x_start, y - for_y_start, 0, 0)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// do NOT add "if (!isBlendMul(thisTile))"!
|
// do NOT add "if (!isBlendMul(thisTile))"!
|
||||||
|
|||||||
Reference in New Issue
Block a user