Relocate Hw*Renderer -> opengl subpackage

7 files changed, 11 insertions, 13 deletions

diff --git a/src/com/jogamp/graph/curve/HwRegionRenderer.java b/src/com/jogamp/graph/curve/opengl/HwRegionRenderer.java
index 2caa6bb7e..9fa67a0be 100755
--- a/src/com/jogamp/graph/curve/HwRegionRenderer.java
+++ b/src/com/jogamp/graph/curve/opengl/HwRegionRenderer.java
@@ -25,7 +25,7 @@
  * authors and should not be interpreted as representing official policies, either expressed

  * or implied, of JogAmp Community.

  */

-package com.jogamp.graph.curve;

+package com.jogamp.graph.curve.opengl;

 

 import java.nio.FloatBuffer;

 import java.util.ArrayList;

@@ -39,6 +39,9 @@ import javax.media.opengl.GLException;
 import javax.media.opengl.GLUniformData;

 import javax.media.opengl.fixedfunc.GLMatrixFunc;

 

+import com.jogamp.graph.curve.OutlineShape;

+import com.jogamp.graph.curve.Region;

+import com.jogamp.graph.curve.RegionFactory;

 import com.jogamp.graph.geom.Triangle;

 import com.jogamp.graph.geom.Vertex;

 

diff --git a/src/com/jogamp/graph/curve/HwTextRenderer.java b/src/com/jogamp/graph/curve/opengl/HwTextRenderer.java
index f3a15975a..f9a104ad0 100644
--- a/src/com/jogamp/graph/curve/HwTextRenderer.java
+++ b/src/com/jogamp/graph/curve/opengl/HwTextRenderer.java
@@ -25,7 +25,7 @@
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
-package com.jogamp.graph.curve;
+package com.jogamp.graph.curve.opengl;
 
 import java.nio.FloatBuffer;
 import java.util.HashMap;
@@ -41,6 +41,7 @@ import jogamp.graph.font.FontInt;
 import jogamp.graph.geom.plane.AffineTransform;
 import jogamp.graph.geom.plane.Path2D;
 
+import com.jogamp.graph.curve.Region;
 import com.jogamp.graph.font.Font;
 import com.jogamp.graph.geom.Vertex;
 import com.jogamp.graph.geom.opengl.SVertex;
@@ -193,7 +194,7 @@ public class HwTextRenderer {
 	
 	public void dispose(GL2ES2 gl) {
 	    st.destroy(gl);
-	    clearCached();
+	    flushCash();
 	}
 	
 	public float getAlpha() {
@@ -310,12 +311,6 @@ public class HwTextRenderer {
 	}
 	
 	
-	public void enable(GL2ES2 gl, boolean enable) {
-	    if(null != gl) {
-	        st.glUseProgram(gl, enable);
-	    }
-	}
-	
 	/** Render the String in 3D space wrt to the font provided at the position provided
 	 * the outlines will be generated, if not yet generated
 	 * @param font font to be used
@@ -347,7 +342,7 @@ public class HwTextRenderer {
 	/** Clears the cached string curves
 	 *  and destorys underlying buffers
 	 */
-	public void clearCached() {
+	public void flushCash() {
 		Iterator<GlyphString> iterator = strings.values().iterator();
 		while(iterator.hasNext()){
 			GlyphString glyphString = iterator.next();
diff --git a/src/com/jogamp/graph/curve/shader/curverenderer.fp b/src/com/jogamp/graph/curve/opengl/shader/curverenderer.fp
index 2b3a0ce1d..2b3a0ce1d 100644
--- a/src/com/jogamp/graph/curve/shader/curverenderer.fp
+++ b/src/com/jogamp/graph/curve/opengl/shader/curverenderer.fp
diff --git a/src/com/jogamp/graph/curve/shader/curverenderer.vp b/src/com/jogamp/graph/curve/opengl/shader/curverenderer.vp
index bc9ecb41e..bc9ecb41e 100644
--- a/src/com/jogamp/graph/curve/shader/curverenderer.vp
+++ b/src/com/jogamp/graph/curve/opengl/shader/curverenderer.vp
diff --git a/src/demo/GPURegionNewtDemo01.java b/src/demo/GPURegionNewtDemo01.java
index cde4df683..e2e47709e 100755
--- a/src/demo/GPURegionNewtDemo01.java
+++ b/src/demo/GPURegionNewtDemo01.java
@@ -35,8 +35,8 @@ import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLProfile;
 
-import com.jogamp.graph.curve.HwRegionRenderer;
 import com.jogamp.graph.curve.OutlineShape;
+import com.jogamp.graph.curve.opengl.HwRegionRenderer;
 import com.jogamp.graph.geom.opengl.SVertex;
 import com.jogamp.newt.event.KeyEvent;
 import com.jogamp.newt.event.KeyListener;
diff --git a/src/demo/GPURegionNewtDemo02.java b/src/demo/GPURegionNewtDemo02.java
index f9d7bb944..0d9ad3f63 100755
--- a/src/demo/GPURegionNewtDemo02.java
+++ b/src/demo/GPURegionNewtDemo02.java
@@ -35,8 +35,8 @@ import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLProfile;
 
-import com.jogamp.graph.curve.HwRegionRenderer;
 import com.jogamp.graph.curve.OutlineShape;
+import com.jogamp.graph.curve.opengl.HwRegionRenderer;
 import com.jogamp.graph.geom.opengl.SVertex;
 import com.jogamp.newt.event.KeyEvent;
 import com.jogamp.newt.event.KeyListener;
diff --git a/src/demo/GPUTextGLListenerBase01.java b/src/demo/GPUTextGLListenerBase01.java
index eee1efbdb..25805d530 100644
--- a/src/demo/GPUTextGLListenerBase01.java
+++ b/src/demo/GPUTextGLListenerBase01.java
@@ -41,7 +41,7 @@ import javax.media.opengl.GLException;
 import javax.media.opengl.GLPipelineFactory;
 import javax.media.opengl.GLRunnable;
 
-import com.jogamp.graph.curve.HwTextRenderer;
+import com.jogamp.graph.curve.opengl.HwTextRenderer;
 import com.jogamp.graph.font.Font;
 import com.jogamp.graph.font.FontFactory;
 import com.jogamp.graph.geom.Vertex;