MaterialBundler not needed any more

redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/graphics/GraphicsRenderer.groovy

@@ -24,8 +24,6 @@ import org.joml.Matrix4f
 import org.joml.Vector2f
 import org.joml.primitives.Rectanglef
 
-import groovy.transform.stc.ClosureParams
-import groovy.transform.stc.SimpleType
 import java.nio.ByteBuffer
 
 /**
@@ -129,19 +127,4 @@ interface GraphicsRenderer extends Closeable, EventTarget {
 	 * {@code null} to set the render target as the screen.
 	 */
 	void setRenderTarget(Framebuffer framebuffer)
-
-	/**
-	 * Use a batching material builder within the context of the given closure
-	 * that will return a single renderable material that is the sum of all the
-	 * materials initialized within the closure.
-	 *
-	 * @param closure
-	 * @return
-	 *   A material that represents all of the materials created within the
-	 *   closure.  This material can then be rendered as normal to render all of
-	 *   the created materials at once.
-	 */
-	Tuple2<Mesh, Material> withMaterialBundler(
-		@ClosureParams(value = SimpleType, options = 'nz.net.ultraq.redhorizon.engine.graphics.MaterialBundler')
-			Closure closure)
 }

redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/graphics/opengl/OpenGLRenderer.groovy

@@ -26,7 +26,6 @@ import nz.net.ultraq.redhorizon.engine.graphics.FramebufferDeletedEvent
 import nz.net.ultraq.redhorizon.engine.graphics.FramebufferSizeEvent
 import nz.net.ultraq.redhorizon.engine.graphics.GraphicsConfiguration
 import nz.net.ultraq.redhorizon.engine.graphics.GraphicsRenderer
-import nz.net.ultraq.redhorizon.engine.graphics.GraphicsRendererEvent
 import nz.net.ultraq.redhorizon.engine.graphics.GraphicsResource
 import nz.net.ultraq.redhorizon.engine.graphics.Material
 import nz.net.ultraq.redhorizon.engine.graphics.Mesh
@@ -58,8 +57,6 @@ import static org.lwjgl.opengl.GL30C.glBindFramebuffer
 import static org.lwjgl.opengl.KHRDebug.*
 
 import groovy.transform.NamedVariant
-import groovy.transform.stc.ClosureParams
-import groovy.transform.stc.SimpleType
 import java.lang.reflect.Modifier
 import java.nio.ByteBuffer
 
@@ -320,15 +317,4 @@ class OpenGLRenderer implements GraphicsRenderer {
 			 - OpenGL version: ${glGetString(GL_VERSION)}
 		""".stripIndent()
 	}
-
-	@Override
-	Tuple2<Mesh, Material> withMaterialBundler(
-		@ClosureParams(value = SimpleType, options = 'nz.net.ultraq.redhorizon.engine.graphics.MaterialBundler')
-			Closure closure) {
-
-		def materialBuilder = new OpenGLMaterialBundler(this)
-		materialBuilder.relay(GraphicsRendererEvent, this)
-		closure(materialBuilder)
-		return materialBuilder.bundle()
-	}
 }