diff options
Diffstat (limited to 'src/demo')
| -rwxr-xr-x | src/demo/GPURegionNewtDemo02.java | 1 | ||||
| -rw-r--r-- | src/demo/GPUTextGLListenerBase01.java | 223 | ||||
| -rw-r--r-- | src/demo/GPUTextNewtDemo01.java | 146 | ||||
| -rw-r--r-- | src/demo/GPUTextNewtDemo02.java | 187 |
4 files changed, 285 insertions, 272 deletions
diff --git a/src/demo/GPURegionNewtDemo02.java b/src/demo/GPURegionNewtDemo02.java index 7de9efa43..f9d7bb944 100755 --- a/src/demo/GPURegionNewtDemo02.java +++ b/src/demo/GPURegionNewtDemo02.java @@ -37,7 +37,6 @@ import javax.media.opengl.GLProfile; import com.jogamp.graph.curve.HwRegionRenderer; import com.jogamp.graph.curve.OutlineShape; -import com.jogamp.graph.curve.Region; import com.jogamp.graph.geom.opengl.SVertex; import com.jogamp.newt.event.KeyEvent; import com.jogamp.newt.event.KeyListener; diff --git a/src/demo/GPUTextGLListenerBase01.java b/src/demo/GPUTextGLListenerBase01.java new file mode 100644 index 000000000..afdec1220 --- /dev/null +++ b/src/demo/GPUTextGLListenerBase01.java @@ -0,0 +1,223 @@ +/** + * 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 demo; + +import javax.media.opengl.GL; +import javax.media.opengl.GL2ES2; +import javax.media.opengl.GLAutoDrawable; +import javax.media.opengl.GLEventListener; +import javax.media.opengl.GLPipelineFactory; + +import com.jogamp.graph.curve.text.HwTextRenderer; +import com.jogamp.graph.font.Font; +import com.jogamp.graph.geom.Vertex; +import com.jogamp.newt.event.KeyEvent; +import com.jogamp.newt.event.KeyListener; +import com.jogamp.newt.opengl.GLWindow; + +public abstract class GPUTextGLListenerBase01 implements GLEventListener { + Vertex.Factory<? extends Vertex> vfactory; + HwTextRenderer textRenderer; + KeyAction keyAction; + + boolean fontUpdate = true; + int fontSize = 40; + final int fontSizeModulo = 100; + Font font; + + final float[] position = new float[] {0,0,0}; + + float xTran = -10; + float yTran = 10; + float ang = 0f; + float zoom = -70f; + // float zoom = -1000f; + int texSize = 400; // FBO/tex size .. + + boolean doMatrix = true; + boolean debug; + boolean trace; + static final String text1; + static final String text2; + + static { + text1 = "abcdef\nghijklmn\nopqrstuv\nwxyz"; // \n0123456789"; + text2 = text1.toUpperCase(); + } + + public GPUTextGLListenerBase01(Vertex.Factory<? extends Vertex> vfactory, int mode, boolean debug, boolean trace) { + this.textRenderer = new HwTextRenderer(vfactory, mode); + this.vfactory = vfactory; + this.debug = debug; + this.trace = trace; + } + + public void setMatrix(float xtrans, float ytrans, float angle, int zoom, int fbosize) { + this.xTran = xtrans; + this.yTran = ytrans; + this.ang = angle; + this.zoom = zoom; + this.texSize = fbosize; + } + + public void init(GLAutoDrawable drawable) { + GL2ES2 gl = drawable.getGL().getGL2ES2(); + + if(debug) { + gl = gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Debug", null, gl, null) ).getGL2ES2(); + } + if(trace) { + gl = gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Trace", null, gl, new Object[] { System.err } ) ).getGL2ES2(); + } + gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f); + } + + public void reshape(GLAutoDrawable drawable, int xstart, int ystart, int width, int height) { + GL2ES2 gl = drawable.getGL().getGL2ES2(); + + gl.glViewport(xstart, ystart, width, height); + textRenderer.reshape(gl, 45.0f, width, height, 0.1f, 7000.0f); + + dumpMatrix(); + } + + public void display(GLAutoDrawable drawable) { + GL2ES2 gl = drawable.getGL().getGL2ES2(); + + gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f); // Demo02 needs to have this set here as well .. hmm ? + gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); + + if(doMatrix) { + textRenderer.resetMatrix(gl); + textRenderer.translate(gl, xTran, yTran, zoom); + textRenderer.rotate(gl, ang, 0, 1, 0); + doMatrix = false; + } + + if(fontUpdate) { + font = textRenderer.createFont(vfactory, "Lucida Sans Regular", fontSize); + fontUpdate = false; + } + textRenderer.renderString3D(gl, font, text2, position, texSize); + } + + public void dispose(GLAutoDrawable drawable) { + GL2ES2 gl = drawable.getGL().getGL2ES2(); + textRenderer.dispose(gl); + } + + public void fontIncr(int v) { + fontSize = Math.abs((fontSize + v) % fontSizeModulo) ; + fontUpdate = true; + dumpMatrix(); + } + + public void zoom(int v){ + zoom += v; + doMatrix = true; + dumpMatrix(); + } + + public void move(float x, float y){ + xTran += x; + yTran += y; + doMatrix = true; + dumpMatrix(); + } + public void rotate(float delta){ + ang += delta; + ang %= 360.0f; + doMatrix = true; + dumpMatrix(); + } + + void dumpMatrix() { + System.err.println("Matrix: " + xTran + "/" + yTran + " x"+zoom + " @"+ang +" fontSize "+fontSize); + } + + public void attachTo(GLWindow window) { + if ( null == keyAction ) { + keyAction = new KeyAction(); + } + window.addGLEventListener(this); + window.addKeyListener(keyAction); + } + + public void detachFrom(GLWindow window) { + if ( null == keyAction ) { + return; + } + window.removeGLEventListener(this); + window.removeKeyListener(keyAction); + } + + public class KeyAction implements KeyListener { + public void keyPressed(KeyEvent arg0) { + if(arg0.getKeyCode() == KeyEvent.VK_1){ + zoom(10); + } + else if(arg0.getKeyCode() == KeyEvent.VK_2){ + zoom(-10); + } + else if(arg0.getKeyCode() == KeyEvent.VK_3){ + fontIncr(10); + } + else if(arg0.getKeyCode() == KeyEvent.VK_4){ + fontIncr(-10); + } + else if(arg0.getKeyCode() == KeyEvent.VK_UP){ + move(0, -1); + } + else if(arg0.getKeyCode() == KeyEvent.VK_DOWN){ + move(0, 1); + } + else if(arg0.getKeyCode() == KeyEvent.VK_LEFT){ + move(1, 0); + } + else if(arg0.getKeyCode() == KeyEvent.VK_RIGHT){ + move(-1, 0); + } + else if(arg0.getKeyCode() == KeyEvent.VK_6){ + texSize -= 10; + System.err.println("Tex Size: " + texSize); + } + else if(arg0.getKeyCode() == KeyEvent.VK_7){ + texSize += 10; + System.err.println("Tex Size: " + texSize); + } + else if(arg0.getKeyCode() == KeyEvent.VK_0){ + rotate(1); + } + else if(arg0.getKeyCode() == KeyEvent.VK_9){ + rotate(-1); + } + } + public void keyTyped(KeyEvent arg0) {} + public void keyReleased(KeyEvent arg0) {} + } +}
\ No newline at end of file diff --git a/src/demo/GPUTextNewtDemo01.java b/src/demo/GPUTextNewtDemo01.java index 25c40b433..ad1020122 100644 --- a/src/demo/GPUTextNewtDemo01.java +++ b/src/demo/GPUTextNewtDemo01.java @@ -27,44 +27,28 @@ */ package demo; -import javax.media.opengl.GL; import javax.media.opengl.GL2ES2; -import javax.media.opengl.GL2GL3; import javax.media.opengl.GLAutoDrawable; import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLEventListener; import javax.media.opengl.GLProfile; import com.jogamp.graph.curve.Region; -import com.jogamp.graph.curve.text.HwTextRenderer; -import com.jogamp.graph.font.Font; -import com.jogamp.graph.geom.Vertex; import com.jogamp.graph.geom.opengl.SVertex; -import com.jogamp.newt.event.KeyEvent; -import com.jogamp.newt.event.KeyListener; -import com.jogamp.newt.event.WindowAdapter; -import com.jogamp.newt.event.WindowEvent; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.util.FPSAnimator; public class GPUTextNewtDemo01 { - private static void create(){ - new TextNewtWindow1(); - } + static final boolean DEBUG = false; + static final boolean TRACE = false; + public static void main(String[] args) { - create(); + GPUTextNewtDemo01 test = new GPUTextNewtDemo01(); + test.testMe(); } -} - -class TextNewtWindow1 { - Vertex.Factory<SVertex> pointFactory = SVertex.factory(); TextGLListener textGLListener = null; - public TextNewtWindow1(){ - createWindow(); - } - private void createWindow() { + public void testMe() { GLProfile.initSingleton(true); GLProfile glp = GLProfile.getGL2ES2(); GLCapabilities caps = new GLCapabilities(glp); @@ -80,120 +64,36 @@ class TextNewtWindow1 { window.setTitle("GPU Text Newt Demo 01 - r2t0 msaa1"); textGLListener = new TextGLListener(); - window.addGLEventListener(textGLListener); + textGLListener.attachTo(window); window.setVisible(true); - - window.addKeyListener(new KeyListener() { - public void keyPressed(KeyEvent arg0) { - if(arg0.getKeyCode() == KeyEvent.VK_1){ - textGLListener.zoomIn(); - } - else if(arg0.getKeyCode() == KeyEvent.VK_2){ - textGLListener.zoomOut(); - } - else if(arg0.getKeyCode() == KeyEvent.VK_UP){ - textGLListener.move(0, -1); - } - else if(arg0.getKeyCode() == KeyEvent.VK_DOWN){ - textGLListener.move(0, 1); - } - else if(arg0.getKeyCode() == KeyEvent.VK_LEFT){ - textGLListener.move(1, 0); - } - else if(arg0.getKeyCode() == KeyEvent.VK_RIGHT){ - textGLListener.move(-1, 0); - } - else if(arg0.getKeyCode() == KeyEvent.VK_0){ - textGLListener.rotate(1); - } - else if(arg0.getKeyCode() == KeyEvent.VK_9){ - textGLListener.rotate(-1); - } - } - public void keyTyped(KeyEvent arg0) {} - public void keyReleased(KeyEvent arg0) {} - }); - - FPSAnimator animator = new FPSAnimator(60); + FPSAnimator animator = new FPSAnimator(10); + // Animator animator = new Animator(); animator.add(window); - window.addWindowListener(new WindowAdapter() { - public void windowDestroyNotify(WindowEvent arg0) { - System.exit(0); - }; - }); animator.start(); } - private class TextGLListener implements GLEventListener{ - HwTextRenderer textRenderer = null; - - public TextGLListener(){ - + + private class TextGLListener extends GPUTextGLListenerBase01 { + public TextGLListener() { + super(SVertex.factory(), Region.SINGLE_PASS, DEBUG, TRACE); + setMatrix(-10, 10, 0f, -70, 0); } - + public void init(GLAutoDrawable drawable) { - GL2ES2 gl = drawable.getGL().getGL2ES2(); + GL2ES2 gl = drawable.getGL().getGL2ES2(); + + super.init(drawable); + gl.setSwapInterval(1); gl.glEnable(GL2ES2.GL_DEPTH_TEST); - textRenderer = new HwTextRenderer(drawable.getContext(), pointFactory, Region.SINGLE_PASS); - textRenderer.setAlpha(1.0f); - textRenderer.setColor(0.0f, 0.0f, 0.0f); + textRenderer.init(gl); + textRenderer.setAlpha(gl, 1.0f); + textRenderer.setColor(gl, 0.0f, 0.0f, 0.0f); //gl.glSampleCoverage(0.95f, false); //gl.glEnable(GL2GL3.GL_SAMPLE_COVERAGE); // sample coverage doesn't really make a difference to lines + //gl.glEnable(GL2GL3.GL_SAMPLE_ALPHA_TO_COVERAGE); //gl.glEnable(GL2GL3.GL_SAMPLE_ALPHA_TO_ONE); MSAATool.dump(drawable); } - - float ang = 0; - float zoom = -70; - float xTran = -10; - float yTran = 10; - - public void display(GLAutoDrawable drawable) { - GL2ES2 gl = drawable.getGL().getGL2ES2(); - - gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f); - gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); - - textRenderer.resetMatrix(); - textRenderer.translate(xTran, yTran, zoom); - textRenderer.rotate(ang, 0, 1, 0); - - String text1 = "abcdef\nghijklmn\nopqrstuv\nwxyz"; - String text2 = text1.toUpperCase(); - - Font font = textRenderer.createFont(pointFactory, "Lucida Sans Regular",40); - float[] position = new float[]{0,0,0}; - - try { - textRenderer.renderString3D(font, text2, position, 0); - } catch (Exception e) { - e.printStackTrace(); - } - } - public void reshape(GLAutoDrawable drawable, int xstart, int ystart, int width, int height){ - GL2ES2 gl = drawable.getGL().getGL2ES2(); - gl.glViewport(xstart, ystart, width, height); - - textRenderer.reshape(drawable, 45.0f, width, height, 0.1f, 7000.0f); - } - - public void zoomIn(){ - zoom++; - } - public void zoomOut(){ - zoom--; - } - public void move(float x, float y){ - xTran += x; - yTran += y; - } - public void rotate(float delta){ - ang+= delta; - ang%=360; - } - public void dispose(GLAutoDrawable arg0) { - textRenderer.clearCached(); - } } } diff --git a/src/demo/GPUTextNewtDemo02.java b/src/demo/GPUTextNewtDemo02.java index 4f5e62b31..c7e7504ab 100644 --- a/src/demo/GPUTextNewtDemo02.java +++ b/src/demo/GPUTextNewtDemo02.java @@ -28,188 +28,79 @@ package demo; import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GL2GL3; import javax.media.opengl.GL3; import javax.media.opengl.GLAutoDrawable; import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLEventListener; import javax.media.opengl.GLProfile; import com.jogamp.graph.curve.Region; -import com.jogamp.graph.curve.text.HwTextRenderer; -import com.jogamp.graph.font.Font; -import com.jogamp.graph.geom.Vertex; import com.jogamp.graph.geom.opengl.SVertex; -import com.jogamp.newt.event.KeyEvent; -import com.jogamp.newt.event.KeyListener; -import com.jogamp.newt.event.WindowAdapter; -import com.jogamp.newt.event.WindowEvent; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.util.FPSAnimator; public class GPUTextNewtDemo02 { - private static void create(){ - new TextNewtWindow(); - } - public static void main(String[] args) { - create(); - } -} - -class TextNewtWindow { - Vertex.Factory<SVertex> pointFactory = SVertex.factory(); + /** + * If DEBUG is enabled: + * + * Caused by: javax.media.opengl.GLException: Thread[main-Display-X11_:0.0-1-EDT-1,5,main] glGetError() returned the following error codes after a call to glFramebufferRenderbuffer(<int> 0x8D40, <int> 0x1902, <int> 0x8D41, <int> 0x1): GL_INVALID_ENUM ( 1280 0x500), + * at javax.media.opengl.DebugGL4bc.checkGLGetError(DebugGL4bc.java:33961) + * at javax.media.opengl.DebugGL4bc.glFramebufferRenderbuffer(DebugGL4bc.java:33077) + * at jogamp.graph.curve.opengl.VBORegion2PGL3.initFBOTexture(VBORegion2PGL3.java:295) + */ + static final boolean DEBUG = false; + static final boolean TRACE = false; + + public static void main(String[] args) { + GPUTextNewtDemo02 test = new GPUTextNewtDemo02(); + test.testMe(); + } + + GLWindow window; TextGLListener textGLListener = null; - public TextNewtWindow(){ - createWindow(); - } - private void createWindow() { + public void testMe() { GLProfile.initSingleton(true); - GLProfile glp = GLProfile.get(GLProfile.GL3); + GLProfile glp = GLProfile.get(GLProfile.GL3bc); GLCapabilities caps = new GLCapabilities(glp); caps.setAlphaBits(4); System.out.println("Requested: "+caps); - final GLWindow window = GLWindow.create(caps); + window = GLWindow.create(caps); window.setPosition(10, 10); - window.setSize(1000, 1000); + window.setSize(400, 400); - window.setTitle("GPU Text Newt Demo 01 - r2t1 msaa0"); - textGLListener = new TextGLListener(); - window.addGLEventListener(textGLListener); + window.setTitle("GPU Text Newt Demo 02 - r2t1 msaa0"); + textGLListener = new TextGLListener(); + textGLListener.attachTo(window); window.setVisible(true); - window.addKeyListener(new KeyListener() { - public void keyPressed(KeyEvent arg0) { - if(arg0.getKeyCode() == KeyEvent.VK_1){ - textGLListener.zoomIn(1); - } - else if(arg0.getKeyCode() == KeyEvent.VK_2){ - textGLListener.zoomOut(1); - } - else if(arg0.getKeyCode() == KeyEvent.VK_3){ - textGLListener.zoomIn(10); - } - else if(arg0.getKeyCode() == KeyEvent.VK_4){ - textGLListener.zoomOut(10); - } - else if(arg0.getKeyCode() == KeyEvent.VK_UP){ - textGLListener.move(0, -1); - } - else if(arg0.getKeyCode() == KeyEvent.VK_DOWN){ - textGLListener.move(0, 1); - } - else if(arg0.getKeyCode() == KeyEvent.VK_LEFT){ - textGLListener.move(1, 0); - } - else if(arg0.getKeyCode() == KeyEvent.VK_RIGHT){ - textGLListener.move(-1, 0); - } - else if(arg0.getKeyCode() == KeyEvent.VK_0){ - textGLListener.rotate(1); - } - else if(arg0.getKeyCode() == KeyEvent.VK_9){ - textGLListener.rotate(-1); - } - else if(arg0.getKeyCode() == KeyEvent.VK_6){ - textGLListener.size -= 10; - System.err.println("Tex Size: " + textGLListener.size); - } - else if(arg0.getKeyCode() == KeyEvent.VK_7){ - textGLListener.size += 10; - System.err.println("Tex Size: " + textGLListener.size); - } - } - public void keyTyped(KeyEvent arg0) {} - public void keyReleased(KeyEvent arg0) {} - }); - FPSAnimator animator = new FPSAnimator(60); animator.add(window); - window.addWindowListener(new WindowAdapter() { - public void windowDestroyNotify(WindowEvent arg0) { - System.exit(0); - }; - }); animator.start(); } - private class TextGLListener implements GLEventListener{ - HwTextRenderer textRenderer = null; - - public TextGLListener(){ - - } - + + private class TextGLListener extends GPUTextGLListenerBase01 { + public TextGLListener() { + super(SVertex.factory(), Region.TWO_PASS, DEBUG, TRACE); + setMatrix(-10, 10, 0f, -1000, window.getWidth()); + } + public void init(GLAutoDrawable drawable) { - GL3 gl = drawable.getGL().getGL3(); + GL3 gl = drawable.getGL().getGL3(); + + super.init(drawable); + gl.setSwapInterval(1); gl.glEnable(GL3.GL_DEPTH_TEST); - - textRenderer = new HwTextRenderer(drawable.getContext(), pointFactory, Region.TWO_PASS); - textRenderer.setAlpha(1.0f); - textRenderer.setColor(0.0f, 0.0f, 0.0f); + textRenderer.init(gl); + textRenderer.setAlpha(gl, 1.0f); + textRenderer.setColor(gl, 0.0f, 0.0f, 0.0f); gl.glDisable(GL.GL_MULTISAMPLE); // this state usually doesn't matter in driver - but document here: no MSAA - gl.glHint(GL2.GL_PERSPECTIVE_CORRECTION_HINT, GL3.GL_NICEST); + //gl.glHint(GL2.GL_PERSPECTIVE_CORRECTION_HINT, GL3.GL_NICEST); MSAATool.dump(drawable); } - - float ang = 0; - float zoom = -4000; - float xTran = -100; - float yTran = 40; - int size = 190; - - public void display(GLAutoDrawable drawable) { - GL3 gl = drawable.getGL().getGL3(); - - gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f); - gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); - - textRenderer.resetMatrix(); - textRenderer.translate(xTran, yTran, zoom); - textRenderer.rotate(ang, 0, 1, 0); - - String text1 = "abcdef\nghijklmn\nopqrstuv\nwxyz"; - String text2 = text1.toUpperCase(); - - Font font = textRenderer.createFont(pointFactory, "Lucida Sans Regular",40); - float[] position = new float[]{0,0,0}; - - try { - textRenderer.renderString3D(font, text2, position, size); - } catch (Exception e) { - e.printStackTrace(); - } - } - public void reshape(GLAutoDrawable drawable, int xstart, int ystart, int width, int height){ - GL3 gl = drawable.getGL().getGL3(); - gl.glViewport(xstart, ystart, width, height); - - textRenderer.reshape(drawable, 45.0f, width , height, 0.1f, 7000.0f); - } - - public void zoomIn(float f){ - zoom+=f; - } - public void zoomOut(float f){ - zoom-=f; - System.err.println("Zoom: " + zoom); - } - public void move(float x, float y){ - xTran += x; - yTran += y; - } - public void rotate(float delta){ - ang+= delta; - ang%=360; - } - - public void dispose(GLAutoDrawable arg0) { - textRenderer.clearCached(); - } } } |