diff options
Diffstat (limited to 'src/jogl/classes/com/jogamp/graph/curve/opengl')
4 files changed, 302 insertions, 364 deletions
diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java index d63e02a9c..78c8660fa 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java +++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java @@ -30,8 +30,8 @@ package com.jogamp.graph.curve.opengl; import java.util.List;
import javax.media.opengl.GL2ES2;
-import com.jogamp.opengl.util.PMVMatrix;
+import com.jogamp.opengl.util.PMVMatrix;
import com.jogamp.graph.curve.OutlineShape;
import com.jogamp.graph.curve.Region;
@@ -47,20 +47,17 @@ import com.jogamp.graph.curve.Region; */
public abstract class GLRegion extends Region {
- /** Create an ogl {@link GLRegion} defining the list of {@link OutlineShape}.
- * Combining the Shapes into single buffers.
- * @return the resulting Region inclusive the generated region
- */
- public static GLRegion create(List<OutlineShape> outlineShapes, int renderModes) {
- return (GLRegion) Region.create(outlineShapes, renderModes);
- }
-
/**
- * Create an ogl {@link Region} defining this {@link OutlineShape}
- * @return the resulting Region.
+ * Create a GLRegion 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(OutlineShape outlineShape, int renderModes) {
- return (GLRegion) Region.create(outlineShape, renderModes);
+ public static GLRegion create(int renderModes) {
+ return Region.create(renderModes);
}
protected GLRegion(int renderModes) {
@@ -73,27 +70,29 @@ public abstract class GLRegion extends Region { * <p>Called by {@link #draw(GL2ES2, RenderState, int, int, int)}.</p>
* @param rs TODO
*/
- protected abstract void update(GL2ES2 gl, RenderState rs);
+ protected abstract void update(GL2ES2 gl, RegionRenderer renderer);
/** Delete and clean the associated OGL
* objects
*/
- public abstract void destroy(GL2ES2 gl, RenderState rs);
+ public abstract void destroy(GL2ES2 gl, RegionRenderer renderer);
- /** Renders the associated OGL objects specifying
+ /**
+ * Renders the associated OGL objects specifying
* current width/hight of window for multi pass rendering
* of the region.
* @param matrix current {@link PMVMatrix}.
- * @param rs the RenderState to be used
- * @param vp_width current screen width
- * @param vp_height current screen height
+ * @param renderer the {@link RegionRenderer} to be used
* @param texWidth desired texture width for multipass-rendering.
* The actual used texture-width is written back when mp rendering is enabled, otherwise the store is untouched.
*/
- public final void draw(GL2ES2 gl, RenderState rs, int vp_width, int vp_height, int[/*1*/] texWidth) {
- update(gl, rs);
- drawImpl(gl, rs, vp_width, vp_height, texWidth);
+ public final void draw(GL2ES2 gl, RegionRenderer renderer, int[/*1*/] texWidth) {
+ if(isDirty()) {
+ update(gl, renderer);
+ setDirty(false);
+ }
+ drawImpl(gl, renderer, texWidth);
}
- protected abstract void drawImpl(GL2ES2 gl, RenderState rs, int vp_width, int vp_height, int[/*1*/] texWidth);
+ protected abstract void drawImpl(GL2ES2 gl, RegionRenderer renderer, int[/*1*/] texWidth);
}
diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java index faaf72a99..a9e258f36 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java +++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java @@ -27,13 +27,32 @@ */ package com.jogamp.graph.curve.opengl; +import java.nio.FloatBuffer; + import javax.media.opengl.GL2ES2; import javax.media.opengl.GLException; +import javax.media.opengl.fixedfunc.GLMatrixFunc; +import com.jogamp.opengl.util.glsl.ShaderCode; +import com.jogamp.opengl.util.glsl.ShaderState; +import com.jogamp.opengl.util.PMVMatrix; import com.jogamp.graph.curve.OutlineShape; import com.jogamp.graph.curve.Region; -public abstract class RegionRenderer extends Renderer { +/** + * OpenGL {@link Region} renderer + * <p> + * All OpenGL related operations regarding {@link Region}s + * are passed through an instance of this class. + * </p> + */ +public abstract class RegionRenderer { + protected static final boolean DEBUG = Region.DEBUG; + protected static final boolean DEBUG_INSTANCE = Region.DEBUG_INSTANCE; + + public static boolean isWeightValid(float v) { + return 0.0f <= v && v <= 1.9f ; + } /** * Create a Hardware accelerated Region Renderer. @@ -45,39 +64,256 @@ public abstract class RegionRenderer extends Renderer { return new jogamp.graph.curve.opengl.RegionRendererImpl01(rs, renderModes); } + protected final int renderModes; + protected final RenderState rs; + + protected int vp_width; + protected int vp_height; + protected boolean initialized; + private boolean vboSupported = false; + + public final boolean isInitialized() { return initialized; } + + public final int getWidth() { return vp_width; } + public final int getHeight() { return vp_height; } + + public final float getWeight() { return rs.getWeight().floatValue(); } + public final float getAlpha() { return rs.getAlpha().floatValue(); } + public final PMVMatrix getMatrix() { return rs.pmvMatrix(); } + + /** + * Implementation shall load, compile and link the shader program and leave it active. + * @param gl referencing the current GLContext to which the ShaderState is bound to + * @return + */ + protected abstract boolean initImpl(GL2ES2 gl); + + /** Delete and clean the associated OGL objects */ + protected abstract void destroyImpl(GL2ES2 gl); + + ////////////////////////////////////// + + /** + * @param rs the used {@link RenderState} + * @param renderModes bit-field of modes + */ protected RegionRenderer(RenderState rs, int renderModes) { - super(rs, renderModes); + this.rs = rs; + this.renderModes = renderModes; + } + + public final int getRenderModes() { + return renderModes; } + public final boolean usesVariableCurveWeight() { return Region.isNonUniformWeight(renderModes); } - /** Render an {@link OutlineShape} in 3D space at the position provided - * the triangles of the shapes will be generated, if not yet generated - * @param region the OutlineShape to Render. - * @param texWidth desired texture width for multipass-rendering. - * The actual used texture-width is written back when mp rendering is enabled, otherwise the store is untouched. - * @throws Exception if HwRegionRenderer not initialized + /** + * @return true if Region's renderModes contains all bits as this Renderer's renderModes + * except {@link Region#VARIABLE_CURVE_WEIGHT_BIT}, otherwise false. */ - public final void draw(GL2ES2 gl, Region region, int[/*1*/] texWidth) { - if(!isInitialized()) { - throw new GLException("RegionRenderer: not initialized!"); - } - if( !areRenderModesCompatible(region) ) { - throw new GLException("Incompatible render modes, : region modes "+region.getRenderModes()+ - " doesn't contain renderer modes "+this.getRenderModes()); - } - drawImpl(gl, region, texWidth); + public final boolean areRenderModesCompatible(final Region region) { + final int cleanRenderModes = getRenderModes() & ( Region.VARIABLE_CURVE_WEIGHT_BIT ); + return cleanRenderModes == ( region.getRenderModes() & cleanRenderModes ); } + public final boolean isVBOSupported() { return vboSupported; } + /** - * Usually just dispatched the draw call to the Region's draw implementation, - * e.g. {@link com.jogamp.graph.curve.opengl.GLRegion#draw(GL2ES2, RenderState, int, int, int[]) GLRegion#draw(GL2ES2, RenderState, int, int, int[])}. + * Initialize shader and bindings for GPU based rendering bound to the given GL object's GLContext + * if not initialized yet. + * <p>Leaves the renderer enabled, ie ShaderState.</p> + * <p>Shall be called by a {@code draw()} method, e.g. {@link RegionRenderer#draw(GL2ES2, Region, int)}</p> + * + * @param gl referencing the current GLContext to which the ShaderState is bound to + * @throws GLException if initialization failed */ - protected abstract void drawImpl(GL2ES2 gl, Region region, int[] texWidth); + public final void init(GL2ES2 gl) throws GLException { + if(initialized){ + return; + } + vboSupported = gl.isFunctionAvailable("glGenBuffers") && + gl.isFunctionAvailable("glBindBuffer") && + gl.isFunctionAvailable("glBufferData") && + gl.isFunctionAvailable("glDrawElements") && + gl.isFunctionAvailable("glVertexAttribPointer") && + gl.isFunctionAvailable("glDeleteBuffers"); + + if(DEBUG) { + System.err.println("TextRendererImpl01: VBO Supported = " + isVBOSupported()); + } + + if(!vboSupported){ + throw new GLException("VBO not supported"); + } + + rs.attachTo(gl); + + gl.glEnable(GL2ES2.GL_BLEND); + gl.glBlendFunc(GL2ES2.GL_SRC_ALPHA, GL2ES2.GL_ONE_MINUS_SRC_ALPHA); // FIXME: alpha blending stage ? + + initialized = initImpl(gl); + if(!initialized) { + throw new GLException("Shader initialization failed"); + } - @Override - protected void destroyImpl(GL2ES2 gl) { - // nop + if(!rs.getShaderState().uniform(gl, rs.getPMVMatrix())) { + throw new GLException("Error setting PMVMatrix in shader: "+rs.getShaderState()); + } + + if( Region.isNonUniformWeight( getRenderModes() ) ) { + if(!rs.getShaderState().uniform(gl, rs.getWeight())) { + throw new GLException("Error setting weight in shader: "+rs.getShaderState()); + } + } + + if(!rs.getShaderState().uniform(gl, rs.getAlpha())) { + throw new GLException("Error setting global alpha in shader: "+rs.getShaderState()); + } + + if(!rs.getShaderState().uniform(gl, rs.getColorStatic())) { + throw new GLException("Error setting global color in shader: "+rs.getShaderState()); + } + } + + public final void destroy(GL2ES2 gl) { + if(!initialized){ + if(DEBUG_INSTANCE) { + System.err.println("TextRenderer: Not initialized!"); + } + return; + } + rs.getShaderState().useProgram(gl, false); + destroyImpl(gl); + rs.destroy(gl); + initialized = false; } + public final RenderState getRenderState() { return rs; } + public final ShaderState getShaderState() { return rs.getShaderState(); } -} + public final void enable(GL2ES2 gl, boolean enable) { + rs.getShaderState().useProgram(gl, enable); + } + + public final void setWeight(GL2ES2 gl, float v) { + if( !isWeightValid(v) ) { + throw new IllegalArgumentException("Weight out of range"); + } + rs.getWeight().setData(v); + if(null != gl && rs.getShaderState().inUse() && Region.isNonUniformWeight( getRenderModes() ) ) { + rs.getShaderState().uniform(gl, rs.getWeight()); + } + } + + public final void setAlpha(GL2ES2 gl, float alpha_t) { + rs.getAlpha().setData(alpha_t); + if(null != gl && rs.getShaderState().inUse()) { + rs.getShaderState().uniform(gl, rs.getAlpha()); + } + + } + + public final void getColorStatic(GL2ES2 gl, float[] rgb) { + FloatBuffer fb = (FloatBuffer) rs.getColorStatic().getBuffer(); + rgb[0] = fb.get(0); + rgb[1] = fb.get(1); + rgb[2] = fb.get(2); + } + + public final void setColorStatic(GL2ES2 gl, float r, float g, float b){ + FloatBuffer fb = (FloatBuffer) rs.getColorStatic().getBuffer(); + fb.put(0, r); + fb.put(1, g); + fb.put(2, b); + if(null != gl && rs.getShaderState().inUse()) { + rs.getShaderState().uniform(gl, rs.getColorStatic()); + } + } + + public final void rotate(GL2ES2 gl, float angle, float x, float y, float z) { + rs.pmvMatrix().glRotatef(angle, x, y, z); + updateMatrix(gl); + } + + public final void translate(GL2ES2 gl, float x, float y, float z) { + rs.pmvMatrix().glTranslatef(x, y, z); + updateMatrix(gl); + } + + public final void scale(GL2ES2 gl, float x, float y, float z) { + rs.pmvMatrix().glScalef(x, y, z); + updateMatrix(gl); + } + + public final void resetModelview(GL2ES2 gl) { + rs.pmvMatrix().glMatrixMode(GLMatrixFunc.GL_MODELVIEW); + rs.pmvMatrix().glLoadIdentity(); + updateMatrix(gl); + } + + public final void updateMatrix(GL2ES2 gl) { + if(initialized && null != gl && rs.getShaderState().inUse()) { + rs.getShaderState().uniform(gl, rs.getPMVMatrix()); + } + } + + /** No PMVMatrix operation is performed here. PMVMatrix will be updated if gl is not null. */ + public final boolean reshapeNotify(GL2ES2 gl, int width, int height) { + this.vp_width = width; + this.vp_height = height; + updateMatrix(gl); + return true; + } + + public final boolean reshapePerspective(GL2ES2 gl, float angle, int width, int height, float near, float far) { + this.vp_width = width; + this.vp_height = height; + final float ratio = (float)width/(float)height; + final PMVMatrix p = rs.pmvMatrix(); + p.glMatrixMode(GLMatrixFunc.GL_PROJECTION); + p.glLoadIdentity(); + p.gluPerspective(angle, ratio, near, far); + updateMatrix(gl); + return true; + } + + public final boolean reshapeOrtho(GL2ES2 gl, int width, int height, float near, float far) { + this.vp_width = width; + this.vp_height = height; + final PMVMatrix p = rs.pmvMatrix(); + p.glMatrixMode(GLMatrixFunc.GL_PROJECTION); + p.glLoadIdentity(); + p.glOrthof(0, width, 0, height, near, far); + updateMatrix(gl); + return true; + } + + protected String getVertexShaderName() { + return "curverenderer" + getImplVersion(); + } + + protected String getFragmentShaderName() { + final String version = getImplVersion(); + final String pass = Region.isVBAA(renderModes) ? "-2pass" : "-1pass" ; + final String weight = Region.isNonUniformWeight(renderModes) ? "-weight" : "" ; + return "curverenderer" + version + pass + weight; + } + + // FIXME: Really required to have sampler2D def. precision ? If not, we can drop getFragmentShaderPrecision(..) and use default ShaderCode .. + public static final String es2_precision_fp = "\nprecision mediump float;\nprecision mediump int;\nprecision mediump sampler2D;\n"; + + protected String getFragmentShaderPrecision(GL2ES2 gl) { + if( gl.isGLES() ) { + return es2_precision_fp; + } + if( ShaderCode.requiresGL3DefaultPrecision(gl) ) { + return ShaderCode.gl3_default_precision_fp; + } + return null; + } + + protected String getImplVersion() { + return "01"; + } +}
\ No newline at end of file diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java deleted file mode 100644 index 31e4f0b8f..000000000 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java +++ /dev/null @@ -1,302 +0,0 @@ -/** - * 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.graph.curve.opengl; - -import java.nio.FloatBuffer; - -import javax.media.opengl.GL2ES2; -import javax.media.opengl.GLException; -import javax.media.opengl.fixedfunc.GLMatrixFunc; - -import com.jogamp.opengl.util.glsl.ShaderCode; -import com.jogamp.opengl.util.glsl.ShaderState; -import com.jogamp.opengl.util.PMVMatrix; - -import com.jogamp.graph.curve.Region; - -public abstract class Renderer { - protected static final boolean DEBUG = Region.DEBUG; - protected static final boolean DEBUG_INSTANCE = Region.DEBUG_INSTANCE; - - public static boolean isWeightValid(float v) { - return 0.0f <= v && v <= 1.9f ; - } - - protected final int renderModes; - protected int vp_width; - protected int vp_height; - protected boolean initialized; - protected final RenderState rs; - private boolean vboSupported = false; - - public final boolean isInitialized() { return initialized; } - - public final int getWidth() { return vp_width; } - public final int getHeight() { return vp_height; } - - public float getWeight() { return rs.getWeight().floatValue(); } - public float getAlpha() { return rs.getAlpha().floatValue(); } - public final PMVMatrix getMatrix() { return rs.pmvMatrix(); } - - /** - * Implementation shall load, compile and link the shader program and leave it active. - * @param gl referencing the current GLContext to which the ShaderState is bound to - * @return - */ - protected abstract boolean initShaderProgram(GL2ES2 gl); - - protected abstract void destroyImpl(GL2ES2 gl); - - /** - * @param rs the used {@link RenderState} - * @param renderModes bit-field of modes - */ - protected Renderer(RenderState rs, int renderModes) { - this.rs = rs; - this.renderModes = renderModes; - } - - public final int getRenderModes() { - return renderModes; - } - - public boolean usesVariableCurveWeight() { return Region.isNonUniformWeight(renderModes); } - - /** - * @return true if Region's renderModes contains all bits as this Renderer's renderModes - * except {@link Region#VARIABLE_CURVE_WEIGHT_BIT}, otherwise false. - */ - public final boolean areRenderModesCompatible(Region region) { - final int cleanRenderModes = getRenderModes() & ( Region.VARIABLE_CURVE_WEIGHT_BIT ); - return cleanRenderModes == ( region.getRenderModes() & cleanRenderModes ); - } - - public final boolean isVBOSupported() { return vboSupported; } - - /** - * Initialize shader and bindings for GPU based rendering bound to the given GL object's GLContext - * if not initialized yet. - * <p>Leaves the renderer enabled, ie ShaderState.</p> - * <p>Shall be called by a {@code draw()} method, e.g. {@link RegionRenderer#draw(GL2ES2, Region, int)}</p> - * - * @param gl referencing the current GLContext to which the ShaderState is bound to - * @throws GLException if initialization failed - */ - public final void init(GL2ES2 gl) throws GLException { - if(initialized){ - return; - } - vboSupported = gl.isFunctionAvailable("glGenBuffers") && - gl.isFunctionAvailable("glBindBuffer") && - gl.isFunctionAvailable("glBufferData") && - gl.isFunctionAvailable("glDrawElements") && - gl.isFunctionAvailable("glVertexAttribPointer") && - gl.isFunctionAvailable("glDeleteBuffers"); - - if(DEBUG) { - System.err.println("TextRendererImpl01: VBO Supported = " + isVBOSupported()); - } - - if(!vboSupported){ - throw new GLException("VBO not supported"); - } - - rs.attachTo(gl); - - gl.glEnable(GL2ES2.GL_BLEND); - gl.glBlendFunc(GL2ES2.GL_SRC_ALPHA, GL2ES2.GL_ONE_MINUS_SRC_ALPHA); // FIXME: alpha blending stage ? - - initialized = initShaderProgram(gl); - if(!initialized) { - throw new GLException("Shader initialization failed"); - } - - if(!rs.getShaderState().uniform(gl, rs.getPMVMatrix())) { - throw new GLException("Error setting PMVMatrix in shader: "+rs.getShaderState()); - } - - if( Region.isNonUniformWeight( getRenderModes() ) ) { - if(!rs.getShaderState().uniform(gl, rs.getWeight())) { - throw new GLException("Error setting weight in shader: "+rs.getShaderState()); - } - } - - if(!rs.getShaderState().uniform(gl, rs.getAlpha())) { - throw new GLException("Error setting global alpha in shader: "+rs.getShaderState()); - } - - if(!rs.getShaderState().uniform(gl, rs.getColorStatic())) { - throw new GLException("Error setting global color in shader: "+rs.getShaderState()); - } - } - - public final void flushCache(GL2ES2 gl) { - // FIXME: REMOVE ! - } - - public void destroy(GL2ES2 gl) { - if(!initialized){ - if(DEBUG_INSTANCE) { - System.err.println("TextRenderer: Not initialized!"); - } - return; - } - rs.getShaderState().useProgram(gl, false); - destroyImpl(gl); - rs.destroy(gl); - initialized = false; - } - - public final RenderState getRenderState() { return rs; } - public final ShaderState getShaderState() { return rs.getShaderState(); } - - public final void enable(GL2ES2 gl, boolean enable) { - rs.getShaderState().useProgram(gl, enable); - } - - public void setWeight(GL2ES2 gl, float v) { - if( !isWeightValid(v) ) { - throw new IllegalArgumentException("Weight out of range"); - } - rs.getWeight().setData(v); - if(null != gl && rs.getShaderState().inUse() && Region.isNonUniformWeight( getRenderModes() ) ) { - rs.getShaderState().uniform(gl, rs.getWeight()); - } - } - - public void setAlpha(GL2ES2 gl, float alpha_t) { - rs.getAlpha().setData(alpha_t); - if(null != gl && rs.getShaderState().inUse()) { - rs.getShaderState().uniform(gl, rs.getAlpha()); - } - - } - - public void getColorStatic(GL2ES2 gl, float[] rgb) { - FloatBuffer fb = (FloatBuffer) rs.getColorStatic().getBuffer(); - rgb[0] = fb.get(0); - rgb[1] = fb.get(1); - rgb[2] = fb.get(2); - } - - public void setColorStatic(GL2ES2 gl, float r, float g, float b){ - FloatBuffer fb = (FloatBuffer) rs.getColorStatic().getBuffer(); - fb.put(0, r); - fb.put(1, g); - fb.put(2, b); - if(null != gl && rs.getShaderState().inUse()) { - rs.getShaderState().uniform(gl, rs.getColorStatic()); - } - } - - public void rotate(GL2ES2 gl, float angle, float x, float y, float z) { - rs.pmvMatrix().glRotatef(angle, x, y, z); - updateMatrix(gl); - } - - public void translate(GL2ES2 gl, float x, float y, float z) { - rs.pmvMatrix().glTranslatef(x, y, z); - updateMatrix(gl); - } - - public void scale(GL2ES2 gl, float x, float y, float z) { - rs.pmvMatrix().glScalef(x, y, z); - updateMatrix(gl); - } - - public void resetModelview(GL2ES2 gl) { - rs.pmvMatrix().glMatrixMode(GLMatrixFunc.GL_MODELVIEW); - rs.pmvMatrix().glLoadIdentity(); - updateMatrix(gl); - } - - public void updateMatrix(GL2ES2 gl) { - if(initialized && null != gl && rs.getShaderState().inUse()) { - rs.getShaderState().uniform(gl, rs.getPMVMatrix()); - } - } - - /** No PMVMatrix operation is performed here. PMVMatrix will be updated if gl is not null. */ - public boolean reshapeNotify(GL2ES2 gl, int width, int height) { - this.vp_width = width; - this.vp_height = height; - updateMatrix(gl); - return true; - } - - public boolean reshapePerspective(GL2ES2 gl, float angle, int width, int height, float near, float far) { - this.vp_width = width; - this.vp_height = height; - final float ratio = (float)width/(float)height; - final PMVMatrix p = rs.pmvMatrix(); - p.glMatrixMode(GLMatrixFunc.GL_PROJECTION); - p.glLoadIdentity(); - p.gluPerspective(angle, ratio, near, far); - updateMatrix(gl); - return true; - } - - public boolean reshapeOrtho(GL2ES2 gl, int width, int height, float near, float far) { - this.vp_width = width; - this.vp_height = height; - final PMVMatrix p = rs.pmvMatrix(); - p.glMatrixMode(GLMatrixFunc.GL_PROJECTION); - p.glLoadIdentity(); - p.glOrthof(0, width, 0, height, near, far); - updateMatrix(gl); - return true; - } - - protected String getVertexShaderName() { - return "curverenderer" + getImplVersion(); - } - - protected String getFragmentShaderName() { - final String version = getImplVersion(); - final String pass = Region.isVBAA(renderModes) ? "-2pass" : "-1pass" ; - final String weight = Region.isNonUniformWeight(renderModes) ? "-weight" : "" ; - return "curverenderer" + version + pass + weight; - } - - // FIXME: Really required to have sampler2D def. precision ? If not, we can drop getFragmentShaderPrecision(..) and use default ShaderCode .. - public static final String es2_precision_fp = "\nprecision mediump float;\nprecision mediump int;\nprecision mediump sampler2D;\n"; - - protected String getFragmentShaderPrecision(GL2ES2 gl) { - if( gl.isGLES() ) { - return es2_precision_fp; - } - if( ShaderCode.requiresGL3DefaultPrecision(gl) ) { - return ShaderCode.gl3_default_precision_fp; - } - return null; - } - - protected String getImplVersion() { - return "01"; - } -}
\ No newline at end of file diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderUtil.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderUtil.java index cef589f4f..6ac3d926f 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderUtil.java +++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderUtil.java @@ -35,7 +35,6 @@ import java.util.List; import javax.media.opengl.GL2ES2; import javax.media.opengl.GLException; -import jogamp.graph.curve.opengl.RegionFactory; import jogamp.graph.geom.plane.AffineTransform; import com.jogamp.graph.curve.OutlineShape; @@ -53,9 +52,9 @@ import com.jogamp.graph.geom.Vertex.Factory; */ public class TextRenderUtil { - public final Renderer renderer; + public final RegionRenderer renderer; - public TextRenderUtil(final Renderer renderer) { + public TextRenderUtil(final RegionRenderer renderer) { this.renderer = renderer; } @@ -75,7 +74,7 @@ public class TextRenderUtil { final Font font, final CharSequence str, final int pixelSize) { final int charCount = str.length(); - final GLRegion region = RegionFactory.create(renderModes); + final GLRegion region = Region.create(renderModes); // region.setFlipped(true); final Font.Metrics metrics = font.getMetrics(); @@ -108,7 +107,7 @@ public class TextRenderUtil { final Font.Glyph glyph = font.getGlyph(character); final OutlineShape glyphShape = glyph.getShape(); - if( null == glyphShape || glyphShape.getVertices().size() < 3 ) { + if( null == glyphShape ) { continue; } // glyphShape.closeLastOutline(); @@ -116,10 +115,16 @@ public class TextRenderUtil { if( false ) { region.addOutlineShape(glyphShape, t); } else { - final ArrayList<Triangle> trisIn = glyphShape.getTriangles(); + // System.err.println("XXXXX Pre TRI"); + // glyphShape.getVertices(); + final ArrayList<Triangle> trisIn = glyphShape.getTriangles(OutlineShape.VerticesState.QUADRATIC_NURBS); + final ArrayList<Vertex> gVertices = glyphShape.getVertices(); + + if( gVertices.size() < 3 ) { + continue; + } region.addTriangles(trisIn, t, numVertices); - final ArrayList<Vertex> gVertices = glyphShape.getVertices(); for(int j=0; j<gVertices.size(); j++) { final Vertex vert = gVertices.get(j); final Vertex svert = t.transform(vert, null); @@ -156,13 +161,13 @@ public class TextRenderUtil { shapesOut.add(glyphShape); } - final GLRegion region = RegionFactory.create(renderModes); + final GLRegion region = Region.create(renderModes); // region.setFlipped(true); int numVertices = region.getNumVertices(); for(int i=0; i< shapesOut.size(); i++) { final OutlineShape shape = shapesOut.get(i); - ArrayList<Triangle> gtris = shape.getTriangles(); + ArrayList<Triangle> gtris = shape.getTriangles(OutlineShape.VerticesState.QUADRATIC_NURBS); region.addTriangles(gtris, null, 0); final ArrayList<Vertex> gVertices = shape.getVertices(); @@ -198,7 +203,7 @@ public class TextRenderUtil { region = createRegion(renderer.getRenderModes(), rs.getVertexFactory(), font, str, pixelSize); addCachedRegion(gl, font, str, pixelSize, region); } - region.draw(gl, rs, renderer.getWidth(), renderer.getHeight(), texSize); + region.draw(gl, renderer, texSize); } /** @@ -212,14 +217,14 @@ public class TextRenderUtil { * The actual used texture-width is written back when mp rendering is enabled, otherwise the store is untouched. * @throws Exception if TextRenderer not initialized */ - public static void drawString3D(final Renderer renderer, final GL2ES2 gl, + public static void drawString3D(final RegionRenderer renderer, final GL2ES2 gl, final Font font, final CharSequence str, final int fontSize, final int[/*1*/] texSize) { if(!renderer.isInitialized()){ throw new GLException("TextRendererImpl01: not initialized!"); } final RenderState rs = renderer.getRenderState(); GLRegion region = createRegion(renderer.getRenderModes(), rs.getVertexFactory(), font, str, fontSize); - region.draw(gl, rs, renderer.getWidth(), renderer.getHeight(), texSize); + region.draw(gl, renderer, texSize); } /** FIXME @@ -238,7 +243,7 @@ public class TextRenderUtil { final Iterator<GLRegion> iterator = stringCacheMap.values().iterator(); while(iterator.hasNext()){ final GLRegion region = iterator.next(); - region.destroy(gl, renderer.getRenderState()); + region.destroy(gl, renderer); } stringCacheMap.clear(); stringCacheArray.clear(); @@ -304,7 +309,7 @@ public class TextRenderUtil { final String key = getKey(font, str, fontSize); GLRegion region = stringCacheMap.remove(key); if(null != region) { - region.destroy(gl, renderer.getRenderState()); + region.destroy(gl, renderer); } stringCacheArray.remove(key); } @@ -313,7 +318,7 @@ public class TextRenderUtil { final String key = stringCacheArray.remove(idx); final GLRegion region = stringCacheMap.remove(key); if(null != region) { - region.destroy(gl, renderer.getRenderState()); + region.destroy(gl, renderer); } } |