summaryrefslogtreecommitdiffstats
path: root/src/demo
diff options
context:
space:
mode:
authorRami Santina <[email protected]>2011-03-25 12:00:55 +0200
committerRami Santina <[email protected]>2011-03-25 12:00:55 +0200
commit526af50c03af2e00a028caf4b8504e6c3f3c4221 (patch)
tree69b63713bc99051f26bb7ca172ed5464fec13485 /src/demo
parentb01b243241635ab4d210aa88cdbff6cc5713a815 (diff)
Refactored Vertex Point PointTex GraphPoint namings
Vertex class --> SVertex (Simple vertex wwhere memory impl is float[]) Point interface --> Vertex (which combines in it PointTex Interface) GraphPoint --> GraphVertex
Diffstat (limited to 'src/demo')
-rwxr-xr-xsrc/demo/GPURegionNewtDemo01.java4
-rwxr-xr-xsrc/demo/GPURegionNewtDemo02.java6
-rw-r--r--src/demo/GPUTextNewtDemo01.java6
-rw-r--r--src/demo/GPUTextNewtDemo02.java6
4 files changed, 11 insertions, 11 deletions
diff --git a/src/demo/GPURegionNewtDemo01.java b/src/demo/GPURegionNewtDemo01.java
index c728e74e5..76e4bb97b 100755
--- a/src/demo/GPURegionNewtDemo01.java
+++ b/src/demo/GPURegionNewtDemo01.java
@@ -37,7 +37,7 @@ import javax.media.opengl.GLProfile;
import com.jogamp.graph.curve.HwRegionRenderer;
import com.jogamp.graph.curve.OutlineShape;
-import com.jogamp.graph.geom.opengl.Vertex;
+import com.jogamp.graph.geom.opengl.SVertex;
import com.jogamp.newt.event.KeyEvent;
import com.jogamp.newt.event.KeyListener;
import com.jogamp.newt.event.WindowAdapter;
@@ -134,7 +134,7 @@ class RegionNewtWindow {
private void createTestOutline(){
float offset = 0;
- outlineShape = new OutlineShape(Vertex.factory());
+ outlineShape = new OutlineShape(SVertex.factory());
outlineShape.addVertex(0.0f,-10.0f, true);
outlineShape.addVertex(15.0f,-10.0f, true);
outlineShape.addVertex(10.0f,5.0f, false);
diff --git a/src/demo/GPURegionNewtDemo02.java b/src/demo/GPURegionNewtDemo02.java
index 414b7942d..a4a8e91e6 100755
--- a/src/demo/GPURegionNewtDemo02.java
+++ b/src/demo/GPURegionNewtDemo02.java
@@ -37,7 +37,7 @@ import javax.media.opengl.GLProfile;
import com.jogamp.graph.curve.HwRegionRenderer;
import com.jogamp.graph.curve.OutlineShape;
-import com.jogamp.graph.geom.opengl.Vertex;
+import com.jogamp.graph.geom.opengl.SVertex;
import com.jogamp.newt.event.KeyEvent;
import com.jogamp.newt.event.KeyListener;
import com.jogamp.newt.event.WindowAdapter;
@@ -131,7 +131,7 @@ class RegionsNewtWindow {
private void createTestOutline(){
float offset = 0;
- outlineShapes[0] = new OutlineShape(Vertex.factory());
+ outlineShapes[0] = new OutlineShape(SVertex.factory());
outlineShapes[0].addVertex(0.0f,-10.0f,true);
outlineShapes[0].addVertex(15.0f,-10.0f, true);
outlineShapes[0].addVertex(10.0f,5.0f, false);
@@ -148,7 +148,7 @@ class RegionsNewtWindow {
outlineShapes[0].closeLastOutline();
/** Same shape as above but without any off-curve vertices */
- outlineShapes[1] = new OutlineShape(Vertex.factory());
+ outlineShapes[1] = new OutlineShape(SVertex.factory());
offset = 30;
outlineShapes[1].addVertex(offset+0.0f,-10.0f, true);
outlineShapes[1].addVertex(offset+17.0f,-10.0f, true);
diff --git a/src/demo/GPUTextNewtDemo01.java b/src/demo/GPUTextNewtDemo01.java
index fcd2134ae..0051df72e 100644
--- a/src/demo/GPUTextNewtDemo01.java
+++ b/src/demo/GPUTextNewtDemo01.java
@@ -37,8 +37,8 @@ import javax.media.opengl.GLProfile;
import com.jogamp.graph.curve.Region;
import com.jogamp.graph.curve.text.HwTextRenderer;
import com.jogamp.graph.font.Font;
-import com.jogamp.graph.geom.Point;
-import com.jogamp.graph.geom.opengl.Vertex;
+import com.jogamp.graph.geom.Vertex;
+import com.jogamp.graph.geom.opengl.SVertex;
import com.jogamp.newt.event.KeyEvent;
import com.jogamp.newt.event.KeyListener;
import com.jogamp.newt.event.WindowAdapter;
@@ -56,7 +56,7 @@ public class GPUTextNewtDemo01 {
}
class TextNewtWindow1 {
- Point.Factory<Vertex> pointFactory = Vertex.factory();
+ Vertex.Factory<SVertex> pointFactory = SVertex.factory();
TextGLListener textGLListener = null;
diff --git a/src/demo/GPUTextNewtDemo02.java b/src/demo/GPUTextNewtDemo02.java
index b0c7115ec..b048a3a68 100644
--- a/src/demo/GPUTextNewtDemo02.java
+++ b/src/demo/GPUTextNewtDemo02.java
@@ -38,8 +38,8 @@ import javax.media.opengl.GLProfile;
import com.jogamp.graph.curve.Region;
import com.jogamp.graph.curve.text.HwTextRenderer;
import com.jogamp.graph.font.Font;
-import com.jogamp.graph.geom.Point;
-import com.jogamp.graph.geom.opengl.Vertex;
+import com.jogamp.graph.geom.Vertex;
+import com.jogamp.graph.geom.opengl.SVertex;
import com.jogamp.newt.event.KeyEvent;
import com.jogamp.newt.event.KeyListener;
import com.jogamp.newt.event.WindowAdapter;
@@ -57,7 +57,7 @@ public class GPUTextNewtDemo02 {
}
class TextNewtWindow {
- Point.Factory<Vertex> pointFactory = Vertex.factory();
+ Vertex.Factory<SVertex> pointFactory = SVertex.factory();
TextGLListener textGLListener = null;
public TextNewtWindow(){