From 4ccf5ed0cc14743a3a97d7b0dcc61e839d263a1a Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 9 May 2011 01:24:14 +0200 Subject: Graph/UI-Demo: Use RegionRenderer for region and text, start data/gl separation (2) Complete commit 77910075c04d4c86aabf12a2853b381f804bf04a, oops, got a fs corruption. --- .../opengl/test/junit/graph/demos/ui/Label.java | 96 ++++++++++++++++++++++ .../test/junit/graph/demos/ui/UINewtDemo01.java | 0 .../opengl/test/junit/graph/demos/ui/UIShape.java | 76 +++++++++++++++++ .../test/junit/graph/demos/ui/UITextShape.java | 37 +++++++++ .../test/junit/graph/demos/ui/opengl/UIRegion.java | 77 +++++++++++++++++ 5 files changed, 286 insertions(+) create mode 100644 src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label.java mode change 100755 => 100644 src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UINewtDemo01.java create mode 100644 src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIShape.java create mode 100644 src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UITextShape.java create mode 100644 src/test/com/jogamp/opengl/test/junit/graph/demos/ui/opengl/UIRegion.java diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label.java new file mode 100644 index 000000000..70dd489b0 --- /dev/null +++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label.java @@ -0,0 +1,96 @@ +/** + * 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 com.jogamp.opengl.test.junit.graph.demos.ui; + +import jogamp.graph.curve.text.GlyphString; + +import com.jogamp.graph.font.Font; +import com.jogamp.graph.geom.Vertex; +import com.jogamp.graph.geom.Vertex.Factory; + +public class Label extends UIShape implements UITextShape { + protected Font font; + protected int size; + protected String text; + protected GlyphString glyphString; + + public Label(Factory factory, Font font, int size, String text) { + super(factory); + this.font = font; + this.size = size; + this.text = text; + } + + public GlyphString getGlyphString() { + return glyphString; + } + + public String getText(){ + return text; + } + + public void setText(String text) { + this.text = text; + dirty |= DIRTY_SHAPE; + } + + public Font getFont() { + return font; + } + + public void setFont(Font font) { + this.font = font; + dirty |= DIRTY_SHAPE; + } + + public int getSize() { + return size; + } + + public void setSize(int size) { + this.size = size; + dirty |= DIRTY_SHAPE; + } + + public String toString(){ + return "Label [" + font.toString() + ", size " + size + ", " + getText() + "]"; + } + + @Override + protected void clearImpl() { + if(null != glyphString) { + glyphString.destroy(null, null); + } + } + + @Override + protected void createShape() { + clearImpl(); + glyphString = GlyphString.createString(shape, getVertexFactory(), font, size, text); + } +} diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UINewtDemo01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UINewtDemo01.java old mode 100755 new mode 100644 diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIShape.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIShape.java new file mode 100644 index 000000000..7e3d26775 --- /dev/null +++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIShape.java @@ -0,0 +1,76 @@ +/** + * 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 com.jogamp.opengl.test.junit.graph.demos.ui; + +import com.jogamp.graph.curve.OutlineShape; +import com.jogamp.graph.geom.AABBox; +import com.jogamp.graph.geom.Vertex; +import com.jogamp.graph.geom.Vertex.Factory; + +public abstract class UIShape { + private final Factory vertexFactory; + protected OutlineShape shape; + + protected static final int DIRTY_SHAPE = 1 << 0 ; + protected int dirty = DIRTY_SHAPE; + + public UIShape(Factory factory) { + this.vertexFactory = factory; + this.shape = new OutlineShape(factory); + } + + public void clear() { + clearImpl(); + shape.clear(); + } + protected abstract void clearImpl(); + + protected abstract void createShape(); + + public boolean updateShape() { + if( isShapeDirty() ) { + shape.clear(); + createShape(); + dirty &= ~DIRTY_SHAPE; + return true; + } + return false; + } + + public final Vertex.Factory getVertexFactory() { return vertexFactory; } + public AABBox getBounds() { return shape.getBounds(); } + + public OutlineShape getShape() { + updateShape(); + return shape; + } + + public boolean isShapeDirty() { + return 0 != ( dirty & DIRTY_SHAPE ) ; + } +} diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UITextShape.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UITextShape.java new file mode 100644 index 000000000..ee79d9a0b --- /dev/null +++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UITextShape.java @@ -0,0 +1,37 @@ +/** + * 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 com.jogamp.opengl.test.junit.graph.demos.ui; + +import jogamp.graph.curve.text.GlyphString; + +/** + * Marker interface to mark a UIShape implementation for text usage + */ +public interface UITextShape { + GlyphString getGlyphString(); +} diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/opengl/UIRegion.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/opengl/UIRegion.java new file mode 100644 index 000000000..88271095c --- /dev/null +++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/opengl/UIRegion.java @@ -0,0 +1,77 @@ +/** + * 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 com.jogamp.opengl.test.junit.graph.demos.ui.opengl; + +import javax.media.opengl.GL2ES2; + +import com.jogamp.graph.curve.opengl.GLRegion; +import com.jogamp.graph.curve.opengl.RenderState; +import com.jogamp.opengl.test.junit.graph.demos.ui.UIShape; +import com.jogamp.opengl.test.junit.graph.demos.ui.UITextShape; + +public class UIRegion { + protected static final int DIRTY_REGION = 1 << 0 ; + protected int dirty = DIRTY_REGION; + + private UIShape uiShape; + private GLRegion region; + + public UIRegion(UIShape uis) { + this.uiShape = uis; + } + + public boolean updateRegion(GL2ES2 gl, RenderState rs, int renderModes) { + if( uiShape.updateShape() || isRegionDirty() ) { + destroy(gl, rs); + if(uiShape instanceof UITextShape) { + region = ((UITextShape)uiShape).getGlyphString().createRegion(gl, renderModes); + } else { + region = GLRegion.create(uiShape.getShape(), renderModes); + } + dirty &= ~DIRTY_REGION; + return true; + } + return false; + } + + public GLRegion getRegion(GL2ES2 gl, RenderState rs, int renderModes) { + updateRegion(gl, rs, renderModes); + return region; + } + + public boolean isRegionDirty() { + return 0 != ( dirty & DIRTY_REGION ) ; + } + + public void destroy(GL2ES2 gl, RenderState rs) { + if(null != region) { + region.destroy(gl, rs); + region = null; + } + } +} -- cgit v1.2.3