studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

explicit error on setting uniform to unsupported type
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
austin 2024-08-28 21:41:02 -04:00
parent fc4730c24a
commit f6ac972aa7
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/electrosphere/renderer/model/Mesh.java
View File

@ -464,7 +464,7 @@ public class Mesh {
} else { } else {
// System.out.println("Bonename: " + boneName); // System.out.println("Bonename: " + boneName);
// System.exit(1); // System.exit(1);
openGLState.getActiveShader().setUniform(openGLState, currentUniform, new float[16]); openGLState.getActiveShader().setUniform(openGLState, currentUniform, new Matrix4f());
// GL45.glUniformMatrix4fv(glGetUniformLocation(openGLState.getActiveShader().getShaderId(), currentUniform), false, new float[16]); // GL45.glUniformMatrix4fv(glGetUniformLocation(openGLState.getActiveShader().getShaderId(), currentUniform), false, new float[16]);
} }
incrementer++; incrementer++;

25
src/main/java/electrosphere/renderer/shader/ShaderProgram.java
View File

@ -675,36 +675,33 @@ public class ShaderProgram {
* @param value the value * @param value the value
*/ */
public void setUniform(OpenGLState openGLState, int uniformLocation, Object value){ public void setUniform(OpenGLState openGLState, int uniformLocation, Object value){
if(DISABLE_CACHING || !uniformMap.containsKey(uniformLocation) || !uniformMap.get(uniformLocation).equals(value)){ if(
DISABLE_CACHING ||
!uniformMap.containsKey(uniformLocation) ||
!uniformMap.get(uniformLocation).equals(value)
){
try(MemoryStack stack = MemoryStack.stackPush()){ try(MemoryStack stack = MemoryStack.stackPush()){
uniformMap.put(uniformLocation,value); uniformMap.put(uniformLocation,value);
if(value instanceof Matrix4f){ if(value instanceof Matrix4f){
Matrix4f currentUniform = (Matrix4f)value; Matrix4f currentUniform = (Matrix4f)value;
GL40.glUniformMatrix4fv(uniformLocation, false, currentUniform.get(new float[16])); GL40.glUniformMatrix4fv(uniformLocation, false, currentUniform.get(new float[16]));
Globals.renderingEngine.checkError(); Globals.renderingEngine.checkError();
} } else if(value instanceof Matrix4d){
if(value instanceof Matrix4d){
Matrix4d currentUniform = (Matrix4d)value; Matrix4d currentUniform = (Matrix4d)value;
GL40.glUniformMatrix4fv(uniformLocation, false, currentUniform.get(new float[16])); GL40.glUniformMatrix4fv(uniformLocation, false, currentUniform.get(new float[16]));
Globals.renderingEngine.checkError(); Globals.renderingEngine.checkError();
} } else if(value instanceof Vector3f){
if(value instanceof Vector3f){
Vector3f currentUniform = (Vector3f)value; Vector3f currentUniform = (Vector3f)value;
GL40.glUniform3fv(uniformLocation, currentUniform.get(BufferUtils.createFloatBuffer(3))); GL40.glUniform3fv(uniformLocation, currentUniform.get(BufferUtils.createFloatBuffer(3)));
Globals.renderingEngine.checkError(); Globals.renderingEngine.checkError();
} } else if(value instanceof Integer){
if(value instanceof Integer){
GL40.glUniform1i(uniformLocation, (Integer)value); GL40.glUniform1i(uniformLocation, (Integer)value);
Globals.renderingEngine.checkError(); Globals.renderingEngine.checkError();
} } else if(value instanceof Float){
if(value instanceof Float){
GL40.glUniform1f(uniformLocation, (Float)value); GL40.glUniform1f(uniformLocation, (Float)value);
Globals.renderingEngine.checkError(); Globals.renderingEngine.checkError();
} } else {
if(value instanceof Vector3f){ throw new UnsupportedOperationException("Tried to set uniform with unsupported type!");
Vector3f vectorView = (Vector3f)value;
GL40.glUniform3fv(uniformLocation, vectorView.get(stack.mallocFloat(3)));
Globals.renderingEngine.checkError();
} }
} }
} }