Renamed Hw*Renderer -> *Renderer

6 files changed, 19 insertions, 19 deletions

diff --git a/src/com/jogamp/graph/curve/opengl/HwRegionRenderer.java b/src/com/jogamp/graph/curve/opengl/RegionRenderer.java
index 9fa67a0be..e75ca25cd 100755
--- a/src/com/jogamp/graph/curve/opengl/HwRegionRenderer.java
+++ b/src/com/jogamp/graph/curve/opengl/RegionRenderer.java
@@ -51,7 +51,7 @@ import com.jogamp.opengl.util.glsl.ShaderCode;
 import com.jogamp.opengl.util.glsl.ShaderProgram;

 import com.jogamp.opengl.util.glsl.ShaderState;

 

-public class HwRegionRenderer {

+public class RegionRenderer {

 	protected static final boolean DEBUG = Debug.debug("RegionRenderer");

 	

 	private ShaderState st;

@@ -76,7 +76,7 @@ public class HwRegionRenderer {
 	 * @param context OpenGL rendering context

 	 * @param factory optional Point.Factory for Vertex construction. Default is Vertex.Factory.

 	 */

-	public HwRegionRenderer(GLContext context) {

+	public RegionRenderer(GLContext context) {

 		this.context = context;

 		init(context, 0.5f);

 	}

@@ -84,7 +84,7 @@ public class HwRegionRenderer {
 	 * @param context OpenGL rendering context

 	 * @param type region type (single or multipass)

 	 */

-	public HwRegionRenderer(GLContext context, int type) {

+	public RegionRenderer(GLContext context, int type) {

 		this.context = context;

 		this.regionType = type;

 		init(context, 0.5f);

@@ -227,9 +227,9 @@ public class HwRegionRenderer {
 	}

 

 	private void initShader(GL2ES2 gl) {

-		ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, HwRegionRenderer.class,

+		ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, RegionRenderer.class,

 				"shader", "shader/bin", "curverenderer");

-		ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, HwRegionRenderer.class,

+		ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, RegionRenderer.class,

 				"shader", "shader/bin", "curverenderer");

 

 		ShaderProgram sp = new ShaderProgram();

diff --git a/src/com/jogamp/graph/curve/opengl/HwTextRenderer.java b/src/com/jogamp/graph/curve/opengl/TextRenderer.java
index f9a104ad0..703f82373 100644
--- a/src/com/jogamp/graph/curve/opengl/HwTextRenderer.java
+++ b/src/com/jogamp/graph/curve/opengl/TextRenderer.java
@@ -51,7 +51,7 @@ import com.jogamp.opengl.util.glsl.ShaderCode;
 import com.jogamp.opengl.util.glsl.ShaderProgram;
 import com.jogamp.opengl.util.glsl.ShaderState;
 
-public class HwTextRenderer {
+public class TextRenderer {
 	protected static final boolean DEBUG = Debug.debug("TextRenderer");
 	static final boolean FONTTOOL_CUSTOM = false;
 	
@@ -84,7 +84,7 @@ public class HwTextRenderer {
 	 * @param context OpenGL rendering context
 	 * @param factory optional Point.Factory for Vertex construction. Default is Vertex.Factory.
 	 */
-	public HwTextRenderer(Vertex.Factory<? extends Vertex> factory, int type) {
+	public TextRenderer(Vertex.Factory<? extends Vertex> factory, int type) {
 		this.pointFactory = (null != factory) ? factory : SVertex.factory();
 		this.regionType = type;
 	}
@@ -124,9 +124,9 @@ public class HwTextRenderer {
 		gl.glEnable(GL2ES2.GL_BLEND);
 		gl.glBlendFunc(GL2ES2.GL_SRC_ALPHA, GL2ES2.GL_ONE_MINUS_SRC_ALPHA);
 		
-        ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, HwTextRenderer.class,
+        ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, TextRenderer.class,
                 "shader", "shader/bin", "curverenderer");
-        ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, HwTextRenderer.class,
+        ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, TextRenderer.class,
                 "shader", "shader/bin", "curverenderer");
 
         ShaderProgram sp = new ShaderProgram();
diff --git a/src/demo/GPURegionNewtDemo01.java b/src/demo/GPURegionNewtDemo01.java
index e2e47709e..d58d4148d 100755
--- a/src/demo/GPURegionNewtDemo01.java
+++ b/src/demo/GPURegionNewtDemo01.java
@@ -36,7 +36,7 @@ import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLProfile;
 
 import com.jogamp.graph.curve.OutlineShape;
-import com.jogamp.graph.curve.opengl.HwRegionRenderer;
+import com.jogamp.graph.curve.opengl.RegionRenderer;
 import com.jogamp.graph.geom.opengl.SVertex;
 import com.jogamp.newt.event.KeyEvent;
 import com.jogamp.newt.event.KeyListener;
@@ -125,7 +125,7 @@ class RegionNewtWindow {
 		animator.start();
 	}
 	private class RegionGLListener implements GLEventListener{
-		HwRegionRenderer regionRenderer = null;
+		RegionRenderer regionRenderer = null;
 		
 		OutlineShape outlineShape = null;
 		
@@ -172,7 +172,7 @@ class RegionNewtWindow {
 			GL2ES2 gl = drawable.getGL().getGL2ES2();
 			gl.setSwapInterval(1);
 			gl.glEnable(GL2ES2.GL_DEPTH_TEST);
-			regionRenderer = new HwRegionRenderer(drawable.getContext());
+			regionRenderer = new RegionRenderer(drawable.getContext());
             regionRenderer.setAlpha(1.0f);
             regionRenderer.setColor(0.0f, 0.0f, 0.0f);
             //gl.glSampleCoverage(0.95f, false);
diff --git a/src/demo/GPURegionNewtDemo02.java b/src/demo/GPURegionNewtDemo02.java
index 0d9ad3f63..19889ac6e 100755
--- a/src/demo/GPURegionNewtDemo02.java
+++ b/src/demo/GPURegionNewtDemo02.java
@@ -36,7 +36,7 @@ import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLProfile;
 
 import com.jogamp.graph.curve.OutlineShape;
-import com.jogamp.graph.curve.opengl.HwRegionRenderer;
+import com.jogamp.graph.curve.opengl.RegionRenderer;
 import com.jogamp.graph.geom.opengl.SVertex;
 import com.jogamp.newt.event.KeyEvent;
 import com.jogamp.newt.event.KeyListener;
@@ -120,7 +120,7 @@ class RegionsNewtWindow {
 		animator.start();
 	}
 	private class RegionGLListener implements GLEventListener{
-		HwRegionRenderer regionRenderer = null;
+		RegionRenderer regionRenderer = null;
 		
 		OutlineShape[] outlineShapes = new OutlineShape[2];
 		
@@ -167,7 +167,7 @@ class RegionsNewtWindow {
 			GL2ES2 gl = drawable.getGL().getGL2ES2();
 			gl.setSwapInterval(1);
 			gl.glEnable(GL2ES2.GL_DEPTH_TEST);
-			regionRenderer = new HwRegionRenderer(drawable.getContext());
+			regionRenderer = new RegionRenderer(drawable.getContext());
             regionRenderer.setAlpha(1.0f);
             regionRenderer.setColor(0.0f, 0.0f, 0.0f);
             MSAATool.dump(drawable);
diff --git a/src/demo/GPUTextGLListenerBase01.java b/src/demo/GPUTextGLListenerBase01.java
index 25805d530..238a733ce 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.opengl.HwTextRenderer;
+import com.jogamp.graph.curve.opengl.TextRenderer;
 import com.jogamp.graph.font.Font;
 import com.jogamp.graph.font.FontFactory;
 import com.jogamp.graph.geom.Vertex;
@@ -64,7 +64,7 @@ import com.jogamp.opengl.util.awt.Screenshot;
  */
 public abstract class GPUTextGLListenerBase01 implements GLEventListener {
     Vertex.Factory<? extends Vertex> vfactory;
-    protected HwTextRenderer textRenderer;
+    protected TextRenderer textRenderer;
     int fontSet = FontFactory.UBUNTU;
     Font font;
     boolean debug;
@@ -100,7 +100,7 @@ public abstract class GPUTextGLListenerBase01 implements GLEventListener {
         // this.font = FontFactory.get(FontFactory.JAVA).getDefault();
         this.font = FontFactory.get(fontSet).getDefault();
         this.vfactory = vfactory;
-        this.textRenderer = new HwTextRenderer(vfactory, mode);
+        this.textRenderer = new TextRenderer(vfactory, mode);
         this.debug = debug;
         this.trace = trace;
     }
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestHwTextRenderer01.java b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRenderer01.java
index 7f5ee9d98..501bdbb75 100755
--- a/src/test/com/jogamp/opengl/test/junit/graph/TestHwTextRenderer01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRenderer01.java
@@ -22,7 +22,7 @@ import com.jogamp.newt.opengl.GLWindow;
 

 import demo.GPUTextGLListenerBase01;

 

-public class TestHwTextRenderer01 {

+public class TestTextRenderer01 {

 

 	@BeforeClass

 	public static void initClass() {