diff options
author | Sven Gothel <[email protected]> | 2014-02-28 12:12:58 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2014-02-28 12:12:58 +0100 |
commit | ea0059f01866bd6257d4a06164db1b6c906a2949 (patch) | |
tree | d41f597228823492a17b306f009971e389f3e426 /src/test/com/jogamp | |
parent | 2283c881aae4b105275a4aaee77cac2727e4c924 (diff) |
Bug 801: Outline.setClosed(boolean [closed->closeTail]): Always close, but allow to either close-tail or head; OutlineShape/Triangulator: Pass 'sharpness' (very little effect though)
Diffstat (limited to 'src/test/com/jogamp')
3 files changed, 10 insertions, 10 deletions
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 2673a0e85..84c816b7a 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 @@ -62,13 +62,13 @@ public class GPURegionGLListener01 extends GPURegionRendererListenerBase01 { outlineShape.addVertex(6.0f,15.0f, false); outlineShape.addVertex(5.0f,8.0f, false); outlineShape.addVertex(0.0f,10.0f,true); - outlineShape.closeLastOutline(); + outlineShape.closeLastOutline(true); outlineShape.addEmptyOutline(); outlineShape.addVertex(5.0f,-5.0f,true); outlineShape.addVertex(10.0f,-5.0f, false); outlineShape.addVertex(10.0f,0.0f, true); outlineShape.addVertex(5.0f,0.0f, false); - outlineShape.closeLastOutline(); + outlineShape.closeLastOutline(true); /** Same shape as above but without any off-curve vertices */ offset = 30; @@ -80,13 +80,13 @@ public class GPURegionGLListener01 extends GPURegionRendererListenerBase01 { outlineShape.addVertex(offset+7.0f,15.0f, true); outlineShape.addVertex(offset+6.0f,8.0f, true); outlineShape.addVertex(offset+0.0f,10.0f, true); - outlineShape.closeLastOutline(); + outlineShape.closeLastOutline(true); outlineShape.addEmptyOutline(); outlineShape.addVertex(offset+5.0f,0.0f, true); outlineShape.addVertex(offset+5.0f,-5.0f, true); outlineShape.addVertex(offset+10.0f,-5.0f, true); outlineShape.addVertex(offset+10.0f,0.0f, true); - outlineShape.closeLastOutline(); + outlineShape.closeLastOutline(true); region = GLRegion.create(getRenderModes()); region.addOutlineShape(outlineShape, null); diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener02.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener02.java index 0e92bd2b6..83b37ac0b 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener02.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener02.java @@ -63,13 +63,13 @@ public class GPURegionGLListener02 extends GPURegionRendererListenerBase01 { shape.addVertex(6.0f,15.0f, false); shape.addVertex(5.0f,8.0f, false); shape.addVertex(0.0f,10.0f,true); - shape.closeLastOutline(); + shape.closeLastOutline(true); shape.addEmptyOutline(); shape.addVertex(5.0f,-5.0f,true); shape.addVertex(10.0f,-5.0f, false); shape.addVertex(10.0f,0.0f, true); shape.addVertex(5.0f,0.0f, false); - shape.closeLastOutline(); + shape.closeLastOutline(true); /** Same shape as above but without any off-curve vertices */ shape = new OutlineShape(getRenderer().getRenderState().getVertexFactory()); @@ -82,13 +82,13 @@ public class GPURegionGLListener02 extends GPURegionRendererListenerBase01 { shape.addVertex(offset+7.0f,15.0f, true); shape.addVertex(offset+6.0f,8.0f, true); shape.addVertex(offset+0.0f,10.0f, true); - shape.closeLastOutline(); + shape.closeLastOutline(true); shape.addEmptyOutline(); shape.addVertex(offset+5.0f,0.0f, true); shape.addVertex(offset+5.0f,-5.0f, true); shape.addVertex(offset+10.0f,-5.0f, true); shape.addVertex(offset+10.0f,0.0f, true); - shape.closeLastOutline(); + shape.closeLastOutline(true); region = GLRegion.create(getRenderModes()); region.addOutlineShapes(outlineShapes, null); diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/RIButton.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/RIButton.java index 6a3b9fc73..8c64e1463 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/RIButton.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/RIButton.java @@ -115,7 +115,7 @@ public abstract class RIButton extends UIShape { shape.addVertex(minX+tw, minY, minZ, true); shape.addVertex(minX+tw, minY + th, minZ, true); shape.addVertex(minX, minY + th, minZ, true); - shape.closeLastOutline(); + shape.closeLastOutline(true); } private void createCurvedOutline(AABBox lbox){ @@ -140,7 +140,7 @@ public abstract class RIButton extends UIShape { shape.addVertex(minX + cw, minY + th, minZ, true); shape.addVertex(minX, minY + th, minZ, false); shape.addVertex(minX, minY + th - ch, minZ, true); - shape.closeLastOutline(); + shape.closeLastOutline(true); } public void setCorner(float corner) { |