diff options
author | Sven Gothel <[email protected]> | 2012-10-08 10:44:05 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-10-08 10:44:05 +0200 |
commit | f5612e7dfc635359f15b402c2ee9022a5e703a9d (patch) | |
tree | 0b54287f72b87a2693f38ed308195e928311a093 /test | |
parent | 3119458b32c8620f971ba44488389ddf03b2d705 (diff) |
Simple NEWT port: Remove AWT dependencies in Jake2 / JOGL / Fast (default mode) - Prepare for ES2NEWT
- Removed AWT init dialog, replaced w/ UI less auto install if n/a @ default location:
$HOME/Jake2/baseq2
- JOGL GL2 Renderer 'joglgl2'
- JOGL ES2 Renderer 'jogles2' (TBD)
- Replaced JOGLKBD (AWT) w/ NEWTKBD
- JOGL* Renderer using NEWT
Diffstat (limited to 'test')
-rw-r--r-- | test/jake2/render/TestMap.java | 2 | ||||
-rw-r--r-- | test/jake2/render/TestRenderer.java | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/test/jake2/render/TestMap.java b/test/jake2/render/TestMap.java index f127a19..3dd89fd 100644 --- a/test/jake2/render/TestMap.java +++ b/test/jake2/render/TestMap.java @@ -84,7 +84,7 @@ public class TestMap // sehr wichtig !!! VID.Shutdown(); - Globals.re = this.re = Renderer.getDriver("jogl2", true); + Globals.re = this.re = Renderer.getDriver("joglgl2", true); re.Init(0, 0); diff --git a/test/jake2/render/TestRenderer.java b/test/jake2/render/TestRenderer.java index a1a9515..3c0bb7f 100644 --- a/test/jake2/render/TestRenderer.java +++ b/test/jake2/render/TestRenderer.java @@ -35,10 +35,11 @@ import jake2.sys.KBD; import jake2.util.Lib; import jake2.util.Math3D; -import java.awt.Dimension; import java.nio.FloatBuffer; import java.util.*; +import javax.media.nativewindow.util.Dimension; + /** * TestRenderer * @@ -75,7 +76,7 @@ public class TestRenderer { Locale.setDefault(Locale.US); Jake2.Q2Dialog.setVisible(true); - String DRIVER = "jogl2"; + String DRIVER = "joglgl2"; Qcommon.Init(new String[] { "TestRenderer", "+set", "gl_mode", "6", "+set", "vid_fullscreen", "0", "+set", "vid_ref", DRIVER }); @@ -125,7 +126,7 @@ public class TestRenderer { Dimension wal = new Dimension(); re.DrawGetPicSize(wal, "/textures/e1u1/basemap.wal"); - re.DrawPic(0, viddef.getHeight() - wal.height, "/textures/e1u1/basemap.wal"); + re.DrawPic(0, viddef.getHeight() - wal.getHeight(), "/textures/e1u1/basemap.wal"); switch (testnr) { case 0: |