From da4eb5d83efcc7278d6b179966c7597f0ec5f313 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 17 Aug 2003 18:40:58 +0000 Subject: [PATCH] *** empty log message *** --- src/java/org/lwjgl/opengl/Window.java | 2 +- src/java/org/lwjgl/test/WindowCreationTest.java | 2 +- src/java/org/lwjgl/test/input/ControllerCreationTest.java | 2 +- src/java/org/lwjgl/test/input/ControllerTest.java | 2 +- src/java/org/lwjgl/test/input/HWCursorTest.java | 2 +- src/java/org/lwjgl/test/input/KeyboardTest.java | 2 +- src/java/org/lwjgl/test/input/MouseCreationTest.java | 2 +- src/java/org/lwjgl/test/input/MouseTest.java | 2 +- src/java/org/lwjgl/test/openal/MovingSoundTest.java | 2 +- src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java | 2 +- src/java/org/lwjgl/test/opengl/Game.java | 2 +- src/java/org/lwjgl/test/opengl/PbufferTest.java | 2 +- src/java/org/lwjgl/test/opengl/VBOIndexTest.java | 2 +- src/java/org/lwjgl/test/opengl/VBOTest.java | 2 +- src/native/common/org_lwjgl_opengl_Window.h | 4 ++-- src/native/configure.in | 4 ++-- src/native/linux/org_lwjgl_opengl_Window.cpp | 4 ++-- src/native/win32/org_lwjgl_opengl_Window.cpp | 4 ++-- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/java/org/lwjgl/opengl/Window.java b/src/java/org/lwjgl/opengl/Window.java index d03ff18c..a1ed4c4e 100644 --- a/src/java/org/lwjgl/opengl/Window.java +++ b/src/java/org/lwjgl/opengl/Window.java @@ -332,5 +332,5 @@ public final class Window { * Updates the windows internal state. This must be called at least once per video frame * to handle window close requests, moves, paints, etc. */ - public static native void updateState(); + public static native void update(); } diff --git a/src/java/org/lwjgl/test/WindowCreationTest.java b/src/java/org/lwjgl/test/WindowCreationTest.java index 16035e8a..43308df7 100644 --- a/src/java/org/lwjgl/test/WindowCreationTest.java +++ b/src/java/org/lwjgl/test/WindowCreationTest.java @@ -31,7 +31,7 @@ public class WindowCreationTest { System.out.println("Display created"); while(!Window.isCloseRequested()) { - Window.updateState(); + Window.update(); try { Thread.sleep(100); } catch (Exception e) { diff --git a/src/java/org/lwjgl/test/input/ControllerCreationTest.java b/src/java/org/lwjgl/test/input/ControllerCreationTest.java index fb44bbed..5b34201d 100644 --- a/src/java/org/lwjgl/test/input/ControllerCreationTest.java +++ b/src/java/org/lwjgl/test/input/ControllerCreationTest.java @@ -160,7 +160,7 @@ public class ControllerCreationTest { while (Sys.getTime() < endtime) { - Window.updateState(); + Window.update(); Controller.poll(); diff --git a/src/java/org/lwjgl/test/input/ControllerTest.java b/src/java/org/lwjgl/test/input/ControllerTest.java index 6ce1d408..42758274 100644 --- a/src/java/org/lwjgl/test/input/ControllerTest.java +++ b/src/java/org/lwjgl/test/input/ControllerTest.java @@ -113,7 +113,7 @@ public class ControllerTest { private void wiggleController() { while (!Window.isCloseRequested()) { - Window.updateState(); + Window.update(); if(Window.isMinimized()) { try { diff --git a/src/java/org/lwjgl/test/input/HWCursorTest.java b/src/java/org/lwjgl/test/input/HWCursorTest.java index 58a67f33..23f5835c 100644 --- a/src/java/org/lwjgl/test/input/HWCursorTest.java +++ b/src/java/org/lwjgl/test/input/HWCursorTest.java @@ -149,7 +149,7 @@ public class HWCursorTest { while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE) && !Window.isCloseRequested()) { // allow subsystem to get a chance to run too - Window.updateState(); + Window.update(); if (!Window.isMinimized()) { // check keyboard input diff --git a/src/java/org/lwjgl/test/input/KeyboardTest.java b/src/java/org/lwjgl/test/input/KeyboardTest.java index a066afee..a085cfba 100644 --- a/src/java/org/lwjgl/test/input/KeyboardTest.java +++ b/src/java/org/lwjgl/test/input/KeyboardTest.java @@ -118,7 +118,7 @@ public class KeyboardTest { Keyboard.enableTranslation(); while (!Window.isCloseRequested()) { - Window.updateState(); + Window.update(); if(Window.isMinimized()) { try { diff --git a/src/java/org/lwjgl/test/input/MouseCreationTest.java b/src/java/org/lwjgl/test/input/MouseCreationTest.java index 7248a55d..04d304d2 100644 --- a/src/java/org/lwjgl/test/input/MouseCreationTest.java +++ b/src/java/org/lwjgl/test/input/MouseCreationTest.java @@ -162,7 +162,7 @@ public class MouseCreationTest { long endtime = Sys.getTime() + Sys.getTimerResolution() * 5; while (Sys.getTime() < endtime) { - Window.updateState(); + Window.update(); Mouse.poll(); diff --git a/src/java/org/lwjgl/test/input/MouseTest.java b/src/java/org/lwjgl/test/input/MouseTest.java index 230cf196..b6436f0a 100644 --- a/src/java/org/lwjgl/test/input/MouseTest.java +++ b/src/java/org/lwjgl/test/input/MouseTest.java @@ -113,7 +113,7 @@ public class MouseTest { private void wiggleMouse() { while (!Window.isCloseRequested()) { - Window.updateState(); + Window.update(); if(Window.isMinimized()) { try { diff --git a/src/java/org/lwjgl/test/openal/MovingSoundTest.java b/src/java/org/lwjgl/test/openal/MovingSoundTest.java index 598d00d5..e5d751b7 100644 --- a/src/java/org/lwjgl/test/openal/MovingSoundTest.java +++ b/src/java/org/lwjgl/test/openal/MovingSoundTest.java @@ -156,7 +156,7 @@ public class MovingSoundTest extends BasicTest { System.out.println("Move source with arrow keys\nMove listener with right shift and arrowkeys\nEnable EAX effect by pressing e (if available)\nExit with ESC"); while(!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)) { - Window.updateState(); + Window.update(); Keyboard.poll(); if(Keyboard.isKeyDown(Keyboard.KEY_LEFT)) { diff --git a/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java b/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java index 0f72363c..2ba18607 100644 --- a/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java +++ b/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java @@ -113,7 +113,7 @@ public class FullScreenWindowedTest { while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE) && !Window.isCloseRequested()) { // allow subsystem to get a chance to run too - Window.updateState(); + Window.update(); if (!Window.isMinimized()) { // check keyboard input diff --git a/src/java/org/lwjgl/test/opengl/Game.java b/src/java/org/lwjgl/test/opengl/Game.java index 328d2c31..20598f63 100644 --- a/src/java/org/lwjgl/test/opengl/Game.java +++ b/src/java/org/lwjgl/test/opengl/Game.java @@ -98,7 +98,7 @@ public final class Game { try { init(); while (!finished) { - Window.updateState(); + Window.update(); if (Window.isMinimized()) Thread.sleep(200); diff --git a/src/java/org/lwjgl/test/opengl/PbufferTest.java b/src/java/org/lwjgl/test/opengl/PbufferTest.java index d5731bc9..63d26833 100644 --- a/src/java/org/lwjgl/test/opengl/PbufferTest.java +++ b/src/java/org/lwjgl/test/opengl/PbufferTest.java @@ -122,7 +122,7 @@ public class PbufferTest { while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE) && !Window.isCloseRequested()) { // allow subsystem to get a chance to run too - Window.updateState(); + Window.update(); if (!Window.isMinimized()) { // check keyboard input diff --git a/src/java/org/lwjgl/test/opengl/VBOIndexTest.java b/src/java/org/lwjgl/test/opengl/VBOIndexTest.java index 4a423111..de47453e 100644 --- a/src/java/org/lwjgl/test/opengl/VBOIndexTest.java +++ b/src/java/org/lwjgl/test/opengl/VBOIndexTest.java @@ -100,7 +100,7 @@ public final class VBOIndexTest { try { init(); while (!finished) { - Window.updateState(); + Window.update(); if (Window.isMinimized()) Thread.sleep(200); diff --git a/src/java/org/lwjgl/test/opengl/VBOTest.java b/src/java/org/lwjgl/test/opengl/VBOTest.java index ad001f78..87ebe85d 100644 --- a/src/java/org/lwjgl/test/opengl/VBOTest.java +++ b/src/java/org/lwjgl/test/opengl/VBOTest.java @@ -96,7 +96,7 @@ public final class VBOTest { try { init(); while (!finished) { - Window.updateState(); + Window.update(); if (Window.isMinimized()) Thread.sleep(200); diff --git a/src/native/common/org_lwjgl_opengl_Window.h b/src/native/common/org_lwjgl_opengl_Window.h index 54b15171..d19c69e5 100644 --- a/src/native/common/org_lwjgl_opengl_Window.h +++ b/src/native/common/org_lwjgl_opengl_Window.h @@ -103,10 +103,10 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nDestroy /* * Class: org_lwjgl_opengl_Window - * Method: updateState + * Method: update * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_updateState +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_update (JNIEnv *, jclass); #ifdef __cplusplus diff --git a/src/native/configure.in b/src/native/configure.in index c2f1bb91..014c92f5 100644 --- a/src/native/configure.in +++ b/src/native/configure.in @@ -51,8 +51,8 @@ if test "x$JAVA_HOME" = x; then else AC_MSG_RESULT($JAVA_HOME) JAVA_HOME="$JAVA_HOME" - CPPFLAGS="$CPPFLAGS -D_DEBUG -fno-rtti -fno-exceptions -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux" - CFLAGS="$CFLAGS -D_DEBUG -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux" + CPPFLAGS="$CPPFLAGS -fno-rtti -fno-exceptions -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux" + CFLAGS="$CFLAGS -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux" fi dnl Checks for libraries. diff --git a/src/native/linux/org_lwjgl_opengl_Window.cpp b/src/native/linux/org_lwjgl_opengl_Window.cpp index b3e48fb2..824e649d 100644 --- a/src/native/linux/org_lwjgl_opengl_Window.cpp +++ b/src/native/linux/org_lwjgl_opengl_Window.cpp @@ -256,10 +256,10 @@ int getWindowHeight(void) { /* * Class: org_lwjgl_Window - * Method: updateState + * Method: update * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_updateState +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_update (JNIEnv *env, jclass clazz) { handleMessages(); diff --git a/src/native/win32/org_lwjgl_opengl_Window.cpp b/src/native/win32/org_lwjgl_opengl_Window.cpp index 78e08e93..4ac3175b 100755 --- a/src/native/win32/org_lwjgl_opengl_Window.cpp +++ b/src/native/win32/org_lwjgl_opengl_Window.cpp @@ -477,10 +477,10 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nSetTitle /* * Class: org_lwjgl_Window - * Method: updateState + * Method: update * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_updateState +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_update (JNIEnv * env, jclass clazz) { handleMessages(env, clazz);