diff options
| author | Sven Gothel <[email protected]> | 2014-06-09 16:42:33 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-06-09 16:42:33 +0200 |
| commit | 99230cc04b6d0143088129ccc1a20d5c8799ca67 (patch) | |
| tree | ce61b5f4b8e62d4d2372f6e4824a98c38f0a8982 /src/test/com/jogamp | |
| parent | 4686a652d821efe04045333026be79270bc19bfd (diff) | |
GraphUI: Fix using multiple texture units w/ opt. colorTexUnit in GLRegion
The texture unit has to be updated always,
since program maybe used by multiple regions and diff. texUnits
Diffstat (limited to 'src/test/com/jogamp')
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java index fbb29d6ea..e58051131 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java @@ -509,9 +509,21 @@ public class GPUUISceneGLListener0A implements GLEventListener { final float button2XSize = 2f*buttonXSize; final float button2YSize = 2f*buttonYSize; final float xStartRight = -button2XSize - 8f; // aligned to right edge via reshape + final int texUnitMediaPlayer, texUnitImageButton, texUnitGLELButton; + if( true ) { + texUnitMediaPlayer=0; + texUnitImageButton=0; + texUnitGLELButton=0; + } else { + // works - but not required .. + texUnitMediaPlayer=1; + texUnitImageButton=2; + texUnitGLELButton=3; + } if(true) { final GLMediaPlayer mPlayer = GLMediaPlayerFactory.createDefault(); + mPlayer.setTextureUnit(texUnitMediaPlayer); final MediaPlayerButton mPlayerButton = new MediaPlayerButton(renderer.getRenderState().getVertexFactory(), renderModes, button2XSize, button2YSize, mPlayer); mPlayerButton.addDefaultEventListener(); @@ -534,7 +546,7 @@ public class GPUUISceneGLListener0A implements GLEventListener { } } if( true ) { - final ImageSequence imgSeq = new ImageSequence(0, true); + final ImageSequence imgSeq = new ImageSequence(texUnitImageButton, true); final ImageSeqButton imgButton = new ImageSeqButton(renderer.getRenderState().getVertexFactory(), renderModes, button2XSize, button2YSize, imgSeq); try { @@ -564,7 +576,7 @@ public class GPUUISceneGLListener0A implements GLEventListener { glel.setClearColor(new float[] { 0.9f, 0.9f, 0.9f, 1f } ); final GLEventListenerButton glelButton = new GLEventListenerButton(renderer.getRenderState().getVertexFactory(), renderModes, button2XSize, button2YSize, - 0, glel, false /* useAlpha */, + texUnitGLELButton, glel, false /* useAlpha */, (int)(button2XSize), (int)(button2YSize)); glelButton.setToggleable(true); glelButton.setToggle(true); // toggle == true -> animation |