diff options
Diffstat (limited to 'src/test/com/jogamp')
3 files changed, 210 insertions, 111 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java b/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java new file mode 100644 index 000000000..1282d5d97 --- /dev/null +++ b/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java @@ -0,0 +1,195 @@ +/** + * Copyright 2014 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; + +import java.io.IOException; + +import javax.media.opengl.GL2ES2; +import javax.media.opengl.GLAutoDrawable; +import javax.media.opengl.GLEventListener; +import javax.media.opengl.fixedfunc.GLMatrixFunc; + +import com.jogamp.graph.curve.opengl.RenderState; +import com.jogamp.graph.curve.opengl.TextRenderer; +import com.jogamp.graph.font.Font; +import com.jogamp.graph.font.FontFactory; +import com.jogamp.graph.geom.opengl.SVertex; +import com.jogamp.opengl.math.geom.AABBox; +import com.jogamp.opengl.util.PMVMatrix; +import com.jogamp.opengl.util.glsl.ShaderState; + +public abstract class TextRendererGLELBase implements GLEventListener { + protected final float[] textPosition = new float[] {0,0,0}; + protected final int[] texSize = new int[] { 0 }; + protected final float[] staticRGBAColor = new float[] { 1f, 1f, 1f, 1f }; + + protected final Font font; + protected final int usrRenderModes; + + /** + * In exclusive mode, impl. uses a pixelScale of 1f and orthogonal PMV on window dimensions + * and renderString uses 'height' for '1'. + * <p> + * In non-exclusive mode, i.e. shared w/ custom PMV (within another 3d scene), + * it uses the custom pixelScale and renderString uses normalized 'height', i.e. '1'. + * </p> + */ + protected boolean exclusivePMVMatrix = true; + protected PMVMatrix usrPMVMatrix = null; + protected RenderState rs = null; + protected TextRenderer renderer = null; + + /** font size in pixels, default is 24 */ + protected int fontSize = 24; + /** scale pixel, default is 1f */ + protected float pixelScale = 1.0f; + protected int texSizeScale = 2; + + boolean flipVerticalInGLOrientation = false; + + public TextRendererGLELBase(final int renderModes) { + usrRenderModes = renderModes; + { + Font _font = null; + try { + _font = FontFactory.get(FontFactory.UBUNTU).getDefault(); + } catch (IOException e) { + e.printStackTrace(); + } + this.font = _font; + } + } + + public void setFlipVerticalInGLOrientation(boolean v) { flipVerticalInGLOrientation=v; } + public final TextRenderer getRenderer() { return renderer; } + + @Override + public void init(GLAutoDrawable drawable) { + if( null != font ) { + exclusivePMVMatrix = null == usrPMVMatrix; + this.rs = RenderState.createRenderState(new ShaderState(), SVertex.factory(), usrPMVMatrix); + this.renderer = TextRenderer.create(rs, usrRenderModes); + if( 0 == usrRenderModes ) { + texSizeScale = 0; + } + final GL2ES2 gl = drawable.getGL().getGL2ES2(); + renderer.init(gl); + renderer.setAlpha(gl, staticRGBAColor[3]); + renderer.setColorStatic(gl, staticRGBAColor[0], staticRGBAColor[1], staticRGBAColor[2]); + final ShaderState st = rs.getShaderState(); + st.useProgram(gl, false); + } else { + this.rs = null; + this.renderer = null; + } + } + + @Override + public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { + if( null != renderer ) { + final GL2ES2 gl = drawable.getGL().getGL2ES2(); + final ShaderState st = rs.getShaderState(); + st.useProgram(gl, true); + if( exclusivePMVMatrix ) { + // renderer.reshapePerspective(gl, 45.0f, width, height, 0.1f, 1000.0f); + renderer.reshapeOrtho(gl, width, height, 0.1f, 1000.0f); + pixelScale = 1.0f; + } else { + renderer.reshapeNotify(gl, width, height); + } + st.useProgram(gl, false); + texSize[0] = width * texSizeScale; + } + } + + @Override + public abstract void display(GLAutoDrawable drawable); + + @Override + public void dispose(GLAutoDrawable drawable) { + if( null != renderer ) { + final GL2ES2 gl = drawable.getGL().getGL2ES2(); + renderer.destroy(gl); + } + } + + int lastRow = -1; + + public void renderString(GLAutoDrawable drawable, String text, int column, float tx, float ty, float tz) { + final int row = lastRow + 1; + renderString(drawable, text, column, row, tx, ty, tz); + lastRow = row; + } + + public void renderString(GLAutoDrawable drawable, String text, int column, int row, float tx, float ty, float tz) { + if( null != renderer ) { + final GL2ES2 gl = drawable.getGL().getGL2ES2(); + + float dx = tx; + float dy; + + if( !exclusivePMVMatrix ) { + dy = 1f-ty; + } else { + final int height = drawable.getHeight(); + dy = height-ty; + } + + final AABBox textBox = font.getStringBounds(text, fontSize); + dx += pixelScale * font.getAdvanceWidth('X', fontSize) * column; + dy -= pixelScale * (int)textBox.getHeight() * ( row + 1 ); + + final ShaderState st = rs.getShaderState(); + final PMVMatrix pmvMatrix = rs.pmvMatrix(); + pmvMatrix.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); + if( !exclusivePMVMatrix ) { + pmvMatrix.glPushMatrix(); + } else { + pmvMatrix.glLoadIdentity(); + } + + st.useProgram(gl, true); + gl.glEnable(GL2ES2.GL_BLEND); + pmvMatrix.glTranslatef(dx, dy, tz); + if( flipVerticalInGLOrientation && drawable.isGLOriented() ) { + pmvMatrix.glScalef(pixelScale, -1f*pixelScale, 1f); + } else if( 1f != pixelScale ) { + pmvMatrix.glScalef(pixelScale, pixelScale, 1f); + } + renderer.updateMatrix(gl); + renderer.drawString3D(gl, font, text, textPosition, fontSize, texSize); + st.useProgram(gl, false); + gl.glDisable(GL2ES2.GL_BLEND); + + if( !exclusivePMVMatrix ) { + pmvMatrix.glPopMatrix(); + } + lastRow = -1; + } + } +}
\ No newline at end of file diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLReadBuffer00Base.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLReadBuffer00Base.java index 2ad622d14..06fefe059 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLReadBuffer00Base.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLReadBuffer00Base.java @@ -30,11 +30,9 @@ package com.jogamp.opengl.test.junit.jogl.acore; import java.io.IOException; import java.lang.reflect.InvocationTargetException; -import javax.media.opengl.GL2ES2; import javax.media.opengl.GLAutoDrawable; import javax.media.opengl.GLCapabilities; import javax.media.opengl.GLCapabilitiesImmutable; -import javax.media.opengl.GLEventListener; import javax.media.opengl.GLProfile; import org.junit.BeforeClass; @@ -43,14 +41,8 @@ import org.junit.Test; import org.junit.runners.MethodSorters; import com.jogamp.graph.curve.Region; -import com.jogamp.graph.curve.opengl.RenderState; -import com.jogamp.graph.curve.opengl.TextRenderer; -import com.jogamp.graph.font.Font; -import com.jogamp.graph.font.FontFactory; -import com.jogamp.graph.geom.opengl.SVertex; -import com.jogamp.opengl.math.geom.AABBox; +import com.jogamp.opengl.test.junit.graph.TextRendererGLELBase; import com.jogamp.opengl.test.junit.util.UITestCase; -import com.jogamp.opengl.util.glsl.ShaderState; /** * Multiple GLJPanels in a JFrame @@ -58,108 +50,20 @@ import com.jogamp.opengl.util.glsl.ShaderState; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public abstract class GLReadBuffer00Base extends UITestCase { - public static abstract class TextRendererGLELBase implements GLEventListener { - final float[] textPosition = new float[] {0,0,0}; - final int[] texSize = new int[] { 0 }; - final int fontSize = 24; - - final Font font; - final RenderState rs; - final TextRenderer renderer; - - boolean flipVerticalInGLOrientation = false; - - public TextRendererGLELBase() { - { - Font _font = null; - try { - _font = FontFactory.get(FontFactory.UBUNTU).getDefault(); - } catch (IOException e) { - e.printStackTrace(); - } - this.font = _font; - } - if( null != font ) { - this.rs = RenderState.createRenderState(new ShaderState(), SVertex.factory()); - this.renderer = TextRenderer.create(rs, Region.VBAA_RENDERING_BIT); - } else { - this.rs = null; - this.renderer = null; - } - } - - public void setFlipVerticalInGLOrientation(boolean v) { flipVerticalInGLOrientation=v; } - public final TextRenderer getRenderer() { return renderer; } - - public void init(GLAutoDrawable drawable) { - if( null != renderer ) { - final GL2ES2 gl = drawable.getGL().getGL2ES2(); - renderer.init(gl); - renderer.setAlpha(gl, 0.99f); - renderer.setColorStatic(gl, 1.0f, 1.0f, 1.0f); - final ShaderState st = rs.getShaderState(); - st.useProgram(gl, false); - } - } - - public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { - if( null != renderer ) { - final GL2ES2 gl = drawable.getGL().getGL2ES2(); - final ShaderState st = rs.getShaderState(); - st.useProgram(gl, true); - // renderer.reshapePerspective(gl, 45.0f, width, height, 0.1f, 1000.0f); - renderer.reshapeOrtho(gl, width, height, 0.1f, 1000.0f); - st.useProgram(gl, false); - texSize[0] = width * 2; - } - } - - public abstract void display(GLAutoDrawable drawable); - - public void dispose(GLAutoDrawable drawable) { - if( null != renderer ) { - final GL2ES2 gl = drawable.getGL().getGL2ES2(); - renderer.destroy(gl); - } - } - - int lastRow = -1; - - public void renderString(GLAutoDrawable drawable, String text, int column, int row, int z0) { - if( null != renderer ) { - final GL2ES2 gl = drawable.getGL().getGL2ES2(); - final int height = drawable.getHeight(); - - int dx = 0; - int dy = height; - if(0>row) { - row = lastRow + 1; - } - AABBox textBox = font.getStringBounds(text, fontSize); - dx += font.getAdvanceWidth('X', fontSize) * column; - dy -= (int)textBox.getHeight() * ( row + 1 ); - - final ShaderState st = rs.getShaderState(); - st.useProgram(gl, true); - gl.glEnable(GL2ES2.GL_BLEND); - renderer.resetModelview(null); - renderer.translate(gl, dx, dy, z0); - if( flipVerticalInGLOrientation && drawable.isGLOriented() ) { - renderer.scale(gl, 1f, -1f, 1f); - } - renderer.drawString3D(gl, font, text, textPosition, fontSize, texSize); - st.useProgram(gl, false); - gl.glDisable(GL2ES2.GL_BLEND); - - lastRow = row; - } - } - } public static class TextRendererGLEL extends TextRendererGLELBase { int frameNo = 0; public TextRendererGLEL() { - super(); + // FIXME: Graph TextRenderer does not AA well w/o MSAA and FBO + super(Region.VBAA_RENDERING_BIT); + texSizeScale = 2; + + fontSize = 24; + + staticRGBAColor[0] = 1.0f; + staticRGBAColor[1] = 1.0f; + staticRGBAColor[2] = 1.0f; + staticRGBAColor[3] = 0.99f; } @Override @@ -167,7 +71,7 @@ public abstract class GLReadBuffer00Base extends UITestCase { frameNo++; final String text = String.format("Frame %04d: %04dx%04d", frameNo, drawable.getWidth(), drawable.getHeight()); if( null != renderer ) { - renderString(drawable, text, 0, 0, -1); + renderString(drawable, text, 0 /* col */, 0 /* row */, 0, 0, -1); } else { System.err.println(text); } diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java index 616aa52c3..b02238c2b 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java @@ -66,14 +66,14 @@ public class TextureSequenceCubeES2 implements GLEventListener { } private TextureSequence texSeq; - private ShaderState st; - private PMVMatrix pmvMatrix; + public ShaderState st; + public PMVMatrix pmvMatrix; private GLUniformData pmvMatrixUniform; // private TextureCoords[] textureCoords = null; private float nearPlaneNormalized; // private float zoom0=-5.0f, zoom=zoom0; // private float view_rotx = 20.0f, view_roty = 30.0f, view_rotz = 0.0f; - private float zoom=-2.3f; + public float zoom=-2.3f; private float view_rotx = 0.0f, view_roty = 0.0f; private final float view_rotz = 0.0f; int[] vboNames = new int[4]; |