Skip to content

Commit

Permalink
Decent rendering of translucent blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
@Martomate
Martomate committed Dec 15, 2024
1 parent 86674da commit 464e139
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 32 deletions.
1 change: 1 addition & 0 deletions client/src/main/resources/shaders/world_combiner/frag.glsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ void main() {

color = worldColor;//vec4(mix(worldColor.rgb, vec3(0.0, 0.0, 0.5), 1.0 - exp(-0.2 * worldDepth)), 1.0);
color.rgb *= visibility;
color.a = sqrt(color.a);
}
100 changes: 68 additions & 32 deletions client/src/main/scala/hexacraft/client/WorldRenderer.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package hexacraft.client
import hexacraft.client.ClientWorld.WorldTickResult
import hexacraft.client.render.*
import hexacraft.infra.gpu.OpenGL
import hexacraft.renderer.{GpuState, TextureArray, TextureSingle, VAO}
import hexacraft.renderer.{GpuState, Shader, TextureArray, TextureSingle, VAO}
import hexacraft.shaders.*
import hexacraft.util.{NamedThreadFactory, TickableTimer}
import hexacraft.world.*
Expand Down Expand Up @@ -42,14 +42,14 @@ class WorldRenderer(

private val terrainShader = new TerrainShader()

private val solidBlockGpuState = GpuState.build(_.blend(false).cullFace(true))
private val transmissiveBlockGpuState = GpuState.build(_.blend(true).cullFace(true))
private val opaqueBlockGpuState = GpuState.build(_.blend(false).cullFace(true))
private val translucentBlockGpuState = GpuState.build(_.blend(true).cullFace(true))

private val terrainGpuState = GpuState.build(_.blend(false).cullFace(true))

private val solidBlockRenderers: IndexedSeq[mutable.LongMap[BlockFaceBatchRenderer]] =
private val opaqueBlockRenderers: IndexedSeq[mutable.LongMap[BlockFaceBatchRenderer]] =
IndexedSeq.tabulate(8)(s => new mutable.LongMap())
private val transmissiveBlockRenderers: IndexedSeq[mutable.LongMap[BlockFaceBatchRenderer]] =
private val translucentBlockRenderers: IndexedSeq[mutable.LongMap[BlockFaceBatchRenderer]] =
IndexedSeq.tabulate(8)(s => new mutable.LongMap())

private val terrainRenderers: mutable.LongMap[TerrainBatchRenderer] = mutable.LongMap.empty
Expand Down Expand Up @@ -89,10 +89,10 @@ class WorldRenderer(
}

def regularChunkBufferFragmentation: IndexedSeq[Float] =
solidBlockRenderers.map(a => a.values.map(_.fragmentation).sum / a.keys.size)
opaqueBlockRenderers.map(a => a.values.map(_.fragmentation).sum / a.keys.size)

def transmissiveChunkBufferFragmentation: IndexedSeq[Float] =
transmissiveBlockRenderers.map(a => a.values.map(_.fragmentation).sum / a.keys.size)
translucentBlockRenderers.map(a => a.values.map(_.fragmentation).sum / a.keys.size)

def renderQueueLength: Int = {
chunkRenderUpdateQueue.length
Expand Down Expand Up @@ -293,13 +293,12 @@ class WorldRenderer(
}
}

// Step 1: Render everything to a FrameBuffer
// Step 1.1: Render all opaque things to a FrameBuffer
mainFrameBuffer.bind()

OpenGL.glClear(OpenGL.ClearMask.colorBuffer | OpenGL.ClearMask.depthBuffer)

// World content
renderBlocks(camera, sun)
renderBlocks(camera, sun, true)
// TODO: Opaque and translucent blocks are both rendered here, but they need to be separate.
// In the world combiner there is a normal field, but if there is glass in front of grass then the normal will be for the glass.
// The normal-based shading only happens for the grass.
Expand All @@ -313,13 +312,48 @@ class WorldRenderer(
}

mainFrameBuffer.unbind()

// Step 2: Render everything to the screen (one could add post processing here in the future)
OpenGL.glViewport(0, 0, mainFrameBuffer.frameBuffer.width, mainFrameBuffer.frameBuffer.height)

OpenGL.glClear(OpenGL.ClearMask.colorBuffer | OpenGL.ClearMask.depthBuffer)

renderSky(camera, sun)

// Step 2: Render the FrameBuffer to the screen (one could add post processing here in the future)
// Step 2.1: Render the FrameBuffer for opaque things
OpenGL.glActiveTexture(worldCombinerShader.positionTextureSlot)
OpenGL.glBindTexture(OpenGL.TextureTarget.Texture2D, mainFrameBuffer.positionTexture)
OpenGL.glActiveTexture(worldCombinerShader.normalTextureSlot)
OpenGL.glBindTexture(OpenGL.TextureTarget.Texture2D, mainFrameBuffer.normalTexture)
OpenGL.glActiveTexture(worldCombinerShader.colorTextureSlot)
OpenGL.glBindTexture(OpenGL.TextureTarget.Texture2D, mainFrameBuffer.colorTexture)
OpenGL.glActiveTexture(worldCombinerShader.depthTextureSlot)
OpenGL.glBindTexture(OpenGL.TextureTarget.Texture2D, mainFrameBuffer.depthTexture)

worldCombinerShader.enable()
worldCombinerShader.setSunPosition(sun)
worldCombinerRenderer.render(worldCombinerVao, worldCombinerVao.maxCount)

OpenGL.glActiveTexture(OpenGL.TextureSlot.ofSlot(3))
OpenGL.glBindTexture(OpenGL.TextureTarget.Texture2D, OpenGL.TextureId.none)
OpenGL.glActiveTexture(OpenGL.TextureSlot.ofSlot(2))
OpenGL.glBindTexture(OpenGL.TextureTarget.Texture2D, OpenGL.TextureId.none)
OpenGL.glActiveTexture(OpenGL.TextureSlot.ofSlot(1))
OpenGL.glBindTexture(OpenGL.TextureTarget.Texture2D, OpenGL.TextureId.none)
OpenGL.glActiveTexture(OpenGL.TextureSlot.ofSlot(0))
OpenGL.glBindTexture(OpenGL.TextureTarget.Texture2D, OpenGL.TextureId.none)

// Step 1.2: Render all translucent things to a FrameBuffer
mainFrameBuffer.bind()
OpenGL.glClear(OpenGL.ClearMask.colorBuffer)
OpenGL.glDepthMask(false)

renderBlocks(camera, sun, false)

OpenGL.glDepthMask(true)
mainFrameBuffer.unbind()

// Step 2.2: Render the FrameBuffer for translucent things
OpenGL.glActiveTexture(worldCombinerShader.positionTextureSlot)
OpenGL.glBindTexture(OpenGL.TextureTarget.Texture2D, mainFrameBuffer.positionTexture)
OpenGL.glActiveTexture(worldCombinerShader.normalTextureSlot)
Expand Down Expand Up @@ -357,15 +391,15 @@ class WorldRenderer(
selectedBlockRenderer.render(selectedBlockVao, 1)
}

private def renderBlocks(camera: Camera, sun: Vector3f): Unit = {
private def renderBlocks(camera: Camera, sun: Vector3f, opaque: Boolean): Unit = {
blockShader.setViewMatrix(camera.view.matrix)
blockShader.setCameraPosition(camera.position)

blockSideShader.setViewMatrix(camera.view.matrix)
blockSideShader.setCameraPosition(camera.position)

blockTexture.bind()
renderBlocks()
renderBlocks(opaque)
}

private def renderTerrain(camera: Camera, sun: Vector3f): Unit = {
Expand Down Expand Up @@ -394,22 +428,24 @@ class WorldRenderer(
updateBlockData(transmissiveData._1, transmissiveData._2, transmissive = true)
}

private def renderBlocks(): Unit = {
for side <- 0 until 8 do {
val sh = if side < 2 then blockShader else blockSideShader
sh.enable()
sh.setSide(side)
for h <- solidBlockRenderers(side).values do {
h.render()
private def renderBlocks(opaque: Boolean): Unit = {
if opaque then {
for side <- 0 until 8 do {
val sh = if side < 2 then blockShader else blockSideShader
sh.enable()
sh.setSide(side)
for h <- opaqueBlockRenderers(side).values do {
h.render()
}
}
}

for side <- 0 until 8 do {
val sh = if side < 2 then blockShader else blockSideShader
sh.enable()
sh.setSide(side)
for h <- transmissiveBlockRenderers(side).values do {
h.render()
} else {
for side <- 0 until 8 do {
val sh = if side < 2 then blockShader else blockSideShader
sh.enable()
sh.setSide(side)
for h <- translucentBlockRenderers(side).values do {
h.render()
}
}
}
}
Expand Down Expand Up @@ -449,10 +485,10 @@ class WorldRenderer(
(g, clear.getOrElse(g, Seq()), update.getOrElse(g, Seq()))
}

val gpuState = if transmissive then transmissiveBlockGpuState else solidBlockGpuState
val gpuState = if transmissive then translucentBlockGpuState else opaqueBlockGpuState

for s <- 0 until 8 do {
val batchRenderers = if transmissive then transmissiveBlockRenderers(s) else solidBlockRenderers(s)
val batchRenderers = if transmissive then translucentBlockRenderers(s) else opaqueBlockRenderers(s)

for (g, clear, update) <- groupData do {
val r = batchRenderers.getOrElseUpdate(g, new BlockFaceBatchRenderer(makeBufferHandler(s, gpuState)))
Expand Down Expand Up @@ -531,14 +567,14 @@ class WorldRenderer(
r.unload()
}

for rs <- solidBlockRenderers do {
for rs <- opaqueBlockRenderers do {
for h <- rs.values do {
h.unload()
}
rs.clear()
}

for rs <- transmissiveBlockRenderers do {
for rs <- translucentBlockRenderers do {
for h <- rs.values do {
h.unload()
}
Expand Down
7 changes: 7 additions & 0 deletions gpu/src/main/scala/hexacraft/infra/gpu/OpenGL.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,10 @@ object OpenGL {
gl.glBlendFunc(sfactor.toGL, dfactor.toGL)
}

def glDepthMask(shouldWriteDepth: Boolean): Unit = {
gl.glDepthMask(shouldWriteDepth)
}

def glDepthFunc(func: DepthFunc): Unit = {
gl.glDepthFunc(func.toGL)
}
Expand Down Expand Up @@ -889,6 +893,7 @@ trait GLWrapper {

def glGetError(): Int
def glClear(mask: Int): Unit
def glDepthMask(flag: Boolean): Unit
def glDepthFunc(func: Int): Unit
def glBlendFunc(sfactor: Int, dfactor: Int): Unit
def glScissor(x: Int, y: Int, width: Int, height: Int): Unit
Expand Down Expand Up @@ -1024,6 +1029,7 @@ class StubGL extends GLWrapper {

def glGetError(): Int = 0
def glClear(mask: Int): Unit = ()
def glDepthMask(flag: Boolean): Unit = ()
def glDepthFunc(func: Int): Unit = ()
def glBlendFunc(sfactor: Int, dfactor: Int): Unit = ()
def glScissor(x: Int, y: Int, width: Int, height: Int): Unit = ()
Expand Down Expand Up @@ -1152,6 +1158,7 @@ object RealGL extends GLWrapper {

def glGetError(): Int = GL11.glGetError()
def glClear(mask: Int): Unit = GL11.glClear(mask)
def glDepthMask(flag: Boolean): Unit = GL11.glDepthMask(flag)
def glDepthFunc(func: Int): Unit = GL11.glDepthFunc(func)
def glBlendFunc(sfactor: Int, dfactor: Int): Unit = GL11.glBlendFunc(sfactor, dfactor)
def glScissor(x: Int, y: Int, width: Int, height: Int): Unit = GL11.glScissor(x, y, width, height)
Expand Down

0 comments on commit 464e139

Please sign in to comment.