Migrated to new esp shape builder

Author: Avanatiker

src/main/kotlin/com/lambda/config/AutomationConfig.kt

@@ -85,9 +85,8 @@ open class AutomationConfig(
             var drawables = listOf<Drawable>()
 
             init {
-                onStaticRender {
-                    if (renders)
-                        with(it) { drawables.forEach { with(it) { buildRenderer() } } }
+                onStaticRender { esp ->
+	                drawables.forEach { it.render(esp) }
                 }
             }
         }

src/main/kotlin/com/lambda/event/events/RenderEvent.kt

@@ -23,13 +23,13 @@ import com.lambda.event.callback.Cancellable
 import com.lambda.event.callback.ICancellable
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.graphics.RenderMain
-import com.lambda.graphics.renderer.esp.ShapeBuilder
+import com.lambda.graphics.mc.TransientRegionESP
 
-fun Any.onStaticRender(block: SafeContext.(ShapeBuilder) -> Unit) =
-	listen<RenderEvent.Upload> { block(ShapeBuilder(RenderMain.StaticESP)) }
+fun Any.onStaticRender(block: SafeContext.(TransientRegionESP) -> Unit) =
+	listen<RenderEvent.Upload> { block(RenderMain.StaticESP) }
 
-fun Any.onDynamicRender(block: SafeContext.(ShapeBuilder) -> Unit) =
-	listen<RenderEvent.Upload> { block(ShapeBuilder(RenderMain.DynamicESP)) }
+fun Any.onDynamicRender(block: SafeContext.(TransientRegionESP) -> Unit) =
+	listen<RenderEvent.Upload> { block(RenderMain.DynamicESP) }
 
 sealed class RenderEvent {
     object Upload : Event

src/main/kotlin/com/lambda/graphics/RenderMain.kt

@@ -32,10 +32,10 @@ import org.joml.Vector4f
 
 object RenderMain {
     @JvmStatic
-    val StaticESP = TransientRegionESP("Static", true)
+    val StaticESP = TransientRegionESP("Static")
 
     @JvmStatic
-    val DynamicESP = TransientRegionESP("Dynamic", false)
+    val DynamicESP = TransientRegionESP("Dynamic")
 
     val projectionMatrix = Matrix4f()
     val modelViewMatrix

src/main/kotlin/com/lambda/graphics/mc/RegionShapeBuilder.kt

@@ -41,7 +41,7 @@ import kotlin.math.sqrt
  * Shape builder for region-based rendering. All coordinates are automatically converted to
  * region-relative positions.
  *
- * This class provides the same DSL as ShapeDsl but collects vertex data in thread-safe collections
+ * This class provides drawing primitives for region-based rendering and collects vertex data in thread-safe collections
  * for later upload to MC's BufferBuilder.
  *
  * @param region The render region (provides origin for coordinate conversion)
@@ -160,7 +160,7 @@ class RegionShapeBuilder(val region: RenderRegion) {
 		if (shape.isEmpty) {
 			filled(Box(pos), color, sides)
 		} else {
-			filled(shape, color, sides)
+			filled(shape.offset(pos.x.toDouble(), pos.y.toDouble(), pos.z.toDouble()), color, sides)
 		}
 	}
 
@@ -233,21 +233,9 @@ class RegionShapeBuilder(val region: RenderRegion) {
 			lerp(tickDelta, prev.minX, curr.minX),
 			lerp(tickDelta, prev.minY, curr.minY),
 			lerp(tickDelta, prev.minZ, curr.minZ),
-			lerp(
-				tickDelta,
-				prev.maxX,
-				curr.maxX
-			),
-			lerp(
-				mc.partialTicks.toDouble(),
-				prev.maxY,
-				curr.maxY
-			),
-			lerp(
-				mc.partialTicks.toDouble(),
-				prev.maxZ,
-				curr.maxZ
-			)
+			lerp(tickDelta, prev.maxX, curr.maxX),
+			lerp(tickDelta, prev.maxY, curr.maxY),
+			lerp(tickDelta, prev.maxZ, curr.maxZ)
 		)
 		outline(interpolated, color, sides, mode)
 	}
@@ -263,7 +251,7 @@ class RegionShapeBuilder(val region: RenderRegion) {
 		if (shape.isEmpty) {
 			outline(Box(pos), color, sides, mode)
 		} else {
-			outline(shape, color, sides, mode)
+			outline(shape.offset(pos.x.toDouble(), pos.y.toDouble(), pos.z.toDouble()), color, sides, mode)
 		}
 	}
 

src/main/kotlin/com/lambda/graphics/mc/TransientRegionESP.kt

@@ -26,7 +26,7 @@ import kotlin.math.floor
  * Modern replacement for the legacy Treed system. Handles geometry that is cleared and rebuilt
  * every tick. Uses region-based rendering for precision.
  */
-class TransientRegionESP(name: String, depthTest: Boolean) : RegionESP(name, depthTest) {
+class TransientRegionESP(name: String, depthTest: Boolean = false) : RegionESP(name, depthTest) {
 	private val builders = ConcurrentHashMap<Long, ShapeScope>()
 
 	/** Get or create a builder for a specific region. */

src/main/kotlin/com/lambda/graphics/renderer/esp/ShapeDsl.kt

@@ -19,7 +19,8 @@ package com.lambda.interaction.construction.simulation
 
 import com.lambda.context.Automated
 import com.lambda.context.SafeContext
-import com.lambda.graphics.renderer.esp.ShapeBuilder
+import com.lambda.graphics.esp.ShapeScope
+import com.lambda.graphics.mc.TransientRegionESP
 import com.lambda.interaction.construction.blueprint.Blueprint
 import com.lambda.interaction.construction.simulation.result.BuildResult
 import com.lambda.interaction.construction.simulation.result.Drawable
@@ -63,8 +64,10 @@ data class Simulation(
         .map { PossiblePos(it.key.toBlockPos(), it.value.count { it.rank.ordinal < 4 }) }
 
     class PossiblePos(val pos: BlockPos, val interactions: Int) : Drawable {
-        override fun ShapeBuilder.buildRenderer() {
-            box(Vec3d.ofBottomCenter(pos).playerBox(), Color(0, 255, 0, 50), Color(0, 255, 0, 50))
+        override fun render(esp: TransientRegionESP) {
+            esp.shapes(pos.x.toDouble(), pos.y.toDouble(), pos.z.toDouble()) {
+                box(Vec3d.ofBottomCenter(pos).playerBox(), Color(0, 255, 0, 50), Color(0, 255, 0, 50))
+            }
         }
     }
 

src/main/kotlin/com/lambda/interaction/construction/simulation/Simulation.kt

@@ -18,7 +18,8 @@
 package com.lambda.interaction.construction.simulation.context
 
 import com.lambda.context.Automated
-import com.lambda.graphics.renderer.esp.ShapeBuilder
+import com.lambda.graphics.esp.ShapeScope
+import com.lambda.graphics.mc.TransientRegionESP
 import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.managers.LogContext
 import com.lambda.interaction.managers.LogContext.Companion.LogContextBuilder
@@ -63,14 +64,10 @@ data class BreakContext(
 
     override val sorter get() = breakConfig.sorter
 
-    override fun ShapeBuilder.buildRenderer() {
-        val box = with(hitResult.pos) {
-            Box(
-                x - 0.05, y - 0.05, z - 0.05,
-                x + 0.05, y + 0.05, z + 0.05,
-            ).offset(hitResult.side.doubleVector.multiply(0.05))
+    override fun render(esp: TransientRegionESP) {
+        esp.shapes(blockPos.x.toDouble(), blockPos.y.toDouble(), blockPos.z.toDouble()) {
+            box(blockPos, baseColor, sideColor)
         }
-        box(box, baseColor, sideColor)
     }
 
     override fun getLogContextBuilder(): LogContextBuilder.() -> Unit = {

src/main/kotlin/com/lambda/interaction/construction/simulation/context/BreakContext.kt

@@ -18,7 +18,8 @@
 package com.lambda.interaction.construction.simulation.context
 
 import com.lambda.context.Automated
-import com.lambda.graphics.renderer.esp.ShapeBuilder
+import com.lambda.graphics.esp.ShapeScope
+import com.lambda.graphics.mc.TransientRegionESP
 import com.lambda.interaction.managers.LogContext
 import com.lambda.interaction.managers.LogContext.Companion.LogContextBuilder
 import com.lambda.interaction.managers.LogContext.Companion.getLogContextBuilder
@@ -49,14 +50,16 @@ data class InteractContext(
 
     override val sorter get() = interactConfig.sorter
 
-    override fun ShapeBuilder.buildRenderer() {
-        val box = with(hitResult.pos) {
-            Box(
-                x - 0.05, y - 0.05, z - 0.05,
-                x + 0.05, y + 0.05, z + 0.05,
-            ).offset(hitResult.side.doubleVector.multiply(0.05))
+    override fun render(esp: TransientRegionESP) {
+        esp.shapes(hitResult.pos.x, hitResult.pos.y, hitResult.pos.z) {
+            val box = with(hitResult.pos) {
+                Box(
+                    x - 0.05, y - 0.05, z - 0.05,
+                    x + 0.05, y + 0.05, z + 0.05,
+                ).offset(hitResult.side.doubleVector.multiply(0.05))
+            }
+            box(box, baseColor, sideColor)
         }
-        box(box, baseColor, sideColor)
     }
 
     fun requestDependencies(request: InteractRequest): Boolean {