[WIP] algae, reeds, mycelium, coral working

+ lots of cleanup, reorganizing

src/main/kotlin/mods/betterfoliage/render/pipeline/RenderCtxBase.kt

@@ -3,17 +3,27 @@ package mods.betterfoliage.render.pipeline
 import com.mojang.blaze3d.matrix.MatrixStack
 import mods.betterfoliage.chunk.BasicBlockCtx
 import mods.betterfoliage.chunk.BlockCtx
-import mods.betterfoliage.render.old.HalfBakedQuad
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.render.lighting.VanillaFullBlockLighting
+import mods.betterfoliage.render.lighting.VanillaQuadLighting
+import mods.betterfoliage.render.lighting.VanillaVertexLighter
+import mods.betterfoliage.model.HalfBakedQuad
 import mods.betterfoliage.util.Int3
+import mods.betterfoliage.util.plus
 import net.minecraft.block.Block
 import net.minecraft.client.Minecraft
-import net.minecraft.client.renderer.model.IBakedModel
 import net.minecraft.util.Direction
 import net.minecraft.util.math.BlockPos
 import net.minecraft.world.ILightReader
 import net.minecraftforge.client.model.data.IModelData
 import java.util.Random
 
+/**
+ * Rendering context for drawing [SpecialRenderModel] models.
+ *
+ * This class (and others in its constellation) basically form a replacement, highly customizable,
+ * push-based partial rendering pipeline for [SpecialRenderModel] instances.
+ */
 abstract class RenderCtxBase(
     world: ILightReader,
     pos: BlockPos,
@@ -23,12 +33,17 @@ abstract class RenderCtxBase(
     val modelData: IModelData
 ) : BlockCtx by BasicBlockCtx(world, pos) {
 
+    abstract fun renderQuad(quad: HalfBakedQuad)
+
     var hasRendered = false
     val blockModelShapes = Minecraft.getInstance().blockRendererDispatcher.blockModelShapes
-    inline fun Direction?.shouldRender() = this == null || !checkSides || Block.shouldSideBeRendered(state, world, pos, this)
+    var vertexLighter: VanillaVertexLighter = VanillaFullBlockLighting
+    protected val lightingData = RenderCtxBase.lightingData.get().apply {
+        calc.reset(this@RenderCtxBase)
+        blockColors = Minecraft.getInstance().blockColors
+    }
 
-    protected abstract fun renderQuad(quad: HalfBakedQuad)
-    abstract fun renderFallback(model: IBakedModel)
+    inline fun Direction?.shouldRender() = this == null || !checkSides || Block.shouldSideBeRendered(state, world, pos, this)
 
     fun render(quads: Iterable<HalfBakedQuad>) {
         quads.forEach { quad ->
@@ -39,5 +54,13 @@ abstract class RenderCtxBase(
         }
     }
 
-    abstract fun renderMasquerade(offset: Int3, func: ()->Unit)
+    fun renderMasquerade(offset: Int3, func: () -> Unit) {
+        lightingData.calc.blockPos += offset
+        func()
+        lightingData.calc.blockPos = pos
+    }
+
+    companion object {
+        val lightingData = ThreadLocal.withInitial { VanillaQuadLighting() }
+    }
 }

src/main/kotlin/mods/betterfoliage/render/pipeline/RenderCtxForge.kt

@@ -1,16 +1,12 @@
 package mods.betterfoliage.render.pipeline
 
 import com.mojang.blaze3d.matrix.MatrixStack
-import mods.betterfoliage.render.ISpecialRenderModel
+import mods.betterfoliage.model.SpecialRenderModel
 import mods.betterfoliage.render.lighting.ForgeVertexLighter
 import mods.betterfoliage.render.lighting.ForgeVertexLighterAccess
-import mods.betterfoliage.render.old.HalfBakedQuad
-import mods.betterfoliage.util.Int3
-import mods.betterfoliage.util.directionsAndNull
-import mods.betterfoliage.util.get
-import mods.octarinecore.VertexLighterFlat_blockInfo
+import mods.betterfoliage.model.HalfBakedQuad
 import net.minecraft.block.BlockState
-import net.minecraft.client.renderer.model.IBakedModel
+import net.minecraft.client.renderer.LightTexture
 import net.minecraft.util.math.BlockPos
 import net.minecraft.world.ILightReader
 import net.minecraftforge.client.model.data.IModelData
@@ -25,28 +21,28 @@ class RenderCtxForge(
     checkSides: Boolean,
     random: Random,
     modelData: IModelData
-): RenderCtxBase(world, pos, matrixStack, checkSides, random, modelData), ForgeVertexLighterAccess {
+): RenderCtxBase(world, pos, matrixStack, checkSides, random, modelData), ForgeVertexLighter {
 
-    val blockInfo = lighter[VertexLighterFlat_blockInfo]
-    override var vertexLighter: ForgeVertexLighter
-        get() = (lighter as ForgeVertexLighterAccess).vertexLighter
-        set(value) { (lighter as ForgeVertexLighterAccess).vertexLighter = value }
+    override fun renderQuad(quad: HalfBakedQuad) {
+        // set Forge lighter AO calculator to us
+        vertexLighter.updateLightmapAndColor(quad, lightingData)
+        quad.baked.pipe(lighter)
+    }
 
-    override fun renderQuad(quad: HalfBakedQuad) { quad.baked.pipe(lighter) }
-
-    override fun renderFallback(model: IBakedModel) {
-        directionsAndNull.forEach { face ->
-            model.getQuads(state, null, random, modelData).forEach { quad ->
-                if (quad.face.shouldRender()) {
-                    quad.pipe(lighter)
-                    hasRendered = true
-                }
-            }
+    // somewhat ugly hack to pipe lighting values into the Forge pipeline
+    var vIdx = 0
+    override fun updateVertexLightmap(normal: FloatArray, lightmap: FloatArray, x: Float, y: Float, z: Float) {
+        lightingData.packedLight[vIdx].let { packedLight ->
+            lightmap[0] = LightTexture.getLightBlock(packedLight) / 0xF.toFloat()
+            lightmap[1] = LightTexture.getLightSky(packedLight) / 0xF.toFloat()
         }
     }
 
-    override fun renderMasquerade(offset: Int3, func: () -> Unit) {
-        TODO("Not yet implemented")
+    override fun updateVertexColor(normal: FloatArray, color: FloatArray, x: Float, y: Float, z: Float, tint: Float, multiplier: Int) {
+        color[0] = lightingData.tint[0] * lightingData.colorMultiplier[vIdx]
+        color[1] = lightingData.tint[1] * lightingData.colorMultiplier[vIdx]
+        color[2] = lightingData.tint[2] * lightingData.colorMultiplier[vIdx]
+        vIdx++
     }
 
     companion object {
@@ -54,7 +50,7 @@ class RenderCtxForge(
         fun render(
             lighter: VertexLighterFlat,
             world: ILightReader,
-            model: ISpecialRenderModel,
+            model: SpecialRenderModel,
             state: BlockState,
             pos: BlockPos,
             matrixStack: MatrixStack,
@@ -68,6 +64,7 @@ class RenderCtxForge(
             rand.setSeed(seed)
             lighter.updateBlockInfo()
             return RenderCtxForge(world, pos, lighter, matrixStack, checkSides, rand, modelData).let {
+                (lighter as ForgeVertexLighterAccess).vertexLighter = it
                 model.render(it, false)
                 lighter.resetBlockInfo()
                 it.hasRendered

src/main/kotlin/mods/betterfoliage/render/pipeline/RenderCtxVanilla.kt

@@ -2,17 +2,10 @@ package mods.betterfoliage.render.pipeline
 
 import com.mojang.blaze3d.matrix.MatrixStack
 import com.mojang.blaze3d.vertex.IVertexBuilder
-import mods.betterfoliage.render.ISpecialRenderModel
-import mods.betterfoliage.render.lighting.VanillaFullBlockLighting
-import mods.betterfoliage.render.lighting.VanillaVertexLighter
-import mods.betterfoliage.render.lighting.VanillaQuadLighting
-import mods.betterfoliage.render.old.HalfBakedQuad
-import mods.betterfoliage.util.Int3
-import mods.betterfoliage.util.ThreadLocalDelegate
-import mods.betterfoliage.util.plus
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.model.HalfBakedQuad
 import net.minecraft.block.BlockState
 import net.minecraft.client.renderer.BlockModelRenderer
-import net.minecraft.client.renderer.model.IBakedModel
 import net.minecraft.util.math.BlockPos
 import net.minecraft.world.ILightReader
 import net.minecraftforge.client.model.data.IModelData
@@ -32,30 +25,14 @@ class RenderCtxVanilla(
     val useAO: Boolean
 ): RenderCtxBase(world, pos, matrixStack, checkSides, random, modelData) {
 
-    private val blockColors = renderer.blockColors
-    var vertexLighter: VanillaVertexLighter = VanillaFullBlockLighting
-
     override fun renderQuad(quad: HalfBakedQuad) {
-        lightingData.let { lighting ->
-            vertexLighter.updateLightmapAndColor(quad, lighting)
-            buffer.addQuad(
-                matrixStack.last, quad.baked,
-                lighting.colorMultiplier,
-                lighting.tint[0], lighting.tint[1], lighting.tint[2],
-                lighting.packedLight, combinedOverlay, true
-            )
-        }
-    }
-
-    override fun renderFallback(model: IBakedModel) {
-        if (useAO) renderer.renderModelSmooth(world, model, state, pos, matrixStack, buffer, checkSides, random, seed, combinedOverlay, modelData)
-        else renderer.renderModelFlat(world, model, state, pos, matrixStack, buffer, checkSides, random, seed, combinedOverlay, modelData)
-    }
-
-    override fun renderMasquerade(offset: Int3, func: () -> Unit) {
-        lightingData.calc.blockPos += offset
-        func()
-        lightingData.calc.blockPos = pos
+        vertexLighter.updateLightmapAndColor(quad, lightingData)
+        buffer.addQuad(
+            matrixStack.last, quad.baked,
+            lightingData.colorMultiplier,
+            lightingData.tint[0], lightingData.tint[1], lightingData.tint[2],
+            lightingData.packedLight, combinedOverlay, true
+        )
     }
 
     companion object {
@@ -63,7 +40,7 @@ class RenderCtxVanilla(
         fun render(
             renderer: BlockModelRenderer,
             world: ILightReader,
-            model: ISpecialRenderModel,
+            model: SpecialRenderModel,
             state: BlockState,
             pos: BlockPos,
             matrixStack: MatrixStack,
@@ -78,13 +55,12 @@ class RenderCtxVanilla(
             random.setSeed(rand)
             val ctx = RenderCtxVanilla(renderer, world, pos, buffer, combinedOverlay, matrixStack, checkSides, random, rand, modelData, smooth)
             lightingData.apply {
-                calc.reset(ctx)
-                blockColors = renderer.blockColors
+
             }
             model.render(ctx, false)
             return ctx.hasRendered
         }
 
-        val lightingData by ThreadLocalDelegate { VanillaQuadLighting() }
+
     }
 }