From 02668c235bdb5ad23066d02b2c9785946964073d Mon Sep 17 00:00:00 2001 From: Dan Royer Date: Wed, 20 Dec 2023 07:54:17 -0800 Subject: [PATCH] load correct shader --- .../robotoverlord/renderpanel/OpenGLRenderPanel.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/marginallyclever/robotoverlord/renderpanel/OpenGLRenderPanel.java b/src/main/java/com/marginallyclever/robotoverlord/renderpanel/OpenGLRenderPanel.java index 979dcc8f9..9a868c66d 100644 --- a/src/main/java/com/marginallyclever/robotoverlord/renderpanel/OpenGLRenderPanel.java +++ b/src/main/java/com/marginallyclever/robotoverlord/renderpanel/OpenGLRenderPanel.java @@ -383,13 +383,13 @@ public void keyReleased(KeyEvent e) { private void createShaderPrograms(GL3 gl3) { shaderDefault = new ShaderProgram(gl3, - readResource("mesh.vert"), - readResource("mesh.frag")); + readResource("default_330.vert"), + readResource("default_330.frag")); shaderOutline = new ShaderProgram(gl3, readResource("outline_330.vert"), readResource("outline_330.frag")); shaderHUD = new ShaderProgram(gl3, - readResource("mesh.vert"), + readResource("default_330.vert"), readResource("givenColor_330.frag")); } @@ -720,6 +720,7 @@ private void renderOneMMRItem(GL3 gl, MatrixMaterialRender mmr, ShaderProgram sh // if we have a texture assigned, then we might still enable textures. texture = material.texture.getTexture(); if(texture==null) useTexture = false; + // assign the object's overall color. double[] diffuseColor = material.getDiffuseColor(); shaderProgram.set4f(gl,