From dce77f00239074d33bb7dca4009e45ba87141093 Mon Sep 17 00:00:00 2001
From: Rami Santina <rami.santina@gmail.com>
Date: Sun, 5 Jun 2011 22:05:38 +0300
Subject: Graph: updated inclass documentations

---
 .../jogamp/graph/curve/opengl/VBORegionSPES2.java  | 51 ++++++++++------------
 1 file changed, 23 insertions(+), 28 deletions(-)

(limited to 'src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java')

diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java
index 17fb29b1b..bad436a80 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java
@@ -44,47 +44,47 @@ public class VBORegionSPES2 extends GLRegion {
     private GLArrayDataServer verticeAttr = null;
     private GLArrayDataServer texCoordAttr = null;
     private GLArrayDataServer indices = null;
-        
+
     protected VBORegionSPES2(int renderModes) { 
         super(renderModes);
     }
-    
+
     protected void update(GL2ES2 gl, RenderState rs) {
         if(!isDirty()) {
             return; 
         }
-        
+
         if(null == indices) {
             final int initialSize = 256;
             final ShaderState st = rs.getShaderState();
-            
+
             indices = GLArrayDataServer.createData(3, GL2ES2.GL_SHORT, initialSize, GL.GL_STATIC_DRAW, GL.GL_ELEMENT_ARRAY_BUFFER);
-            
+
             verticeAttr = GLArrayDataServer.createGLSL(st, AttributeNames.VERTEX_ATTR_NAME, 3, 
-                                                       GL2ES2.GL_FLOAT, false, initialSize, GL.GL_STATIC_DRAW);         
+                    GL2ES2.GL_FLOAT, false, initialSize, GL.GL_STATIC_DRAW);         
             st.ownAttribute(verticeAttr, true);
-            
+
             texCoordAttr = GLArrayDataServer.createGLSL(st, AttributeNames.TEXCOORD_ATTR_NAME, 2, 
-                                                        GL2ES2.GL_FLOAT, false, initialSize, GL.GL_STATIC_DRAW);
+                    GL2ES2.GL_FLOAT, false, initialSize, GL.GL_STATIC_DRAW);
             st.ownAttribute(texCoordAttr, true);
-            
+
             if(DEBUG_INSTANCE) {
                 System.err.println("VBORegionSPES2 Create: " + this);
             }
         }
-        
+
         // process triangles
         indices.seal(gl, false);
         indices.rewind();        
         for(int i=0; i<triangles.size(); i++) {
             final Triangle t = triangles.get(i);
             final Vertex[] t_vertices = t.getVertices();
-            
+
             if(t_vertices[0].getId() == Integer.MAX_VALUE){
                 t_vertices[0].setId(numVertices++);
                 t_vertices[1].setId(numVertices++);
                 t_vertices[2].setId(numVertices++);
-                                
+
                 vertices.add(t_vertices[0]);
                 vertices.add(t_vertices[1]);
                 vertices.add(t_vertices[2]);
@@ -100,7 +100,7 @@ public class VBORegionSPES2 extends GLRegion {
         }
         indices.seal(gl, true);
         indices.enableBuffer(gl, false);
-        
+
         // process vertices and update bbox
         box.reset();
         verticeAttr.seal(gl, false); 
@@ -109,12 +109,11 @@ public class VBORegionSPES2 extends GLRegion {
         texCoordAttr.rewind();
         for(int i=0; i<vertices.size(); i++) {
             final Vertex v = vertices.get(i);
-            final float ysign = isFlipped() ? -1.0f : 1.0f ; 
-            verticeAttr.putf(        v.getX());
-            verticeAttr.putf(ysign * v.getY());
-            verticeAttr.putf(        v.getZ());            
-            box.resize(v.getX(), ysign*v.getY(), v.getZ());
-            
+            verticeAttr.putf(v.getX());
+            verticeAttr.putf(v.getY());
+            verticeAttr.putf(v.getZ());            
+            box.resize(v.getX(), v.getY(), v.getZ());
+
             final float[] tex = v.getTexCoord();
             texCoordAttr.putf(tex[0]);
             texCoordAttr.putf(tex[1]);
@@ -123,26 +122,22 @@ public class VBORegionSPES2 extends GLRegion {
         verticeAttr.enableBuffer(gl, false);
         texCoordAttr.seal(gl, true);
         texCoordAttr.enableBuffer(gl, false);
-        
-        // update all bbox related data: nope
-        
+
         setDirty(false);
-        
-        // the buffers were disabled, since due to real/fbo switching and other vbo usage
     }
-        
+
     protected void drawImpl(GL2ES2 gl, RenderState rs, int vp_width, int vp_height, int width) {
         verticeAttr.enableBuffer(gl, true);       
         texCoordAttr.enableBuffer(gl, true);
         indices.enableBuffer(gl, true);
-        
+
         gl.glDrawElements(GL2ES2.GL_TRIANGLES, indices.getElementNumber() * indices.getComponentNumber(), GL2ES2.GL_UNSIGNED_SHORT, 0);         
-        
+
         verticeAttr.enableBuffer(gl, false);       
         texCoordAttr.enableBuffer(gl, false);
         indices.enableBuffer(gl, false);
     }    
-    
+
     public final void destroy(GL2ES2 gl, RenderState rs) {
         if(DEBUG_INSTANCE) {
             System.err.println("VBORegionSPES2 Destroy: " + this);
-- 
cgit v1.2.3


From d23d1dd01cc7e3bb228d65feb8f781c4ff0e5e11 Mon Sep 17 00:00:00 2001
From: Rami Santina <rami.santina@gmail.com>
Date: Sun, 5 Jun 2011 23:12:36 +0300
Subject: Graph: Remove unused imports

---
 src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java             | 1 -
 src/jogl/classes/com/jogamp/graph/font/FontFactory.java                  | 1 -
 src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java           | 1 -
 src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java        | 1 -
 .../com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener01.java  | 1 -
 5 files changed, 5 deletions(-)

(limited to 'src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java')

diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
index f1d31c345..e77fc14d4 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
@@ -37,7 +37,6 @@ import com.jogamp.opengl.util.glsl.ShaderState;
 import com.jogamp.opengl.util.PMVMatrix;
 
 import com.jogamp.graph.curve.Region;
-import com.jogamp.graph.geom.Vertex;
 
 public abstract class Renderer {
     protected static final boolean DEBUG = Region.DEBUG;
diff --git a/src/jogl/classes/com/jogamp/graph/font/FontFactory.java b/src/jogl/classes/com/jogamp/graph/font/FontFactory.java
index 9bf4b1f73..1e83668de 100644
--- a/src/jogl/classes/com/jogamp/graph/font/FontFactory.java
+++ b/src/jogl/classes/com/jogamp/graph/font/FontFactory.java
@@ -29,7 +29,6 @@ package com.jogamp.graph.font;
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java
index bad436a80..dc4e3a6e0 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java
@@ -34,7 +34,6 @@ import jogamp.graph.curve.opengl.shader.AttributeNames;
 
 import com.jogamp.graph.curve.opengl.GLRegion;
 import com.jogamp.graph.curve.opengl.RenderState;
-import com.jogamp.graph.geom.AABBox;
 import com.jogamp.graph.geom.Vertex;
 import com.jogamp.graph.geom.Triangle;
 import com.jogamp.opengl.util.GLArrayDataServer;
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java
index 50b510d23..86d4d2a3d 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java
@@ -29,7 +29,6 @@ package jogamp.graph.font.typecast;
 
 import java.util.ArrayList;
 
-import jogamp.graph.curve.text.GlyphShape;
 import jogamp.graph.font.typecast.ot.OTGlyph;
 import jogamp.graph.font.typecast.ot.Point;
 import jogamp.graph.geom.plane.AffineTransform;
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener01.java
index e5e3c56e5..b8bb9ac14 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener01.java
@@ -32,7 +32,6 @@ import javax.media.opengl.GL;
 import javax.media.opengl.GL2ES2;
 import javax.media.opengl.GLAutoDrawable;
 import com.jogamp.graph.curve.OutlineShape;
-import com.jogamp.graph.curve.Region;
 import com.jogamp.graph.curve.opengl.GLRegion;
 import com.jogamp.graph.curve.opengl.RegionRenderer;
 import com.jogamp.graph.curve.opengl.RenderState;
-- 
cgit v1.2.3