Menu
▾
▴
java-game-lib-cvs
|
From: <ma...@us...> - 2007-10-20 21:31:55
|
Revision: 2904
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2904&view=rev
Author: matzon
Date: 2007-10-20 14:31:52 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
cleaning imports
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/fmod3/FMusicModule.java
trunk/LWJGL/src/java/org/lwjgl/input/Cursor.java
trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasInputImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java
trunk/LWJGL/src/java/org/lwjgl/opengl/EventQueue.java
trunk/LWJGL/src/java/org/lwjgl/opengl/InputImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxKeyboard.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputDevice3.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputDevice8.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputMouse.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java
trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java
trunk/LWJGL/src/java/org/lwjgl/test/applet/OpenGL.java
trunk/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java
Modified: trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -31,7 +31,6 @@
*/
package org.lwjgl;
-import java.security.AccessController;
/**
*
Modified: trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -31,7 +31,6 @@
*/
package org.lwjgl;
-import java.security.AccessController;
/**
* <p>
Modified: trunk/LWJGL/src/java/org/lwjgl/fmod3/FMusicModule.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/fmod3/FMusicModule.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/fmod3/FMusicModule.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -32,7 +32,6 @@
package org.lwjgl.fmod3;
import java.nio.Buffer;
-import java.nio.ByteBuffer;
/**
* This class is a representation of a Module in FMod.
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Cursor.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Cursor.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Cursor.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -33,11 +33,10 @@
import java.nio.IntBuffer;
-import org.lwjgl.BufferChecks;
import org.lwjgl.BufferUtils;
-import org.lwjgl.NondirectBufferWrapper;
import org.lwjgl.LWJGLException;
import org.lwjgl.LWJGLUtil;
+import org.lwjgl.NondirectBufferWrapper;
import org.lwjgl.Sys;
/**
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -34,7 +34,6 @@
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
import java.util.HashMap;
import java.util.Map;
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasInputImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasInputImplementation.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasInputImplementation.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -31,7 +31,6 @@
*/
package org.lwjgl.opengl;
-import org.lwjgl.LWJGLException;
/**
*
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -31,17 +31,15 @@
*/
package org.lwjgl.opengl;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.input.Mouse;
-import org.lwjgl.input.Keyboard;
+import java.lang.reflect.Method;
import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
-import java.lang.reflect.Method;
+import org.lwjgl.LWJGLException;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
-import java.awt.Canvas;
-
/**
* This is the static class for using LWJGL input (Mouse and Keyboard)
* with an AWTGLCanvas.
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -35,34 +35,23 @@
* @author elias_naur
*/
-import java.awt.Cursor;
import java.awt.Component;
-import java.awt.GraphicsDevice;
+import java.awt.Cursor;
import java.awt.Dimension;
+import java.awt.GraphicsDevice;
import java.awt.IllegalComponentStateException;
import java.awt.Point;
-import java.awt.Rectangle;
import java.awt.Robot;
import java.awt.Toolkit;
-import java.awt.event.KeyEvent;
import java.awt.image.BufferedImage;
-import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.List;
-import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
import org.lwjgl.LWJGLUtil;
-import org.lwjgl.input.Keyboard;
final class AWTUtil {
public static boolean hasWheel() {
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -31,15 +31,13 @@
*/
package org.lwjgl.opengl;
-import java.nio.IntBuffer;
+import java.awt.Cursor;
+import java.awt.Robot;
import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
import org.lwjgl.LWJGLException;
-import org.lwjgl.LWJGLUtil;
-import java.awt.Cursor;
-import java.awt.Robot;
-
/**
*
* @author elias_naur <eli...@us...>
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/EventQueue.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/EventQueue.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/EventQueue.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -37,7 +37,6 @@
*/
import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
class EventQueue {
private static final int QUEUE_SIZE = 200;
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/InputImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/InputImplementation.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/InputImplementation.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -39,7 +39,6 @@
*/
import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import org.lwjgl.LWJGLException;
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -42,10 +42,9 @@
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
+import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
import org.lwjgl.LWJGLUtil;
-import org.lwjgl.BufferUtils;
-import org.lwjgl.input.Keyboard;
final class LinuxDisplay implements DisplayImplementation {
/* X11 constants */
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxKeyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxKeyboard.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxKeyboard.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -36,15 +36,13 @@
*/
import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
import org.lwjgl.BufferUtils;
import org.lwjgl.input.Keyboard;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.Charset;
-
final class LinuxKeyboard {
private static final int LockMapIndex = 1;
private static final long NoSymbol = 0;
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -37,15 +37,11 @@
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
-import java.nio.CharBuffer;
import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
import org.lwjgl.input.Mouse;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.Charset;
-
final class LinuxMouse {
private static final int NUM_BUTTONS = 3;
private static final int POINTER_WARP_BORDER = 10;
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -31,12 +31,7 @@
*/
package org.lwjgl.opengl;
-import java.nio.IntBuffer;
-import java.nio.ByteBuffer;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.LWJGLUtil;
-
/**
*
* @author elias_naur <eli...@us...>
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -39,13 +39,7 @@
*/
import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.Rectangle;
import java.awt.Robot;
-import java.awt.Toolkit;
-import java.awt.event.KeyEvent;
-import java.awt.image.BufferedImage;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
@@ -54,7 +48,6 @@
import java.nio.IntBuffer;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.List;
@@ -62,7 +55,6 @@
import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
import org.lwjgl.LWJGLUtil;
-import org.lwjgl.input.Keyboard;
final class MacOSXDisplay implements DisplayImplementation {
private static final int PBUFFER_HANDLE_SIZE = 24;
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -36,19 +36,12 @@
* @author elias_naur
*/
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
import java.awt.Component;
-import java.awt.Rectangle;
import java.awt.Point;
-import java.nio.ByteBuffer;
+import java.awt.Rectangle;
import java.nio.IntBuffer;
import org.lwjgl.BufferUtils;
-import org.lwjgl.input.Mouse;
final class MacOSXMouseEventQueue extends MouseEventQueue {
private final IntBuffer delta_buffer = BufferUtils.createIntBuffer(2);
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -36,17 +36,16 @@
* @author elias_naur
*/
+import java.awt.Component;
+import java.awt.Point;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
import java.awt.event.MouseWheelEvent;
import java.awt.event.MouseWheelListener;
-import java.awt.Component;
-import java.awt.Point;
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
-import org.lwjgl.BufferUtils;
import org.lwjgl.input.Mouse;
class MouseEventQueue extends EventQueue implements MouseListener, MouseMotionListener, MouseWheelListener {
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -31,10 +31,7 @@
*/
package org.lwjgl.opengl;
-import java.nio.IntBuffer;
-import org.lwjgl.BufferUtils;
-
/**
* Simple utility class.
*
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -31,16 +31,14 @@
*/
package org.lwjgl.opengl;
-import java.nio.IntBuffer;
+import java.awt.Cursor;
import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
import org.lwjgl.LWJGLUtil;
-import org.lwjgl.BufferUtils;
-import java.awt.Cursor;
-import java.awt.Point;
-
/**
*
* @author elias_naur <eli...@us...>
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputDevice3.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputDevice3.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputDevice3.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -38,7 +38,6 @@
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
-import org.lwjgl.LWJGLException;
final class WindowsDirectInputDevice3 extends WindowsDirectInputDevice {
/** Re-declare to get the constants into the native headers */
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputDevice8.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputDevice8.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputDevice8.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -38,7 +38,6 @@
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
-import org.lwjgl.LWJGLException;
final class WindowsDirectInputDevice8 extends WindowsDirectInputDevice {
/** Re-declare to get the constants into the native headers */
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputMouse.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputMouse.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -38,11 +38,10 @@
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
-import java.nio.CharBuffer;
+import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
import org.lwjgl.LWJGLUtil;
-import org.lwjgl.BufferUtils;
import org.lwjgl.input.Mouse;
final class WindowsDirectInputMouse {
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -37,12 +37,10 @@
*/
import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
import java.nio.CharBuffer;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.LWJGLUtil;
import org.lwjgl.BufferUtils;
+import org.lwjgl.LWJGLException;
import org.lwjgl.input.Keyboard;
final class WindowsKeyboard {
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -38,13 +38,11 @@
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
-import java.nio.CharBuffer;
+import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
import org.lwjgl.LWJGLUtil;
-import org.lwjgl.BufferUtils;
import org.lwjgl.input.Mouse;
-import org.lwjgl.input.Cursor;
final class WindowsMouse {
private final long hwnd;
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -33,10 +33,9 @@
import java.nio.ByteBuffer;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
import org.lwjgl.opengl.ARBImaging;
import org.lwjgl.opengl.EXTFramebufferObject;
+import org.lwjgl.opengl.GL11;
/**
* GLU.java
Modified: trunk/LWJGL/src/java/org/lwjgl/test/applet/OpenGL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/applet/OpenGL.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/test/applet/OpenGL.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -32,14 +32,12 @@
package org.lwjgl.test.applet;
import org.lwjgl.LWJGLException;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.AWTGLCanvas;
-import org.lwjgl.opengl.Display;
+import org.lwjgl.opengl.AWTInputAdapter;
import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.AWTInputAdapter;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-
public class OpenGL extends AWTGLCanvas implements Test {
float angle = 0;
Modified: trunk/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -35,7 +35,6 @@
import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.DisplayMode;
import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.glu.GLU;
import org.lwjgl.util.vector.Vector2f;
/**
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -47,7 +47,6 @@
import org.lwjgl.opengl.ARBProgram;
import org.lwjgl.opengl.ARBShaderObjects;
import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.Util;
abstract class Shader {
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -37,7 +37,6 @@
import java.awt.FlowLayout;
import java.awt.FontMetrics;
import java.awt.Graphics;
-import java.awt.GridLayout;
import java.awt.Image;
import java.awt.Toolkit;
import java.io.DataInputStream;
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -32,19 +32,15 @@
package org.lwjgl.util.generator;
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.*;
-
import java.io.PrintWriter;
-import java.io.IOException;
-import java.io.File;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.Iterator;
-import java.nio.*;
-import java.lang.annotation.Annotation;
+import com.sun.mirror.declaration.InterfaceDeclaration;
+import com.sun.mirror.declaration.MethodDeclaration;
+import com.sun.mirror.type.InterfaceType;
/**
*
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -32,25 +32,28 @@
package org.lwjgl.util.generator;
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
+import static java.util.Collections.unmodifiableCollection;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
+import java.util.Map;
import java.util.Set;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Arrays;
-import java.io.PrintWriter;
-import java.io.IOException;
-import java.io.File;
+import com.sun.mirror.apt.AnnotationProcessor;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.apt.AnnotationProcessorFactory;
+import com.sun.mirror.apt.AnnotationProcessors;
+import com.sun.mirror.apt.Filer;
+import com.sun.mirror.apt.RoundCompleteEvent;
+import com.sun.mirror.apt.RoundCompleteListener;
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+import com.sun.mirror.declaration.InterfaceDeclaration;
+import com.sun.mirror.declaration.TypeDeclaration;
+import com.sun.mirror.util.DeclarationFilter;
-import static java.util.Collections.*;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
/**
*
* Generator tool for creating the ContexCapabilities class
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java 2007-10-20 21:20:00 UTC (rev 2903)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java 2007-10-20 21:31:52 UTC (rev 2904)
@@ -32,25 +32,30 @@
package org.lwjgl.util.generator;
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableCollection;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Set;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Arrays;
-import java.io.PrintWriter;
-import java.io.IOException;
-import java.io.File;
+import com.sun.mirror.apt.AnnotationProcessor;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.apt.AnnotationProcessorFactory;
+import com.sun.mirror.apt.AnnotationProcessors;
+import com.sun.mirror.apt.Filer;
+import com.sun.mirror.apt.RoundCompleteEvent;
+import com.sun.mirror.apt.RoundCompleteListener;
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+import com.sun.mirror.declaration.InterfaceDeclaration;
+import com.sun.mirror.declaration.MethodDeclaration;
+import com.sun.mirror.declaration.ParameterDeclaration;
+import com.sun.mirror.declaration.TypeDeclaration;
+import com.sun.mirror.util.DeclarationFilter;
-import static java.util.Collections.*;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
/**
*
* Generator tool for creating the References class
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-01-21 20:38:09
|
Revision: 2939
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2939&view=rev
Author: elias_naur
Date: 2008-01-21 12:38:04 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
Moved org.lwjgl.opengl.glu to org.lwjgl.util.glu
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/OpenGLException.java
trunk/LWJGL/src/java/org/lwjgl/test/input/HWCursorTest.java
trunk/LWJGL/src/java/org/lwjgl/test/openal/PositionTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/PbufferTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/pbuffers/PbufferTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java
Added Paths:
-----------
trunk/LWJGL/src/java/org/lwjgl/util/glu/
trunk/LWJGL/src/java/org/lwjgl/util/glu/Cylinder.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Disk.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/MipMap.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/PartialDisk.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/PixelStoreState.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Project.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Quadric.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Registry.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Sphere.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Util.java
Removed Paths:
-------------
trunk/LWJGL/src/java/org/lwjgl/opengl/glu/
trunk/LWJGL/src/java/org/lwjgl/util/glu/Cylinder.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Disk.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/MipMap.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/PartialDisk.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/PixelStoreState.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Project.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Quadric.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Registry.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Sphere.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Util.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/OpenGLException.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/OpenGLException.java 2008-01-21 20:28:53 UTC (rev 2938)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/OpenGLException.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -31,8 +31,6 @@
*/
package org.lwjgl.opengl;
-import org.lwjgl.opengl.glu.GLU;
-
/**
* <p/>
* Thrown by the debug build library of the LWJGL if any OpenGL operation causes an error.
@@ -51,7 +49,7 @@
}
private static String createErrorMessage(int gl_error_code) {
- String error_string = GLU.gluErrorString(gl_error_code);
+ String error_string = Util.translateGLErrorString(gl_error_code);
return error_string + " (" + gl_error_code + ")";
}
Modified: trunk/LWJGL/src/java/org/lwjgl/test/input/HWCursorTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/input/HWCursorTest.java 2008-01-21 20:28:53 UTC (rev 2938)
+++ trunk/LWJGL/src/java/org/lwjgl/test/input/HWCursorTest.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -41,7 +41,7 @@
import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.DisplayMode;
import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.glu.GLU;
+import org.lwjgl.util.glu.GLU;
/**
*
Modified: trunk/LWJGL/src/java/org/lwjgl/test/openal/PositionTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/openal/PositionTest.java 2008-01-21 20:28:53 UTC (rev 2938)
+++ trunk/LWJGL/src/java/org/lwjgl/test/openal/PositionTest.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -42,7 +42,7 @@
import org.lwjgl.openal.AL10;
import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.glu.GLU;
+import org.lwjgl.util.glu.GLU;
import org.lwjgl.util.WaveData;
/**
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java 2008-01-21 20:28:53 UTC (rev 2938)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -36,7 +36,7 @@
import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.DisplayMode;
import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.glu.GLU;
+import org.lwjgl.util.glu.GLU;
import org.lwjgl.util.vector.Vector2f;
/**
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/PbufferTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/PbufferTest.java 2008-01-21 20:28:53 UTC (rev 2938)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/PbufferTest.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -42,7 +42,7 @@
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.Pbuffer;
import org.lwjgl.opengl.PixelFormat;
-import org.lwjgl.opengl.glu.GLU;
+import org.lwjgl.util.glu.GLU;
import org.lwjgl.util.vector.Vector2f;
/**
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java 2008-01-21 20:28:53 UTC (rev 2938)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -55,7 +55,7 @@
import org.lwjgl.opengl.DisplayMode;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GLContext;
-import org.lwjgl.opengl.glu.GLU;
+import org.lwjgl.util.glu.GLU;
public final class VBOIndexTest {
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java 2008-01-21 20:28:53 UTC (rev 2938)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -55,7 +55,7 @@
import org.lwjgl.opengl.DisplayMode;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GLContext;
-import org.lwjgl.opengl.glu.GLU;
+import org.lwjgl.util.glu.GLU;
public final class VBOTest {
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTTest.java 2008-01-21 20:28:53 UTC (rev 2938)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTTest.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -39,7 +39,7 @@
import org.lwjgl.LWJGLException;
import org.lwjgl.opengl.AWTGLCanvas;
import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.glu.GLU;
+import org.lwjgl.util.glu.GLU;
/**
* <p>
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/pbuffers/PbufferTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/pbuffers/PbufferTest.java 2008-01-21 20:28:53 UTC (rev 2938)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/pbuffers/PbufferTest.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -41,7 +41,7 @@
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.Pbuffer;
import org.lwjgl.opengl.PixelFormat;
-import org.lwjgl.opengl.glu.GLU;
+import org.lwjgl.util.glu.GLU;
import org.lwjgl.util.vector.Vector2f;
/**
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java 2008-01-21 20:28:53 UTC (rev 2938)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -50,8 +50,8 @@
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GLContext;
import org.lwjgl.opengl.PixelFormat;
-import org.lwjgl.opengl.glu.GLU;
-import org.lwjgl.opengl.glu.Sphere;
+import org.lwjgl.util.glu.GLU;
+import org.lwjgl.util.glu.Sphere;
public final class ShadersTest {
Copied: trunk/LWJGL/src/java/org/lwjgl/util/glu (from rev 2936, trunk/LWJGL/src/java/org/lwjgl/opengl/glu)
Deleted: trunk/LWJGL/src/java/org/lwjgl/util/glu/Cylinder.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/glu/Cylinder.java 2008-01-21 18:59:12 UTC (rev 2936)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/Cylinder.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl.glu;
-
-import org.lwjgl.opengl.GL11;
-
-/**
- * Cylinder.java
- *
- *
- * Created 23-dec-2003
- * @author Erik Duijs
- */
-public class Cylinder extends Quadric {
-
- /**
- * Constructor for Cylinder.
- */
- public Cylinder() {
- super();
- }
-
- /**
- * draws a cylinder oriented along the z axis. The base of the
- * cylinder is placed at z = 0, and the top at z=height. Like a sphere, a
- * cylinder is subdivided around the z axis into slices, and along the z axis
- * into stacks.
- *
- * Note that if topRadius is set to zero, then this routine will generate a
- * cone.
- *
- * If the orientation is set to GLU.OUTSIDE (with glu.quadricOrientation), then
- * any generated normals point away from the z axis. Otherwise, they point
- * toward the z axis.
- *
- * If texturing is turned on (with glu.quadricTexture), then texture
- * coordinates are generated so that t ranges linearly from 0.0 at z = 0 to
- * 1.0 at z = height, and s ranges from 0.0 at the +y axis, to 0.25 at the +x
- * axis, to 0.5 at the -y axis, to 0.75 at the -x axis, and back to 1.0 at the
- * +y axis.
- *
- * @param baseRadius Specifies the radius of the cylinder at z = 0.
- * @param topRadius Specifies the radius of the cylinder at z = height.
- * @param height Specifies the height of the cylinder.
- * @param slices Specifies the number of subdivisions around the z axis.
- * @param stacks Specifies the number of subdivisions along the z axis.
- */
- public void draw(float baseRadius, float topRadius, float height, int slices, int stacks) {
-
- float da, r, dr, dz;
- float x, y, z, nz, nsign;
- int i, j;
-
- if (super.orientation == GLU.GLU_INSIDE) {
- nsign = -1.0f;
- } else {
- nsign = 1.0f;
- }
-
- da = 2.0f * GLU.PI / slices;
- dr = (topRadius - baseRadius) / stacks;
- dz = height / stacks;
- nz = (baseRadius - topRadius) / height;
- // Z component of normal vectors
-
- if (super.drawStyle == GLU.GLU_POINT) {
- GL11.glBegin(GL11.GL_POINTS);
- for (i = 0; i < slices; i++) {
- x = cos((i * da));
- y = sin((i * da));
- normal3f(x * nsign, y * nsign, nz * nsign);
-
- z = 0.0f;
- r = baseRadius;
- for (j = 0; j <= stacks; j++) {
- GL11.glVertex3f((x * r), (y * r), z);
- z += dz;
- r += dr;
- }
- }
- GL11.glEnd();
- } else if (super.drawStyle == GLU.GLU_LINE || super.drawStyle == GLU.GLU_SILHOUETTE) {
- // Draw rings
- if (super.drawStyle == GLU.GLU_LINE) {
- z = 0.0f;
- r = baseRadius;
- for (j = 0; j <= stacks; j++) {
- GL11.glBegin(GL11.GL_LINE_LOOP);
- for (i = 0; i < slices; i++) {
- x = cos((i * da));
- y = sin((i * da));
- normal3f(x * nsign, y * nsign, nz * nsign);
- GL11.glVertex3f((x * r), (y * r), z);
- }
- GL11.glEnd();
- z += dz;
- r += dr;
- }
- } else {
- // draw one ring at each end
- if (baseRadius != 0.0) {
- GL11.glBegin(GL11.GL_LINE_LOOP);
- for (i = 0; i < slices; i++) {
- x = cos((i * da));
- y = sin((i * da));
- normal3f(x * nsign, y * nsign, nz * nsign);
- GL11.glVertex3f((x * baseRadius), (y * baseRadius), 0.0f);
- }
- GL11.glEnd();
- GL11.glBegin(GL11.GL_LINE_LOOP);
- for (i = 0; i < slices; i++) {
- x = cos((i * da));
- y = sin((i * da));
- normal3f(x * nsign, y * nsign, nz * nsign);
- GL11.glVertex3f((x * topRadius), (y * topRadius), height);
- }
- GL11.glEnd();
- }
- }
- // draw length lines
- GL11.glBegin(GL11.GL_LINES);
- for (i = 0; i < slices; i++) {
- x = cos((i * da));
- y = sin((i * da));
- normal3f(x * nsign, y * nsign, nz * nsign);
- GL11.glVertex3f((x * baseRadius), (y * baseRadius), 0.0f);
- GL11.glVertex3f((x * topRadius), (y * topRadius), (height));
- }
- GL11.glEnd();
- } else if (super.drawStyle == GLU.GLU_FILL) {
- float ds = 1.0f / slices;
- float dt = 1.0f / stacks;
- float t = 0.0f;
- z = 0.0f;
- r = baseRadius;
- for (j = 0; j < stacks; j++) {
- float s = 0.0f;
- GL11.glBegin(GL11.GL_QUAD_STRIP);
- for (i = 0; i <= slices; i++) {
- if (i == slices) {
- x = sin(0.0f);
- y = cos(0.0f);
- } else {
- x = sin((i * da));
- y = cos((i * da));
- }
- if (nsign == 1.0f) {
- normal3f((x * nsign), (y * nsign), (nz * nsign));
- TXTR_COORD(s, t);
- GL11.glVertex3f((x * r), (y * r), z);
- normal3f((x * nsign), (y * nsign), (nz * nsign));
- TXTR_COORD(s, t + dt);
- GL11.glVertex3f((x * (r + dr)), (y * (r + dr)), (z + dz));
- } else {
- normal3f(x * nsign, y * nsign, nz * nsign);
- TXTR_COORD(s, t);
- GL11.glVertex3f((x * r), (y * r), z);
- normal3f(x * nsign, y * nsign, nz * nsign);
- TXTR_COORD(s, t + dt);
- GL11.glVertex3f((x * (r + dr)), (y * (r + dr)), (z + dz));
- }
- s += ds;
- } // for slices
- GL11.glEnd();
- r += dr;
- t += dt;
- z += dz;
- } // for stacks
- }
- }
-}
Copied: trunk/LWJGL/src/java/org/lwjgl/util/glu/Cylinder.java (from rev 2938, trunk/LWJGL/src/java/org/lwjgl/opengl/glu/Cylinder.java)
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/Cylinder.java (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/Cylinder.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.util.glu;
+
+import org.lwjgl.opengl.GL11;
+
+/**
+ * Cylinder.java
+ *
+ *
+ * Created 23-dec-2003
+ * @author Erik Duijs
+ */
+public class Cylinder extends Quadric {
+
+ /**
+ * Constructor for Cylinder.
+ */
+ public Cylinder() {
+ super();
+ }
+
+ /**
+ * draws a cylinder oriented along the z axis. The base of the
+ * cylinder is placed at z = 0, and the top at z=height. Like a sphere, a
+ * cylinder is subdivided around the z axis into slices, and along the z axis
+ * into stacks.
+ *
+ * Note that if topRadius is set to zero, then this routine will generate a
+ * cone.
+ *
+ * If the orientation is set to GLU.OUTSIDE (with glu.quadricOrientation), then
+ * any generated normals point away from the z axis. Otherwise, they point
+ * toward the z axis.
+ *
+ * If texturing is turned on (with glu.quadricTexture), then texture
+ * coordinates are generated so that t ranges linearly from 0.0 at z = 0 to
+ * 1.0 at z = height, and s ranges from 0.0 at the +y axis, to 0.25 at the +x
+ * axis, to 0.5 at the -y axis, to 0.75 at the -x axis, and back to 1.0 at the
+ * +y axis.
+ *
+ * @param baseRadius Specifies the radius of the cylinder at z = 0.
+ * @param topRadius Specifies the radius of the cylinder at z = height.
+ * @param height Specifies the height of the cylinder.
+ * @param slices Specifies the number of subdivisions around the z axis.
+ * @param stacks Specifies the number of subdivisions along the z axis.
+ */
+ public void draw(float baseRadius, float topRadius, float height, int slices, int stacks) {
+
+ float da, r, dr, dz;
+ float x, y, z, nz, nsign;
+ int i, j;
+
+ if (super.orientation == GLU.GLU_INSIDE) {
+ nsign = -1.0f;
+ } else {
+ nsign = 1.0f;
+ }
+
+ da = 2.0f * GLU.PI / slices;
+ dr = (topRadius - baseRadius) / stacks;
+ dz = height / stacks;
+ nz = (baseRadius - topRadius) / height;
+ // Z component of normal vectors
+
+ if (super.drawStyle == GLU.GLU_POINT) {
+ GL11.glBegin(GL11.GL_POINTS);
+ for (i = 0; i < slices; i++) {
+ x = cos((i * da));
+ y = sin((i * da));
+ normal3f(x * nsign, y * nsign, nz * nsign);
+
+ z = 0.0f;
+ r = baseRadius;
+ for (j = 0; j <= stacks; j++) {
+ GL11.glVertex3f((x * r), (y * r), z);
+ z += dz;
+ r += dr;
+ }
+ }
+ GL11.glEnd();
+ } else if (super.drawStyle == GLU.GLU_LINE || super.drawStyle == GLU.GLU_SILHOUETTE) {
+ // Draw rings
+ if (super.drawStyle == GLU.GLU_LINE) {
+ z = 0.0f;
+ r = baseRadius;
+ for (j = 0; j <= stacks; j++) {
+ GL11.glBegin(GL11.GL_LINE_LOOP);
+ for (i = 0; i < slices; i++) {
+ x = cos((i * da));
+ y = sin((i * da));
+ normal3f(x * nsign, y * nsign, nz * nsign);
+ GL11.glVertex3f((x * r), (y * r), z);
+ }
+ GL11.glEnd();
+ z += dz;
+ r += dr;
+ }
+ } else {
+ // draw one ring at each end
+ if (baseRadius != 0.0) {
+ GL11.glBegin(GL11.GL_LINE_LOOP);
+ for (i = 0; i < slices; i++) {
+ x = cos((i * da));
+ y = sin((i * da));
+ normal3f(x * nsign, y * nsign, nz * nsign);
+ GL11.glVertex3f((x * baseRadius), (y * baseRadius), 0.0f);
+ }
+ GL11.glEnd();
+ GL11.glBegin(GL11.GL_LINE_LOOP);
+ for (i = 0; i < slices; i++) {
+ x = cos((i * da));
+ y = sin((i * da));
+ normal3f(x * nsign, y * nsign, nz * nsign);
+ GL11.glVertex3f((x * topRadius), (y * topRadius), height);
+ }
+ GL11.glEnd();
+ }
+ }
+ // draw length lines
+ GL11.glBegin(GL11.GL_LINES);
+ for (i = 0; i < slices; i++) {
+ x = cos((i * da));
+ y = sin((i * da));
+ normal3f(x * nsign, y * nsign, nz * nsign);
+ GL11.glVertex3f((x * baseRadius), (y * baseRadius), 0.0f);
+ GL11.glVertex3f((x * topRadius), (y * topRadius), (height));
+ }
+ GL11.glEnd();
+ } else if (super.drawStyle == GLU.GLU_FILL) {
+ float ds = 1.0f / slices;
+ float dt = 1.0f / stacks;
+ float t = 0.0f;
+ z = 0.0f;
+ r = baseRadius;
+ for (j = 0; j < stacks; j++) {
+ float s = 0.0f;
+ GL11.glBegin(GL11.GL_QUAD_STRIP);
+ for (i = 0; i <= slices; i++) {
+ if (i == slices) {
+ x = sin(0.0f);
+ y = cos(0.0f);
+ } else {
+ x = sin((i * da));
+ y = cos((i * da));
+ }
+ if (nsign == 1.0f) {
+ normal3f((x * nsign), (y * nsign), (nz * nsign));
+ TXTR_COORD(s, t);
+ GL11.glVertex3f((x * r), (y * r), z);
+ normal3f((x * nsign), (y * nsign), (nz * nsign));
+ TXTR_COORD(s, t + dt);
+ GL11.glVertex3f((x * (r + dr)), (y * (r + dr)), (z + dz));
+ } else {
+ normal3f(x * nsign, y * nsign, nz * nsign);
+ TXTR_COORD(s, t);
+ GL11.glVertex3f((x * r), (y * r), z);
+ normal3f(x * nsign, y * nsign, nz * nsign);
+ TXTR_COORD(s, t + dt);
+ GL11.glVertex3f((x * (r + dr)), (y * (r + dr)), (z + dz));
+ }
+ s += ds;
+ } // for slices
+ GL11.glEnd();
+ r += dr;
+ t += dt;
+ z += dz;
+ } // for stacks
+ }
+ }
+}
Deleted: trunk/LWJGL/src/java/org/lwjgl/util/glu/Disk.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/glu/Disk.java 2008-01-21 18:59:12 UTC (rev 2936)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/Disk.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -1,213 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl.glu;
-
-import org.lwjgl.opengl.GL11;
-
-/**
- * Disk.java
- *
- *
- * Created 23-dec-2003
- * @author Erik Duijs
- */
-public class Disk extends Quadric {
-
- /**
- * Constructor for Disk.
- */
- public Disk() {
- super();
- }
-
- /**
- * renders a disk on the z = 0 plane. The disk has a radius of
- * outerRadius, and contains a concentric circular hole with a radius of
- * innerRadius. If innerRadius is 0, then no hole is generated. The disk is
- * subdivided around the z axis into slices (like pizza slices), and also
- * about the z axis into rings (as specified by slices and loops,
- * respectively).
- *
- * With respect to orientation, the +z side of the disk is considered to be
- * "outside" (see glu.quadricOrientation). This means that if the orientation
- * is set to GLU.OUTSIDE, then any normals generated point along the +z axis.
- * Otherwise, they point along the -z axis.
- *
- * If texturing is turned on (with glu.quadricTexture), texture coordinates are
- * generated linearly such that where r=outerRadius, the value at (r, 0, 0) is
- * (1, 0.5), at (0, r, 0) it is (0.5, 1), at (-r, 0, 0) it is (0, 0.5), and at
- * (0, -r, 0) it is (0.5, 0).
- */
- public void draw(float innerRadius, float outerRadius, int slices, int loops)
- {
- float da, dr;
-
- /* Normal vectors */
- if (super.normals != GLU.GLU_NONE) {
- if (super.orientation == GLU.GLU_OUTSIDE) {
- GL11.glNormal3f(0.0f, 0.0f, +1.0f);
- }
- else {
- GL11.glNormal3f(0.0f, 0.0f, -1.0f);
- }
- }
-
- da = 2.0f * GLU.PI / slices;
- dr = (outerRadius - innerRadius) / loops;
-
- switch (super.drawStyle) {
- case GLU.GLU_FILL:
- {
- /* texture of a gluDisk is a cut out of the texture unit square
- * x, y in [-outerRadius, +outerRadius]; s, t in [0, 1]
- * (linear mapping)
- */
- float dtc = 2.0f * outerRadius;
- float sa, ca;
- float r1 = innerRadius;
- int l;
- for (l = 0; l < loops; l++) {
- float r2 = r1 + dr;
- if (super.orientation == GLU.GLU_OUTSIDE) {
- int s;
- GL11.glBegin(GL11.GL_QUAD_STRIP);
- for (s = 0; s <= slices; s++) {
- float a;
- if (s == slices)
- a = 0.0f;
- else
- a = s * da;
- sa = sin(a);
- ca = cos(a);
- TXTR_COORD(0.5f + sa * r2 / dtc, 0.5f + ca * r2 / dtc);
- GL11.glVertex2f(r2 * sa, r2 * ca);
- TXTR_COORD(0.5f + sa * r1 / dtc, 0.5f + ca * r1 / dtc);
- GL11.glVertex2f(r1 * sa, r1 * ca);
- }
- GL11.glEnd();
- }
- else {
- int s;
- GL11.glBegin(GL11.GL_QUAD_STRIP);
- for (s = slices; s >= 0; s--) {
- float a;
- if (s == slices)
- a = 0.0f;
- else
- a = s * da;
- sa = sin(a);
- ca = cos(a);
- TXTR_COORD(0.5f - sa * r2 / dtc, 0.5f + ca * r2 / dtc);
- GL11.glVertex2f(r2 * sa, r2 * ca);
- TXTR_COORD(0.5f - sa * r1 / dtc, 0.5f + ca * r1 / dtc);
- GL11.glVertex2f(r1 * sa, r1 * ca);
- }
- GL11.glEnd();
- }
- r1 = r2;
- }
- break;
- }
- case GLU.GLU_LINE:
- {
- int l, s;
- /* draw loops */
- for (l = 0; l <= loops; l++) {
- float r = innerRadius + l * dr;
- GL11.glBegin(GL11.GL_LINE_LOOP);
- for (s = 0; s < slices; s++) {
- float a = s * da;
- GL11.glVertex2f(r * sin(a), r * cos(a));
- }
- GL11.glEnd();
- }
- /* draw spokes */
- for (s = 0; s < slices; s++) {
- float a = s * da;
- float x = sin(a);
- float y = cos(a);
- GL11.glBegin(GL11.GL_LINE_STRIP);
- for (l = 0; l <= loops; l++) {
- float r = innerRadius + l * dr;
- GL11.glVertex2f(r * x, r * y);
- }
- GL11.glEnd();
- }
- break;
- }
- case GLU.GLU_POINT:
- {
- int s;
- GL11.glBegin(GL11.GL_POINTS);
- for (s = 0; s < slices; s++) {
- float a = s * da;
- float x = sin(a);
- float y = cos(a);
- int l;
- for (l = 0; l <= loops; l++) {
- float r = innerRadius * l * dr;
- GL11.glVertex2f(r * x, r * y);
- }
- }
- GL11.glEnd();
- break;
- }
- case GLU.GLU_SILHOUETTE:
- {
- if (innerRadius != 0.0) {
- float a;
- GL11.glBegin(GL11.GL_LINE_LOOP);
- for (a = 0.0f; a < 2.0 * GLU.PI; a += da) {
- float x = innerRadius * sin(a);
- float y = innerRadius * cos(a);
- GL11.glVertex2f(x, y);
- }
- GL11.glEnd();
- }
- {
- float a;
- GL11.glBegin(GL11.GL_LINE_LOOP);
- for (a = 0; a < 2.0f * GLU.PI; a += da) {
- float x = outerRadius * sin(a);
- float y = outerRadius * cos(a);
- GL11.glVertex2f(x, y);
- }
- GL11.glEnd();
- }
- break;
- }
- default:
- return;
- }
- }
-
-}
Copied: trunk/LWJGL/src/java/org/lwjgl/util/glu/Disk.java (from rev 2938, trunk/LWJGL/src/java/org/lwjgl/opengl/glu/Disk.java)
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/Disk.java (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/Disk.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.util.glu;
+
+import org.lwjgl.opengl.GL11;
+
+/**
+ * Disk.java
+ *
+ *
+ * Created 23-dec-2003
+ * @author Erik Duijs
+ */
+public class Disk extends Quadric {
+
+ /**
+ * Constructor for Disk.
+ */
+ public Disk() {
+ super();
+ }
+
+ /**
+ * renders a disk on the z = 0 plane. The disk has a radius of
+ * outerRadius, and contains a concentric circular hole with a radius of
+ * innerRadius. If innerRadius is 0, then no hole is generated. The disk is
+ * subdivided around the z axis into slices (like pizza slices), and also
+ * about the z axis into rings (as specified by slices and loops,
+ * respectively).
+ *
+ * With respect to orientation, the +z side of the disk is considered to be
+ * "outside" (see glu.quadricOrientation). This means that if the orientation
+ * is set to GLU.OUTSIDE, then any normals generated point along the +z axis.
+ * Otherwise, they point along the -z axis.
+ *
+ * If texturing is turned on (with glu.quadricTexture), texture coordinates are
+ * generated linearly such that where r=outerRadius, the value at (r, 0, 0) is
+ * (1, 0.5), at (0, r, 0) it is (0.5, 1), at (-r, 0, 0) it is (0, 0.5), and at
+ * (0, -r, 0) it is (0.5, 0).
+ */
+ public void draw(float innerRadius, float outerRadius, int slices, int loops)
+ {
+ float da, dr;
+
+ /* Normal vectors */
+ if (super.normals != GLU.GLU_NONE) {
+ if (super.orientation == GLU.GLU_OUTSIDE) {
+ GL11.glNormal3f(0.0f, 0.0f, +1.0f);
+ }
+ else {
+ GL11.glNormal3f(0.0f, 0.0f, -1.0f);
+ }
+ }
+
+ da = 2.0f * GLU.PI / slices;
+ dr = (outerRadius - innerRadius) / loops;
+
+ switch (super.drawStyle) {
+ case GLU.GLU_FILL:
+ {
+ /* texture of a gluDisk is a cut out of the texture unit square
+ * x, y in [-outerRadius, +outerRadius]; s, t in [0, 1]
+ * (linear mapping)
+ */
+ float dtc = 2.0f * outerRadius;
+ float sa, ca;
+ float r1 = innerRadius;
+ int l;
+ for (l = 0; l < loops; l++) {
+ float r2 = r1 + dr;
+ if (super.orientation == GLU.GLU_OUTSIDE) {
+ int s;
+ GL11.glBegin(GL11.GL_QUAD_STRIP);
+ for (s = 0; s <= slices; s++) {
+ float a;
+ if (s == slices)
+ a = 0.0f;
+ else
+ a = s * da;
+ sa = sin(a);
+ ca = cos(a);
+ TXTR_COORD(0.5f + sa * r2 / dtc, 0.5f + ca * r2 / dtc);
+ GL11.glVertex2f(r2 * sa, r2 * ca);
+ TXTR_COORD(0.5f + sa * r1 / dtc, 0.5f + ca * r1 / dtc);
+ GL11.glVertex2f(r1 * sa, r1 * ca);
+ }
+ GL11.glEnd();
+ }
+ else {
+ int s;
+ GL11.glBegin(GL11.GL_QUAD_STRIP);
+ for (s = slices; s >= 0; s--) {
+ float a;
+ if (s == slices)
+ a = 0.0f;
+ else
+ a = s * da;
+ sa = sin(a);
+ ca = cos(a);
+ TXTR_COORD(0.5f - sa * r2 / dtc, 0.5f + ca * r2 / dtc);
+ GL11.glVertex2f(r2 * sa, r2 * ca);
+ TXTR_COORD(0.5f - sa * r1 / dtc, 0.5f + ca * r1 / dtc);
+ GL11.glVertex2f(r1 * sa, r1 * ca);
+ }
+ GL11.glEnd();
+ }
+ r1 = r2;
+ }
+ break;
+ }
+ case GLU.GLU_LINE:
+ {
+ int l, s;
+ /* draw loops */
+ for (l = 0; l <= loops; l++) {
+ float r = innerRadius + l * dr;
+ GL11.glBegin(GL11.GL_LINE_LOOP);
+ for (s = 0; s < slices; s++) {
+ float a = s * da;
+ GL11.glVertex2f(r * sin(a), r * cos(a));
+ }
+ GL11.glEnd();
+ }
+ /* draw spokes */
+ for (s = 0; s < slices; s++) {
+ float a = s * da;
+ float x = sin(a);
+ float y = cos(a);
+ GL11.glBegin(GL11.GL_LINE_STRIP);
+ for (l = 0; l <= loops; l++) {
+ float r = innerRadius + l * dr;
+ GL11.glVertex2f(r * x, r * y);
+ }
+ GL11.glEnd();
+ }
+ break;
+ }
+ case GLU.GLU_POINT:
+ {
+ int s;
+ GL11.glBegin(GL11.GL_POINTS);
+ for (s = 0; s < slices; s++) {
+ float a = s * da;
+ float x = sin(a);
+ float y = cos(a);
+ int l;
+ for (l = 0; l <= loops; l++) {
+ float r = innerRadius * l * dr;
+ GL11.glVertex2f(r * x, r * y);
+ }
+ }
+ GL11.glEnd();
+ break;
+ }
+ case GLU.GLU_SILHOUETTE:
+ {
+ if (innerRadius != 0.0) {
+ float a;
+ GL11.glBegin(GL11.GL_LINE_LOOP);
+ for (a = 0.0f; a < 2.0 * GLU.PI; a += da) {
+ float x = innerRadius * sin(a);
+ float y = innerRadius * cos(a);
+ GL11.glVertex2f(x, y);
+ }
+ GL11.glEnd();
+ }
+ {
+ float a;
+ GL11.glBegin(GL11.GL_LINE_LOOP);
+ for (a = 0; a < 2.0f * GLU.PI; a += da) {
+ float x = outerRadius * sin(a);
+ float y = outerRadius * cos(a);
+ GL11.glVertex2f(x, y);
+ }
+ GL11.glEnd();
+ }
+ break;
+ }
+ default:
+ return;
+ }
+ }
+
+}
Deleted: trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java 2008-01-21 18:59:12 UTC (rev 2936)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -1,442 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl.glu;
-
-import java.nio.ByteBuffer;
-
-import org.lwjgl.opengl.ARBImaging;
-import org.lwjgl.opengl.EXTFramebufferObject;
-import org.lwjgl.opengl.GL11;
-
-/**
- * GLU.java
- *
- *
- * Created 23-dec-2003
- * @author Erik Duijs
- */
-public class GLU {
- static final float PI = (float)Math.PI;
-
- /* Errors: (return value 0 = no error) */
- public static final int GLU_INVALID_ENUM = 100900;
- public static final int GLU_INVALID_VALUE = 100901;
- public static final int GLU_OUT_OF_MEMORY = 100902;
- public static final int GLU_INCOMPATIBLE_GL_VERSION = 100903;
-
- /* StringName */
- public static final int GLU_VERSION = 100800;
- public static final int GLU_EXTENSIONS = 100801;
-
- /* Boolean */
- public static final boolean GLU_TRUE = true;
- public static final boolean GLU_FALSE = false;
-
-
- /**** Quadric constants ****/
-
- /* QuadricNormal */
- public static final int GLU_SMOOTH = 100000;
- public static final int GLU_FLAT = 100001;
- public static final int GLU_NONE = 100002;
-
- /* QuadricDrawStyle */
- public static final int GLU_POINT = 100010;
- public static final int GLU_LINE = 100011;
- public static final int GLU_FILL = 100012;
- public static final int GLU_SILHOUETTE = 100013;
-
- /* QuadricOrientation */
- public static final int GLU_OUTSIDE = 100020;
- public static final int GLU_INSIDE = 100021;
-
- /* Callback types: */
- /* ERROR = 100103 */
-
-
- /**** Tesselation constants ****/
-
- public static final double TESS_MAX_COORD = 1.0e150;
-
- /* TessProperty */
- public static final int GLU_TESS_WINDING_RULE = 100140;
- public static final int GLU_TESS_BOUNDARY_ONLY = 100141;
- public static final int GLU_TESS_TOLERANCE = 100142;
-
- /* TessWinding */
- public static final int GLU_TESS_WINDING_ODD = 100130;
- public static final int GLU_TESS_WINDING_NONZERO = 100131;
- public static final int GLU_TESS_WINDING_POSITIVE = 100132;
- public static final int GLU_TESS_WINDING_NEGATIVE = 100133;
- public static final int GLU_TESS_WINDING_ABS_GEQ_TWO = 100134;
-
- /* TessCallback */
- public static final int GLU_TESS_BEGIN = 100100; /* void (CALLBACK*)(GLenum type) */
- public static final int GLU_TESS_VERTEX = 100101; /* void (CALLBACK*)(void *data) */
- public static final int GLU_TESS_END = 100102; /* void (CALLBACK*)(void) */
- public static final int GLU_TESS_ERROR = 100103; /* void (CALLBACK*)(GLenum errno) */
- public static final int GLU_TESS_EDGE_FLAG = 100104; /* void (CALLBACK*)(GLboolean boundaryEdge) */
- public static final int GLU_TESS_COMBINE = 100105; /* void (CALLBACK*)(GLdouble coords[3],
- void *data[4],
- GLfloat weight[4],
- void **dataOut) */
- public static final int GLU_TESS_BEGIN_DATA = 100106; /* void (CALLBACK*)(GLenum type,
- void *polygon_data) */
- public static final int GLU_TESS_VERTEX_DATA = 100107; /* void (CALLBACK*)(void *data,
- void *polygon_data) */
- public static final int GLU_TESS_END_DATA = 100108; /* void (CALLBACK*)(void *polygon_data) */
- public static final int GLU_TESS_ERROR_DATA = 100109; /* void (CALLBACK*)(GLenum errno,
- void *polygon_data) */
- public static final int GLU_TESS_EDGE_FLAG_DATA = 100110; /* void (CALLBACK*)(GLboolean boundaryEdge,
- void *polygon_data) */
- public static final int GLU_TESS_COMBINE_DATA = 100111; /* void (CALLBACK*)(GLdouble coords[3],
- void *data[4],
- GLfloat weight[4],
- void **dataOut,
- void *polygon_data) */
-
- /* TessError */
- public static final int GLU_TESS_ERROR1 = 100151;
- public static final int GLU_TESS_ERROR2 = 100152;
- public static final int GLU_TESS_ERROR3 = 100153;
- public static final int GLU_TESS_ERROR4 = 100154;
- public static final int GLU_TESS_ERROR5 = 100155;
- public static final int GLU_TESS_ERROR6 = 100156;
- public static final int GLU_TESS_ERROR7 = 100157;
- public static final int GLU_TESS_ERROR8 = 100158;
-
- public static final int GLU_TESS_MISSING_BEGIN_POLYGON = GLU_TESS_ERROR1;
- public static final int GLU_TESS_MISSING_BEGIN_CONTOUR = GLU_TESS_ERROR2;
- public static final int GLU_TESS_MISSING_END_POLYGON = GLU_TESS_ERROR3;
- public static final int GLU_TESS_MISSING_END_CONTOUR = GLU_TESS_ERROR4;
- public static final int GLU_TESS_COORD_TOO_LARGE = GLU_TESS_ERROR5;
- public static final int GLU_TESS_NEED_COMBINE_CALLBACK = GLU_TESS_ERROR6;
-
- /**** NURBS constants ****/
-
- /* NurbsProperty */
- public static final int GLU_AUTO_LOAD_MATRIX = 100200;
- public static final int GLU_CULLING = 100201;
- public static final int GLU_SAMPLING_TOLERANCE = 100203;
- public static final int GLU_DISPLAY_MODE = 100204;
- public static final int GLU_PARAMETRIC_TOLERANCE = 100202;
- public static final int GLU_SAMPLING_METHOD = 100205;
- public static final int GLU_U_STEP = 100206;
- public static final int GLU_V_STEP = 100207;
-
- /* NurbsSampling */
- public static final int GLU_PATH_LENGTH = 100215;
- public static final int GLU_PARAMETRIC_ERROR = 100216;
- public static final int GLU_DOMAIN_DISTANCE = 100217;
-
-
- /* NurbsTrim */
- public static final int GLU_MAP1_TRIM_2 = 100210;
- public static final int GLU_MAP1_TRIM_3 = 100211;
-
- /* NurbsDisplay */
- /* FILL = 100012 */
- public static final int GLU_OUTLINE_POLYGON = 100240;
- public static final int GLU_OUTLINE_PATCH = 100241;
-
- /* NurbsCallback */
- /* ERROR = 100103 */
-
- /* NurbsErrors */
- public static final int GLU_NURBS_ERROR1 = 100251;
- public static final int GLU_NURBS_ERROR2 = 100252;
- public static final int GLU_NURBS_ERROR3 = 100253;
- public static final int GLU_NURBS_ERROR4 = 100254;
- public static final int GLU_NURBS_ERROR5 = 100255;
- public static final int GLU_NURBS_ERROR6 = 100256;
- public static final int GLU_NURBS_ERROR7 = 100257;
- public static final int GLU_NURBS_ERROR8 = 100258;
- public static final int GLU_NURBS_ERROR9 = 100259;
- public static final int GLU_NURBS_ERROR10 = 100260;
- public static final int GLU_NURBS_ERROR11 = 100261;
- public static final int GLU_NURBS_ERROR12 = 100262;
- public static final int GLU_NURBS_ERROR13 = 100263;
- public static final int GLU_NURBS_ERROR14 = 100264;
- public static final int GLU_NURBS_ERROR15 = 100265;
- public static final int GLU_NURBS_ERROR16 = 100266;
- public static final int GLU_NURBS_ERROR17 = 100267;
- public static final int GLU_NURBS_ERROR18 = 100268;
- public static final int GLU_NURBS_ERROR19 = 100269;
- public static final int GLU_NURBS_ERROR20 = 100270;
- public static final int GLU_NURBS_ERROR21 = 100271;
- public static final int GLU_NURBS_ERROR22 = 100272;
- public static final int GLU_NURBS_ERROR23 = 100273;
- public static final int GLU_NURBS_ERROR24 = 100274;
- public static final int GLU_NURBS_ERROR25 = 100275;
- public static final int GLU_NURBS_ERROR26 = 100276;
- public static final int GLU_NURBS_ERROR27 = 100277;
- public static final int GLU_NURBS_ERROR28 = 100278;
- public static final int GLU_NURBS_ERROR29 = 100279;
- public static final int GLU_NURBS_ERROR30 = 100280;
- public static final int GLU_NURBS_ERROR31 = 100281;
- public static final int GLU_NURBS_ERROR32 = 100282;
- public static final int GLU_NURBS_ERROR33 = 100283;
- public static final int GLU_NURBS_ERROR34 = 100284;
- public static final int GLU_NURBS_ERROR35 = 100285;
- public static final int GLU_NURBS_ERROR36 = 100286;
- public static final int GLU_NURBS_ERROR37 = 100287;
-
- /* Contours types -- obsolete! */
- public static final int GLU_CW = 100120;
- public static final int GLU_CCW = 100121;
- public static final int GLU_INTERIOR = 100122;
- public static final int GLU_EXTERIOR = 100123;
- public static final int GLU_UNKNOWN = 100124;
-
- /* Names without "TESS_" prefix */
- public static final int GLU_BEGIN = GLU_TESS_BEGIN;
- public static final int GLU_VERTEX = GLU_TESS_VERTEX;
- public static final int GLU_END = GLU_TESS_END;
- public static final int GLU_ERROR = GLU_TESS_ERROR;
- public static final int GLU_EDGE_FLAG = GLU_TESS_EDGE_FLAG;
-
- /**
- * Method gluLookAt
- * @param eyex
- * @param eyey
- * @param eyez
- * @param centerx
- * @param centery
- * @param centerz
- * @param upx
- * @param upy
- * @param upz
- */
- public static void gluLookAt(
- float eyex,
- float eyey,
- float eyez,
- float centerx,
- float centery,
- float centerz,
- float upx,
- float upy,
- float upz) {
-
- Project.gluLookAt(eyex, eyey, eyez, centerx, centery, centerz, upx, upy, upz);
- }
-
- /**
- * Method gluOrtho2D
- * @param left
- * @param right
- * @param bottom
- * @param top
- */
- public static void gluOrtho2D(
- float left,
- float right,
- float bottom,
- float top) {
-
- GL11.glOrtho(left, right, bottom, top, -1.0, 1.0);
- }
-
- /**
- * Method gluPerspective
- * @param fovy
- * @param aspect
- * @param zNear
- * @param zFar
- */
- public static void gluPerspective(
- float fovy,
- float aspect,
- float zNear,
- float zFar) {
-
- Project.gluPerspective(fovy, aspect, zNear, zFar);
- }
-
- /**
- * Method gluProject
- * @param objx
- * @param objy
- * @param objz
- * @param modelMatrix
- * @param projMatrix
- * @param viewport
- * @param win_pos
- * @return
- */
- public static boolean gluProject(float objx, float objy, float objz,
- float[][] modelMatrix,
- float[][] projMatrix,
- int[] viewport,
- float[] win_pos)
- {
- return Project.gluProject(objx, objy, objz, modelMatrix, projMatrix, viewport, win_pos);
- }
-
- /**
- * Method gluUnproject
- * @param winx
- * @param winy
- * @param winz
- * @param modelMatrix
- * @param projMatrix
- * @param viewport
- * @param obj_pos
- * @return
- */
- public static boolean gluUnProject(float winx, float winy, float winz,
- float[][] modelMatrix,
- float[][] projMatrix,
- int[] viewport,
- float[] obj_pos)
- {
- return Project.gluUnProject(winx, winy, winz, modelMatrix, projMatrix, viewport, obj_pos);
- }
-
- /**
- * Method gluPickMatrix
- * @param x
- * @param y
- * @param width
- * @param height
- * @param viewport
- */
- public static void gluPickMatrix(
- float x,
- float y,
- float width,
- float height,
- int[] viewport) {
-
- Project.gluPickMatrix(x, y, width, height, viewport);
- }
-
- /**
- * Method gluGetString.
- * @param name
- * @return String
- */
- public static String gluGetString(int name) {
- return Registry.gluGetString(name);
- }
-
- /**
- * Method gluCheckExtension.
- * @param extName
- * @param extString
- * @return boolean
- */
- public static boolean gluCheckExtension(String extName, String extString) {
- return Registry.gluCheckExtension(extName, extString);
- }
-
- /**
- * Method gluBuild2DMipmaps
- * @param target
- * @param components
- * @param width
- * @param height
- * @param format
- * @param type
- * @param data
- * @return int
- */
- public static int gluBuild2DMipmaps(
- int target,
- int components,
- int width,
- int height,
- int format,
- int type,
- ByteBuffer data) {
-
- return MipMap.gluBuild2DMipmaps(target, components, width, height, format, type, data);
- }
-
- /**
- * Method gluScaleImage.
- * @param format
- * @param widthIn
- * @param heightIn
- * @param typeIn
- * @param dataIn
- * @param widthOut
- * @param heightOut
- * @param typeOut
- * @param dataOut
- * @return int
- */
- public static int gluScaleImage(
- int format,
- int widthIn,
- int heightIn,
- int typeIn,
- ByteBuffer dataIn,
- int widthOut,
- int heightOut,
- int typeOut,
- ByteBuffer dataOut) {
-
- return MipMap.gluScaleImage(format, widthIn, heightIn, typeIn, dataIn, widthOut, heightOut, typeOut, dataOut);
- }
-
- public static String gluErrorString(int error_code) {
- switch (error_code) {
- case GL11.GL_NO_ERROR:
- return "No error";
- case GL11.GL_INVALID_ENUM:
- return "Invalid enum";
- case GL11.GL_INVALID_VALUE:
- return "Invalid value";
- case GL11.GL_INVALID_OPERATION:
- return "Invalid operation";
- case GL11.GL_STACK_OVERFLOW:
- return "Stack overflow";
- case GL11.GL_STACK_UNDERFLOW:
- return "Stack underflow";
- case GL11.GL_OUT_OF_MEMORY:
- return "Out of memory";
- case ARBImaging.GL_TABLE_TOO_LARGE:
- return "Table too large";
- case EXTFramebufferObject.GL_INVALID_FRAMEBUFFER_OPERATION_EXT:
- return "Invalid framebuffer operation";
- case GLU.GLU_INVALID_ENUM:
- return "Invalid enum (glu)";
- case GLU.GLU_INVALID_VALUE:
- return "Invalid value (glu)";
- case GLU.GLU_OUT_OF_MEMORY:
- return "Out of memory (glu)";
- default:
- return null;
- }
- }
-}
Copied: trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java (from rev 2938, trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java)
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java 2008-01-21 20:38:04 UTC (rev 2939)
@@ -0,0 +1,425 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.util.glu;
+
+import java.nio.ByteBuffer;
+
+import org.lwjgl.opengl.ARBImaging;
+import org.lwjgl.opengl.EXTFramebufferObject;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.Util;
+
+/**
+ * GLU.java
+ *
+ *
+ * Created 23-dec-2003
+ * @author Erik Duijs
+ */
+public class GLU {
+ static final float PI = (float)Math.PI;
+
+ /* Errors: (return value 0 = no error) */
+ public static final int GLU_INVALID_ENUM = 100900;
+ public static final int GLU_INVALID_VALUE = 100901;
+ public static final int GLU_OUT_OF_MEMORY = 100902;
+ public static final int GLU_INCOMPATIBLE_GL_VERSION = 100903;
+
+ /* StringName */
+ public static final int GLU_VERSION = 100800;
+ public static final int GLU_EXTENSIONS = 100801;
+
+ /* Boolean */
+ public static final boolean GLU_TRUE = true;
+ public static final boolean GLU_FALSE = false;
+
+
+ /**** Quadric constants ****/
+
+ /* QuadricNormal */
+ public static final int GLU_SMOOTH = 100000;
+ public static final int GLU_FLAT = 100001;
+ public static final int GLU_NONE = 100002;
+
+ /* QuadricDrawStyle */
+ public static final int GLU_POINT = 100010;
+ public static final int GLU_LINE = 100011;
+ public static final int GLU_FILL = 100012;
+ public static final int GLU_SILHOUETTE = 100013;
+
+ /* QuadricOrientation */
+ public static final int GLU_OUTSIDE = 100020;
+ public static final int GLU_INSIDE = 100021;
+
+ /* Callback types: */
+ /* ERROR = 100103 */
+
+
+ /**** Tesselation constants ****/
+
+ public static final double TESS_MAX_COORD = 1.0e150;
+
+ /* TessProperty */
+ public static final int GLU_TESS_WINDING_RULE = 100140;
+ public static final int GLU_TESS_BOUNDARY_ONLY = 100141;
+ public static final int GLU_TESS_TOLERANCE = 100142;
+
+ /* TessWinding */
+ public static final int GLU_TESS_WINDING_ODD = 100130;
+ public static final int GLU_TESS_WINDING_NONZERO = 100131;
+ public static final int GLU_TESS_WINDING_POSITIVE = 100132;
+ public static final int GLU_TESS_WINDING_NEGATIVE = 100133;
+ public static final int GLU_TESS_WINDING_ABS_GEQ_TWO = 100134;
+
+ /* TessCallback */
+ public static final int GLU_TESS_BEGIN = 100100; /* void (CALLBACK*)(GLenum type) */
+ public static final int GLU_TESS_VERTEX = 100101; /* void (CALLBACK*)(void *data) */
+ public static final int GLU_TESS_END = 100102; /* void (CALLBACK*)(void) */
+ public static final int GLU_TESS_ERROR = 100103; /* void (CALLBACK*)(GLenum errno) */
+ public static final int GLU_TESS_EDGE_FLAG = 100104; /* void (CALLBACK*)(GLboolean boundaryEdge) */
+ public static final int GLU_TESS_COMBINE = 100105; /* void (CALLBACK*)(GLdouble coords[3],
+ void *data[4],
+ GLfloat weight[4],
+ void **dataOut) */
+ public static final int GLU_TESS_BEGIN_DATA = 100106; /* void (CALLBACK*)(GLenum type,
+ void *polygon_data) */
+ public static final int GLU_TESS_VERTEX_DATA = 100107; /* void (CALLBACK*)(void *data,
+ void *polygon_data) */
+ public static final int GLU_TESS_END_DATA = 100108; /* void (CALLBACK*)(void *polygon_data) */
+ public static final int GLU_TESS_ERROR_DATA = 100109; /* void (CALLBACK*)(GLenum errno,
+ void *polygon_data) */
+ public static final int GLU_TESS_EDGE_FLAG_DATA = 100110; /* void (CALLBACK*)(GLboolean boundaryEdge,
+ void *polygon_data) */
+ public static final int GLU_TESS_COMBINE_DATA = 100111; /* void (CALLBACK*)(GLdouble coords[3],
+ void *data[4],
+ GLfloat weight[4],
+ void **dataOut,
+ void *polygon_data) */
+
+ /* TessError */
+ public static final int GLU_TESS_ERROR1 = 100151;
+ public static final int GLU_TESS_ERROR2 = 100152;
+ public static final int GLU_TESS_ERROR3 = 100153;
+ public static final int GLU_TESS_ERROR4 = 100154;
+ public static final int GLU_TESS_ERROR5 = 100155;
+ public static final int GLU_TESS_ERROR6 = 100156;
+ public static final int GLU_TESS_ERROR7 = 100157;
+ public static final int GLU_TESS_ERROR8 = 100158;
+
+ public static final int GLU_TESS_MISSING_BEGIN_POLYGON = GLU_TESS_ERROR1;
+ public static final int GLU_TESS_MISSING_BEGIN_CONTOUR = GLU_TESS_ERROR2;
+ public static final int GLU_TESS_MISSING_END_POLYGON = GLU_TESS_ERROR3;
+ public static final int GLU_TESS_MISSING_END_CONTOUR = GLU_TESS_ERROR4;
+ public static final int GLU_TESS_COORD_TOO_LARGE = GLU_TESS_ERROR5;
+ public static final int GLU_TESS_NEED_COMBINE_CALLBACK = GLU_TESS_ERROR6;
+
+ /**** NURBS constants ****/
+
+ /* NurbsProperty */
+ public static final int GLU_AUTO_LOAD_MATRIX = 100200;
+ public static final int GLU_CULLING = 100201;
+ public static final int GLU_SAMPLING_TOLERANCE = 100203;
+ public static final int GLU_DISPLAY_MODE = 100204;
+ public static final int GLU_PARAMETRIC_TOLERANCE = 100202;
+ public static final int GLU_SAMPLING_METHOD = 100205;
+ public static final int GLU_U_STEP = 100206;
+ public static final int GLU_V_STEP = 100207;
+
+ /* NurbsSampling */
+ public static final int GLU_PATH_LENGTH = 100215;
+ public static final int GLU_PARAMETRIC_ERROR = 100216;
+ public static final int GLU_DOMAIN_DISTANCE = 100217;
+
+
+ /* NurbsTrim */
+ public static final int GLU_MAP1_TRIM_2 = 100210;
+ public static final ...
[truncated message content] |
|
From: <eli...@us...> - 2008-01-21 22:03:51
|
Revision: 2950
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2950&view=rev
Author: elias_naur
Date: 2008-01-21 14:03:45 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
javadoc fixes
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
trunk/LWJGL/src/java/org/lwjgl/openal/ALC10.java
Modified: trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java 2008-01-21 21:59:32 UTC (rev 2949)
+++ trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java 2008-01-21 22:03:45 UTC (rev 2950)
@@ -315,7 +315,7 @@
/**
* Locates the paths required by a library.
*
- * @param libName Local Library Name to search the classloader with ("openal").
+ * @param libname Local Library Name to search the classloader with ("openal").
* @param platform_lib_name The native library name ("libopenal.so")
* @param classloader The classloader to ask for library paths
* @return Paths to located libraries, if any
@@ -327,7 +327,7 @@
/**
* Locates the paths required by a library.
*
- * @param libName Local Library Name to search the classloader with ("openal").
+ * @param libname Local Library Name to search the classloader with ("openal").
* @param platform_lib_names The list of possible library names ("libopenal.so")
* @param classloader The classloader to ask for library paths
* @return Paths to located libraries, if any
Modified: trunk/LWJGL/src/java/org/lwjgl/openal/ALC10.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/ALC10.java 2008-01-21 21:59:32 UTC (rev 2949)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/ALC10.java 2008-01-21 22:03:45 UTC (rev 2950)
@@ -318,7 +318,6 @@
* The application can query for, and obtain an handle to, the device of a given context.
*
* @param context address of context to get device for
- * @param ALCdevice associated with context
*/
public static ALCdevice alcGetContextsDevice(ALCcontext context) {
ALCdevice device = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-01-21 22:07:50
|
Revision: 2951
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2951&view=rev
Author: matzon
Date: 2008-01-21 14:07:48 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
removing as per request of elias
Removed Paths:
-------------
trunk/LWJGL/src/java/org/lwjgl/test/applet/AppletTest.java
trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
Deleted: trunk/LWJGL/src/java/org/lwjgl/test/applet/AppletTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/applet/AppletTest.java 2008-01-21 22:03:45 UTC (rev 2950)
+++ trunk/LWJGL/src/java/org/lwjgl/test/applet/AppletTest.java 2008-01-21 22:07:48 UTC (rev 2951)
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2006 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.test.applet;
-
-import java.applet.Applet;
-import java.awt.BorderLayout;
-import java.awt.Canvas;
-
-import org.lwjgl.util.applet.LWJGLInstaller;
-import org.lwjgl.opengl.AWTInputAdapter;
-
-public class AppletTest extends Applet {
-
- Test test = null;
-
- public void destroy() {
- super.destroy();
- System.out.println("*** destroy ***");
- AWTInputAdapter.destroy();
- }
-
- public void start() {
- super.start();
- System.out.println("*** start ***");
- }
-
- public void stop() {
- super.stop();
- System.out.println("*** stop ***");
- test.stop();
- }
-
- public void init() {
- System.out.println("*** init ***");
-
- try {
- LWJGLInstaller.tempInstall();
- } catch (Exception le) {
- /* screwed */
- le.printStackTrace();
- }
-
- setLayout(new BorderLayout());
- try {
- test = (Test) Class.forName(getParameter("test")).newInstance();
- Canvas canvas = (Canvas) test;
- canvas.setSize(getWidth(), getHeight());
- add(canvas);
- } catch (Exception e) {
- e.printStackTrace();
- }
- test.start();
- }
-}
Deleted: trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java 2008-01-21 22:03:45 UTC (rev 2950)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java 2008-01-21 22:07:48 UTC (rev 2951)
@@ -1,356 +0,0 @@
-/*
- * Copyright (c) 2006 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.util.applet;
-
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-import java.security.cert.Certificate;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.jar.JarEntry;
-import java.util.Enumeration;
-import java.util.jar.JarFile;
-
-import org.lwjgl.LWJGLUtil;
-
-/**
- * <p>
- * Installer class for installing LWJGL temporarily into a temp directory.
- * This class is used for installing LWJGL for use with applets.
- * </p>
- * @author Brian Matzon <br...@ma...>
- * @version $Revision$
- * $Id$
- */
-public class LWJGLInstaller {
- /** Whether the installer has been called */
- private static boolean installed;
-
- /** Directory all lwjgl installations go into */
- private static final String MASTER_INSTALL_DIR = ".lwjglinstall";
-
- /** Name of file that we use to tag 'live' installations */
- private static final String WATERMARK_FILE = ".lwjglinuse";
-
- /** Name of the native jar we're expected to load and install */
- private static final String NATIVES_PLATFORM_JAR = "/" + LWJGLUtil.getPlatformName() + "_natives.jar";
-
- private LWJGLInstaller() {
- /* Unused */
- }
-
- /**
- * Create a temporary installation of LWJGL.
- * This will extract the relevant native files (for the platform) into
- * the user's temp directory, and instruct the LWJGL subsystem to load its
- * native files from there.
- * The file required by the installer, is gotten from the classloader via its
- * getResource command, and is expected to be named <windows | linux | macosx>_natives.jar.
- * Note: Due to the nature of native libraries, we cannot actually uninstall the currently
- * loaded files, but rather the "last" installed. This means that the most recent install of LWJGL
- * will always be present in the users temp dir. When invoking the tempInstall method, all old installations
- * will be uninstalled first.
- *
- * @see java.lang.ClassLoader#getResource(String)
- */
- public synchronized static void tempInstall() throws Exception {
- // only need to install once
- if (installed) {
- return;
- }
-
- try {
- // Validate the certificates of the platform native jar
- HashMap files = (HashMap)
- AccessController.doPrivileged(new PrivilegedExceptionAction() {
- public Object run() throws Exception {
- return validateCertificates();
- }
- });
-
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- uninstall();
- return null;
- }
- });
-
- // create a temporary dir for the native files
- String user_temp_dir = getPriviledgedString("java.io.tmpdir");
- final String path = createTemporaryDir(user_temp_dir);
-
- // extract natives from jar
- writeFiles(files, path);
-
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- System.setProperty("org.lwjgl.librarypath", path);
- // Make sure jinput knows about the new path too
- System.setProperty("net.java.games.input.librarypath", path);
- return null;
- }
- });
-
- installed = true;
- } catch (Exception e) {
- LWJGLUtil.log("Failed extraction e = " + e.getMessage());
- uninstall();
- throw e;
- }
- }
-
- /**
- * Validates the certificates of the native libraries.
- * When installing native libraries, it is imperative that we also check the certficates.
- * The reson for this, is that a user may inject a malicious jar to the classpath
- * before the "real" LWJGL jar, containing native libraries with unwanted code.
- * By forcing all the native libraries to have the same certificate as the signed
- * installer, we can also be sure that the native libraries indeed are correct.
- * @throws Exception If we encounter a certificate mismatch
- */
- private static HashMap validateCertificates() throws Exception {
- // get our certificate chain
- Certificate[] ownCerts = LWJGLInstaller.class.getProtectionDomain().getCodeSource().getCertificates();
- if(ownCerts == null || ownCerts.length == 0) {
- throw new Exception("Unable to get certificate chain for LWJGLInstaller");
- }
-
- // check that each of the entries in the jar is signed by same certificate as LWJGLInstaller
- InputStream is = LWJGLInstaller.class.getResourceAsStream(NATIVES_PLATFORM_JAR);
- if(is == null) {
- throw new Exception("Unable to open " + NATIVES_PLATFORM_JAR + ", which was expected to be on the classpath");
- }
-
- /* Copy the jar containing the natives to a tmp file and unpack and verify it from there.
- * A better way would have been to use JarInputStream, but there's a bug with JIS and
- * JarEntry.getCertificates() on java 1.5 (bug id. 6284489, duplicate id: 6348368).
- * JarEntry.getCodeSigners() does work on java 1.5 with JIS, but that API was introduced
- * in 1.5, and can't be relied upon for java 1.4.
- */
- File tmp_jar_file = File.createTempFile("lwjgl", ".jar");
- copyFile(is, new FileOutputStream(tmp_jar_file));
- is.close();
-
- JarFile jar_file = new JarFile(tmp_jar_file);
-
- JarEntry native_entry;
- HashMap files = new HashMap();
- Enumeration jar_entries = jar_file.entries();
- while (jar_entries.hasMoreElements()) {
- native_entry = (JarEntry)jar_entries.nextElement();
- // skip directories and anything in directories
- // conveniently ignores the manifest
- if(native_entry.isDirectory() || native_entry.getName().indexOf('/') != -1) {
- continue;
- }
-
- // need to read the file, before the certificate is retrievable
- // since we dont want to do two reads, we store it in memory for later use
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- InputStream jis = jar_file.getInputStream(native_entry);
- copyFile(jis, baos);
- files.put(native_entry.getName(), baos.toByteArray());
-
- // now check the chain of an actual file
- validateCertificateChain(ownCerts, native_entry.getCertificates());
- }
-
- return files;
- }
-
- /**
- * Validates the certificate chain for a single file
- * @param ownCerts Chain of certificates to check against
- * @param native_certs Chain of certificates to check
- * @return true if the chains match
- */
- private static void validateCertificateChain(Certificate[] ownCerts, Certificate[] native_certs) throws Exception {
- if(native_certs == null)
- throw new Exception("Unable to validate certificate chain. Native entry did not have a certificate chain at all");
-
- if(ownCerts.length != native_certs.length)
- throw new Exception("Unable to validate certificate chain. Chain differs in length [" + ownCerts.length + " vs " + native_certs.length + "]");
-
- for(int i=0; i<ownCerts.length; i++) {
- if(!ownCerts[i].equals(native_certs[i])) {
- throw new Exception("Certificate mismatch: " + ownCerts[i] + " != " + native_certs[i]);
- }
- }
- }
-
- /**
- * Extracts a file in the classpath to a specified dir
- *
- * @param file File to extract
- * @param path Path to extract to
- */
- private static void writeFiles(final HashMap files, final String path) throws Exception {
- AccessController.doPrivileged(new PrivilegedExceptionAction() {
- public Object run() throws IOException {
- for(Iterator i = files.keySet().iterator(); i.hasNext();) {
- String key = (String) i.next();
- File out = new File(path + File.separator + key);
- out.createNewFile();
- InputStream is = new ByteArrayInputStream((byte[]) files.get(key));
- OutputStream os = new BufferedOutputStream(new FileOutputStream(out));
- copyFile(is, os);
- is.close();
- }
- return null;
- }
- });
- }
-
- /**
- * Copies an inputstream to an outputstream
- * @param is InputStream to read from
- * @param os OutputStream to write to
- * @throws IOException if the copy process fail in any way
- */
- private static void copyFile(InputStream is, OutputStream os) throws IOException {
- byte[] copy_buffer = new byte[4096];
-
- int len;
- while ((len = is.read(copy_buffer)) > 0) {
- os.write(copy_buffer, 0, len);
- }
-
- os.close();
- }
-
- /**
- * Creates the temporary dir to store lwjgl files in.
- * The temporary dir will be created in a subdirectory of '.lwjglinstall' in
- * the users temp dir. The subdirectory will be named the current time in milliseconds.
- * A watermark file called '.lwjglinuse' will also be created in the directory.
- * @return Name of temp directory or null if directory creation failed
- */
- private static String createTemporaryDir(final String user_temp_dir) throws Exception {
- return (String) AccessController.doPrivileged(new PrivilegedExceptionAction() {
- public Object run() throws Exception {
- // create the temp directory
- File tempDir = new File(user_temp_dir + File.separator + MASTER_INSTALL_DIR + File.separator + System.currentTimeMillis());
- if(!tempDir.mkdirs()) {
- throw new IOException("Failed to create directory: " + tempDir);
- }
-
- // add the watermark file
- // TODO: Write some info to the file ?
- File watermark = new File(tempDir.getAbsolutePath() + File.separator + WATERMARK_FILE);
- watermark.createNewFile();
- watermark.deleteOnExit();
- return tempDir.getAbsolutePath();
- }
- });
- }
-
-
- /**
- * Gets a property as a privileged action.
- */
- private static String getPriviledgedString(final String property) {
- return (String) AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- return System.getProperty(property);
- }
- });
- }
-
- /**
- * Uninstalls any PREVIOUS installations
- * We cannot uninstall the current installation, since the files are locked
- * by the VM.
- */
- private static void uninstall() {
- LWJGLUtil.log("running LWJGL uninstaller");
-
- // locate all installer dirs and uninstall them
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- String temp = System.getProperty("java.io.tmpdir");
- File tempDir = new File(temp + File.separator + MASTER_INSTALL_DIR);
- File[] files = tempDir.listFiles(new FileFilter() {
-
- /*
- * @see java.io.FileFilter#accept(java.io.File)
- */
- public boolean accept(File pathname) {
- return isStale(pathname);
- }
-
- /**
- * Checks whether the specified directory is an install directory.
- * This is done by checking for the watermark file
- * @param directory Directory to check
- * @return true if the directory is an install directory
- */
- private boolean isStale(File directory) {
- File installFile = new File(directory.getAbsolutePath() + File.separator + WATERMARK_FILE);
- return !installFile.exists();
- }
-
- });
-
- if (files != null) {
- // uninstall each of the dirs
- for (int i = 0; i < files.length; i++) {
- uninstall(files[i]);
- }
- }
- return null;
- }
- });
- }
-
- /**
- * Uninstall LWJGL from a directory. This deletes all the files in the directory
- * and deletes the directory too.
- * @param file directory to uninstall LWJGL from
- */
- private static void uninstall(File file) {
- File[] files = file.listFiles();
- for (int i = 0; i < files.length; i++) {
- files[i].delete();
- }
- file.delete();
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-01-21 22:20:37
|
Revision: 2956
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2956&view=rev
Author: elias_naur
Date: 2008-01-21 14:20:25 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
javadoc fixes
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
trunk/LWJGL/src/java/org/lwjgl/util/Display.java
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Project.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/Quaternion.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java 2008-01-21 22:19:25 UTC (rev 2955)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java 2008-01-21 22:20:25 UTC (rev 2956)
@@ -136,8 +136,7 @@
/**
* Create an AWTGLCanvas with the requested PixelFormat on the default GraphicsDevice.
*
- * @param pixelFormat The desired pixel format. May not be null
- * @param device the device to create the canvas on.
+ * @param pixel_format The desired pixel format. May not be null
*/
public AWTGLCanvas(PixelFormat pixel_format) throws LWJGLException {
this(GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(), pixel_format);
@@ -146,8 +145,8 @@
/**
* Create an AWTGLCanvas with the requested PixelFormat on the default GraphicsDevice.
*
- * @param pixelFormat The desired pixel format. May not be null
* @param device the device to create the canvas on.
+ * @param pixel_format The desired pixel format. May not be null
*/
public AWTGLCanvas(GraphicsDevice device, PixelFormat pixel_format) throws LWJGLException {
this(device, pixel_format, null);
@@ -157,8 +156,8 @@
* Create an AWTGLCanvas with the requested PixelFormat on the specified GraphicsDevice.
*
* @param device the device to create the canvas on.
- * @param pixelFormat The desired pixel format. May not be null
- * @param shared_drawable The Drawable to share context with
+ * @param pixel_format The desired pixel format. May not be null
+ * @param drawable The Drawable to share context with
*/
public AWTGLCanvas(GraphicsDevice device, PixelFormat pixel_format, Drawable drawable) throws LWJGLException {
super(implementation.findConfiguration(device, pixel_format));
Modified: trunk/LWJGL/src/java/org/lwjgl/util/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/Display.java 2008-01-21 22:19:25 UTC (rev 2955)
+++ trunk/LWJGL/src/java/org/lwjgl/util/Display.java 2008-01-21 22:20:25 UTC (rev 2956)
@@ -127,7 +127,7 @@
* @return the chosen display mode
* @throws NoSuchFieldException if one of the params is not a field in DisplayMode
* @throws Exception if no display mode could be set
- * @see org.lwjgl.DisplayMode
+ * @see org.lwjgl.opengl.DisplayMode
*/
public static DisplayMode setDisplayMode(DisplayMode[] dm, final String[] param) throws Exception {
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2008-01-21 22:19:25 UTC (rev 2955)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2008-01-21 22:20:25 UTC (rev 2956)
@@ -868,7 +868,6 @@
*
* @param ownCerts Chain of certificates to check against
* @param native_certs Chain of certificates to check
- * @return true if the chains match
*/
protected static void validateCertificateChain(Certificate[] ownCerts, Certificate[] native_certs) throws Exception {
if (native_certs == null)
@@ -948,7 +947,6 @@
* Sets the state of the loaded and prints some debug information
*
* @param error Error message to print
- * @param state State to enter
*/
protected void fatalErrorOccured(String error) {
fatalError = true;
@@ -968,4 +966,4 @@
/* ignored */
}
}
-}
\ No newline at end of file
+}
Modified: trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java 2008-01-21 22:19:25 UTC (rev 2955)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java 2008-01-21 22:20:25 UTC (rev 2956)
@@ -294,7 +294,6 @@
* @param projMatrix
* @param viewport
* @param win_pos
- * @return
*/
public static boolean gluProject(float objx, float objy, float objz,
FloatBuffer modelMatrix,
@@ -314,7 +313,6 @@
* @param projMatrix
* @param viewport
* @param obj_pos
- * @return
*/
public static boolean gluUnProject(float winx, float winy, float winz,
FloatBuffer modelMatrix,
Modified: trunk/LWJGL/src/java/org/lwjgl/util/glu/Project.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/Project.java 2008-01-21 22:19:25 UTC (rev 2955)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/Project.java 2008-01-21 22:20:25 UTC (rev 2956)
@@ -287,8 +287,6 @@
* @param projMatrix
* @param viewport
* @param win_pos
- *
- * @return
*/
public static boolean gluProject(
float objx,
@@ -338,8 +336,6 @@
* @param projMatrix
* @param viewport
* @param obj_pos
- *
- * @return
*/
public static boolean gluUnProject(
float winx,
Modified: trunk/LWJGL/src/java/org/lwjgl/util/vector/Quaternion.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/vector/Quaternion.java 2008-01-21 22:19:25 UTC (rev 2955)
+++ trunk/LWJGL/src/java/org/lwjgl/util/vector/Quaternion.java 2008-01-21 22:20:25 UTC (rev 2956)
@@ -67,8 +67,6 @@
/**
* C'tor
*
- * @param x,
- * y, z, w
*/
public Quaternion(float x, float y, float z, float w) {
set(x, y, z, w);
@@ -438,7 +436,7 @@
* Sets the value of this quaternion using the rotational component of the
* passed matrix.
*
- * @param m1
+ * @param m
* The matrix
* @return this
*/
@@ -454,7 +452,7 @@
* The source matrix
* @param q
* The destination quaternion, or null if a new quaternion is to be created
- * @return
+ * @return q
*/
public final static Quaternion setFromMatrix(Matrix4f m, Quaternion q) {
return q.setFromMat(m.m00, m.m01, m.m02, m.m10, m.m11, m.m12, m.m20,
@@ -480,7 +478,7 @@
* The source matrix
* @param q
* The destination quaternion, or null if a new quaternion is to be created
- * @return
+ * @return q
*/
public static final Quaternion setFromMatrix(Matrix3f m, Quaternion q) {
return q.setFromMat(m.m00, m.m01, m.m02, m.m10, m.m11, m.m12, m.m20,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-03-02 18:16:42
|
Revision: 2964
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2964&view=rev
Author: elias_naur
Date: 2008-03-02 10:16:39 -0800 (Sun, 02 Mar 2008)
Log Message:
-----------
Added notes to Mouse.poll() and Keyboard.poll() that Display.processMessages() (or Display.update()) must be called to receive new input state
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java
trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java 2008-02-19 14:06:48 UTC (rev 2963)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java 2008-03-02 18:16:39 UTC (rev 2964)
@@ -363,6 +363,9 @@
* <code>getEventKeyState</code> - finally use <code>getEventCharacter</code> to get the
* character for that event.
*
+ * NOTE: This method does not query the operating system for new events. To do that,
+ * Display.processMessages() (or Display.update()) must be called first.
+ *
* @see org.lwjgl.input.Keyboard#isKeyDown(int key)
* @see org.lwjgl.input.Keyboard#next()
* @see org.lwjgl.input.Keyboard#getEventKey()
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2008-02-19 14:06:48 UTC (rev 2963)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2008-03-02 18:16:39 UTC (rev 2964)
@@ -303,6 +303,9 @@
* <code>getEventButton</code>. To get the state of that button, for that event, use
* <code>getEventButtonState</code>.
*
+ * NOTE: This method does not query the operating system for new events. To do that,
+ * Display.processMessages() (or Display.update()) must be called first.
+ *
* @see org.lwjgl.input.Mouse#next()
* @see org.lwjgl.input.Mouse#getEventButton()
* @see org.lwjgl.input.Mouse#getEventButtonState()
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java 2008-02-19 14:06:48 UTC (rev 2963)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java 2008-03-02 18:16:39 UTC (rev 2964)
@@ -576,9 +576,9 @@
}
/**
- * Process operating system events. Call this to update the Display's state and make sure the
- * input devices receive events. This method is called from update(), and should normally not be called by
- * the application.
+ * Process operating system events. Call this to update the Display's state and to receive new
+ * input device events. This method is called from update(), so it is not necessary to call
+ * this method if update() is called periodically.
*/
public static void processMessages() {
synchronized (GlobalLock.lock) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-04-07 17:10:17
|
Revision: 2981
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2981&view=rev
Author: elias_naur
Date: 2008-04-07 10:10:14 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Mac OS X: Implemented Display.setParent support
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplayPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/DisplayParentTest.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2008-04-07 16:37:39 UTC (rev 2980)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2008-04-07 17:10:14 UTC (rev 2981)
@@ -63,6 +63,7 @@
private MacOSXCanvasListener canvas_listener;
private MacOSXFrame frame;
+ private Canvas canvas;
private Robot robot;
private MacOSXMouseEventQueue mouse_queue;
private KeyboardEventQueue keyboard_queue;
@@ -79,10 +80,16 @@
hideUI(fullscreen);
close_requested = false;
try {
- frame = new MacOSXFrame(mode, requested_mode, fullscreen, x, y);
- canvas_listener = new MacOSXCanvasListener(frame.getCanvas());
+ if (parent == null) {
+ frame = new MacOSXFrame(mode, requested_mode, fullscreen, x, y);
+ canvas = frame.getCanvas();
+ } else {
+ frame = null;
+ canvas = parent;
+ }
+ canvas_listener = new MacOSXCanvasListener(canvas);
canvas_listener.enableListeners();
- robot = AWTUtil.createRobot(frame);
+ robot = AWTUtil.createRobot(canvas);
} catch (LWJGLException e) {
destroyWindow();
throw e;
@@ -185,7 +192,8 @@
}
public void setTitle(String title) {
- frame.setTitle(title);
+ if (frame != null)
+ frame.setTitle(title);
}
public boolean isCloseRequested() {
@@ -198,19 +206,19 @@
}
public boolean isVisible() {
- return frame.syncIsVisible();
+ return frame == null || frame.syncIsVisible();
}
public boolean isActive() {
- return frame.syncIsActive();
+ return canvas.isFocusOwner();
}
- public MacOSXFrame getFrame() {
- return frame;
+ public Canvas getCanvas() {
+ return canvas;
}
public boolean isDirty() {
- return frame.getCanvas().syncIsDirty();
+ return frame != null && frame.getCanvas().syncIsDirty();
}
public PeerInfo createPeerInfo(PixelFormat pixel_format) throws LWJGLException {
@@ -245,7 +253,7 @@
*
* - elias
*/
- if (Display.isFullscreen() && (frame.getCanvas().syncCanvasPainted() || should_update)) {
+ if (Display.isFullscreen() && (frame != null && frame.getCanvas().syncCanvasPainted() || should_update)) {
try {
MacOSXContextImplementation.resetView(Display.getDrawable().getContext().getPeerInfo(), Display.getDrawable().getContext());
} catch (LWJGLException e) {
@@ -258,7 +266,7 @@
GL11.glGetInteger(GL11.GL_VIEWPORT, current_viewport);
GL11.glViewport(current_viewport.get(0), current_viewport.get(1), current_viewport.get(2), current_viewport.get(3));
}
- if (frame.syncShouldWarpCursor() && mouse_queue != null) {
+ if (frame != null && frame.syncShouldWarpCursor() && mouse_queue != null) {
mouse_queue.warpCursor();
}
}
@@ -280,7 +288,8 @@
private native void nHideUI(boolean hide);
public void reshape(int x, int y, int width, int height) {
- frame.resize(x, y, width, height);
+ if (frame != null)
+ frame.resize(x, y, width, height);
}
/* Mouse */
@@ -293,7 +302,6 @@
}
public void createMouse() throws LWJGLException {
- MacOSXGLCanvas canvas = frame.getCanvas();
this.mouse_queue = new MacOSXMouseEventQueue(canvas);
mouse_queue.register();
}
@@ -323,12 +331,13 @@
}
public void setCursorPosition(int x, int y) {
- AWTUtil.setCursorPosition(frame.getCanvas(), robot, x, y);
+ AWTUtil.setCursorPosition(canvas, robot, x, y);
}
public void setNativeCursor(Object handle) throws LWJGLException {
Cursor awt_cursor = (Cursor)handle;
- frame.setCursor(awt_cursor);
+ if (frame != null)
+ frame.setCursor(awt_cursor);
}
public int getMinCursorSize() {
@@ -341,7 +350,6 @@
/* Keyboard */
public void createKeyboard() throws LWJGLException {
- MacOSXGLCanvas canvas = frame.getCanvas();
this.keyboard_queue = new KeyboardEventQueue(canvas);
keyboard_queue.register();
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplayPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplayPeerInfo.java 2008-04-07 16:37:39 UTC (rev 2980)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplayPeerInfo.java 2008-04-07 17:10:14 UTC (rev 2981)
@@ -51,10 +51,9 @@
protected void doLockAndInitHandle() throws LWJGLException {
if (locked)
throw new RuntimeException("Already locked");
- MacOSXFrame frame = ((MacOSXDisplay)Display.getImplementation()).getFrame();
- if (frame != null) {
- Canvas gl_canvas = frame.getCanvas();
- initHandle(gl_canvas);
+ Canvas canvas = ((MacOSXDisplay)Display.getImplementation()).getCanvas();
+ if (canvas != null) {
+ initHandle(canvas);
locked = true;
}
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java 2008-04-07 16:37:39 UTC (rev 2980)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java 2008-04-07 17:10:14 UTC (rev 2981)
@@ -63,13 +63,6 @@
}
}
- /**
- * This initializes the canvas and binds the context to it.
- */
- public void initializeCanvas() {
- setFocusTraversalKeysEnabled(false);
- }
-
public boolean syncCanvasPainted() {
boolean result;
synchronized (this) {
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/DisplayParentTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/DisplayParentTest.java 2008-04-07 16:37:39 UTC (rev 2980)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/DisplayParentTest.java 2008-04-07 17:10:14 UTC (rev 2981)
@@ -64,6 +64,7 @@
setLayout(new GridLayout(1, 2));
final Canvas display_parent = new Canvas();
display_parent.setFocusable(true);
+ display_parent.setIgnoreRepaint(true);
add(display_parent);
/* addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
@@ -74,6 +75,7 @@
setResizable(true);
setVisible(true);
Display.setParent(display_parent);
+ Display.setVSyncEnabled(true);
Display.create();
float angle = 0f;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-04-07 18:36:32
|
Revision: 2983
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2983&view=rev
Author: matzon
Date: 2008-04-07 11:36:09 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
updated and added license where needed
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
trunk/LWJGL/src/java/org/lwjgl/BufferUtils.java
trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/J2SESysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/LWJGLException.java
trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java
trunk/LWJGL/src/java/org/lwjgl/Sys.java
trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/examples/Game.java
trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/AlienEntity.java
trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Entity.java
trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Game.java
trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/ShipEntity.java
trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/ShotEntity.java
trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/SoundManager.java
trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Sprite.java
trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Texture.java
trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/TextureLoader.java
trunk/LWJGL/src/java/org/lwjgl/input/Controller.java
trunk/LWJGL/src/java/org/lwjgl/input/ControllerEvent.java
trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java
trunk/LWJGL/src/java/org/lwjgl/input/Cursor.java
trunk/LWJGL/src/java/org/lwjgl/input/JInputController.java
trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java
trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
trunk/LWJGL/src/java/org/lwjgl/input/OpenGLPackageAccess.java
trunk/LWJGL/src/java/org/lwjgl/openal/AL.java
trunk/LWJGL/src/java/org/lwjgl/openal/ALC10.java
trunk/LWJGL/src/java/org/lwjgl/openal/ALC11.java
trunk/LWJGL/src/java/org/lwjgl/openal/ALCcontext.java
trunk/LWJGL/src/java/org/lwjgl/openal/ALCdevice.java
trunk/LWJGL/src/java/org/lwjgl/openal/OpenALException.java
trunk/LWJGL/src/java/org/lwjgl/openal/Util.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasInputImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java
trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java
trunk/LWJGL/src/java/org/lwjgl/opengl/ContextImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayMode.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Drawable.java
trunk/LWJGL/src/java/org/lwjgl/opengl/EventQueue.java
trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
trunk/LWJGL/src/java/org/lwjgl/opengl/GLUConstants.java
trunk/LWJGL/src/java/org/lwjgl/opengl/GlobalLock.java
trunk/LWJGL/src/java/org/lwjgl/opengl/InputImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/KeyboardEventQueue.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTGLCanvasPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxCanvasImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplayPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxEvent.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxKeyboard.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxKeycodes.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxPbufferPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTGLCanvasPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasListener.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplayPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXFrame.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPbufferPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java
trunk/LWJGL/src/java/org/lwjgl/opengl/OpenGLException.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Pbuffer.java
trunk/LWJGL/src/java/org/lwjgl/opengl/PeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/PixelFormat.java
trunk/LWJGL/src/java/org/lwjgl/opengl/ReferencesStack.java
trunk/LWJGL/src/java/org/lwjgl/opengl/RenderTexture.java
trunk/LWJGL/src/java/org/lwjgl/opengl/StateStack.java
trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTGLCanvasPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsCanvasImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInput.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInput3.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInput8.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputDevice.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputDevice3.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputDevice8.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputDeviceObjectCallback.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDirectInputMouse.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplayPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsFileVersion.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeycodes.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsPbufferPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsRegistry.java
trunk/LWJGL/src/java/org/lwjgl/test/DisplayTest.java
trunk/LWJGL/src/java/org/lwjgl/test/SysTest.java
trunk/LWJGL/src/java/org/lwjgl/test/WindowCreationTest.java
trunk/LWJGL/src/java/org/lwjgl/test/applet/AppletLoaderTest.java
trunk/LWJGL/src/java/org/lwjgl/test/applet/ControllersTest.java
trunk/LWJGL/src/java/org/lwjgl/test/applet/OpenAL.java
trunk/LWJGL/src/java/org/lwjgl/test/applet/OpenGL.java
trunk/LWJGL/src/java/org/lwjgl/test/applet/Speed.java
trunk/LWJGL/src/java/org/lwjgl/test/applet/Test.java
trunk/LWJGL/src/java/org/lwjgl/test/input/HWCursorTest.java
trunk/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java
trunk/LWJGL/src/java/org/lwjgl/test/input/MouseCreationTest.java
trunk/LWJGL/src/java/org/lwjgl/test/input/MouseTest.java
trunk/LWJGL/src/java/org/lwjgl/test/input/TestControllers.java
trunk/LWJGL/src/java/org/lwjgl/test/openal/ALCCaptureTest.java
trunk/LWJGL/src/java/org/lwjgl/test/openal/ALCTest.java
trunk/LWJGL/src/java/org/lwjgl/test/openal/BasicTest.java
trunk/LWJGL/src/java/org/lwjgl/test/openal/MovingSoundTest.java
trunk/LWJGL/src/java/org/lwjgl/test/openal/OpenALCreationTest.java
trunk/LWJGL/src/java/org/lwjgl/test/openal/PlayTest.java
trunk/LWJGL/src/java/org/lwjgl/test/openal/PlayTestMemory.java
trunk/LWJGL/src/java/org/lwjgl/test/openal/PositionTest.java
trunk/LWJGL/src/java/org/lwjgl/test/openal/SourceLimitTest.java
trunk/LWJGL/src/java/org/lwjgl/test/openal/StressTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/Gears.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/PbufferTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTGears.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTGearsCanvas.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/DemoBox.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/DisplayParentTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/pbuffers/PbufferTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/pbuffers/TextureRenderer.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/pbuffers/UniqueRenderer.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/pbuffers/UniqueRendererRTT.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderFP.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderFSH.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderVP.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderVSH.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java
trunk/LWJGL/src/java/org/lwjgl/util/Color.java
trunk/LWJGL/src/java/org/lwjgl/util/Dimension.java
trunk/LWJGL/src/java/org/lwjgl/util/Display.java
trunk/LWJGL/src/java/org/lwjgl/util/Point.java
trunk/LWJGL/src/java/org/lwjgl/util/ReadableColor.java
trunk/LWJGL/src/java/org/lwjgl/util/ReadableDimension.java
trunk/LWJGL/src/java/org/lwjgl/util/ReadablePoint.java
trunk/LWJGL/src/java/org/lwjgl/util/ReadableRectangle.java
trunk/LWJGL/src/java/org/lwjgl/util/Rectangle.java
trunk/LWJGL/src/java/org/lwjgl/util/Renderable.java
trunk/LWJGL/src/java/org/lwjgl/util/Timer.java
trunk/LWJGL/src/java/org/lwjgl/util/WaveData.java
trunk/LWJGL/src/java/org/lwjgl/util/WritableColor.java
trunk/LWJGL/src/java/org/lwjgl/util/WritableDimension.java
trunk/LWJGL/src/java/org/lwjgl/util/WritablePoint.java
trunk/LWJGL/src/java/org/lwjgl/util/WritableRectangle.java
trunk/LWJGL/src/java/org/lwjgl/util/XPMFile.java
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALTypeMap.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALboolean.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALbyte.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALdouble.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALenum.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALfloat.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALint.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALshort.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALsizei.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALubyte.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALuint.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALvoid.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Auto.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/AutoResultSize.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/AutoSize.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/AutoType.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/BufferKind.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/BufferObject.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/CachedReference.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/CachedResult.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Check.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Code.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Const.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Constant.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Extension.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/FieldsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLbitfield.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLboolean.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLbyte.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLchar.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLcharARB.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLclampd.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLclampf.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLdouble.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLenum.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLfloat.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLhalf.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLhandleARB.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLint.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLint64EXT.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLintptr.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLintptrARB.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLshort.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLsizei.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLsizeiptr.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLsizeiptrARB.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLubyte.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLuint.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLuint64EXT.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLushort.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLvoid.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GenerateAutos.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorProcessorFactory.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Indirect.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/JNITypeTranslator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaTypeTranslator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Mode.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeType.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/NoErrorCheck.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/NullTerminated.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/OutParameter.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Platform.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/PlatformDependent.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/PostfixTranslator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/RegisterStubsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Result.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/SignatureTranslator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Signedness.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/StripPostfix.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/TypeInfo.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/TypeMap.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/TypedefsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Cylinder.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Disk.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/MipMap.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/PartialDisk.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/PixelStoreState.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Project.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Quadric.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Registry.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Sphere.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Util.java
trunk/LWJGL/src/java/org/lwjgl/util/input/ControllerAdapter.java
trunk/LWJGL/src/java/org/lwjgl/util/jinput/KeyMap.java
trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLEnvironmentPlugin.java
trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLKeyboard.java
trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLMouse.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix2f.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix3f.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix4f.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/Quaternion.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/ReadableVector.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/ReadableVector2f.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/ReadableVector3f.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/ReadableVector4f.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/Vector.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/Vector2f.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/Vector3f.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/Vector4f.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/WritableVector2f.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/WritableVector3f.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/WritableVector4f.java
Modified: trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/BufferUtils.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/BufferUtils.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/BufferUtils.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/J2SESysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/J2SESysImplementation.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/J2SESysImplementation.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/LWJGLException.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LWJGLException.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/LWJGLException.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2005 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2006 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/examples/Game.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/examples/Game.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/examples/Game.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/AlienEntity.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/AlienEntity.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/AlienEntity.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Entity.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Entity.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Entity.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Game.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Game.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Game.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/ShipEntity.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/ShipEntity.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/ShipEntity.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/ShotEntity.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/ShotEntity.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/ShotEntity.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/SoundManager.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/SoundManager.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/SoundManager.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Sprite.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Sprite.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Sprite.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Texture.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Texture.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Texture.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/TextureLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/TextureLoader.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/TextureLoader.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Controller.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Controller.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Controller.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,3 +1,34 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
package org.lwjgl.input;
/**
Modified: trunk/LWJGL/src/java/org/lwjgl/input/ControllerEvent.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/ControllerEvent.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/input/ControllerEvent.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,3 +1,34 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
package org.lwjgl.input;
/**
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,3 +1,34 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
package org.lwjgl.input;
import java.util.ArrayList;
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Cursor.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Cursor.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Cursor.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/input/JInputController.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/JInputController.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/input/JInputController.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,3 +1,34 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
package org.lwjgl.input;
import java.util.ArrayList;
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/input/OpenGLPackageAccess.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/OpenGLPackageAccess.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/input/OpenGLPackageAccess.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,3 +1,34 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
package org.lwjgl.input;
import org.lwjgl.opengl.InputImplementation;
Modified: trunk/LWJGL/src/java/org/lwjgl/openal/AL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/AL.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/AL.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/openal/ALC10.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/ALC10.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/ALC10.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/openal/ALC11.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/ALC11.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/ALC11.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/openal/ALCcontext.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/ALCcontext.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/ALCcontext.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/openal/ALCdevice.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/ALCdevice.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/ALCdevice.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/openal/OpenALException.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/OpenALException.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/OpenALException.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/openal/Util.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/Util.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/Util.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasImplementation.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasImplementation.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasInputImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasInputImplementation.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasInputImplementation.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2006 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2006 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/ContextImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/ContextImplementation.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/ContextImplementation.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayMode.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayMode.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayMode.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Drawable.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Drawable.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Drawable.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/EventQueue.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/EventQueue.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/EventQueue.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLUConstants.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLUConstants.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLUConstants.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GlobalLock.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GlobalLock.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GlobalLock.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,3 +1,34 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
package org.lwjgl.opengl;
/**
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/InputImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/InputImplementation.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/InputImplementation.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/KeyboardEventQueue.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/KeyboardEventQueue.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/KeyboardEventQueue.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTGLCanvasPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTGLCanvasPeerInfo.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTGLCanvasPeerInfo.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxCanvasImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxCanvasImplementation.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxCanvasImplementation.java 2008-04-07 18:36:09 UTC (rev 2983)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2004 LWJGL Project
+ * Copyright (c) 2002-2008 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextImplementation.java 2008-04-07 17:34:29 UTC (rev 2982)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextImplementation.java 2008-04-07 18:36:09 ...
[truncated message content] |
|
From: <eli...@us...> - 2008-04-09 18:44:46
|
Revision: 2999
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2999&view=rev
Author: elias_naur
Date: 2008-04-09 11:44:25 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
Linux: Moved input focus handling to LinuxDisplay. Bumped Sys.JNI_VERSION
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/Sys.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2008-04-09 18:25:30 UTC (rev 2998)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2008-04-09 18:44:25 UTC (rev 2999)
@@ -57,7 +57,7 @@
private static final String VERSION = "2.0a3";
/** Current version of the JNI library */
- static final int JNI_VERSION = 13;
+ static final int JNI_VERSION = 15;
/** The implementation instance to delegate platform specific behavior to */
private final static SysImplementation implementation;
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2008-04-09 18:25:30 UTC (rev 2998)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2008-04-09 18:44:25 UTC (rev 2999)
@@ -627,6 +627,8 @@
while (LinuxEvent.getPending(getDisplay()) > 0) {
event_buffer.nextEvent(getDisplay());
long event_window = event_buffer.getWindow();
+ if (event_buffer.getType() == LinuxEvent.ButtonPress && parent != null)
+ setInputFocus(getDisplay(), getWindow(), event_buffer.getButtonTime());
if (event_window != getWindow() || event_buffer.filterEvent(event_window) ||
(mouse != null && mouse.filterEvent(grab, shouldWarpPointer(), event_buffer)) ||
(keyboard != null && keyboard.filterEvent(event_buffer)))
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java 2008-04-09 18:25:30 UTC (rev 2998)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java 2008-04-09 18:44:25 UTC (rev 2999)
@@ -280,8 +280,6 @@
case LinuxEvent.ButtonPress: /* Fall through */
case LinuxEvent.ButtonRelease:
handleButtonEvent(grab, event.getButtonTime(), event.getButtonType(), (byte)event.getButtonButton());
- if (Display.getParent() != null)
- LinuxDisplay.setInputFocus(display, window, event.getButtonTime());
return true;
case LinuxEvent.MotionNotify:
handlePointerMotion(grab, warp_pointer, event.getButtonTime(), event.getButtonRoot(), event.getButtonXRoot(), event.getButtonYRoot(), event.getButtonX(), event.getButtonY());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-04-30 14:34:59
|
Revision: 3054
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3054&view=rev
Author: elias_naur
Date: 2008-04-30 07:34:54 -0700 (Wed, 30 Apr 2008)
Log Message:
-----------
Moved Sys.JNI_VERSION to SysImplementation.getRequiredJNIVersion() to enable platform specific native library versions.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/Sys.java
trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
Modified: trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java 2008-04-30 13:47:26 UTC (rev 3053)
+++ trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java 2008-04-30 14:34:54 UTC (rev 3054)
@@ -38,11 +38,15 @@
* @version $Revision$
* $Id$
*/
-class LinuxSysImplementation extends J2SESysImplementation {
+final class LinuxSysImplementation extends J2SESysImplementation {
static {
java.awt.Toolkit.getDefaultToolkit(); // This will make sure libjawt.so is loaded
}
+ public int getRequiredJNIVersion() {
+ return 16;
+ }
+
public boolean openURL(final String url) {
// Linux may as well resort to pure Java hackery, as there's no Linux native way of doing it
// right anyway.
Modified: trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java 2008-04-30 13:47:26 UTC (rev 3053)
+++ trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java 2008-04-30 14:34:54 UTC (rev 3054)
@@ -44,12 +44,16 @@
* @version $Revision$
* $Id$
*/
-class MacOSXSysImplementation extends J2SESysImplementation {
+final class MacOSXSysImplementation extends J2SESysImplementation {
static {
// Make sure AWT is properly initialized. This avoids hangs on Mac OS X 10.3
Toolkit.getDefaultToolkit();
}
+ public int getRequiredJNIVersion() {
+ return 16;
+ }
+
public boolean openURL(String url) {
try {
FileManager.openURL(url);
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2008-04-30 13:47:26 UTC (rev 3053)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2008-04-30 14:34:54 UTC (rev 3054)
@@ -56,9 +56,6 @@
/** Current version of library */
private static final String VERSION = "2.0b1";
- /** Current version of the JNI library */
- static final int JNI_VERSION = 16;
-
/** The implementation instance to delegate platform specific behavior to */
private final static SysImplementation implementation;
@@ -101,8 +98,9 @@
loadLibrary(JNI_LIBRARY_NAME);
int native_jni_version = implementation.getJNIVersion();
- if (native_jni_version != JNI_VERSION)
- throw new LinkageError("Version mismatch: jar version is '" + JNI_VERSION +
+ int required_version = implementation.getRequiredJNIVersion();
+ if (native_jni_version != required_version)
+ throw new LinkageError("Version mismatch: jar version is '" + required_version +
"', native libary version is '" + native_jni_version + "'");
implementation.setDebug(LWJGLUtil.DEBUG);
}
@@ -112,9 +110,9 @@
case LWJGLUtil.PLATFORM_LINUX:
return new LinuxSysImplementation();
case LWJGLUtil.PLATFORM_WINDOWS:
- return new org.lwjgl.WindowsSysImplementation();
+ return new WindowsSysImplementation();
case LWJGLUtil.PLATFORM_MACOSX:
- return new org.lwjgl.MacOSXSysImplementation();
+ return new MacOSXSysImplementation();
default:
throw new IllegalStateException("Unsupported platform");
}
Modified: trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java 2008-04-30 13:47:26 UTC (rev 3053)
+++ trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java 2008-04-30 14:34:54 UTC (rev 3054)
@@ -42,6 +42,11 @@
*/
interface SysImplementation {
/**
+ * Return the required version of the native library
+ */
+ int getRequiredJNIVersion();
+
+ /**
* Return the version of the native library
*/
int getJNIVersion();
Modified: trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java 2008-04-30 13:47:26 UTC (rev 3053)
+++ trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java 2008-04-30 14:34:54 UTC (rev 3054)
@@ -38,11 +38,15 @@
* @version $Revision$
* $Id$
*/
-class WindowsSysImplementation extends DefaultSysImplementation {
+final class WindowsSysImplementation extends DefaultSysImplementation {
static {
Sys.initialize();
}
+ public int getRequiredJNIVersion() {
+ return 16;
+ }
+
public long getTimerResolution() {
return 1000;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-06-05 13:35:44
|
Revision: 3095
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3095&view=rev
Author: matzon
Date: 2008-06-05 06:35:32 -0700 (Thu, 05 Jun 2008)
Log Message:
-----------
fixed internal use of deprecated keys
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/KeyboardEventQueue.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeycodes.java
trunk/LWJGL/src/java/org/lwjgl/util/jinput/KeyMap.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/KeyboardEventQueue.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/KeyboardEventQueue.java 2008-06-05 13:12:34 UTC (rev 3094)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/KeyboardEventQueue.java 2008-06-05 13:35:32 UTC (rev 3095)
@@ -335,9 +335,9 @@
return Keyboard.KEY_LMENU;
case KeyEvent.VK_META:
if (position == KeyEvent.KEY_LOCATION_RIGHT)
- return Keyboard.KEY_RWIN;
+ return Keyboard.KEY_RMETA;
else
- return Keyboard.KEY_LWIN;
+ return Keyboard.KEY_LMETA;
case KeyEvent.VK_SHIFT:
if (position == KeyEvent.KEY_LOCATION_RIGHT)
return Keyboard.KEY_RSHIFT;
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeycodes.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeycodes.java 2008-06-05 13:12:34 UTC (rev 3094)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeycodes.java 2008-06-05 13:35:32 UTC (rev 3095)
@@ -562,9 +562,9 @@
case VK_DELETE:
return Keyboard.KEY_DELETE;
case VK_LWIN:
- return Keyboard.KEY_LWIN;
+ return Keyboard.KEY_LMETA;
case VK_RWIN:
- return Keyboard.KEY_RWIN;
+ return Keyboard.KEY_RMETA;
case VK_APPS:
return Keyboard.KEY_APPS;
/* case VK_POWER:
Modified: trunk/LWJGL/src/java/org/lwjgl/util/jinput/KeyMap.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/jinput/KeyMap.java 2008-06-05 13:12:34 UTC (rev 3094)
+++ trunk/LWJGL/src/java/org/lwjgl/util/jinput/KeyMap.java 2008-06-05 13:35:32 UTC (rev 3095)
@@ -276,9 +276,9 @@
return Component.Identifier.Key.INSERT;
case Keyboard.KEY_DELETE:
return Component.Identifier.Key.DELETE;
- case Keyboard.KEY_LWIN:
+ case Keyboard.KEY_LMETA:
return Component.Identifier.Key.LWIN;
- case Keyboard.KEY_RWIN:
+ case Keyboard.KEY_RMETA:
return Component.Identifier.Key.RWIN;
case Keyboard.KEY_APPS:
return Component.Identifier.Key.APPS;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-06-05 13:37:06
|
Revision: 3096
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3096&view=rev
Author: matzon
Date: 2008-06-05 06:36:57 -0700 (Thu, 05 Jun 2008)
Log Message:
-----------
cleanup of imports
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasListener.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/DisplayParentTest.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java
Modified: trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java 2008-06-05 13:35:32 UTC (rev 3095)
+++ trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java 2008-06-05 13:36:57 UTC (rev 3096)
@@ -31,9 +31,6 @@
*/
package org.lwjgl;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
import java.awt.Toolkit;
import com.apple.eio.FileManager;
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java 2008-06-05 13:35:32 UTC (rev 3095)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java 2008-06-05 13:36:57 UTC (rev 3096)
@@ -38,16 +38,15 @@
import java.awt.Component;
import java.awt.Cursor;
import java.awt.Dimension;
-import java.awt.GraphicsDevice;
import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
import java.awt.IllegalComponentStateException;
-import java.awt.Point;
import java.awt.MouseInfo;
+import java.awt.Point;
import java.awt.PointerInfo;
import java.awt.Robot;
import java.awt.Toolkit;
import java.awt.image.BufferedImage;
-import java.lang.reflect.Method;
import java.nio.IntBuffer;
import java.security.AccessController;
import java.security.PrivilegedActionException;
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasListener.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasListener.java 2008-06-05 13:35:32 UTC (rev 3095)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasListener.java 2008-06-05 13:36:57 UTC (rev 3096)
@@ -37,9 +37,6 @@
*/
import java.awt.Canvas;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Point;
import java.awt.event.ComponentEvent;
import java.awt.event.ComponentListener;
import java.awt.event.HierarchyEvent;
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2008-06-05 13:35:32 UTC (rev 3095)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2008-06-05 13:36:57 UTC (rev 3096)
@@ -38,12 +38,9 @@
* @author elias_naur
*/
-import java.awt.Cursor;
import java.awt.Canvas;
+import java.awt.Cursor;
import java.awt.Robot;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
@@ -57,7 +54,9 @@
import org.lwjgl.LWJGLException;
import org.lwjgl.LWJGLUtil;
-import com.apple.eawt.*;
+import com.apple.eawt.Application;
+import com.apple.eawt.ApplicationAdapter;
+import com.apple.eawt.ApplicationEvent;
final class MacOSXDisplay implements DisplayImplementation {
private static final int PBUFFER_HANDLE_SIZE = 24;
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java 2008-06-05 13:35:32 UTC (rev 3095)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java 2008-06-05 13:36:57 UTC (rev 3096)
@@ -37,13 +37,7 @@
*/
import java.awt.Canvas;
-import java.awt.Dimension;
import java.awt.Graphics;
-import java.awt.Point;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
-import java.awt.event.HierarchyEvent;
-import java.awt.event.HierarchyListener;
final class MacOSXGLCanvas extends Canvas {
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/DisplayParentTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/DisplayParentTest.java 2008-06-05 13:35:32 UTC (rev 3095)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/DisplayParentTest.java 2008-06-05 13:36:57 UTC (rev 3096)
@@ -31,23 +31,16 @@
*/
package org.lwjgl.test.opengl.awt;
+import java.awt.Canvas;
import java.awt.Frame;
-import java.awt.Graphics;
import java.awt.GridLayout;
-import java.awt.Container;
-import java.awt.Component;
-import java.awt.Canvas;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
import org.lwjgl.LWJGLException;
-import org.lwjgl.opengl.AWTGLCanvas;
-import org.lwjgl.opengl.GL11;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
-import org.lwjgl.util.glu.GLU;
import org.lwjgl.opengl.Display;
-import org.lwjgl.opengl.DisplayMode;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.util.glu.GLU;
/**
* <p>
Modified: trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java 2008-06-05 13:35:32 UTC (rev 3095)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java 2008-06-05 13:36:57 UTC (rev 3096)
@@ -32,11 +32,9 @@
package org.lwjgl.util.glu;
import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
-import org.lwjgl.opengl.ARBImaging;
-import org.lwjgl.opengl.EXTFramebufferObject;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.Util;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-07-02 20:01:03
|
Revision: 3108
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3108&view=rev
Author: matzon
Date: 2008-07-02 13:00:49 -0700 (Wed, 02 Jul 2008)
Log Message:
-----------
added opengl init code, previously assumed from Diplay
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/examples/Game.java
trunk/LWJGL/src/java/org/lwjgl/test/input/MouseCreationTest.java
Modified: trunk/LWJGL/src/java/org/lwjgl/examples/Game.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/examples/Game.java 2008-06-28 07:29:33 UTC (rev 3107)
+++ trunk/LWJGL/src/java/org/lwjgl/examples/Game.java 2008-07-02 20:00:49 UTC (rev 3108)
@@ -101,6 +101,16 @@
AL.create();
// TODO: Load in your textures etc here
+
+ // Put the window into orthographic projection mode with 1:1 pixel ratio.
+ // We haven't used GLU here to do this to avoid an unnecessary dependency.
+ GL11.glMatrixMode(GL11.GL_PROJECTION);
+ GL11.glLoadIdentity();
+ GL11.glOrtho(0.0, Display.getDisplayMode().getWidth(), 0.0, Display.getDisplayMode().getHeight(), -1.0, 1.0);
+ GL11.glMatrixMode(GL11.GL_MODELVIEW);
+ GL11.glLoadIdentity();
+ GL11.glViewport(0, 0, Display.getDisplayMode().getWidth(), Display.getDisplayMode().getHeight());
+
}
/**
Modified: trunk/LWJGL/src/java/org/lwjgl/test/input/MouseCreationTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/input/MouseCreationTest.java 2008-06-28 07:29:33 UTC (rev 3107)
+++ trunk/LWJGL/src/java/org/lwjgl/test/input/MouseCreationTest.java 2008-07-02 20:00:49 UTC (rev 3108)
@@ -92,6 +92,14 @@
private void initializeOpenGL() {
GL11.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+ // Put the window into orthographic projection mode with 1:1 pixel ratio.
+ // We haven't used GLU here to do this to avoid an unnecessary dependency.
+ GL11.glMatrixMode(GL11.GL_PROJECTION);
+ GL11.glLoadIdentity();
+ GL11.glOrtho(0.0, Display.getDisplayMode().getWidth(), 0.0, Display.getDisplayMode().getHeight(), -1.0, 1.0);
+ GL11.glMatrixMode(GL11.GL_MODELVIEW);
+ GL11.glLoadIdentity();
+ GL11.glViewport(0, 0, Display.getDisplayMode().getWidth(), Display.getDisplayMode().getHeight());
}
public void executeTest() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X