Java Source Files: dos -> unix format

4 files changed, 434 insertions, 434 deletions

diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/RegionFactory.java b/src/jogl/classes/jogamp/graph/curve/opengl/RegionFactory.java
index e73b0cb85..1f59b5805 100755
--- a/src/jogl/classes/jogamp/graph/curve/opengl/RegionFactory.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/RegionFactory.java
@@ -1,74 +1,74 @@
-/**

- * Copyright 2010 JogAmp Community. All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without modification, are

- * permitted provided that the following conditions are met:

- *

- *    1. Redistributions of source code must retain the above copyright notice, this list of

- *       conditions and the following disclaimer.

- *

- *    2. Redistributions in binary form must reproduce the above copyright notice, this list

- *       of conditions and the following disclaimer in the documentation and/or other materials

- *       provided with the distribution.

- *

- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED

- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR

- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR

- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- *

- * The views and conclusions contained in the software and documentation are those of the

- * authors and should not be interpreted as representing official policies, either expressed

- * or implied, of JogAmp Community.

- */

-package jogamp.graph.curve.opengl;

-

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

-import com.jogamp.graph.curve.opengl.GLRegion;

-

-/** RegionFactory to create a Context specific Region implementation. 

- *  

- * @see GLRegion

- */

-public class RegionFactory {

-    

-    /**

-     * Create a Region using the passed render mode

-     * 

-     * <p> In case {@link Region#VBAA_RENDERING_BIT} is being requested the default texture unit

-     * {@link Region#TWO_PASS_DEFAULT_TEXTURE_UNIT} is being used.</p>

-     * 

-     * @param rs the RenderState to be used

-     * @param renderModes bit-field of modes, e.g. {@link Region#VARIABLE_CURVE_WEIGHT_BIT}, {@link Region#VBAA_RENDERING_BIT} 

-     */

-    public static GLRegion create(int renderModes) {

-        if( 0 != ( Region.VBAA_RENDERING_BIT & renderModes ) ){

-            return new VBORegion2PES2(renderModes, Region.TWO_PASS_DEFAULT_TEXTURE_UNIT);

-        }

-        else{

-            return new VBORegionSPES2(renderModes);

-        }

-    }

-        

-    /** Create a Single Pass Region using the passed render mode

-     * @param renderModes bit-field of modes, e.g. {@link Region#VARIABLE_CURVE_WEIGHT_BIT}, 

-     * {@link Region#VBAA_RENDERING_BIT}

-     * @return

-     */

-    public static GLRegion createSinglePass(int renderModes) {

-        return new VBORegionSPES2(renderModes);

-    }

-    

-    /** Create a Two Pass (VBAA) Region using the passed render mode

-     * @param renderModes bit-field of modes, e.g. {@link Region#VARIABLE_CURVE_WEIGHT_BIT}, 

-     * {@link Region#VBAA_RENDERING_BIT}

-     * @return

-     */

-    public static GLRegion createTwoPass(int renderModes, int textureUnit) {

-        return new VBORegion2PES2(renderModes, textureUnit);

-    }

-}

+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+package jogamp.graph.curve.opengl;
+
+import com.jogamp.graph.curve.Region;
+import com.jogamp.graph.curve.opengl.GLRegion;
+
+/** RegionFactory to create a Context specific Region implementation. 
+ *  
+ * @see GLRegion
+ */
+public class RegionFactory {
+    
+    /**
+     * Create a Region using the passed render mode
+     * 
+     * <p> In case {@link Region#VBAA_RENDERING_BIT} is being requested the default texture unit
+     * {@link Region#TWO_PASS_DEFAULT_TEXTURE_UNIT} is being used.</p>
+     * 
+     * @param rs the RenderState to be used
+     * @param renderModes bit-field of modes, e.g. {@link Region#VARIABLE_CURVE_WEIGHT_BIT}, {@link Region#VBAA_RENDERING_BIT} 
+     */
+    public static GLRegion create(int renderModes) {
+        if( 0 != ( Region.VBAA_RENDERING_BIT & renderModes ) ){
+            return new VBORegion2PES2(renderModes, Region.TWO_PASS_DEFAULT_TEXTURE_UNIT);
+        }
+        else{
+            return new VBORegionSPES2(renderModes);
+        }
+    }
+        
+    /** Create a Single Pass Region using the passed render mode
+     * @param renderModes bit-field of modes, e.g. {@link Region#VARIABLE_CURVE_WEIGHT_BIT}, 
+     * {@link Region#VBAA_RENDERING_BIT}
+     * @return
+     */
+    public static GLRegion createSinglePass(int renderModes) {
+        return new VBORegionSPES2(renderModes);
+    }
+    
+    /** Create a Two Pass (VBAA) Region using the passed render mode
+     * @param renderModes bit-field of modes, e.g. {@link Region#VARIABLE_CURVE_WEIGHT_BIT}, 
+     * {@link Region#VBAA_RENDERING_BIT}
+     * @return
+     */
+    public static GLRegion createTwoPass(int renderModes, int textureUnit) {
+        return new VBORegion2PES2(renderModes, textureUnit);
+    }
+}
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java b/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
index 117faafb8..c34d1cbeb 100755
--- a/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
@@ -1,93 +1,93 @@
-/**

- * Copyright 2010 JogAmp Community. All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without modification, are

- * permitted provided that the following conditions are met:

- *

- *    1. Redistributions of source code must retain the above copyright notice, this list of

- *       conditions and the following disclaimer.

- *

- *    2. Redistributions in binary form must reproduce the above copyright notice, this list

- *       of conditions and the following disclaimer in the documentation and/or other materials

- *       provided with the distribution.

- *

- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED

- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR

- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR

- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- *

- * The views and conclusions contained in the software and documentation are those of the

- * authors and should not be interpreted as representing official policies, either expressed

- * or implied, of JogAmp Community.

- */

-package jogamp.graph.curve.opengl;

-

-import javax.media.opengl.GL2ES2;

-import javax.media.opengl.GLException;

-

-import jogamp.graph.curve.opengl.shader.AttributeNames;

-

-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;

-import com.jogamp.opengl.util.glsl.ShaderCode;

-import com.jogamp.opengl.util.glsl.ShaderProgram;

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

-

-public class RegionRendererImpl01 extends RegionRenderer {

-    public RegionRendererImpl01(RenderState rs, int renderModes) {

-        super(rs, renderModes);

-        

-    }

-    

-    @Override

-    protected String getFragmentShaderName(GL2ES2 gl) {

-        final String type = Region.isNonUniformWeight(renderModes) ? "02" : "01" ;

-        final String pass = Region.isVBAA(renderModes) ? "b" : "a" ;

-        return "curverenderer" + type + pass + getShaderGLVersionSuffix(gl);

-    }

-    

-    protected boolean initShaderProgram(GL2ES2 gl) {

-        final ShaderState st = rs.getShaderState();

-        

-        ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, RegionRendererImpl01.class, "shader",

-                "shader/bin", getVertexShaderName(gl), false);

-        ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, RegionRendererImpl01.class, "shader",

-                "shader/bin", getFragmentShaderName(gl), false);

-    

-        ShaderProgram sp = new ShaderProgram();

-        sp.add(rsVp);

-        sp.add(rsFp);

-

-        sp.init(gl);

-        st.attachShaderProgram(gl, sp, false);        

-        st.bindAttribLocation(gl, AttributeNames.VERTEX_ATTR_IDX, AttributeNames.VERTEX_ATTR_NAME);

-        st.bindAttribLocation(gl, AttributeNames.TEXCOORD_ATTR_IDX, AttributeNames.TEXCOORD_ATTR_NAME);        

-        

-        if(!sp.link(gl, System.err)) {

-            throw new GLException("RegionRenderer: Couldn't link program: "+sp);

-        }    

-        st.useProgram(gl, true);

-    

-        if(DEBUG) {

-            System.err.println("RegionRendererImpl01 initialized: " + Thread.currentThread()+" "+st);

-        }

-        return true;

-    }

-

-    @Override

-    protected void destroyImpl(GL2ES2 gl) {

-        super.destroyImpl(gl);

-    }

-

-    @Override

-    protected void drawImpl(GL2ES2 gl, Region region, float[] position, int[] texSize) {

-        ((GLRegion)region).draw(gl, rs, vp_width, vp_height, texSize);

-    }    

-}

+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+package jogamp.graph.curve.opengl;
+
+import javax.media.opengl.GL2ES2;
+import javax.media.opengl.GLException;
+
+import jogamp.graph.curve.opengl.shader.AttributeNames;
+
+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;
+import com.jogamp.opengl.util.glsl.ShaderCode;
+import com.jogamp.opengl.util.glsl.ShaderProgram;
+import com.jogamp.opengl.util.glsl.ShaderState;
+
+public class RegionRendererImpl01 extends RegionRenderer {
+    public RegionRendererImpl01(RenderState rs, int renderModes) {
+        super(rs, renderModes);
+        
+    }
+    
+    @Override
+    protected String getFragmentShaderName(GL2ES2 gl) {
+        final String type = Region.isNonUniformWeight(renderModes) ? "02" : "01" ;
+        final String pass = Region.isVBAA(renderModes) ? "b" : "a" ;
+        return "curverenderer" + type + pass + getShaderGLVersionSuffix(gl);
+    }
+    
+    protected boolean initShaderProgram(GL2ES2 gl) {
+        final ShaderState st = rs.getShaderState();
+        
+        ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, RegionRendererImpl01.class, "shader",
+                "shader/bin", getVertexShaderName(gl), false);
+        ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, RegionRendererImpl01.class, "shader",
+                "shader/bin", getFragmentShaderName(gl), false);
+    
+        ShaderProgram sp = new ShaderProgram();
+        sp.add(rsVp);
+        sp.add(rsFp);
+
+        sp.init(gl);
+        st.attachShaderProgram(gl, sp, false);        
+        st.bindAttribLocation(gl, AttributeNames.VERTEX_ATTR_IDX, AttributeNames.VERTEX_ATTR_NAME);
+        st.bindAttribLocation(gl, AttributeNames.TEXCOORD_ATTR_IDX, AttributeNames.TEXCOORD_ATTR_NAME);        
+        
+        if(!sp.link(gl, System.err)) {
+            throw new GLException("RegionRenderer: Couldn't link program: "+sp);
+        }    
+        st.useProgram(gl, true);
+    
+        if(DEBUG) {
+            System.err.println("RegionRendererImpl01 initialized: " + Thread.currentThread()+" "+st);
+        }
+        return true;
+    }
+
+    @Override
+    protected void destroyImpl(GL2ES2 gl) {
+        super.destroyImpl(gl);
+    }
+
+    @Override
+    protected void drawImpl(GL2ES2 gl, Region region, float[] position, int[] texSize) {
+        ((GLRegion)region).draw(gl, rs, vp_width, vp_height, texSize);
+    }    
+}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java
index 916c7b4d8..f155345aa 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java
@@ -1,222 +1,222 @@
-/**

- * Copyright 2011 JogAmp Community. All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without modification, are

- * permitted provided that the following conditions are met:

- *

- *    1. Redistributions of source code must retain the above copyright notice, this list of

- *       conditions and the following disclaimer.

- *

- *    2. Redistributions in binary form must reproduce the above copyright notice, this list

- *       of conditions and the following disclaimer in the documentation and/or other materials

- *       provided with the distribution.

- *

- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED

- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR

- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR

- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- *

- * The views and conclusions contained in the software and documentation are those of the

- * authors and should not be interpreted as representing official policies, either expressed

- * or implied, of JogAmp Community.

- */

-package jogamp.graph.font.typecast;

-

-import java.util.ArrayList;

-

-import jogamp.graph.font.FontInt.GlyphInt;

-import jogamp.graph.font.typecast.ot.OTGlyph;

-import jogamp.graph.font.typecast.ot.Point;

-import jogamp.graph.geom.plane.AffineTransform;

-import jogamp.graph.geom.plane.Path2D;

-import jogamp.graph.geom.plane.PathIterator;

-

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

-import com.jogamp.graph.font.Font;

-import com.jogamp.graph.font.Font.Glyph;

-import com.jogamp.graph.geom.Vertex;

-import com.jogamp.graph.geom.Vertex.Factory;

-

-/**

- * Factory to build a {@link com.jogamp.graph.geom.Path2D Path2D} from 

- * {@link jogamp.graph.font.typecast.ot.OTGlyph Glyph}s. 

- */

-public class TypecastRenderer {

-

-    private static void getPaths(TypecastFont font, 

-            CharSequence string, float pixelSize, AffineTransform transform, Path2D[] p)

-    {        

-        if (string == null) {

-            return;

-        }

-        Font.Metrics metrics = font.getMetrics();

-        float advanceTotal = 0;

-        float lineGap = metrics.getLineGap(pixelSize) ;

-        float ascent = metrics.getAscent(pixelSize) ;

-        float descent = metrics.getDescent(pixelSize) ;

-        if (transform == null) {

-            transform = new AffineTransform();

-        }

-        AffineTransform t = new AffineTransform();

-

-        float advanceY = lineGap - descent + ascent;

-        float y = 0;

-        for (int i=0; i<string.length(); i++)

-        {

-            p[i] = new Path2D();

-            p[i].reset();

-            t.setTransform(transform);

-            char character = string.charAt(i);

-            if (character == '\n') {

-                y += advanceY;

-                advanceTotal = 0;

-                continue;

-            } else if (character == ' ') {

-                advanceTotal += font.getAdvanceWidth(Glyph.ID_SPACE, pixelSize);

-                continue;

-            }        

-            Glyph glyph = font.getGlyph(character);

-            Path2D gp = ((GlyphInt)glyph).getPath();

-            float scale = metrics.getScale(pixelSize);

-            t.translate(advanceTotal, y);

-            t.scale(scale, scale);

-            p[i].append(gp.iterator(t), false);

-            advanceTotal += glyph.getAdvance(pixelSize, true); 

-        }

-    }

-

-    public static ArrayList<OutlineShape> getOutlineShapes(TypecastFont font, CharSequence string, float pixelSize, AffineTransform transform, Factory<? extends Vertex> vertexFactory) {

-        Path2D[] paths = new Path2D[string.length()];

-        getPaths(font, string, pixelSize, transform, paths);

-

-        ArrayList<OutlineShape> shapes = new ArrayList<OutlineShape>();

-        final int numGlyps = paths.length;

-        for (int index=0;index<numGlyps;index++) {

-            if(paths[index] == null){

-                continue;

-            }

-            OutlineShape shape = new OutlineShape(vertexFactory);

-            shapes.add(shape);

-            PathIterator iterator = paths[index].iterator(transform);

-            if(null != iterator){

-                while(!iterator.isDone()){

-                    float[] coords = new float[6];

-                    int segmentType = iterator.currentSegment(coords);

-                    addPathVertexToOutline(shape, vertexFactory, coords, segmentType);

-                    iterator.next();

-                }

-            }

-        }

-        return shapes;

-    }

-    private static void addPathVertexToOutline(OutlineShape shape, Factory<? extends Vertex> vertexFactory, float[] coords, int segmentType){

-        switch(segmentType) {

-        case PathIterator.SEG_MOVETO:

-            shape.closeLastOutline();

-            shape.addEmptyOutline();

-            shape.addVertex(0, vertexFactory.create(coords, 0, 2, true));            

-            break;

-        case PathIterator.SEG_LINETO:

-            shape.addVertex(0, vertexFactory.create(coords, 0, 2, true));            

-            break;

-        case PathIterator.SEG_QUADTO:

-            shape.addVertex(0, vertexFactory.create(coords, 0, 2, false));

-            shape.addVertex(0, vertexFactory.create(coords, 2, 2, true));            

-            break;

-        case PathIterator.SEG_CUBICTO:

-            shape.addVertex(0, vertexFactory.create(coords, 0, 2, false));

-            shape.addVertex(0, vertexFactory.create(coords, 2, 2, false));

-            shape.addVertex(0, vertexFactory.create(coords, 4, 2, true));            

-            break;

-        case PathIterator.SEG_CLOSE:

-            shape.closeLastOutline();

-            break;

-        default:

-            throw new IllegalArgumentException("Unhandled Segment Type: "+segmentType);

-        }

-    }

-

-    /**

-     * Build a {@link com.jogamp.graph.geom.Path2D Path2D} from a

-     * {@link jogamp.graph.font.typecast.ot.OTGlyph Glyph}.  This glyph path can then

-     * be transformed and rendered.

-     */

-    public static Path2D buildPath(OTGlyph glyph) {

-

-        if (glyph == null) {

-            return null;

-        }

-

-        Path2D glyphPath = new Path2D();

-

-        // Iterate through all of the points in the glyph.  Each time we find a

-        // contour end point, add the point range to the path.

-        int firstIndex = 0;

-        int count = 0;

-        for (int i = 0; i < glyph.getPointCount(); i++) {

-            count++;

-            if (glyph.getPoint(i).endOfContour) {

-                addContourToPath(glyphPath, glyph, firstIndex, count);

-                firstIndex = i + 1;

-                count = 0;

-            }

-        }

-        return glyphPath;

-    }

-

-    private static void addContourToPath(Path2D gp, OTGlyph glyph, int startIndex, int count) {

-        int offset = 0;

-        while (offset < count) {

-            Point point = glyph.getPoint(startIndex + offset%count);

-            Point point_plus1 = glyph.getPoint(startIndex + (offset+1)%count);

-            Point point_plus2 = glyph.getPoint(startIndex + (offset+2)%count);

-            if(offset == 0)

-            {

-                gp.moveTo(point.x, point.y);

-            }

-

-            if (point.onCurve) {

-                if (point_plus1.onCurve) {

-                    // s = new Line2D.Float(point.x, point.y, point_plus1.x, point_plus1.y);

-                    gp.lineTo( point_plus1.x, point_plus1.y );

-                    offset++;                    

-                } else {

-                    if (point_plus2.onCurve) {

-                        // s = new QuadCurve2D.Float( point.x, point.y, point_plus1.x, point_plus1.y, point_plus2.x, point_plus2.y);

-                        gp.quadTo(point_plus1.x, point_plus1.y, point_plus2.x, point_plus2.y);

-                        offset+=2;                    

-                    } else {

-                        // s = new QuadCurve2D.Float(point.x,point.y,point_plus1.x,point_plus1.y,

-                        //                           midValue(point_plus1.x, point_plus2.x), midValue(point_plus1.y, point_plus2.y));

-                        gp.quadTo(point_plus1.x, point_plus1.y, midValue(point_plus1.x, point_plus2.x), midValue(point_plus1.y, point_plus2.y));

-                        offset+=2;

-                    }

-                }

-            } else {

-                if (point_plus1.onCurve) {

-                    // s = new QuadCurve2D.Float(midValue(point_minus1.x, point.x), midValue(point_minus1.y, point.y),

-                    //                           point.x, point.y, point_plus1.x, point_plus1.y);

-                    //gp.curve3(point_plus1.x, point_plus1.y, point.x, point.y);

-                    gp.quadTo(point.x, point.y, point_plus1.x, point_plus1.y);

-                    offset++;

-

-                } else {

-                    // s = new QuadCurve2D.Float(midValue(point_minus1.x, point.x), midValue(point_minus1.y, point.y), point.x, point.y,

-                    //                           midValue(point.x, point_plus1.x), midValue(point.y, point_plus1.y));

-                    //gp.curve3(midValue(point.x, point_plus1.x), midValue(point.y, point_plus1.y), point.x, point.y);

-                    gp.quadTo(point.x, point.y, midValue(point.x, point_plus1.x), midValue(point.y, point_plus1.y));

-                    offset++;                    

-                }

-            }

-        }

-    }

-

-    private static int midValue(int a, int b) {

-        return a + (b - a)/2;

-    }

-}

+/**
+ * Copyright 2011 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+package jogamp.graph.font.typecast;
+
+import java.util.ArrayList;
+
+import jogamp.graph.font.FontInt.GlyphInt;
+import jogamp.graph.font.typecast.ot.OTGlyph;
+import jogamp.graph.font.typecast.ot.Point;
+import jogamp.graph.geom.plane.AffineTransform;
+import jogamp.graph.geom.plane.Path2D;
+import jogamp.graph.geom.plane.PathIterator;
+
+import com.jogamp.graph.curve.OutlineShape;
+import com.jogamp.graph.font.Font;
+import com.jogamp.graph.font.Font.Glyph;
+import com.jogamp.graph.geom.Vertex;
+import com.jogamp.graph.geom.Vertex.Factory;
+
+/**
+ * Factory to build a {@link com.jogamp.graph.geom.Path2D Path2D} from 
+ * {@link jogamp.graph.font.typecast.ot.OTGlyph Glyph}s. 
+ */
+public class TypecastRenderer {
+
+    private static void getPaths(TypecastFont font, 
+            CharSequence string, float pixelSize, AffineTransform transform, Path2D[] p)
+    {        
+        if (string == null) {
+            return;
+        }
+        Font.Metrics metrics = font.getMetrics();
+        float advanceTotal = 0;
+        float lineGap = metrics.getLineGap(pixelSize) ;
+        float ascent = metrics.getAscent(pixelSize) ;
+        float descent = metrics.getDescent(pixelSize) ;
+        if (transform == null) {
+            transform = new AffineTransform();
+        }
+        AffineTransform t = new AffineTransform();
+
+        float advanceY = lineGap - descent + ascent;
+        float y = 0;
+        for (int i=0; i<string.length(); i++)
+        {
+            p[i] = new Path2D();
+            p[i].reset();
+            t.setTransform(transform);
+            char character = string.charAt(i);
+            if (character == '\n') {
+                y += advanceY;
+                advanceTotal = 0;
+                continue;
+            } else if (character == ' ') {
+                advanceTotal += font.getAdvanceWidth(Glyph.ID_SPACE, pixelSize);
+                continue;
+            }        
+            Glyph glyph = font.getGlyph(character);
+            Path2D gp = ((GlyphInt)glyph).getPath();
+            float scale = metrics.getScale(pixelSize);
+            t.translate(advanceTotal, y);
+            t.scale(scale, scale);
+            p[i].append(gp.iterator(t), false);
+            advanceTotal += glyph.getAdvance(pixelSize, true); 
+        }
+    }
+
+    public static ArrayList<OutlineShape> getOutlineShapes(TypecastFont font, CharSequence string, float pixelSize, AffineTransform transform, Factory<? extends Vertex> vertexFactory) {
+        Path2D[] paths = new Path2D[string.length()];
+        getPaths(font, string, pixelSize, transform, paths);
+
+        ArrayList<OutlineShape> shapes = new ArrayList<OutlineShape>();
+        final int numGlyps = paths.length;
+        for (int index=0;index<numGlyps;index++) {
+            if(paths[index] == null){
+                continue;
+            }
+            OutlineShape shape = new OutlineShape(vertexFactory);
+            shapes.add(shape);
+            PathIterator iterator = paths[index].iterator(transform);
+            if(null != iterator){
+                while(!iterator.isDone()){
+                    float[] coords = new float[6];
+                    int segmentType = iterator.currentSegment(coords);
+                    addPathVertexToOutline(shape, vertexFactory, coords, segmentType);
+                    iterator.next();
+                }
+            }
+        }
+        return shapes;
+    }
+    private static void addPathVertexToOutline(OutlineShape shape, Factory<? extends Vertex> vertexFactory, float[] coords, int segmentType){
+        switch(segmentType) {
+        case PathIterator.SEG_MOVETO:
+            shape.closeLastOutline();
+            shape.addEmptyOutline();
+            shape.addVertex(0, vertexFactory.create(coords, 0, 2, true));            
+            break;
+        case PathIterator.SEG_LINETO:
+            shape.addVertex(0, vertexFactory.create(coords, 0, 2, true));            
+            break;
+        case PathIterator.SEG_QUADTO:
+            shape.addVertex(0, vertexFactory.create(coords, 0, 2, false));
+            shape.addVertex(0, vertexFactory.create(coords, 2, 2, true));            
+            break;
+        case PathIterator.SEG_CUBICTO:
+            shape.addVertex(0, vertexFactory.create(coords, 0, 2, false));
+            shape.addVertex(0, vertexFactory.create(coords, 2, 2, false));
+            shape.addVertex(0, vertexFactory.create(coords, 4, 2, true));            
+            break;
+        case PathIterator.SEG_CLOSE:
+            shape.closeLastOutline();
+            break;
+        default:
+            throw new IllegalArgumentException("Unhandled Segment Type: "+segmentType);
+        }
+    }
+
+    /**
+     * Build a {@link com.jogamp.graph.geom.Path2D Path2D} from a
+     * {@link jogamp.graph.font.typecast.ot.OTGlyph Glyph}.  This glyph path can then
+     * be transformed and rendered.
+     */
+    public static Path2D buildPath(OTGlyph glyph) {
+
+        if (glyph == null) {
+            return null;
+        }
+
+        Path2D glyphPath = new Path2D();
+
+        // Iterate through all of the points in the glyph.  Each time we find a
+        // contour end point, add the point range to the path.
+        int firstIndex = 0;
+        int count = 0;
+        for (int i = 0; i < glyph.getPointCount(); i++) {
+            count++;
+            if (glyph.getPoint(i).endOfContour) {
+                addContourToPath(glyphPath, glyph, firstIndex, count);
+                firstIndex = i + 1;
+                count = 0;
+            }
+        }
+        return glyphPath;
+    }
+
+    private static void addContourToPath(Path2D gp, OTGlyph glyph, int startIndex, int count) {
+        int offset = 0;
+        while (offset < count) {
+            Point point = glyph.getPoint(startIndex + offset%count);
+            Point point_plus1 = glyph.getPoint(startIndex + (offset+1)%count);
+            Point point_plus2 = glyph.getPoint(startIndex + (offset+2)%count);
+            if(offset == 0)
+            {
+                gp.moveTo(point.x, point.y);
+            }
+
+            if (point.onCurve) {
+                if (point_plus1.onCurve) {
+                    // s = new Line2D.Float(point.x, point.y, point_plus1.x, point_plus1.y);
+                    gp.lineTo( point_plus1.x, point_plus1.y );
+                    offset++;                    
+                } else {
+                    if (point_plus2.onCurve) {
+                        // s = new QuadCurve2D.Float( point.x, point.y, point_plus1.x, point_plus1.y, point_plus2.x, point_plus2.y);
+                        gp.quadTo(point_plus1.x, point_plus1.y, point_plus2.x, point_plus2.y);
+                        offset+=2;                    
+                    } else {
+                        // s = new QuadCurve2D.Float(point.x,point.y,point_plus1.x,point_plus1.y,
+                        //                           midValue(point_plus1.x, point_plus2.x), midValue(point_plus1.y, point_plus2.y));
+                        gp.quadTo(point_plus1.x, point_plus1.y, midValue(point_plus1.x, point_plus2.x), midValue(point_plus1.y, point_plus2.y));
+                        offset+=2;
+                    }
+                }
+            } else {
+                if (point_plus1.onCurve) {
+                    // s = new QuadCurve2D.Float(midValue(point_minus1.x, point.x), midValue(point_minus1.y, point.y),
+                    //                           point.x, point.y, point_plus1.x, point_plus1.y);
+                    //gp.curve3(point_plus1.x, point_plus1.y, point.x, point.y);
+                    gp.quadTo(point.x, point.y, point_plus1.x, point_plus1.y);
+                    offset++;
+
+                } else {
+                    // s = new QuadCurve2D.Float(midValue(point_minus1.x, point.x), midValue(point_minus1.y, point.y), point.x, point.y,
+                    //                           midValue(point.x, point_plus1.x), midValue(point.y, point_plus1.y));
+                    //gp.curve3(midValue(point.x, point_plus1.x), midValue(point.y, point_plus1.y), point.x, point.y);
+                    gp.quadTo(point.x, point.y, midValue(point.x, point_plus1.x), midValue(point.y, point_plus1.y));
+                    offset++;                    
+                }
+            }
+        }
+    }
+
+    private static int midValue(int a, int b) {
+        return a + (b - a)/2;
+    }
+}
diff --git a/src/jogl/classes/jogamp/graph/math/MathFloat.java b/src/jogl/classes/jogamp/graph/math/MathFloat.java
index 0b8d69eba..82e7823a6 100644
--- a/src/jogl/classes/jogamp/graph/math/MathFloat.java
+++ b/src/jogl/classes/jogamp/graph/math/MathFloat.java
@@ -1,45 +1,45 @@
-/**

- * Copyright 2011 JogAmp Community. All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without modification, are

- * permitted provided that the following conditions are met:

- *

- *    1. Redistributions of source code must retain the above copyright notice, this list of

- *       conditions and the following disclaimer.

- *

- *    2. Redistributions in binary form must reproduce the above copyright notice, this list

- *       of conditions and the following disclaimer in the documentation and/or other materials

- *       provided with the distribution.

- *

- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED

- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR

- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR

- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- *

- * The views and conclusions contained in the software and documentation are those of the

- * authors and should not be interpreted as representing official policies, either expressed

- * or implied, of JogAmp Community.

- */

-package jogamp.graph.math;

-

-public class MathFloat {

-

-    public static final float E = 2.7182818284590452354f;

-

-    public static final float PI = 3.14159265358979323846f;

-    

-    public static float abs(float a) { return (float) java.lang.Math.abs(a);  }

-    public static float pow(float a, float b) { return (float) java.lang.Math.pow(a, b);  }

-    

-    public static float sin(float a) { return (float) java.lang.Math.sin(a);  }

-    public static float cos(float a) { return (float) java.lang.Math.cos(a);  }

-    public static float acos(float a) { return (float) java.lang.Math.acos(a);  }

-    

-    public static float sqrt(float a) { return (float) java.lang.Math.sqrt(a);  }

-    

-}

+/**
+ * Copyright 2011 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+package jogamp.graph.math;
+
+public class MathFloat {
+
+    public static final float E = 2.7182818284590452354f;
+
+    public static final float PI = 3.14159265358979323846f;
+    
+    public static float abs(float a) { return (float) java.lang.Math.abs(a);  }
+    public static float pow(float a, float b) { return (float) java.lang.Math.pow(a, b);  }
+    
+    public static float sin(float a) { return (float) java.lang.Math.sin(a);  }
+    public static float cos(float a) { return (float) java.lang.Math.cos(a);  }
+    public static float acos(float a) { return (float) java.lang.Math.acos(a);  }
+    
+    public static float sqrt(float a) { return (float) java.lang.Math.sqrt(a);  }
+    
+}