eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-30 11:51:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added GLSL_VERSION constant

Browse Source
This commit is contained in:
codeanticode
2012-05-20 05:12:10 +00:00
parent 7789ac5ca2
commit 971c5b39f9
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/libraries/opengl/src/processing/opengl/PGL.java
View File

@@ -232,10 +232,11 @@ public class PGL {
public static final int GL_TRIANGLE_STRIP = GL.GL_TRIANGLE_STRIP;
public static final int GL_TRIANGLES = GL.GL_TRIANGLES;
public static final int GL_VENDOR = GL.GL_VENDOR;
public static final int GL_RENDERER = GL.GL_RENDERER;
public static final int GL_VERSION = GL.GL_VERSION;
public static final int GL_EXTENSIONS = GL.GL_EXTENSIONS;
public static final int GL_VENDOR = GL.GL_VENDOR;
public static final int GL_RENDERER = GL.GL_RENDERER;
public static final int GL_VERSION = GL.GL_VERSION;
public static final int GL_EXTENSIONS = GL.GL_EXTENSIONS;
public static final int GL_SHADING_LANGUAGE_VERSION = GL2ES2.GL_SHADING_LANGUAGE_VERSION;
public static final int GL_MAX_TEXTURE_SIZE = GL.GL_MAX_TEXTURE_SIZE;
public static final int GL_MAX_SAMPLES = GL2.GL_MAX_SAMPLES;

12
java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
View File

@@ -134,6 +134,7 @@ public class PGraphicsOpenGL extends PGraphics {
static public String OPENGL_RENDERER;
static public String OPENGL_VERSION;
static public String OPENGL_EXTENSIONS;
static public String GLSL_VERSION;
// ........................................................
@@ -1456,15 +1457,12 @@ public class PGraphicsOpenGL extends PGraphics {
}
if (quality < 2) {
pgl.glDisable(PGL.GL_MULTISAMPLE);
// pgl.glEnable(PGL.GL_POINT_SMOOTH);
// pgl.glEnable(PGL.GL_LINE_SMOOTH);
// pgl.glEnable(PGL.GL_POLYGON_SMOOTH);
} else {
pgl.glEnable(PGL.GL_MULTISAMPLE);
pgl.glDisable(PGL.GL_POINT_SMOOTH);
pgl.glDisable(PGL.GL_LINE_SMOOTH);
pgl.glDisable(PGL.GL_POLYGON_SMOOTH);
}
pgl.glDisable(PGL.GL_POINT_SMOOTH);
pgl.glDisable(PGL.GL_LINE_SMOOTH);
pgl.glDisable(PGL.GL_POLYGON_SMOOTH);
// setup opengl viewport.
viewport[0] = 0; viewport[1] = 0; viewport[2] = width; viewport[3] = height;
@@ -5653,7 +5651,9 @@ public class PGraphicsOpenGL extends PGraphics {
OPENGL_VENDOR = pgl.glGetString(PGL.GL_VENDOR);
OPENGL_RENDERER = pgl.glGetString(PGL.GL_RENDERER);
OPENGL_VERSION = pgl.glGetString(PGL.GL_VERSION);
OPENGL_VERSION = pgl.glGetString(PGL.GL_VERSION);
OPENGL_EXTENSIONS = pgl.glGetString(PGL.GL_EXTENSIONS);
GLSL_VERSION = pgl.glGetString(PGL.GL_SHADING_LANGUAGE_VERSION);
npotTexSupported = -1 < OPENGL_EXTENSIONS.indexOf("texture_non_power_of_two");
mipmapGeneration = -1 < OPENGL_EXTENSIONS.indexOf("generate_mipmap");