From 26593bbf2f1e7c14de1ed42f80652719df2fcbb0 Mon Sep 17 00:00:00 2001 From: benfry Date: Sun, 22 Jul 2012 00:20:16 +0000 Subject: [PATCH] more with method naming, add XML hasChildren() method --- android/core/src/processing/core/PApplet.java | 10 ++++++++++ android/core/src/processing/core/PGraphics.java | 12 ++++++++++++ android/core/src/processing/data/XML.java | 6 ++++++ .../core/src/processing/opengl/PGraphicsOpenGL.java | 6 +++--- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/android/core/src/processing/core/PApplet.java b/android/core/src/processing/core/PApplet.java index 698b4417b..f50cf40ed 100644 --- a/android/core/src/processing/core/PApplet.java +++ b/android/core/src/processing/core/PApplet.java @@ -7210,6 +7210,16 @@ public class PApplet extends Activity implements PConstants, Runnable { } + public PGL beginGL() { + return g.beginGL(); + } + + + public void endGL() { + g.endGL(); + } + + /** * Enable a hint option. *

diff --git a/android/core/src/processing/core/PGraphics.java b/android/core/src/processing/core/PGraphics.java index d9eb9332e..1466d702a 100644 --- a/android/core/src/processing/core/PGraphics.java +++ b/android/core/src/processing/core/PGraphics.java @@ -25,6 +25,7 @@ package processing.core; import java.util.HashMap; +import processing.opengl.PGL; import processing.opengl.PShader; import android.graphics.Bitmap; @@ -675,6 +676,17 @@ public class PGraphics extends PImage implements PConstants { public void flush() { // no-op, mostly for P3D to write sorted stuff } + + + public PGL beginGL() { + showMethodWarning("beginGL"); + return null; + } + + + public void endGL() { + showMethodWarning("endGL"); + } protected void checkSettings() { diff --git a/android/core/src/processing/data/XML.java b/android/core/src/processing/data/XML.java index 60cabfe03..c7adbce21 100644 --- a/android/core/src/processing/data/XML.java +++ b/android/core/src/processing/data/XML.java @@ -238,6 +238,12 @@ public class XML implements Serializable { checkChildren(); return children.length; } + + + public boolean hasChildren() { + checkChildren(); + return children.length > 0; + } /** diff --git a/android/core/src/processing/opengl/PGraphicsOpenGL.java b/android/core/src/processing/opengl/PGraphicsOpenGL.java index 0b3f383fa..0efbfcf85 100644 --- a/android/core/src/processing/opengl/PGraphicsOpenGL.java +++ b/android/core/src/processing/opengl/PGraphicsOpenGL.java @@ -1729,18 +1729,18 @@ public class PGraphicsOpenGL extends PGraphics { } - public PGL beginPGL() { + public PGL beginGL() { flush(); return pgl; } - public void endPGL() { + public void endGL() { restoreGL(); } - public void restartPGL() { + protected void restartPGL() { pgl.initialized = false; }