diff options
Diffstat (limited to 'src/demos/es1')
-rwxr-xr-x | src/demos/es1/Info.java | 7 | ||||
-rwxr-xr-x | src/demos/es1/RedSquare.java | 7 | ||||
-rwxr-xr-x | src/demos/es1/angeles/Main.java | 7 | ||||
-rw-r--r-- | src/demos/es1/cube/Cube.java | 7 | ||||
-rw-r--r-- | src/demos/es1/cube/CubeImmModeSink.java | 7 | ||||
-rwxr-xr-x | src/demos/es1/cubefbo/Main.java | 7 |
6 files changed, 24 insertions, 18 deletions
diff --git a/src/demos/es1/Info.java b/src/demos/es1/Info.java index d26738f..de3d16d 100755 --- a/src/demos/es1/Info.java +++ b/src/demos/es1/Info.java @@ -3,6 +3,7 @@ package demos.es1; import java.nio.*; import javax.media.opengl.*; import javax.media.opengl.glu.*; +import javax.media.nativewindow.*; import com.sun.javafx.newt.*; import com.sun.javafx.newt.opengl.*; @@ -26,9 +27,9 @@ public class Info implements GLEventListener { Window nWindow = null; if(0!=(type&USE_AWT)) { - Display nDisplay = NewtFactory.createDisplay(NewtFactory.AWT, null); // local display - Screen nScreen = NewtFactory.createScreen(NewtFactory.AWT, nDisplay, 0); // screen 0 - nWindow = NewtFactory.createWindow(NewtFactory.AWT, nScreen, caps); + Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display + Screen nScreen = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0 + nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps); } window = GLWindow.create(nWindow, caps); diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java index fc134db..2948f42 100755 --- a/src/demos/es1/RedSquare.java +++ b/src/demos/es1/RedSquare.java @@ -3,6 +3,7 @@ package demos.es1; import java.nio.*; import javax.media.opengl.*; import javax.media.opengl.glu.*; +import javax.media.nativewindow.*; import com.sun.opengl.util.*; import com.sun.opengl.util.glsl.fixedfunc.*; @@ -79,9 +80,9 @@ public class RedSquare implements WindowListener, KeyListener, MouseListener, GL Window nWindow = null; if(0!=(type&USE_AWT)) { - Display nDisplay = NewtFactory.createDisplay(NewtFactory.AWT, null); // local display - Screen nScreen = NewtFactory.createScreen(NewtFactory.AWT, nDisplay, 0); // screen 0 - nWindow = NewtFactory.createWindow(NewtFactory.AWT, nScreen, caps); + Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display + Screen nScreen = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0 + nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps); } window = GLWindow.create(nWindow, caps); diff --git a/src/demos/es1/angeles/Main.java b/src/demos/es1/angeles/Main.java index 226f595..3346a1f 100755 --- a/src/demos/es1/angeles/Main.java +++ b/src/demos/es1/angeles/Main.java @@ -2,6 +2,7 @@ package demos.es1.angeles; import java.nio.*; import javax.media.opengl.*; +import javax.media.nativewindow.*; import com.sun.javafx.newt.*; import com.sun.javafx.newt.opengl.*; @@ -61,9 +62,9 @@ public class Main implements WindowListener, MouseListener { Window nWindow = null; if(0!=(type&USE_AWT)) { - Display nDisplay = NewtFactory.createDisplay(NewtFactory.AWT, null); // local display - Screen nScreen = NewtFactory.createScreen(NewtFactory.AWT, nDisplay, 0); // screen 0 - nWindow = NewtFactory.createWindow(NewtFactory.AWT, nScreen, caps); + Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display + Screen nScreen = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0 + nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps); } window = GLWindow.create(nWindow, caps); diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java index 1d31527..3a8a22e 100644 --- a/src/demos/es1/cube/Cube.java +++ b/src/demos/es1/cube/Cube.java @@ -34,6 +34,7 @@ package demos.es1.cube; import java.nio.*; import javax.media.opengl.*; import javax.media.opengl.glu.*; +import javax.media.nativewindow.*; import com.sun.opengl.util.*; import com.sun.opengl.util.glsl.fixedfunc.*; @@ -302,9 +303,9 @@ public class Cube implements GLEventListener { Window nWindow = null; if(0!=(type&USE_AWT)) { - Display nDisplay = NewtFactory.createDisplay(NewtFactory.AWT, null); // local display - Screen nScreen = NewtFactory.createScreen(NewtFactory.AWT, nDisplay, 0); // screen 0 - nWindow = NewtFactory.createWindow(NewtFactory.AWT, nScreen, caps); + Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display + Screen nScreen = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0 + nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps); } GLWindow window = GLWindow.create(nWindow, caps); diff --git a/src/demos/es1/cube/CubeImmModeSink.java b/src/demos/es1/cube/CubeImmModeSink.java index 69504fe..dcc0487 100644 --- a/src/demos/es1/cube/CubeImmModeSink.java +++ b/src/demos/es1/cube/CubeImmModeSink.java @@ -33,6 +33,7 @@ package demos.es1.cube; import javax.media.opengl.*; import javax.media.opengl.glu.*; +import javax.media.nativewindow.*; import com.sun.opengl.util.*; import com.sun.opengl.util.glsl.fixedfunc.*; import java.nio.*; @@ -390,9 +391,9 @@ public class CubeImmModeSink implements GLEventListener { Window nWindow = null; if(0!=(type&USE_AWT)) { - Display nDisplay = NewtFactory.createDisplay(NewtFactory.AWT, null); // local display - Screen nScreen = NewtFactory.createScreen(NewtFactory.AWT, nDisplay, 0); // screen 0 - nWindow = NewtFactory.createWindow(NewtFactory.AWT, nScreen, caps); + Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display + Screen nScreen = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0 + nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps); } GLWindow window = GLWindow.create(nWindow, caps); diff --git a/src/demos/es1/cubefbo/Main.java b/src/demos/es1/cubefbo/Main.java index b80e1af..1cb0bdc 100755 --- a/src/demos/es1/cubefbo/Main.java +++ b/src/demos/es1/cubefbo/Main.java @@ -2,6 +2,7 @@ package demos.es1.cubefbo; import java.nio.*; import javax.media.opengl.*; +import javax.media.nativewindow.*; import com.sun.javafx.newt.*; import com.sun.javafx.newt.opengl.*; @@ -62,9 +63,9 @@ public class Main implements WindowListener, MouseListener { Window nWindow = null; if(0!=(type&USE_AWT)) { - Display nDisplay = NewtFactory.createDisplay(NewtFactory.AWT, null); // local display - Screen nScreen = NewtFactory.createScreen(NewtFactory.AWT, nDisplay, 0); // screen 0 - nWindow = NewtFactory.createWindow(NewtFactory.AWT, nScreen, caps); + Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display + Screen nScreen = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0 + nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps); } window = GLWindow.create(nWindow, caps); |