Skip to content

Commit 2b57b75

Browse files
committed
make jogl work as a subclass of PGraphicsOpenGL
1 parent 51c3c5f commit 2b57b75

10 files changed

Lines changed: 112 additions & 13932 deletions

File tree

core/src/processing/opengl/PGL.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -255,28 +255,28 @@ public abstract class PGL {
255255

256256
// Error messages
257257

258-
protected static final String WIKI =
258+
public static final String WIKI =
259259
" Read http://wiki.processing.org/w/OpenGL_Issues for help.";
260260

261-
protected static final String FRAMEBUFFER_ERROR =
261+
public static final String FRAMEBUFFER_ERROR =
262262
"Framebuffer error (%1$s), rendering will probably not work as expected" + WIKI;
263263

264-
protected static final String MISSING_FBO_ERROR =
264+
public static final String MISSING_FBO_ERROR =
265265
"Framebuffer objects are not supported by this hardware (or driver)" + WIKI;
266266

267-
protected static final String MISSING_GLSL_ERROR =
267+
public static final String MISSING_GLSL_ERROR =
268268
"GLSL shaders are not supported by this hardware (or driver)" + WIKI;
269269

270-
protected static final String MISSING_GLFUNC_ERROR =
270+
public static final String MISSING_GLFUNC_ERROR =
271271
"GL function %1$s is not available on this hardware (or driver)" + WIKI;
272272

273-
protected static final String UNSUPPORTED_GLPROF_ERROR =
273+
public static final String UNSUPPORTED_GLPROF_ERROR =
274274
"Unsupported OpenGL profile.";
275275

276-
protected static final String TEXUNIT_ERROR =
276+
public static final String TEXUNIT_ERROR =
277277
"Number of texture units not supported by this hardware (or driver)" + WIKI;
278278

279-
protected static final String NONPRIMARY_ERROR =
279+
public static final String NONPRIMARY_ERROR =
280280
"The renderer is trying to call a PGL function that can only be called on a primary PGL. " +
281281
"This is most likely due to a bug in the renderer's code, please report it with an " +
282282
"issue on Processing's github page https://github.com/processing/processing/issues?state=open " +
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package processing.jogl;
2+
3+
public interface JOGL {
4+
static final String P2D = "processing.jogl.PGraphics2D";
5+
static final String P3D = "processing.jogl.PGraphics3D";
6+
static final String P2D_2X = "processing.jogl.PGraphics2D2X";
7+
static final String P3D_2X = "processing.jogl.PGraphics3D2X";
8+
}

0 commit comments

Comments
 (0)