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

continues the removal of static references

Browse Source
This commit is contained in:
codeanticode
2014-01-20 12:14:35 -05:00
parent a8a15d112e
commit f2c730b58f
10 changed files with 262 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,10 +52,10 @@ public abstract class PGL {
protected PGraphicsOpenGL pg;
/** OpenGL thread */
protected static Thread glThread;
protected Thread glThread;
/** ID of the GL context associated to the surface **/
protected static int glContext;
protected int glContext;
// ........................................................
@@ -437,7 +437,7 @@ public abstract class PGL {
protected Texture wrapBackTexture(Texture texture) {
if (texture == null) {
texture = new Texture();
texture = new Texture(pg);
texture.init(pg.width, pg.height,
glColorTex.get(backTex), TEXTURE_2D, RGBA,
fboWidth, fboHeight, NEAREST, NEAREST,
@@ -454,7 +454,7 @@ public abstract class PGL {
protected Texture wrapFrontTexture(Texture texture) {
if (texture == null) {
texture = new Texture();
texture = new Texture(pg);
texture.init(pg.width, pg.height,
glColorTex.get(frontTex), TEXTURE_2D, RGBA,
fboWidth, fboHeight, NEAREST, NEAREST,
@@ -737,6 +737,9 @@ public abstract class PGL {
}
protected abstract void getGL(PGL pgl);
protected abstract boolean canDraw();
@@ -903,7 +906,8 @@ public abstract class PGL {
protected void initTex2DShader() {
if (!loadedTex2DShader || tex2DShaderContext != glContext) {
if (!loadedTex2DShader/* || tex2DShaderContext != glContext*/) {
System.out.println("initializing texture shader");
String vertSource = PApplet.join(texVertShaderSource, "\n");
String fragSource = PApplet.join(tex2DFragShaderSource, "\n");
tex2DVertShader = createShader(VERTEX_SHADER, vertSource);