eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 06:09:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove legacy functions from PGL

Browse Source
This commit is contained in:
Jakub Valtar
2015-08-21 13:16:03 -04:00
parent facadfc9f5
commit 88be68b17d
2 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/processing/opengl/PGL.java
View File

@@ -2663,7 +2663,6 @@ public abstract class PGL {
public static int STENCIL_TEST;
public static int DEPTH_TEST;
public static int DEPTH_WRITEMASK;
public static int ALPHA_TEST;
public static int COLOR_BUFFER_BIT;
public static int DEPTH_BUFFER_BIT;
@@ -2719,7 +2718,6 @@ public abstract class PGL {
public static int RENDERBUFFER_INTERNAL_FORMAT;
public static int MULTISAMPLE;
public static int POINT_SMOOTH;
public static int LINE_SMOOTH;
public static int POLYGON_SMOOTH;
@@ -2811,12 +2809,10 @@ public abstract class PGL {
public abstract void vertexAttrib3fv(int index, FloatBuffer values);
public abstract void vertexAttri4fv(int index, FloatBuffer values);
public abstract void vertexAttribPointer(int index, int size, int type, boolean normalized, int stride, int offset);
public abstract void vertexAttribPointer(int index, int size, int type, boolean normalized, int stride, Buffer data);
public abstract void enableVertexAttribArray(int index);
public abstract void disableVertexAttribArray(int index);
public abstract void drawArrays(int mode, int first, int count);
public abstract void drawElements(int mode, int count, int type, int offset);
public abstract void drawElements(int mode, int count, int type, Buffer indices);
//////////////////////////////////////////////////////////////////////////////
@@ -2956,7 +2952,6 @@ public abstract class PGL {
public abstract void blendFunc(int src, int dst);
public abstract void blendFuncSeparate(int srcRGB, int dstRGB, int srcAlpha, int dstAlpha);
public abstract void blendColor(float red, float green, float blue, float alpha);
public abstract void alphaFunc(int func, float ref);
///////////////////////////////////////////////////////////

32
core/src/processing/opengl/PJOGL.java
View File

@@ -40,7 +40,6 @@ import java.nio.IntBuffer;
import com.jogamp.common.util.VersionNumber;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GL2ES1;
import com.jogamp.opengl.GL2ES2;
import com.jogamp.opengl.GL2ES3;
import com.jogamp.opengl.GL2GL3;
@@ -55,8 +54,6 @@ import com.jogamp.opengl.glu.GLUtessellatorCallbackAdapter;
import processing.core.PApplet;
import processing.core.PGraphics;
import processing.opengl.PGL;
import processing.opengl.PGraphicsOpenGL;
public class PJOGL extends PGL {
@@ -1676,7 +1673,6 @@ public class PJOGL extends PGL {
STENCIL_TEST = GL.GL_STENCIL_TEST;
DEPTH_TEST = GL.GL_DEPTH_TEST;
DEPTH_WRITEMASK = GL.GL_DEPTH_WRITEMASK;
ALPHA_TEST = GL2ES1.GL_ALPHA_TEST;
COLOR_BUFFER_BIT = GL.GL_COLOR_BUFFER_BIT;
DEPTH_BUFFER_BIT = GL.GL_DEPTH_BUFFER_BIT;
@@ -1733,7 +1729,6 @@ public class PJOGL extends PGL {
RENDERBUFFER_INTERNAL_FORMAT = GL.GL_RENDERBUFFER_INTERNAL_FORMAT;
MULTISAMPLE = GL.GL_MULTISAMPLE;
POINT_SMOOTH = GL2ES1.GL_POINT_SMOOTH;
LINE_SMOOTH = GL.GL_LINE_SMOOTH;
POLYGON_SMOOTH = GL2GL3.GL_POLYGON_SMOOTH;
}
@@ -1970,15 +1965,6 @@ public class PJOGL extends PGL {
gl2.glVertexAttribPointer(index, size, type, normalized, stride, offset);
}
@Override
public void vertexAttribPointer(int index, int size, int type, boolean normalized, int stride, Buffer data) {
if (gl2x != null) {
gl2x.glVertexAttribPointer(index, size, type, normalized, stride, data);
} else {
throw new RuntimeException(String.format(MISSING_GLFUNC_ERROR, "glVertexAttribPointer()"));
}
}
@Override
public void enableVertexAttribArray(int index) {
gl2.glEnableVertexAttribArray(index);
@@ -1999,15 +1985,6 @@ public class PJOGL extends PGL {
gl.glDrawElements(mode, count, type, offset);
}
@Override
public void drawElements(int mode, int count, int type, Buffer indices) {
if (gl2x != null) {
gl2x.glDrawElements(mode, count, type, indices);
} else {
throw new RuntimeException(String.format(MISSING_GLFUNC_ERROR, "glDrawElements()"));
}
}
//////////////////////////////////////////////////////////////////////////////
// Rasterization
@@ -2491,15 +2468,6 @@ public class PJOGL extends PGL {
gl2.glBlendColor(red, green, blue, alpha);
}
@Override
public void alphaFunc(int func, float ref) {
if (gl2x != null) {
gl2x.glAlphaFunc(func, ref);
} else {
throw new RuntimeException(String.format(MISSING_GLFUNC_ERROR, "glAlphaFunc()"));
}
}
///////////////////////////////////////////////////////////
// Whole Framebuffer Operations