diff --git a/java/examples/Demos/Graphics/LowLevelGL/LowLevelGL.pde b/java/examples/Demos/Graphics/LowLevelGL/LowLevelGL.pde index d9db7537a..0e7d6a628 100644 --- a/java/examples/Demos/Graphics/LowLevelGL/LowLevelGL.pde +++ b/java/examples/Demos/Graphics/LowLevelGL/LowLevelGL.pde @@ -2,7 +2,7 @@ import java.nio.*; PGL pgl; -PShader flatShader; +PShader sh; int vertLoc; int colorLoc; @@ -18,7 +18,7 @@ void setup() { // Loads a shader to render geometry w/out // textures and lights. - flatShader = loadShader("frag.glsl", "vert.glsl"); + sh = loadShader("frag.glsl", "vert.glsl"); vertices = new float[12]; vertData = allocateDirectFloatBuffer(12); @@ -37,10 +37,10 @@ void draw() { updateGeometry(); pgl = beginPGL(); - flatShader.bind(); + sh.bind(); - vertLoc = pgl.getAttribLocation(flatShader.glProgram, "vertex"); - colorLoc = pgl.getAttribLocation(flatShader.glProgram, "color"); + vertLoc = pgl.getAttribLocation(sh.glProgram, "vertex"); + colorLoc = pgl.getAttribLocation(sh.glProgram, "color"); pgl.enableVertexAttribArray(vertLoc); pgl.enableVertexAttribArray(colorLoc); @@ -53,7 +53,7 @@ void draw() { pgl.disableVertexAttribArray(vertLoc); pgl.disableVertexAttribArray(colorLoc); - flatShader.unbind(); + sh.unbind(); endPGL(); } diff --git a/java/examples/Demos/Graphics/LowLevelGL/data/vert.glsl b/java/examples/Demos/Graphics/LowLevelGL/data/vert.glsl index 1a0177008..27c255ee5 100644 --- a/java/examples/Demos/Graphics/LowLevelGL/data/vert.glsl +++ b/java/examples/Demos/Graphics/LowLevelGL/data/vert.glsl @@ -18,8 +18,6 @@ Boston, MA 02111-1307 USA */ -#define PROCESSING_COLOR_SHADER - uniform mat4 transform; attribute vec4 vertex;