From 59265902cfb4ffdab1c22bdcd1c0c65193d00450 Mon Sep 17 00:00:00 2001 From: codeanticode Date: Wed, 15 Aug 2012 04:40:03 +0000 Subject: [PATCH] Updated OpenGL examples --- .../OpenGL/Shaders/LowLevelGL/LowLevelGL.pde | 22 +++++++++---------- .../OpenGL/Tests/SpecsTest/SpecsTest.pde | 7 ++++++ 2 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 java/examples/OpenGL/Tests/SpecsTest/SpecsTest.pde diff --git a/java/examples/OpenGL/Shaders/LowLevelGL/LowLevelGL.pde b/java/examples/OpenGL/Shaders/LowLevelGL/LowLevelGL.pde index a8f9ef4fb..b1a4327d3 100644 --- a/java/examples/OpenGL/Shaders/LowLevelGL/LowLevelGL.pde +++ b/java/examples/OpenGL/Shaders/LowLevelGL/LowLevelGL.pde @@ -40,25 +40,25 @@ void draw() { updateGeometry(); - pgl = pg.beginGL(); + pgl = pg.beginPGL(); flatShader.bind(); - vertLoc = pgl.glGetAttribLocation(flatShader.glProgram, "inVertex"); - colorLoc = pgl.glGetAttribLocation(flatShader.glProgram, "inColor"); + vertLoc = pgl.getAttribLocation(flatShader.glProgram, "inVertex"); + colorLoc = pgl.getAttribLocation(flatShader.glProgram, "inColor"); - pgl.glEnableVertexAttribArray(vertLoc); - pgl.glEnableVertexAttribArray(colorLoc); + pgl.enableVertexAttribArray(vertLoc); + pgl.enableVertexAttribArray(colorLoc); - pgl.glVertexAttribPointer(vertLoc, 4, PGL.GL_FLOAT, false, 0, vertData); - pgl.glVertexAttribPointer(colorLoc, 4, PGL.GL_FLOAT, false, 0, colorData); + pgl.vertexAttribPointer(vertLoc, 4, PGL.FLOAT, false, 0, vertData); + pgl.vertexAttribPointer(colorLoc, 4, PGL.FLOAT, false, 0, colorData); - pgl.glDrawArrays(PGL.GL_TRIANGLES, 0, 3); + pgl.drawArrays(PGL.TRIANGLES, 0, 3); - pgl.glDisableVertexAttribArray(vertLoc); - pgl.glDisableVertexAttribArray(colorLoc); + pgl.disableVertexAttribArray(vertLoc); + pgl.disableVertexAttribArray(colorLoc); flatShader.unbind(); - pg.endGL(); + pg.endPGL(); } void updateGeometry() { diff --git a/java/examples/OpenGL/Tests/SpecsTest/SpecsTest.pde b/java/examples/OpenGL/Tests/SpecsTest/SpecsTest.pde new file mode 100644 index 000000000..4217d51b1 --- /dev/null +++ b/java/examples/OpenGL/Tests/SpecsTest/SpecsTest.pde @@ -0,0 +1,7 @@ +size(100, 100, P3D); +PGraphicsOpenGL pg = (PGraphicsOpenGL)g; +println(pg.OPENGL_VENDOR); +println(pg.OPENGL_RENDERER); +println(pg.OPENGL_VERSION); +println(pg.GLSL_VERSION); +println(pg.OPENGL_EXTENSIONS); \ No newline at end of file