GraphUI Cleanup: Simplify Shape.draw*() and Container.{add,remove*}Shape[s](); Remove Scene.setDebugBorderBox()

Simplify Shape/Scene
- Split scene.display()/shape.drawImpl0() and scene.displayGLSelect()/shape.drawToSelectImpl0()

Simplify Container (Scene/Group)
- {add,remove*}Shape[s](), i.e. drop unusual removeShape*() and simplify implementation

Scene
- Remove setDebugBorderBox()

3 files changed, 1 insertions, 7 deletions

diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java
index 061cc4de1..a520711de 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java
@@ -182,7 +182,6 @@ public class UISceneDemo03 {
 
         final Scene scene = new Scene(options.graphAASamples);
         scene.setClearParams(new float[] { 1f, 1f, 1f, 1f }, GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
-        scene.setDebugBorderBox(options.debugBoxThickness);
 
         final AnimGroup animGroup = new AnimGroup(null);
         scene.addShape(animGroup);
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java
index 6d03212e4..eaff6bf78 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java
@@ -314,7 +314,6 @@ public class UISceneDemo20 implements GLEventListener {
         scene.setPMVMatrixSetup(new Scene.DefaultPMVMatrixSetup(-1f));
         scene.getRenderer().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
         // scene.setSampleCount(3); // easy on embedded devices w/ just 3 samples (default is 4)?
-        scene.setDebugBorderBox(options.debugBoxThickness);
         scene.addShape(buttonsLeft);
         scene.addShape(buttonsRight);
     }
diff --git a/src/demos/com/jogamp/opengl/demos/util/CommandlineOptions.java b/src/demos/com/jogamp/opengl/demos/util/CommandlineOptions.java
index 21ea23a10..9eeb01f45 100644
--- a/src/demos/com/jogamp/opengl/demos/util/CommandlineOptions.java
+++ b/src/demos/com/jogamp/opengl/demos/util/CommandlineOptions.java
@@ -37,7 +37,6 @@ public class CommandlineOptions {
     public int sceneMSAASamples = 0;
     /** Sample count for Graph Region AA {@link Region#getRenderModes() render-modes}: {@link Region#VBAA_RENDERING_BIT} or {@link Region#MSAA_RENDERING_BIT} */
     public int graphAASamples = 0;
-    public float debugBoxThickness = 0f;
     public boolean exclusiveContext = false;
     public boolean wait_to_start = false;
     public boolean keepRunning = false;
@@ -126,9 +125,6 @@ public class CommandlineOptions {
             graphAASamples = MiscUtils.atoi(args[idx[0]], 4);
             renderModes &= ~Region.AA_RENDERING_MASK;
             renderModes |= Region.VBAA_RENDERING_BIT;
-        } else if (args[idx[0]].equals("-dbgbox")) {
-            ++idx[0];
-            debugBoxThickness = MiscUtils.atof(args[idx[0]], debugBoxThickness);
         } else if(args[idx[0]].equals("-exclusiveContext")) {
             exclusiveContext = true;
         } else if(args[idx[0]].equals("-wait")) {
@@ -150,7 +146,7 @@ public class CommandlineOptions {
     public String toString() {
         return "Options{surface[width "+surface_width+" x "+surface_height+"], glp "+glProfileName+
                ", renderModes "+Region.getRenderModeString(renderModes)+
-               ", smsaa "+sceneMSAASamples+", dbgbox "+debugBoxThickness+
+               ", smsaa "+sceneMSAASamples+
                ", exclusiveContext "+exclusiveContext+", wait "+wait_to_start+", keep "+keepRunning+", stay "+stayOpen+", dur "+total_duration+"s"+
                "}";
     }