diff options
| author | Sven Gothel <[email protected]> | 2013-06-24 07:00:42 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-06-24 07:00:42 +0200 |
| commit | 00f82fde560306891823a1273baf50264dca3d05 (patch) | |
| tree | a4d852abc4148d2a563e97ddec4e5a2851be4570 /src/test | |
| parent | 3e528a69db38711c789a08d1d7335e5a7739f780 (diff) | |
TestGearsES2GLJPanel*: Use Gears (GL 1 based) if using bitmap - On Windows GDI would be returned and neither ES1 nor ES2 features are available.
Fixes commit 3e528a69db38711c789a08d1d7335e5a7739f780
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelAWT.java | 4 | ||||
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelsAWT.java | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelAWT.java index f15065525..e3be7b8b7 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelAWT.java @@ -49,8 +49,8 @@ import com.jogamp.newt.event.TraceKeyAdapter; import com.jogamp.newt.event.TraceWindowAdapter; import com.jogamp.newt.event.awt.AWTKeyAdapter; import com.jogamp.newt.event.awt.AWTWindowAdapter; -import com.jogamp.opengl.test.junit.jogl.demos.es1.GearsES1; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; +import com.jogamp.opengl.test.junit.jogl.demos.gl2.Gears; import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.util.QuitAdapter; import com.jogamp.opengl.test.junit.util.UITestCase; @@ -105,7 +105,7 @@ public class TestGearsES2GLJPanelAWT extends UITestCase { glJPanel.setPreferredSize(wsize); glJPanel.setSize(wsize); if( caps.isBitmap() ) { - glJPanel.addGLEventListener(new GearsES1(swapInterval)); + glJPanel.addGLEventListener(new Gears(swapInterval)); } else { glJPanel.addGLEventListener(new GearsES2(swapInterval)); } diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelsAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelsAWT.java index 2fb30a7ed..4668603d8 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelsAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelsAWT.java @@ -55,8 +55,8 @@ import org.junit.BeforeClass; import org.junit.Test; import com.jogamp.common.nio.Buffers; -import com.jogamp.opengl.test.junit.jogl.demos.es1.GearsES1; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; +import com.jogamp.opengl.test.junit.jogl.demos.gl2.Gears; import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.util.QuitAdapter; import com.jogamp.opengl.test.junit.util.UITestCase; @@ -122,9 +122,7 @@ public class TestGearsES2GLJPanelsAWT extends UITestCase { } final GLEventListener demo; if( caps.isBitmap() ) { - GearsES1 gdemo = new GearsES1(swapInterval); - gdemo.setGearsColors(color, color, color); - demo = gdemo; + demo = new Gears(swapInterval); } else { GearsES2 gdemo = new GearsES2(swapInterval); gdemo.setIgnoreFocus(true); |