Try combining the setUniform methods

ultraq · Jun 28, 2024 · 144c209 · 144c209
1 parent 8b3157c
commit 144c209
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 71 deletions.
diff --git a/...rizon-classic/source/nz/net/ultraq/redhorizon/classic/shaders/PalettedSpriteShader.groovy b/...rizon-classic/source/nz/net/ultraq/redhorizon/classic/shaders/PalettedSpriteShader.groovy
@@ -17,7 +17,6 @@
 package nz.net.ultraq.redhorizon.classic.shaders
 
 import nz.net.ultraq.redhorizon.engine.graphics.Attribute
-import nz.net.ultraq.redhorizon.engine.graphics.Material
 import nz.net.ultraq.redhorizon.engine.graphics.ShaderConfig
 import nz.net.ultraq.redhorizon.engine.graphics.Uniform
 
@@ -40,9 +39,11 @@ class PalettedSpriteShader extends ShaderConfig {
 			shader.setUniform('adjustmentMap', material.adjustmentMap)
 		},
 		{ shader, material, window ->
-			Material.KEYS_SPRITES.each { key ->
-				shader.setUniformGeneric(key, material.attributes[key])
-			}
+			shader.setUniform('frame', material.frame)
+			shader.setUniform('framesHorizontal', material.framesHorizontal)
+			shader.setUniform('framesVertical', material.framesVertical)
+			shader.setUniform('frameStepX', material.frameStepX)
+			shader.setUniform('frameStepY', material.frameStepY)
 		}
 	]
 }
diff --git a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/graphics/Material.groovy b/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/graphics/Material.groovy
@@ -32,13 +32,29 @@ class Material {
 	private static final String KEY_FRAME_STEP_X = 'frameStepX'
 	private static final String KEY_FRAME_STEP_Y = 'frameStepY'
 
-	static final String[] KEYS_SPRITES = [
-		KEY_FRAME, KEY_FRAMES_HORIZONTAL, KEY_FRAMES_VERTICAL, KEY_FRAME_STEP_X, KEY_FRAME_STEP_Y
-	]
-
 	final Map<String, Object> attributes = [:]
 	Texture texture
 
+	int getFrame() {
+		return attributes[KEY_FRAME]
+	}
+
+	float getFrameStepX() {
+		return attributes[KEY_FRAME_STEP_X]
+	}
+
+	float getFrameStepY() {
+		return attributes[KEY_FRAME_STEP_Y]
+	}
+
+	int getFramesHorizontal() {
+		return attributes[KEY_FRAMES_HORIZONTAL]
+	}
+
+	int getFramesVertical() {
+		return attributes[KEY_FRAMES_VERTICAL]
+	}
+
 	void setFrame(int frame) {
 		attributes[KEY_FRAME] = frame
 	}

diff --git a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/graphics/Shader.groovy b/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/graphics/Shader.groovy
@@ -34,8 +34,6 @@ abstract class Shader implements GraphicsResource {
 	final Attribute[] attributes
 	final Uniform[] uniforms
 
-	private final Map<String, Object> lastValues = [:]
-
 	/**
 	 * Update a shader's uniforms using the given context.
 	 */
@@ -51,43 +49,7 @@ abstract class Shader implements GraphicsResource {
 	 * Apply a data uniform to the shader.  If {@code data} is an array, it can be
 	 * used to determine the shader type (eg: 2 floats = vec2).
 	 */
-	void setUniformGeneric(String name, Object data) {
-
-		if (data == null) {
-			throw new IllegalArgumentException("Data value for key ${name} was null")
-		}
-
-		// Only perform an update if there was a change in the value since last time
-		if (lastValues[name] != data) {
-			lastValues[name] = data
-
-			switch (data) {
-				case Float -> setUniform(name, data)
-				case Float[] -> setUniform(name, (float[])data)
-				case Integer -> setUniform(name, data)
-				case Integer[] -> setUniform(name, (int[])data)
-				case Matrix4f -> setUniform(name, data)
-				default -> throw new UnsupportedOperationException("Data type of ${data.class.simpleName} not supported")
-			}
-		}
-	}
-
-	/**
-	 * Apply a data uniform to the shader.  The type of data is determined by the
-	 * size of the data array.
-	 */
-	abstract void setUniform(String name, float[] data)
-
-	/**
-	 * Apply a data uniform to the shader.  The type of data is determined by the
-	 * size of the data array.
-	 */
-	abstract void setUniform(String name, int[] data)
-
-	/**
-	 * Apply a matrix uniform to the shader.
-	 */
-	abstract void setUniform(String name, Matrix4f matrix)
+	abstract void setUniform(String name, Object data)
 
 	/**
 	 * Apply a texture uniform using the given texture ID.

diff --git a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/graphics/opengl/OpenGLShader.groovy b/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/graphics/opengl/OpenGLShader.groovy
@@ -119,29 +119,25 @@ class OpenGLShader extends Shader {
 	}
 
 	@Override
-	void setUniform(String name, float[] data) {
+	void setUniform(String name, Object data) {
 
-		stackPush().withCloseable { stack ->
-			switch (data.length) {
-				case 2 -> glUniform2fv(getUniformLocation(name), stack.floats(data))
-				default -> glUniform1fv(getUniformLocation(name), stack.floats(data))
-			}
-		}
-	}
-
-	@Override
-	void setUniform(String name, int[] data) {
+		var uniformLocation = getUniformLocation(name)
 
 		stackPush().withCloseable { stack ->
-			glUniform1iv(getUniformLocation(name), stack.ints(data))
-		}
-	}
-
-	@Override
-	void setUniform(String name, Matrix4f matrix) {
-
-		stackPush().withCloseable { stack ->
-			glUniformMatrix4fv(getUniformLocation(name), false, matrix.get(stack.mallocFloat(16)))
+			switch (data) {
+				case Float -> glUniform1f(uniformLocation, data)
+				case float[] -> {
+					var floatData = (float[])data
+					switch (floatData.length) {
+						case 2 -> glUniform2fv(uniformLocation, stack.floats(floatData))
+						default -> glUniform1fv(uniformLocation, stack.floats(floatData))
+					}
+				}
+				case Integer -> glUniform1i(uniformLocation, data)
+				case int[] -> glUniform1iv(uniformLocation, (int[])data)
+				case Matrix4f -> glUniformMatrix4fv(uniformLocation, false, data.get(stack.mallocFloat(16)))
+				default -> throw new UnsupportedOperationException("Data type of ${data.class.simpleName} not supported")
+			}
 		}
 	}
 

diff --git a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/graphics/opengl/SpriteShader.groovy b/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/graphics/opengl/SpriteShader.groovy
@@ -17,7 +17,6 @@
 package nz.net.ultraq.redhorizon.engine.graphics.opengl
 
 import nz.net.ultraq.redhorizon.engine.graphics.Attribute
-import nz.net.ultraq.redhorizon.engine.graphics.Material
 import nz.net.ultraq.redhorizon.engine.graphics.ShaderConfig
 import nz.net.ultraq.redhorizon.engine.graphics.Uniform
 
@@ -37,9 +36,11 @@ class SpriteShader extends ShaderConfig {
 			shader.setUniformTexture('mainTexture', 0, material.texture)
 		},
 		{ shader, material, window ->
-			Material.KEYS_SPRITES.each { key ->
-				shader.setUniformGeneric(key, material[key])
-			}
+			shader.setUniform('frame', material.frame)
+			shader.setUniform('framesHorizontal', material.framesHorizontal)
+			shader.setUniform('framesVertical', material.framesVertical)
+			shader.setUniform('frameStepX', material.frameStepX)
+			shader.setUniform('frameStepY', material.frameStepY)
 		}
 	]
 }