Menu
▾
▴
java-game-lib-cvs — Commits to the repository will be send to this list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(134) |
Sep
(52) |
Oct
(13) |
Nov
(342) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(44) |
Feb
(62) |
Mar
(158) |
Apr
(38) |
May
(70) |
Jun
(58) |
Jul
(104) |
Aug
(207) |
Sep
(83) |
Oct
(122) |
Nov
(23) |
Dec
(49) |
| 2004 |
Jan
(119) |
Feb
(132) |
Mar
(192) |
Apr
(140) |
May
(77) |
Jun
(74) |
Jul
(201) |
Aug
(63) |
Sep
(102) |
Oct
(70) |
Nov
(173) |
Dec
(78) |
| 2005 |
Jan
(174) |
Feb
(197) |
Mar
(105) |
Apr
(59) |
May
(77) |
Jun
(43) |
Jul
(21) |
Aug
(18) |
Sep
(47) |
Oct
(37) |
Nov
(74) |
Dec
(50) |
| 2006 |
Jan
(44) |
Feb
(19) |
Mar
(32) |
Apr
(24) |
May
(31) |
Jun
(55) |
Jul
(138) |
Aug
(28) |
Sep
(12) |
Oct
(41) |
Nov
(58) |
Dec
(24) |
| 2007 |
Jan
(28) |
Feb
(14) |
Mar
(10) |
Apr
(68) |
May
(30) |
Jun
(26) |
Jul
(18) |
Aug
(63) |
Sep
(19) |
Oct
(29) |
Nov
(20) |
Dec
(10) |
| 2008 |
Jan
(38) |
Feb
(7) |
Mar
(37) |
Apr
(120) |
May
(41) |
Jun
(36) |
Jul
(39) |
Aug
(24) |
Sep
(28) |
Oct
(30) |
Nov
(36) |
Dec
(75) |
| 2009 |
Jan
(46) |
Feb
(22) |
Mar
(50) |
Apr
(70) |
May
(134) |
Jun
(105) |
Jul
(75) |
Aug
(34) |
Sep
(38) |
Oct
(34) |
Nov
(19) |
Dec
(20) |
| 2010 |
Jan
(11) |
Feb
(20) |
Mar
(65) |
Apr
(83) |
May
(104) |
Jun
(73) |
Jul
(78) |
Aug
(57) |
Sep
(43) |
Oct
(35) |
Nov
(9) |
Dec
(4) |
| 2011 |
Jan
(21) |
Feb
(11) |
Mar
(18) |
Apr
(10) |
May
(18) |
Jun
(15) |
Jul
(48) |
Aug
(25) |
Sep
(17) |
Oct
(45) |
Nov
(15) |
Dec
(12) |
| 2012 |
Jan
(21) |
Feb
(9) |
Mar
(12) |
Apr
(9) |
May
(9) |
Jun
(5) |
Jul
(1) |
Aug
(10) |
Sep
(12) |
Oct
(1) |
Nov
(28) |
Dec
(5) |
| 2013 |
Jan
(4) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2016 |
Jan
(2) |
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <eli...@us...> - 2008-01-25 10:46:22
|
Revision: 2959
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2959&view=rev
Author: elias_naur
Date: 2008-01-25 02:46:18 -0800 (Fri, 25 Jan 2008)
Log Message:
-----------
Mac OS X: Let gcc-3.3 build against 10.4 universal sdk
Modified Paths:
--------------
trunk/LWJGL/platform_build/macosx_ant/build.xml
Modified: trunk/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build.xml 2008-01-21 22:56:37 UTC (rev 2958)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml 2008-01-25 10:46:18 UTC (rev 2959)
@@ -41,9 +41,9 @@
<target name="nativelibrary" depends="init">
<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
- <property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/>
+ <property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
<property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386"/>
- <property name="legacy_flags" value="-arch ppc"/>
+ <property name="legacy_flags" value="-F${legacy_sdkroot}/System/Library/Frameworks -arch ppc"/>
<antcall target="compile">
<param name="dstdir" location="intel"/>
<param name="compiler" value="gcc-4.0"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: xauc/ait <xauc/<ai...@PC...> - 2008-01-24 18:27:16
|
http://cvogaoea.com/ The steps to being a real man start HERE. |
|
From: <ma...@us...> - 2008-01-21 22:56:39
|
Revision: 2958
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2958&view=rev
Author: matzon
Date: 2008-01-21 14:56:37 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
2.0a version string
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/src/java/org/lwjgl/Sys.java
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2008-01-21 22:47:32 UTC (rev 2957)
+++ trunk/LWJGL/build.xml 2008-01-21 22:56:37 UTC (rev 2958)
@@ -13,7 +13,7 @@
<property name="lwjgl.docs" location="doc" />
<property name="lwjgl.temp" location="temp" />
<property name="lwjgl.res" location="res" />
- <property name="lwjgl.version" value="2.0" />
+ <property name="lwjgl.version" value="2.0a" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java"/>
<!-- ================================================================== -->
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2008-01-21 22:47:32 UTC (rev 2957)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2008-01-21 22:56:37 UTC (rev 2958)
@@ -54,7 +54,7 @@
private static final String JNI_LIBRARY_NAME = "lwjgl";
/** Current version of library */
- private static final String VERSION = "2.0";
+ private static final String VERSION = "2.0a";
/** Current version of the JNI library */
static final int JNI_VERSION = 12;
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:47:39
|
Revision: 2957
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2957&view=rev
Author: matzon
Date: 2008-01-21 14:47:32 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
removed required devil and fmod jars
Modified Paths:
--------------
trunk/LWJGL/applet/appletloader.html
Modified: trunk/LWJGL/applet/appletloader.html
===================================================================
--- trunk/LWJGL/applet/appletloader.html 2008-01-21 22:20:25 UTC (rev 2956)
+++ trunk/LWJGL/applet/appletloader.html 2008-01-21 22:47:32 UTC (rev 2957)
@@ -17,7 +17,7 @@
<param name="al_progressbar" value="appletprogress.gif">
<!-- List of Jars to add to classpath -->
-<param name="al_jars" value="lwjgl_applet.jar, lwjgl.jar, jinput.jar, lwjgl_devil.jar, lwjgl_fmod3.jar, lwjgl_util.jar, res.jar">
+<param name="al_jars" value="lwjgl_applet.jar, lwjgl.jar, jinput.jar, lwjgl_util.jar, res.jar">
<!-- signed windows natives jar in a jar -->
<param name="al_windows" value="windows_natives.jar">
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: <ma...@us...> - 2008-01-21 22:19:29
|
Revision: 2955
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2955&view=rev
Author: matzon
Date: 2008-01-21 14:19:25 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
removed /Wp64 command line argument - deprecated as of VS express 2008
Modified Paths:
--------------
trunk/LWJGL/platform_build/windows_ant/build.xml
Modified: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml 2008-01-21 22:15:12 UTC (rev 2954)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml 2008-01-21 22:19:25 UTC (rev 2955)
@@ -11,7 +11,7 @@
<target name="compile_dir">
<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
- <arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c"/>
+ <arg line="/Ox /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c"/>
<arg value="/I${sdkhome}\include"/>
<arg value="/I${dxhome}\include"/>
<arg value="/I${alhome}\include"/>
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:15:13
|
Revision: 2954
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2954&view=rev
Author: elias_naur
Date: 2008-01-21 14:15:12 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
javdoc fixes
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
trunk/LWJGL/src/templates/org/lwjgl/openal/AL11.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java 2008-01-21 22:11:01 UTC (rev 2953)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java 2008-01-21 22:15:12 UTC (rev 2954)
@@ -192,14 +192,14 @@
/**
* The left windows key, mapped to KEY_LMETA
*
- * @Deprecated Use KEY_LMETA instead
+ * @deprecated Use KEY_LMETA instead
*/
public static final int KEY_LWIN = KEY_LMETA; /* Left Windows key */
public static final int KEY_RMETA = 0xDC; /* Right Windows/Option key */
/**
* The right windows key, mapped to KEY_RMETA
*
- * @Deprecated Use KEY_RMETA instead
+ * @deprecated Use KEY_RMETA instead
*/
public static final int KEY_RWIN = KEY_RMETA; /* Right Windows key */
public static final int KEY_APPS = 0xDD; /* AppMenu key */
@@ -563,7 +563,7 @@
}
/**
- * @see org.lwjgl.input.Keyboard#enableRepeatEvents()
+ * @see org.lwjgl.input.Keyboard#enableRepeatEvents(boolean)
* @return true if the current event is a repeat event, false if
* the current event is not a repeat even or if repeat events are disabled.
*/
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2008-01-21 22:11:01 UTC (rev 2953)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2008-01-21 22:15:12 UTC (rev 2954)
@@ -186,9 +186,9 @@
* Set the position of the cursor. If the cursor is not grabbed,
* the native cursor is moved to the new position.
*
- * @param x The x coordinate of the new cursor position in OpenGL coordinates relative
+ * @param new_x The x coordinate of the new cursor position in OpenGL coordinates relative
* to the window origin.
- * @param y The y coordinate of the new cursor position in OpenGL coordinates relative
+ * @param new_y The y coordinate of the new cursor position in OpenGL coordinates relative
* to the window origin.
*/
public static void setCursorPosition(int new_x, int new_y) {
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java 2008-01-21 22:11:01 UTC (rev 2953)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java 2008-01-21 22:15:12 UTC (rev 2954)
@@ -899,7 +899,7 @@
*
* A video frame period is the time required to display a full frame of video data.
*
- * @param sync true to synchronize; false to ignore synchronization
+ * @param value The swap interval in frames, 0 to disable
*/
public static void setSwapInterval(int value) {
synchronized (GlobalLock.lock) {
@@ -926,9 +926,9 @@
* The window is clamped to remain entirely on the screen. If you attempt
* to position the window such that it would extend off the screen, the window
* is simply placed as close to the edge as possible.
- * <br><b>note</b>If no location has been specified (or x == y == -1) the window will be centered
- * @param x The new window location on the x axis
- * @param y The new window location on the y axis
+ * <br><b>note</b>If no location has been specified (or x == y == -1) the window will be centered
+ * @param new_x The new window location on the x axis
+ * @param new_y The new window location on the y axis
*/
public static void setLocation(int new_x, int new_y) {
synchronized (GlobalLock.lock) {
Modified: trunk/LWJGL/src/templates/org/lwjgl/openal/AL11.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/openal/AL11.java 2008-01-21 22:11:01 UTC (rev 2953)
+++ trunk/LWJGL/src/templates/org/lwjgl/openal/AL11.java 2008-01-21 22:15:12 UTC (rev 2954)
@@ -68,7 +68,7 @@
/** Type of source: when it has the NULL buffer attached */
public static final int AL_UNDETERMINED = 0x1030;
- /** @see AL10.AL_INVALID_OPERATION */
+ /** @see AL10#AL_INVALID_OPERATION */
public static final int AL_ILLEGAL_COMMAND = 0xA004;
/** Speed of Sound in units per second */
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java 2008-01-21 22:11:01 UTC (rev 2953)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java 2008-01-21 22:15:12 UTC (rev 2954)
@@ -223,7 +223,6 @@
* @param program
* @param name
*
- * @return
*/
int glGetUniformLocation(@GLuint int program, @NullTerminated @Check("1") @Const @GLchar ByteBuffer name);
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:11:09
|
Revision: 2953
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2953&view=rev
Author: matzon
Date: 2008-01-21 14:11:01 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
fixed ? -> ?\195?\184, utf8 issue ?
Modified Paths:
--------------
trunk/LWJGL/doc/CREDITS
Modified: trunk/LWJGL/doc/CREDITS
===================================================================
--- trunk/LWJGL/doc/CREDITS 2008-01-21 22:09:38 UTC (rev 2952)
+++ trunk/LWJGL/doc/CREDITS 2008-01-21 22:11:01 UTC (rev 2953)
@@ -6,7 +6,7 @@
- Ioannis Tsakpinis <sp...@us...>
contributors:
- - Niels J?rgensen <nj...@ni...>
+ - Niels J\xF8rgensen <nj...@ni...>
- Tristan Campbell <tr...@ha...>
- Gregory Pierce <gre...@ya...>
- Luke Holden <lh...@us...>
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:09:41
|
Revision: 2952
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2952&view=rev
Author: matzon
Date: 2008-01-21 14:09:38 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
removing applet test (relied on LWJGLInstaller)
Removed Paths:
-------------
trunk/LWJGL/applet/applet.html
Deleted: trunk/LWJGL/applet/applet.html
===================================================================
--- trunk/LWJGL/applet/applet.html 2008-01-21 22:07:48 UTC (rev 2951)
+++ trunk/LWJGL/applet/applet.html 2008-01-21 22:09:38 UTC (rev 2952)
@@ -1,7 +0,0 @@
-<html>
-<body>
- <applet code="org.lwjgl.test.applet.AppletTest" archive="lwjgl_applet.jar,lwjgl_util_applet.jar,lwjgl.jar,res.jar,lwjgl_util.jar,lwjgl_fmod3.jar,lwjgl_devil.jar,natives.jar,jinput.jar" width="640" height="480">
- <param name="test" value="org.lwjgl.test.applet.OpenGL">
- </applet>
-</body>
-</html>
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: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: <eli...@us...> - 2008-01-21 21:59:33
|
Revision: 2949
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2949&view=rev
Author: elias_naur
Date: 2008-01-21 13:59:32 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
Added jinput.jar to javadoc classpath
Modified Paths:
--------------
trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2008-01-21 21:55:44 UTC (rev 2948)
+++ trunk/LWJGL/build.xml 2008-01-21 21:59:32 UTC (rev 2949)
@@ -500,7 +500,7 @@
<!-- Creates the Javadoc -->
<target name="javadoc" description="Creates javadoc from java source code">
- <javadoc destdir="${lwjgl.docs}/javadoc" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API">
+ <javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API">
<fileset refid="lwjgl.javadoc.fileset" />
<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
<bottom><![CDATA[<i>Copyright © 2002-2008 lwjgl.org. All Rights Reserved.</i>]]></bottom>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-01-21 21:56:03
|
Revision: 2948
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2948&view=rev
Author: matzon
Date: 2008-01-21 13:55:44 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
2.0 version string
fixed date to 2008
Modified Paths:
--------------
trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2008-01-21 21:55:20 UTC (rev 2947)
+++ trunk/LWJGL/build.xml 2008-01-21 21:55:44 UTC (rev 2948)
@@ -13,7 +13,7 @@
<property name="lwjgl.docs" location="doc" />
<property name="lwjgl.temp" location="temp" />
<property name="lwjgl.res" location="res" />
- <property name="lwjgl.version" value="1.1.4" />
+ <property name="lwjgl.version" value="2.0" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java"/>
<!-- ================================================================== -->
@@ -503,7 +503,7 @@
<javadoc destdir="${lwjgl.docs}/javadoc" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API">
<fileset refid="lwjgl.javadoc.fileset" />
<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
- <bottom><![CDATA[<i>Copyright © 2002-2006 lwjgl.org. All Rights Reserved.</i>]]></bottom>
+ <bottom><![CDATA[<i>Copyright © 2002-2008 lwjgl.org. All Rights Reserved.</i>]]></bottom>
</javadoc>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-01-21 21:55:23
|
Revision: 2947
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2947&view=rev
Author: matzon
Date: 2008-01-21 13:55:20 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
2.0 version string
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/Sys.java
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2008-01-21 21:55:17 UTC (rev 2946)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2008-01-21 21:55:20 UTC (rev 2947)
@@ -54,7 +54,7 @@
private static final String JNI_LIBRARY_NAME = "lwjgl";
/** Current version of library */
- private static final String VERSION = "1.1.4";
+ private static final String VERSION = "2.0";
/** Current version of the JNI library */
static final int JNI_VERSION = 12;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-01-21 21:55:20
|
Revision: 2946
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2946&view=rev
Author: elias_naur
Date: 2008-01-21 13:55:17 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
Updated my contact info in CREDITS
Modified Paths:
--------------
trunk/LWJGL/doc/CREDITS
Modified: trunk/LWJGL/doc/CREDITS
===================================================================
--- trunk/LWJGL/doc/CREDITS 2008-01-21 21:48:02 UTC (rev 2945)
+++ trunk/LWJGL/doc/CREDITS 2008-01-21 21:55:17 UTC (rev 2946)
@@ -2,11 +2,11 @@
active developers:
- Caspian Rychlik-Prince <cp...@sh...>
- Brian Matzon <br...@ma...>
- - Elias Naur <na...@od...>
+ - Elias Naur <eli...@gm...>
- Ioannis Tsakpinis <sp...@us...>
contributors:
- - Niels J\xF8rgensen <nj...@ni...>
+ - Niels J?rgensen <nj...@ni...>
- Tristan Campbell <tr...@ha...>
- Gregory Pierce <gre...@ya...>
- Luke Holden <lh...@us...>
@@ -28,4 +28,4 @@
Please see the /doc/3rdparty/ directory for licenses.
-All trademarks and registered trademarks are the property of their respective owners.
\ No newline at end of file
+All trademarks and registered trademarks are the property of their respective owners.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-01-21 21:48:06
|
Revision: 2945
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2945&view=rev
Author: elias_naur
Date: 2008-01-21 13:48:02 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
Removed mention of devil and fmod from www/*php
Modified Paths:
--------------
trunk/LWJGL/www/demos.php
trunk/LWJGL/www/installation.php
Modified: trunk/LWJGL/www/demos.php
===================================================================
--- trunk/LWJGL/www/demos.php 2008-01-21 21:47:17 UTC (rev 2944)
+++ trunk/LWJGL/www/demos.php 2008-01-21 21:48:02 UTC (rev 2945)
@@ -47,14 +47,6 @@
</pre>
<p>
- <b>FMOD</b>
-</p>
-<pre>
- NetTest [<a href="jnlp/lwjgl-demo.php/test.fmod3.NetTest">launch</a> | <a href="jnlp/source.php?path=test/fmod3/NetTest.java" target="_blank">source</a>]
- StreamPlayerMemory [<a href="jnlp/lwjgl-demo.php/test.fmod3.StreamPlayerMemory">launch</a> | <a href="jnlp/source.php?path=test/fmod3/StreamPlayerMemory.java" target="_blank">source</a>]
-</pre>
-
-<p>
<b>org.lwjgl</b>
</p>
<pre>
@@ -63,4 +55,4 @@
WindowCreationTest [<a href="jnlp/lwjgl-demo.php/test.WindowCreationTest">launch</a> | <a href="jnlp/source.php?path=test/WindowCreationTest.java" target="_blank">source</a>]
</pre>
-<? require('_include/footer.php'); ?>
\ No newline at end of file
+<? require('_include/footer.php'); ?>
Modified: trunk/LWJGL/www/installation.php
===================================================================
--- trunk/LWJGL/www/installation.php 2008-01-21 21:47:17 UTC (rev 2944)
+++ trunk/LWJGL/www/installation.php 2008-01-21 21:48:02 UTC (rev 2945)
@@ -20,7 +20,7 @@
</li>
<li>
Test LWJGL by opening a command prompt, and navigating to the folder where the archive was extracted. Once navigated, issue the following command:<br/><br/>
- <pre>java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar;jar\lwjgl_fmod3.jar;jar\lwjgl_devil.jar;jar\jinput.jar;
+ <pre>java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar;jar\jinput.jar;
-Djava.library.path=native\win32 org.lwjgl.test.WindowCreationTest</pre>
A window should appear and you should see the following output:<br/><br/>
<pre>Found <number> display modes
@@ -47,10 +47,10 @@
</li>
<li>
Test LWJGL by opening a command prompt, and navigating to the folder where the archive was extracted. Once navigated, issue the following command:<br/><br/>
- <pre>java -cp .:res:jar/lwjgl.jar:jar/lwjgl_test.jar:jar/lwjgl_util.jar:jar/lwjgl_fmod3.jar:jar/lwjgl_devil.jar:jar/jinput.jar:
+ <pre>java -cp .:res:jar/lwjgl.jar:jar/lwjgl_test.jar:jar/lwjgl_util.jar:jar/jinput.jar:
-Djava.library.path=native/linux org.lwjgl.test.WindowCreationTest</pre>
Should library loading fail, try using -Djava.library.path to specify the path. For example:<br/><br/>
- <pre>java -cp .:res:jar/lwjgl.jar:jar/lwjgl_test.jar:jar/lwjgl_util.jar:jar/lwjgl_fmod3.jar:jar/lwjgl_devil.jar:jar/jinput.jar:
+ <pre>java -cp .:res:jar/lwjgl.jar:jar/lwjgl_test.jar:jar/lwjgl_util.jar:jar/jinput.jar:
-Djava.library.path=/home/lwjgluser/lwjgl/ org.lwjgl.test.WindowCreationTest</pre>
A window should appear and you should see the following output:<br/><br/>
<pre>Found <number> display modes
@@ -77,7 +77,7 @@
</li>
<li>
Test LWJGL by opening a command prompt, and navigating to the folder where the archive was extracted. Once navigated, issue the following command:<br/><br/>
- <pre>java -cp .:res:jar/lwjgl.jar:jar/lwjgl_test.jar:jar/lwjgl_util.jar:jar/lwjgl_fmod3.jar:jar/lwjgl_devil.jar:jar/jinput.jar:
+ <pre>java -cp .:res:jar/lwjgl.jar:jar/lwjgl_test.jar:jar/lwjgl_util.jar:jar/jinput.jar:
-Djava.library.path=native/macosx org.lwjgl.test.WindowCreationTest</pre>
A window should appear and you should see the following output:<br/><br/>
<pre>Found <number> display modes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-01-21 21:47:22
|
Revision: 2944
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2944&view=rev
Author: matzon
Date: 2008-01-21 13:47:17 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
adding kappaone
removed fmod and devil
Modified Paths:
--------------
trunk/LWJGL/doc/CREDITS
Modified: trunk/LWJGL/doc/CREDITS
===================================================================
--- trunk/LWJGL/doc/CREDITS 2008-01-21 21:45:38 UTC (rev 2943)
+++ trunk/LWJGL/doc/CREDITS 2008-01-21 21:47:17 UTC (rev 2944)
@@ -15,6 +15,7 @@
- Jos Hirth <jh...@ka...>
- Kevin Glass <ke...@co...>
- Atsuya Takagi
+ - kappaOne
additional credits goes to:
- Joseph I. Valenzuela [OpenAL stuff]
@@ -23,8 +24,6 @@
The LWJGL project includes files from or depends on the following projects:
- OpenGL, SGI - http://opengl.org/
- OpenAL, Creative Labs - http://openal.org/
- - FMOD, Firelight Technologies - http://fmod.org
- - DevIL, <no company> - http://openil.sourceforge.net/
- jinput, Sun - https://jinput.dev.java.net/
Please see the /doc/3rdparty/ directory for licenses.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-01-21 21:45:41
|
Revision: 2943
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2943&view=rev
Author: elias_naur
Date: 2008-01-21 13:45:38 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
Removed mention of devil and fmod from README
Modified Paths:
--------------
trunk/LWJGL/doc/README
Modified: trunk/LWJGL/doc/README
===================================================================
--- trunk/LWJGL/doc/README 2008-01-21 21:44:19 UTC (rev 2942)
+++ trunk/LWJGL/doc/README 2008-01-21 21:45:38 UTC (rev 2943)
@@ -4,10 +4,6 @@
the license as stated in the LICENSE file. If you have not received this
file, please download it from the cvs server.
-Please note that DevIL and FMOD are distributed in the optional package (lwjgl_optional-<version>.zip). Their license is also included.
-If you want to use FMOD you must download the binary from their site: http://fmod.org. Please
-note that FMOD is a commercial offering and you must accept their license before using.
-
To run some of the included tests:
Extract the archive, and cd into directory
(please substitute ; and \ according to platform)
@@ -46,20 +42,6 @@
org.lwjgl.test.opengl.shaders.ShadersTest
-
- OPTIONAL TESTS (requires optional package)
- [requires fmod dll (fmod.org)]
- org.lwjgl.test.fmod3.CDDAPlayer
- org.lwjgl.test.fmod3.CDPlayer
- org.lwjgl.test.fmod3.DSPTest
- org.lwjgl.test.fmod3.MusicPlayer
- org.lwjgl.test.fmod3.NetTest
- org.lwjgl.test.fmod3.StreamPlayer
- org.lwjgl.test.fmod3.StreamTest
- org.lwjgl.test.fmod3.SyncTest
-
- org.lwjgl.test.devil.BasicTest
-
You may also run the Space invaders demo by executing:
java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar; -Djava.library.path=native\<win32|linux|macosx> org.lwjgl.examples.spaceinvaders.Game
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-01-21 21:44:21
|
Revision: 2942
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2942&view=rev
Author: matzon
Date: 2008-01-21 13:44:19 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
removing optional support binaries
Removed Paths:
-------------
trunk/LWJGL/libs/linux/libIL.so
trunk/LWJGL/libs/linux/libILU.so
trunk/LWJGL/libs/linux/libILUT.so
trunk/LWJGL/libs/macosx/libIL.dylib
trunk/LWJGL/libs/macosx/libILU.dylib
trunk/LWJGL/libs/macosx/libILUT.dylib
trunk/LWJGL/libs/win32/DevIL.dll
trunk/LWJGL/libs/win32/ILU.dll
trunk/LWJGL/libs/win32/ILUT.dll
Deleted: trunk/LWJGL/libs/linux/libIL.so
===================================================================
(Binary files differ)
Deleted: trunk/LWJGL/libs/linux/libILU.so
===================================================================
(Binary files differ)
Deleted: trunk/LWJGL/libs/linux/libILUT.so
===================================================================
(Binary files differ)
Deleted: trunk/LWJGL/libs/macosx/libIL.dylib
===================================================================
(Binary files differ)
Deleted: trunk/LWJGL/libs/macosx/libILU.dylib
===================================================================
(Binary files differ)
Deleted: trunk/LWJGL/libs/macosx/libILUT.dylib
===================================================================
(Binary files differ)
Deleted: trunk/LWJGL/libs/win32/DevIL.dll
===================================================================
(Binary files differ)
Deleted: trunk/LWJGL/libs/win32/ILU.dll
===================================================================
(Binary files differ)
Deleted: trunk/LWJGL/libs/win32/ILUT.dll
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-01-21 21:38:33
|
Revision: 2941
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2941&view=rev
Author: elias_naur
Date: 2008-01-21 13:38:29 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
Removed devil and fmod support. yay.
Modified Paths:
--------------
trunk/LWJGL/build.xml
Removed Paths:
-------------
trunk/LWJGL/doc/3rdparty/openil_license.txt
trunk/LWJGL/platform_build/linux_ant/build_devil.xml
trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml
trunk/LWJGL/platform_build/macosx_ant/build_devil.xml
trunk/LWJGL/platform_build/macosx_ant/build_fmod3.xml
trunk/LWJGL/platform_build/windows_ant/build_devil.xml
trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml
trunk/LWJGL/src/java/org/lwjgl/devil/
trunk/LWJGL/src/java/org/lwjgl/fmod3/
trunk/LWJGL/src/java/org/lwjgl/test/applet/Optional.java
trunk/LWJGL/src/java/org/lwjgl/test/devil/
trunk/LWJGL/src/java/org/lwjgl/test/fmod3/
trunk/LWJGL/src/native/common/devil/
trunk/LWJGL/src/native/common/fmod3/
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2008-01-21 21:27:03 UTC (rev 2940)
+++ trunk/LWJGL/build.xml 2008-01-21 21:38:29 UTC (rev 2941)
@@ -24,10 +24,8 @@
<fileset id="lwjgl.fileset" dir="${lwjgl.bin}">
<include name="org/**/*" />
<exclude name="org/lwjgl/d3d/**" />
- <exclude name="org/lwjgl/fmod3/**" />
<exclude name="org/lwjgl/test/**" />
<exclude name="org/lwjgl/util/**" />
- <exclude name="org/lwjgl/devil/**" />
<exclude name="org/lwjgl/examples/**" />
</fileset>
@@ -62,18 +60,6 @@
<include name="org/lwjgl/util/**" />
</fileset>
- <!-- Files to include in the lwjgl_fmod3.jar file -->
- <fileset id="lwjgl_fmod3.fileset" dir="${lwjgl.bin}">
- <exclude name="**.*" />
- <include name="org/lwjgl/fmod3/**" />
- </fileset>
-
- <!-- Files to include in the lwjgl_devil.jar file -->
- <fileset id="lwjgl_devil.fileset" dir="${lwjgl.bin}">
- <exclude name="**.*"/>
- <include name="org/lwjgl/devil/**"/>
- </fileset>
-
<!-- Files to include in the lwjgl_applet.jar file -->
<fileset id="lwjgl_applet.fileset" dir="${lwjgl.bin}">
<exclude name="**.*"/>
@@ -108,15 +94,6 @@
<include name="jinput-raw.dll" />
</patternset>
- <!-- Files to include in win32 optional package -->
- <patternset id="lwjgl-win32_optional.fileset">
- <include name="lwjgl-fmod3.dll" />
- <include name="lwjgl-devil.dll" />
- <include name="DevIL.dll" />
- <include name="ILU.dll" />
- <include name="ILUT.dll" />
- </patternset>
-
<!-- Files to include in linux, glibc2.3 package -->
<patternset id="lwjgl-linux.fileset">
<include name="liblwjgl*.so" />
@@ -124,15 +101,6 @@
<include name="libjinput-linux.so" />
</patternset>
- <!-- Files to include in linux optional, glibc2.3 package -->
- <patternset id="lwjgl-linux_optional.fileset">
- <include name="liblwjgl-fmod3.so" />
- <include name="liblwjgl-devil.so" />
- <include name="libIL.so" />
- <include name="libILU.so" />
- <include name="libILUT.so" />
- </patternset>
-
<!-- Files to include in mac os x package -->
<patternset id="lwjgl-macosx.fileset">
<include name="liblwjgl.jnilib" />
@@ -141,15 +109,6 @@
<include name="libjinput-osx-legacy.jnilib" />
</patternset>
- <!-- Files to include in mac os x optional package -->
- <patternset id="lwjgl-macosx_optional.fileset">
- <include name="liblwjgl-fmod3.jnilib" />
- <include name="liblwjgl-devil.jnilib" />
- <include name="libIL.dylib" />
- <include name="libILU.dylib" />
- <include name="libILUT.dylib" />
- </patternset>
-
<!-- Files to include in source distribution -->
<fileset id="lwjgl.source.fileset" dir=".">
<include name="build.xml" />
@@ -160,40 +119,18 @@
<!-- files in the base package -->
<patternset id="lwjgl_base">
<include name="**" />
- <exclude name="jar/lwjgl_fmod3.jar" />
- <exclude name="jar/lwjgl_devil.jar" />
- <exclude name="native/win32/lwjgl-*.dll" />
- <exclude name="native/win32/DevIL.dll" />
- <exclude name="native/win32/ILU.dll" />
- <exclude name="native/win32/ILUT.dll" />
- <exclude name="native/linux/libIL*.so" />
- <exclude name="native/linux/liblwjgl-*.so" />
- <exclude name="native/macosx/libIL*.dylib" />
- <exclude name="native/macosx/liblwjgl-*.jnilib" />
<exclude name="res/ILtest.*" />
<exclude name="res/Missing_you.mod" />
<exclude name="res/phero*.*" />
- <exclude name="doc/3rdparty/openil_license.txt" />
</patternset>
<!-- files in the optional package -->
<patternset id="lwjgl_optional">
- <include name="jar/lwjgl_fmod3.jar" />
- <include name="jar/lwjgl_devil.jar" />
- <include name="native/win32/lwjgl-*.dll" />
- <include name="native/win32/DevIL.dll" />
- <include name="native/win32/ILU.dll" />
- <include name="native/win32/ILUT.dll" />
- <include name="native/linux/libIL*.so" />
- <include name="native/linux/liblwjgl-*.so" />
- <include name="native/macosx/libIL*.dylib" />
- <include name="native/macosx/liblwjgl-*.jnilib" />
<include name="res/**" />
<exclude name="res/logo/**" />
<exclude name="res/spaceinvaders/**" />
<exclude name="res/*.wav" />
<exclude name="res/*.xpm" />
- <include name="doc/3rdparty/openil_license.txt" />
<include name="doc/CREDITS" />
<include name="doc/LICENSE" />
<include name="doc/README" />
@@ -211,16 +148,6 @@
<srcfiles dir= "${lwjgl.src.native}/windows" includes="*.c"/>
</uptodate>
- <uptodate property="lwjgl.fmod.built" targetfile="${lwjgl.lib}/win32/lwjgl-fmod3.dll" >
- <srcfiles dir= "${lwjgl.src.native}/common" includes="*.c"/>
- <srcfiles dir= "${lwjgl.src.native}/common/fmod3" includes="*.c"/>
- </uptodate>
-
- <uptodate property="lwjgl.devil.built" targetfile="${lwjgl.lib}/win32/lwjgl-devil.dll" >
- <srcfiles dir= "${lwjgl.src.native}/common" includes="*.c"/>
- <srcfiles dir= "${lwjgl.src.native}/common/devil" includes="*.c"/>
- </uptodate>
-
<!-- ================================================================== -->
<!-- Everything below this line is targets. -->
<!-- Do not modify, unless you know what you're doing -->
@@ -232,8 +159,6 @@
<target name="-initialize">
<mkdir dir="${lwjgl.bin}" taskname="initialiazing bin folder" />
<mkdir dir="${lwjgl.bin}/lwjgl" taskname="initialiazing bin folder" />
- <mkdir dir="${lwjgl.bin}/devil" taskname="initialiazing bin folder" />
- <mkdir dir="${lwjgl.bin}/fmod3" taskname="initialiazing bin folder" />
<mkdir dir="${lwjgl.lib}" taskname="initialiazing lib folder" />
<mkdir dir="${lwjgl.dist}" taskname="initialiazing dist folder" />
<mkdir dir="${lwjgl.docs}/javadoc" taskname="initialiazing docs folder" />
@@ -310,6 +235,7 @@
<!-- Create ONLY the jar archives -->
<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, generate-all, compile, -createjars">
+ <!-- <target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">-->
<!--<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">-->
<move todir="libs/">
<fileset dir="${lwjgl.temp}/jar">
@@ -346,22 +272,6 @@
<jar destfile="${lwjgl.temp}/jar/lwjgl_util.jar" taskname="lwjgl_util.jar">
<fileset refid="lwjgl_util.fileset" />
</jar>
-
- <!-- Create lwjgl_fmod.jar -->
- <jar destfile="${lwjgl.temp}/jar/lwjgl_fmod3.jar" taskname="lwjgl_fmod3.jar">
- <fileset refid="lwjgl_fmod3.fileset" />
- <manifest>
- <attribute name="Sealed" value="true"/>
- </manifest>
- </jar>
-
- <!-- Create lwjgl_devil.jar -->
- <jar destfile="${lwjgl.temp}/jar/lwjgl_devil.jar" taskname="lwjgl_devil.jar">
- <fileset refid="lwjgl_devil.fileset" />
- <manifest>
- <attribute name="Sealed" value="false"/>
- </manifest>
- </jar>
</target>
<target name="applettest" depends="applet">
@@ -420,8 +330,6 @@
<jar destfile="applet/windows_natives.jar" taskname="windows_natives.jar">
<fileset dir="${lwjgl.lib}/win32">
<patternset refid="lwjgl-win32.fileset"/>
- <patternset refid="lwjgl-win32_optional.fileset"/>
- <include name="fmod.dll"/>
</fileset>
</jar>
<signjar jar="applet/windows_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
@@ -429,8 +337,6 @@
<jar destfile="applet/linux_natives.jar" taskname="linux_natives.jar">
<fileset dir="${lwjgl.lib}/linux">
<patternset refid="lwjgl-linux.fileset"/>
- <patternset refid="lwjgl-linux_optional.fileset"/>
- <include name="libfmod.so"/>
</fileset>
</jar>
<signjar jar="applet/linux_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
@@ -438,8 +344,6 @@
<jar destfile="applet/macosx_natives.jar" taskname="macosx_natives.jar">
<fileset dir="${lwjgl.lib}/macosx">
<patternset refid="lwjgl-macosx.fileset"/>
- <patternset refid="lwjgl-macosx_optional.fileset"/>
- <include name="libfmod.dylib"/>
</fileset>
</jar>
<signjar jar="applet/macosx_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
@@ -460,8 +364,6 @@
<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/>
<copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet"/>
<copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet"/>
- <copy file="${lwjgl.lib}/lwjgl_fmod3.jar" todir="applet"/>
- <copy file="${lwjgl.lib}/lwjgl_devil.jar" todir="applet"/>
<copy file="${lwjgl.lib}/jinput.jar" todir="applet"/>
<zip destfile="applet/res.jar">
<zipfileset dir="${lwjgl.res}" includes="Footsteps.wav, ILtest.tga, Missing_you.mod"/>
@@ -469,8 +371,6 @@
<signjar jar="applet/lwjgl.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<signjar jar="applet/jinput.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<signjar jar="applet/lwjgl_util_applet.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
- <signjar jar="applet/lwjgl_fmod3.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
- <signjar jar="applet/lwjgl_devil.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
</target>
<!-- Distributes files -->
@@ -483,19 +383,16 @@
<copy todir="${lwjgl.temp}/native/win32">
<fileset dir="${lwjgl.lib}/win32">
<patternset refid="lwjgl-win32.fileset" />
- <patternset refid="lwjgl-win32_optional.fileset" />
</fileset>
</copy>
<copy todir="${lwjgl.temp}/native/linux">
<fileset dir="${lwjgl.lib}/linux">
<patternset refid="lwjgl-linux.fileset" />
- <patternset refid="lwjgl-linux_optional.fileset" />
</fileset>
</copy>
<copy todir="${lwjgl.temp}/native/macosx">
<fileset dir="${lwjgl.lib}/macosx">
<patternset refid="lwjgl-macosx.fileset" />
- <patternset refid="lwjgl-macosx_optional.fileset" />
</fileset>
</copy>
@@ -506,13 +403,6 @@
</zipfileset>
</zip>
- <!-- create optional package -->
- <zip destfile="${lwjgl.dist}/lwjgl_optional-${lwjgl.version}.zip">
- <zipfileset dir="${lwjgl.temp}" prefix="lwjgl_optional-${lwjgl.version}/">
- <patternset refid="lwjgl_optional"/>
- </zipfileset>
- </zip>
-
<!-- create applet package -->
<zip destfile="${lwjgl.dist}/lwjgl_applet-${lwjgl.version}.zip">
<zipfileset dir="." prefix="lwjgl_applet-${lwjgl.version}/">
@@ -547,8 +437,6 @@
</javac>
<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" source="1.4" target="1.4" taskname="test" />
<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" source="1.4" target="1.4" taskname="examples" />
- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/fmod3/**" source="1.4" target="1.4" taskname="fmod" />
- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/devil/**" source="1.4" target="1.4" taskname="devil"/>
</target>
<!-- Generates the native headers from source files -->
@@ -608,18 +496,6 @@
<class name="org.lwjgl.opengl.GLContext" />
<class name="org.lwjgl.opengl.Pbuffer" />
</javah>
-
- <!-- fmod -->
- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/fmod3" force="yes">
- <class name="org.lwjgl.fmod3.FMOD" />
- <class name="org.lwjgl.fmod3.FMusic" />
- <class name="org.lwjgl.fmod3.FSound" />
- </javah>
-
- <!-- DevIL -->
- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/devil" force="yes">
- <class name="org.lwjgl.devil.ILNative" />
- </javah>
</target>
<!-- Creates the Javadoc -->
@@ -670,7 +546,7 @@
<arg path="${lwjgl.src}/generated"/>
<arg value="-d"/>
<arg path="${lwjgl.src.native}/generated"/>
- <!--<arg value="-Ageneratechecks"/>-->
+ <arg value="-Ageneratechecks"/>
<arg value="-Acontextspecific"/>
<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
@@ -706,7 +582,7 @@
</apply>
</target>
- <target name="compile_native_all" depends="compile_native, compile_native_optional" description="Compiles the native files"/>
+ <target name="compile_native_all" depends="compile_native" description="Compiles the native files"/>
<!-- Compiles the native files -->
<target name="compile_native" depends="headers" description="Compiles the native files">
@@ -727,37 +603,12 @@
<antcall target="-compile_native_macosx" />
</target>
- <target name="compile_native_optional" depends="headers" description="Compiles the native files">
- <!-- check each platform, and run their build target -->
- <condition property="lwjgl.platform.windows">
- <os family="windows" />
- </condition>
- <antcall target="-compile_native_win32_optional" />
-
- <condition property="lwjgl.platform.linux">
- <os name="Linux" />
- </condition>
- <antcall target="-compile_native_linux_optional" />
- <condition property="lwjgl.platform.macosx">
- <os name="Mac OS X" />
- </condition>
- <antcall target="-compile_native_macosx_optional" />
- </target>
-
<!-- Compiles LWJGL on Win32 platforms -->
<target name="-compile_native_win32" if="lwjgl.platform.windows">
<ant antfile="platform_build/windows_ant/build.xml" inheritAll="false"/>
<copy file="${lwjgl.bin}/lwjgl/lwjgl.dll" todir="${lwjgl.lib}/win32"/>
</target>
- <target name="-compile_native_win32_optional" if="lwjgl.platform.windows">
- <ant antfile="platform_build/windows_ant/build_fmod3.xml" inheritAll="false"/>
- <copy file="${lwjgl.bin}/fmod3/lwjgl-fmod3.dll" todir="${lwjgl.lib}/win32"/>
-
- <ant antfile="platform_build/windows_ant/build_devil.xml" inheritAll="false"/>
- <copy file="${lwjgl.bin}/devil/lwjgl-devil.dll" todir="${lwjgl.lib}/win32"/>
- </target>
-
<!-- Compiles LWJGL on Linux platforms -->
<target name="-compile_native_linux" if="lwjgl.platform.linux">
<ant antfile="platform_build/linux_ant/build.xml" inheritAll="false"/>
@@ -766,32 +617,11 @@
</copy>
</target>
- <target name="-compile_native_linux_optional" if="lwjgl.platform.linux">
- <ant antfile="platform_build/linux_ant/build_fmod3.xml" inheritAll="false"/>
- <copy file="${lwjgl.bin}/fmod3/liblwjgl-fmod3.so" todir="${lwjgl.lib}/linux"/>
-
- <ant antfile="platform_build/linux_ant/build_devil.xml" inheritAll="false"/>
- <copy file="${lwjgl.bin}/devil/liblwjgl-devil.so" todir="${lwjgl.lib}/linux"/>
- </target>
-
<target name="-compile_native_macosx" if="lwjgl.platform.macosx">
<ant antfile="platform_build/macosx_ant/build.xml" inheritAll="false"/>
<copy file="${lwjgl.bin}/lwjgl/liblwjgl.jnilib" todir="${lwjgl.lib}/macosx"/>
</target>
- <!-- Compiles LWJGL on Mac OS X platforms -->
- <target name="-compile_native_macosx_optional" if="lwjgl.platform.macosx">
-
- <!-- check for required properties -->
- <property environment="env"/>
- <fail message="Missing FMOD path environment property" unless="env.FMOD"/>
- <ant antfile="platform_build/macosx_ant/build_fmod3.xml" inheritAll="false"/>
- <ant antfile="platform_build/macosx_ant/build_devil.xml" inheritAll="false"/>
- <copy file="${lwjgl.bin}/fmod3/liblwjgl-fmod3.jnilib" todir="${lwjgl.lib}/macosx"/>
- <copy file="${lwjgl.bin}/devil/liblwjgl-devil.jnilib" todir="${lwjgl.lib}/macosx"/>
- </target>
-
-
<target name="webstart_demo" depends="jars">
<antcall target="-webstart_demo">
<param name="keystore" value="applet/lwjglkeystore"/>
@@ -818,22 +648,14 @@
<!-- unzip common files -->
<unzip src="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip" dest="${lwjgl.temp}/jnlp/temp" overwrite="true"/>
- <unzip src="${lwjgl.dist}/lwjgl_optional-${lwjgl.version}.zip" dest="${lwjgl.temp}/jnlp/temp" overwrite="true"/>
<!-- move files to unified structure -->
<move todir="${lwjgl.temp}/jnlp/temp">
<fileset dir="${lwjgl.temp}/jnlp/temp/lwjgl-${lwjgl.version}/">
<include name="**"/>
</fileset>
- <fileset dir="${lwjgl.temp}/jnlp/temp/lwjgl_optional-${lwjgl.version}/">
- <include name="**"/>
- </fileset>
</move>
- <!-- copy fmod dependent files -->
- <copy file="${lwjgl.lib}/win32/fmod.dll" tofile="${lwjgl.temp}/jnlp/temp/native/win32/fmod.dll"/>
- <copy file="${lwjgl.lib}/linux/libfmod.so" tofile="${lwjgl.temp}/jnlp/temp/native/linux/libfmod.so"/>
-
<!-- move relevant files to root -->
<move todir="${lwjgl.temp}/jnlp/" flatten="true">
<fileset dir="${lwjgl.temp}/jnlp/temp">
@@ -851,8 +673,6 @@
<!-- sign 'em -->
<signjar jar="${lwjgl.temp}/jnlp/lwjgl.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
- <signjar jar="${lwjgl.temp}/jnlp/lwjgl_devil.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
- <signjar jar="${lwjgl.temp}/jnlp/lwjgl_fmod3.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<signjar jar="${lwjgl.temp}/jnlp/lwjgl_util.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<signjar jar="${lwjgl.temp}/jnlp/native_linux.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
Deleted: trunk/LWJGL/doc/3rdparty/openil_license.txt
===================================================================
--- trunk/LWJGL/doc/3rdparty/openil_license.txt 2008-01-21 21:27:03 UTC (rev 2940)
+++ trunk/LWJGL/doc/3rdparty/openil_license.txt 2008-01-21 21:38:29 UTC (rev 2941)
@@ -1,506 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
-
-
Deleted: trunk/LWJGL/platform_build/linux_ant/build_devil.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build_devil.xml 2008-01-21 21:27:03 UTC (rev 2940)
+++ trunk/LWJGL/platform_build/linux_ant/build_devil.xml 2008-01-21 21:38:29 UTC (rev 2941)
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="devil" basedir="../../bin/devil" default="compile">
- <property name="native" location="../../src/native"/>
- <property name="libname32" value="liblwjgl-devil.so"/>
- <property name="libname64" value="liblwjgl64-devil.so"/>
- <property name="libs32" value="-lpthread"/>
- <property name="libs64" value="-lpthread"/>
- <property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread"/>
-
- <target name="clean">
- <delete>
- <fileset dir="." includes="*.o"/>
- <fileset dir="." includes="*.so"/>
- </delete>
- </target>
-
- <target name="compile">
- <exec executable="uname" outputproperty="hwplatform">
- <arg value="-m"/>
- </exec>
- <condition property="libs" value="${libs64}" else="${libs32}">
- <equals arg1="${hwplatform}" arg2="x86_64"/>
- </condition>
- <condition property="libname" value="${libname64}" else="${libname32}">
- <equals arg1="${hwplatform}" arg2="x86_64"/>
- </condition>
- <property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
- <apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true">
- <arg line="${cflags}"/>
- <arg value="-I${java.home}/../include"/>
- <arg value="-I${java.home}/../include/linux"/>
- <arg value="-I${java.home}/include"/>
- <arg value="-I${java.home}/include/linux"/>
- <arg value="-I${native}/common"/>
- <arg value="-I${native}/common/devil"/>
- <mapper type="glob" from="*.c" to="*.o"/>
- <fileset dir="${native}/common" includes="*common*.c"/>
- <fileset dir="${native}/common/devil" includes="*.c"/>
- </apply>
- <apply dir="." parallel="true" executable="cc" failonerror="true">
- <srcfile/>
- <arg line="${linker_flags}"/>
- <fileset dir="." includes="*.o"/>
- </apply>
- <apply dir="." parallel="true" executable="strip" failonerror="true">
- <fileset file="${libname}"/>
- </apply>
- </target>
-</project>
-
Deleted: trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml 2008-01-21 21:27:03 UTC (rev 2940)
+++ trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml 2008-01-21 21:38:29 UTC (rev 2941)
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="fmod3" basedir="../../bin/fmod3" default="compile">
- <property name="native" location="../../src/native"/>
- <property environment="env"/>
- <property name="fmod.home" location="${env.FMOD}"/>
- <property name="libname32" value="liblwjgl-fmod3.so"/>
- <property name="libname64" value="liblwjgl64-fmod3.so"/>
- <property name="libs32" value="-lpthread"/>
- <property name="libs64" value="-lpthread"/>
- <property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread"/>
-
- <fail message="Missing FMOD path environment property" unless="env.FMOD"/>
-
- <target name="clean">
- <delete>
- <fileset dir="." includes="*.o"/>
- <fileset dir="." includes="*.so"/>
- </delete>
- </target>
-
- <target name="compile">
- <exec executable="uname" outputproperty="hwplatform">
- <arg value="-m"/>
- </exec>
- <condition property="libs" value="${libs64}" else="${libs32}">
- <equals arg1="${hwplatform}" arg2="x86_64"/>
- </condition>
- <condition property="libname" value="${libname64}" else="${libname32}">
- <equals arg1="${hwplatform}" arg2="x86_64"/>
- </condition>
- <property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
- <apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true">
- <arg line="${cflags}"/>
- <arg value="-I${java.home}/../include"/>
- <arg value="-I${java.home}/../include/linux"/>
- <arg value="-I${java.home}/include"/>
- <arg value="-I${java.home}/include/linux"/>
- <arg value="-I${fmod.home}/api/inc"/>
- <arg value="-I${native}/common"/>
- <arg value="-I${native}/common/fmod3"/>
- <mapper type="glob" from="*.c" to="*.o"/>
- <fileset dir="${native}/common" includes="*common*.c"/>
- <fileset dir="${native}/common/fmod3" includes="*.c"/>
- </apply>
- <apply dir="." parallel="true" executable="cc" failonerror="true">
- <srcfile/>
- <arg line="${linker_flags}"/>
- <fileset dir="." includes="*.o"/>
- </apply>
- <apply dir="." parallel="true" executable="strip" failonerror="true">
- <fileset file="${libname}"/>
- </apply>
- </target>
-</project>
-
Deleted: trunk/LWJGL/platform_build/macosx_ant/build_devil.xml
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build_devil.xml 2008-01-21 21:27:03 UTC (rev 2940)
+++ trunk/LWJGL/platform_build/macosx_ant/build_devil.xml 2008-01-21 21:38:29 UTC (rev 2941)
@@ -1,81 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OS X Native code" basedir="../../bin/devil" default="nativelibrary">
- <property name="native" location="../../src/native"/>
-
- <target name="init">
- <mkdir dir="ppc"/>
- <mkdir dir="intel"/>
- </target>
-
- <target name="clean">
- <delete failonerror="false">
- <fileset dir="intel"/>
- <fileset dir="ppc"/>
- <fileset dir="." includes="liblwjgl-devil.jnilib"/>
- <fileset dir="." includes="devil.symbols"/>
- </delete>
- </target>
-
- <target name="compile">
- <apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
- <arg line="${cflags} -O2 -Wall -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common"/>
- <!-- Map from *.m and *.c to .o -->
- <mapper type="regexp" from="^(.*)\.(c)" to="\1.o"/>
- <fileset dir="${native}/common" includes="common_tools.c"/>
- <fileset dir="${native}/common/devil" includes="*.c"/>
- </apply>
- </target>
-
- <target name="link">
- <apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
- <arg line="${linkerflags} -exported_symbols_list ../devil.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon"/>
- <fileset dir="${objdir}" includes="*.o"/>
- </apply>
- <apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
- <arg line="-S -X"/>
- <fileset dir="." file="${libname}"/>
- </apply>
- </target>
-
- <target name="nativelibrary" depends="init">
- <property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
- <property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/>
- <property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386"/>
- <property name="legacy_flags" value="-arch ppc"/>
- <antcall target="compile">
- <param name="dstdir" location="intel"/>
- <param name="compiler" value="gcc-4.0"/>
- <param name="sdkroot" location="${universal_sdkroot}"/>
- <param name="cflags" value="${universal_flags}"/>
- </antcall>
- <antcall target="compile">
- <param name="dstdir" location="ppc"/>
- <param name="compiler" value="gcc-3.3"/>
- <param name="sdkroot" location="${legacy_sdkroot}"/>
- <param name="cflags" value="${legacy_flags}"/>
- </antcall>
- <exec vmlauncher="false" executable="../../platform_build/macosx_ant/build-symbol-list" output="devil.symbols" failonerror="true">
- <arg path="intel"/>
- </exec>
- <antcall target="link">
- <param name="objdir" location="intel"/>
- <param name="libname" value="liblwjgl-devil-intel.jnilib"/>
- <param name="linker" value="gcc-4.0"/>
- <param name="linkerflags" value="${universal_flags}"/>
- </antcall>
- <antcall target="link">
- <param name="objdir" location="ppc"/>
- <param name="libname" value="liblwjgl-devil-ppc.jnilib"/>
- <param name="linker" value="gcc-3.3"/>
- <param name="linkerflags" value="${legacy_flags}"/>
- </antcall>
- <apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
- <arg value="-create"/>
- <srcfile/>
- <arg value="-output"/>
- <arg path="liblwjgl-devil.jnilib"/>
- <fileset file="ppc/liblwjgl-devil-ppc.jnilib"/>
- <fileset file="intel/liblwjgl-devil-intel.jnilib"/>
- </apply>
- </target>
-</project>
Deleted: trunk/LWJGL/platform_build/macosx_ant/build_fmod3.xml
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build_fmod3.xml 2008-01-21 21:27:03 UTC (rev 2940)
+++ trunk/LWJGL/platform_build/macosx_ant/build_fmod3.xml 2008-01-21 21:38:29 UTC (rev 2941)
@@ -1,86 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OS X Native code" basedir="../../bin/fmod3" default="nativelibrary">
- <property environment="env"/>
- <property name="native" location="../../src/native"/>
- <property name="fmod.home" location="${env.FMOD}"/>
-
-
- <target name="init">
- <mkdir dir="ppc"/>
- <mkdir dir="intel"/>
- </target>
-
- <target name="clean">
- <delete failonerror="false">
- <fileset dir="intel"/>
- <fileset dir="ppc"/>
- <fileset dir="." includes="liblwjgl-fmod3.jnilib"/>
- <fileset dir="." includes="fmod3.symbols"/>
- </delete>
- </target>
-
- <target name="compile">
- <apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
- <arg line="${cflags} -O2 -Wall -c -fno-common -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${fmod.home}/api/inc"/>
- <!-- Map from *.m and *.c to .o -->
- <mapper type="regexp" from="^(.*)\.(c)" to="\1.o"/>
- <fileset dir="${native}/common" includes="common_tools.c"/>
- <fileset dir="${native}/common/fmod3" includes="*.c"/>
- </apply>
- </target>
-
- <target name="link">
- <apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
- <arg line="${linkerflags} -single_module -exported_symbols_list ../fmod3.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon ${staticlibs}"/>
- <fileset dir="${objdir}" includes="*.o"/>
- </apply>
- <apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
- <arg line="-S -X"/>
- <fileset dir="." file="${libname}"/>
- </apply>
- </target>
-
- <target name="nativelibrary" depends="init">
- <property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
- <property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/>
- <property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386"/>
- <property name="legacy_flags" value="-arch ppc"/>
- <antcall target="compile">
- <param name="dstdir" location="intel"/>
- <param name="compiler" value="gcc-4.0"/>
- <param name="sdkroot" location="${universal_sdkroot}"/>
- <param name="cflags" value="${universal_flags}"/>
- </antcall>
- <antcall target="compile">
- <param name="dstdir" location="ppc"/>
- <param name="compiler" value="gcc-3.3"/>
- <param name="sdkroot" location="${legacy_sdkroot}"/>
- <param name="cflags" value="${legacy_flags}"/>
- </antcall>
- <exec vmlauncher="false" executable="../../platform_build/macosx_ant/build-symbol-list" output="fmod3.symbols" failonerror="true">
- <arg path="intel"/>
- </exec>
- <antcall target="link">
- <param name="objdir" location="intel"/>
- <param name="libname" value="liblwjgl-fmod3-intel.jnilib"/>
- <param name="linker" value="gcc-4.0"/>
- <param name="linkerflags" value="${universal_flags}"/>
- <param name="staticlibs" value="${fmod.home}/api/lib/libfmodx86.a"/>
- </antcall>
- <antcall target="link">
- <param name="objdir" location="ppc"/>
- <param name="libname" value="liblwjgl-fmod3-ppc.jnilib"/>
- <param name="linker" value="gcc-3.3"/>
- <param name="linkerflags" value="${legacy_flags}"/>
- <param name="staticlibs" value="${fmod.home}/api/lib/libfmod.a"/>
- </antcall>
- <apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
- <arg value="-create"/>
- <srcfile/>
- <arg value="-output"/>
- <arg path="liblwjgl-fmod3.jnilib"/>
- <fileset file="ppc/liblwjgl-fmod3-ppc.jnilib"/>
- <fileset file="intel/liblwjgl-fmod3-intel.jnilib"/>
- </apply>
- </target>
-</project>
Deleted: trunk/LWJGL/platform_build/windows_ant/build_devil.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build_devil.xml 2008-01-21 21:27:03 UTC (rev 2940)
+++ trunk/LWJGL/platform_build/windows_ant/build_devil.xml 2008-01-21 21:38:29 UTC (rev 2941)
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="devil" basedir="../../bin/devil" default="compile">
- <property name="native" location="../../src/native"/>
- <property environment="env"/>
- <property name="sdkhome" location="${env.MSSDK}"/>
- <property name="fmodhome" location="${env.FMODHOME}"/>
- <property name="dllname" value="lwjgl-devil.dll"/>
-
- <target name="compile_dir">
- <apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
- <arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/>
- <arg value="/I${sdkhome}\include"/>
- <arg value="/I${java.home}\..\include"/>
- <arg value="/I${java.home}\..\include\win32"/>
- <arg value="/I${native}\common"/>
- <srcfile/>
- <fileset dir="${native}/common/devil" includes="*.c"/>
- <fileset dir="${native}/common" includes="*common*.c"/>
- <mapper type="glob" from="*.c" to="*.obj"/>
- </apply>
- </target>
-
- <target name="link">
- <apply dir="." parallel="true" executable="cl" failonerror="true">
- <arg line="/LD /nologo"/>
- <srcfile/>
- <arg line="/Fe${dllname} /link"/>
- <arg value="/LIBPATH:${java.home}\..\lib"/>
- <arg value="/LIBPATH:${sdkhome}\lib"/>
- <arg value="/OPT:REF"/>
- <arg value="/OPT:ICF"/>
- <fileset dir="." includes="*.obj"/>
- </apply>
- </target>
-
- <target name="clean">
- <delete>
- <fileset dir="." includes="*.obj"/>
- <fileset dir="." includes="*.dll"/>
- <fileset dir="." includes="*.exp"/>
- <fileset dir="." includes="*.lib"/>
- </delete>
- </target>
-
- <target name="compile" depends="clean">
- <property name="libs" value="user32.lib Gdi32.lib Advapi32.lib"/>
- <antcall target="compile_dir"/>
- <antcall target="link"/>
- </target>
-</project>
-
Deleted: trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml 2008-01-21 21:27:03 UTC (rev 2940)
+++...
[truncated message content] |
|
From: <eli...@us...> - 2008-01-21 21:27:10
|
Revision: 2940
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2940&view=rev
Author: elias_naur
Date: 2008-01-21 13:27:03 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
Converted GLU to use Buffers instead of arrays to match the rest of lwjgl
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java
trunk/LWJGL/src/java/org/lwjgl/util/glu/Project.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java 2008-01-21 20:38:04 UTC (rev 2939)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java 2008-01-21 21:27:03 UTC (rev 2940)
@@ -32,6 +32,8 @@
package org.lwjgl.util.glu;
import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+import java.nio.FloatBuffer;
import org.lwjgl.opengl.ARBImaging;
import org.lwjgl.opengl.EXTFramebufferObject;
@@ -295,10 +297,10 @@
* @return
*/
public static boolean gluProject(float objx, float objy, float objz,
- float[][] modelMatrix,
- float[][] projMatrix,
- int[] viewport,
- float[] win_pos)
+ FloatBuffer modelMatrix,
+ FloatBuffer projMatrix,
+ IntBuffer viewport,
+ FloatBuffer win_pos)
{
return Project.gluProject(objx, objy, objz, modelMatrix, projMatrix, viewport, win_pos);
}
@@ -315,10 +317,10 @@
* @return
*/
public static boolean gluUnProject(float winx, float winy, float winz,
- float[][] modelMatrix,
- float[][] projMatrix,
- int[] viewport,
- float[] obj_pos)
+ FloatBuffer modelMatrix,
+ FloatBuffer projMatrix,
+ IntBuffer viewport,
+ FloatBuffer obj_pos)
{
return Project.gluUnProject(winx, winy, winz, modelMatrix, projMatrix, viewport, obj_pos);
}
@@ -336,7 +338,7 @@
float y,
float width,
float height,
- int[] viewport) {
+ IntBuffer viewport) {
Project.gluPickMatrix(x, y, width, height, viewport);
}
Modified: trunk/LWJGL/src/java/org/lwjgl/util/glu/Project.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/Project.java 2008-01-21 20:38:04 UTC (rev 2939)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/Project.java 2008-01-21 21:27:03 UTC (rev 2940)
@@ -32,6 +32,7 @@
package org.lwjgl.util.glu;
import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
@@ -54,9 +55,9 @@
0.0f, 0.0f, 0.0f, 1.0f };
private static final FloatBuffer matrix = BufferUtils.createFloatBuffer(16);
- private static final float[][] finalMatrix = new float[4][4];
+ private static final FloatBuffer finalMatrix = BufferUtils.createFloatBuffer(16);
- private static final float[][] tempMatrix = new float[4][4];
+ private static final FloatBuffer tempMatrix = BufferUtils.createFloatBuffer(16);
private static final float[] in = new float[4];
private static final float[] out = new float[4];
@@ -73,12 +74,6 @@
m.position(oldPos);
}
- private static void __gluMakeIdentityf(float[][] m) {
- for (int i = 0; i < 16; i++) {
- m[i>>2][i%4] = IDENTITY_MATRIX[i];
- }
- }
-
/**
* Method __gluMultMatrixVecf
*
@@ -86,13 +81,13 @@
* @param in
* @param out
*/
- private static void __gluMultMatrixVecf(float[][] finalMatrix, float[] in, float[] out) {
+ private static void __gluMultMatrixVecf(FloatBuffer m, float[] in, float[] out) {
for (int i = 0; i < 4; i++) {
out[i] =
- in[0] * finalMatrix[0][i]
- + in[1] * finalMatrix[1][i]
- + in[2] * finalMatrix[2][i]
- + in[3] * finalMatrix[3][i];
+ in[0] * m.get(m.position() + 0*4 + i)
+ + in[1] * m.get(m.position() + 1*4 + i)
+ + in[2] * m.get(m.position() + 2*4 + i)
+ + in[3] * m.get(m.position() + 3*4 + i);
}
}
@@ -103,15 +98,14 @@
*
* @return
*/
- private static boolean __gluInvertMatrixf(float[][] src, float[][] inverse) {
+ private static boolean __gluInvertMatrixf(FloatBuffer src, FloatBuffer inverse) {
int i, j, k, swap;
float t;
- float[][] temp = Project.tempMatrix;
+ FloatBuffer temp = Project.tempMatrix;
- for (i = 0; i < 4; i++) {
- for (j = 0; j < 4; j++) {
- temp[i][j] = src[i][j];
- }
+
+ for (i = 0; i < 16; i++) {
+ temp.put(i, src.get(i + src.position()));
}
__gluMakeIdentityf(inverse);
@@ -124,7 +118,7 @@
/*
* if (fabs(temp[j][i]) > fabs(temp[i][i])) { swap = j;
*/
- if (Math.abs(temp[j][i]) > Math.abs(temp[i][i])) {
+ if (Math.abs(temp.get(j*4 + i)) > Math.abs(temp.get(i* 4 + i))) {
swap = j;
}
}
@@ -134,19 +128,19 @@
* * Swap rows.
*/
for (k = 0; k < 4; k++) {
- t = temp[i][k];
- temp[i][k] = temp[swap][k];
- temp[swap][k] = t;
+ t = temp.get(i*4 + k);
+ temp.put(i*4 + k, temp.get(swap*4 + k));
+ temp.put(swap*4 + k, t);
- t = inverse[i][k];
- inverse[i][k] = inverse[swap][k];
+ t = inverse.get(i*4 + k);
+ inverse.put(i*4 + k, inverse.get(swap*4 + k));
//inverse.put((i << 2) + k, inverse.get((swap << 2) + k));
- inverse[swap][k] = t;
+ inverse.put(swap*4 + k, t);
//inverse.put((swap << 2) + k, t);
}
}
- if (temp[i][i] == 0) {
+ if (temp.get(i*4 + i) == 0) {
/*
* * No non-zero pivot. The matrix is singular, which shouldn't *
* happen. This means the user gave us a bad matrix.
@@ -154,17 +148,17 @@
return false;
}
- t = temp[i][i];
+ t = temp.get(i*4 + i);
for (k = 0; k < 4; k++) {
- temp[i][k] /= t;
- inverse[i][k] = inverse[i][k] / t;
+ temp.put(i*4 + k, temp.get(i*4 + k)/t);
+ inverse.put(i*4 + k, inverse.get(i*4 + k)/t);
}
for (j = 0; j < 4; j++) {
if (j != i) {
- t = temp[j][i];
+ t = temp.get(j*4 + i);
for (k = 0; k < 4; k++) {
- temp[j][k] -= temp[i][k] * t;
- inverse[j][k] = inverse[j][k] - inverse[i][k] * t;
+ temp.put(j*4 + k, temp.get(j*4 + k) - temp.get(i*4 + k) * t);
+ inverse.put(j*4 + k, inverse.get(j*4 + k) - inverse.get(i*4 + k) * t);
/*inverse.put(
(j << 2) + k,
inverse.get((j << 2) + k) - inverse.get((i << 2) + k) * t);*/
@@ -180,11 +174,11 @@
* @param b
* @param r
*/
- private static void __gluMultMatricesf(float[][] a, float[][] b, float[][] r) {
+ private static void __gluMultMatricesf(FloatBuffer a, FloatBuffer b, FloatBuffer r) {
for (int i = 0; i < 4; i++) {
for (int j = 0; j < 4; j++) {
- r[i][j] =
- a[i][0] * b[0][j] + a[i][1] * b[1][j] + a[i][2] * b[2][j] + a[i][3] * b[3][j];
+ r.put(r.position() + i*4 + j,
+ a.get(a.position() + i*4 + 0) * b.get(b.position() + 0*4 + j) + a.get(a.position() + i*4 + 1) * b.get(b.position() + 1*4 + j) + a.get(a.position() + i*4 + 2) * b.get(b.position() + 2*4 + j) + a.get(a.position() + i*4 + 3) * b.get(b.position() + 3*4 + j));
}
}
}
@@ -300,10 +294,10 @@
float objx,
float objy,
float objz,
- float[][] modelMatrix,
- float[][] projMatrix,
- int[] viewport,
- float[] win_pos) {
+ FloatBuffer modelMatrix,
+ FloatBuffer projMatrix,
+ IntBuffer viewport,
+ FloatBuffer win_pos) {
float[] in = Project.in;
float[] out = Project.out;
@@ -327,9 +321,9 @@
in[2] = in[2] * in[3] + 0.5f;
// Map x,y to viewport
- win_pos[0] = in[0] * viewport[2] + viewport[0];
- win_pos[1] = in[1] * viewport[3] + viewport[1];
- win_pos[2] = in[2];
+ win_pos.put(0, in[0] * viewport.get(viewport.position() + 2) + viewport.get(viewport.position() + 0));
+ win_pos.put(1, in[1] * viewport.get(viewport.position() + 3) + viewport.get(viewport.position() + 1));
+ win_pos.put(2, in[2]);
return true;
}
@@ -351,10 +345,10 @@
float winx,
float winy,
float winz,
- float[][] modelMatrix,
- float[][] projMatrix,
- int[] viewport,
- float[] obj_pos) {
+ FloatBuffer modelMatrix,
+ FloatBuffer projMatrix,
+ IntBuffer viewport,
+ FloatBuffer obj_pos) {
float[] in = Project.in;
float[] out = Project.out;
@@ -369,8 +363,8 @@
in[3] = 1.0f;
// Map x and y from window coordinates
- in[0] = (in[0] - viewport[0]) / viewport[2];
- in[1] = (in[1] - viewport[1]) / viewport[3];
+ in[0] = (in[0] - viewport.get(viewport.position() + 0)) / viewport.get(viewport.position() + 2);
+ in[1] = (in[1] - viewport.get(viewport.position() + 1)) / viewport.get(viewport.position() + 3);
// Map to range -1 to 1
in[0] = in[0] * 2 - 1;
@@ -384,9 +378,9 @@
out[3] = 1.0f / out[3];
- obj_pos[0] = out[0] * out[3];
- obj_pos[1] = out[1] * out[3];
- obj_pos[2] = out[2] * out[3];
+ obj_pos.put(obj_pos.position() + 0, out[0] * out[3]);
+ obj_pos.put(obj_pos.position() + 1, out[1] * out[3]);
+ obj_pos.put(obj_pos.position() + 2, out[2] * out[3]);
return true;
}
@@ -405,16 +399,16 @@
float y,
float deltaX,
float deltaY,
- int[] viewport) {
+ IntBuffer viewport) {
if (deltaX <= 0 || deltaY <= 0) {
return;
}
/* Translate and scale the picked region to the entire window */
GL11.glTranslatef(
- (viewport[2] - 2 * (x - viewport[0])) / deltaX,
- (viewport[3] - 2 * (y - viewport[1])) / deltaY,
+ (viewport.get(viewport.position() + 2) - 2 * (x - viewport.get(viewport.position() + 0))) / deltaX,
+ (viewport.get(viewport.position() + 3) - 2 * (y - viewport.get(viewport.position() + 1))) / deltaY,
0);
- GL11.glScalef(viewport[2] / deltaX, viewport[3] / deltaY, 1.0f);
+ GL11.glScalef(viewport.get(viewport.position() + 2) / deltaX, viewport.get(viewport.position() + 3) / deltaY, 1.0f);
}
}
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 20:28:55
|
Revision: 2938
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2938&view=rev
Author: elias_naur
Date: 2008-01-21 12:28:53 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
Moved translation of ogl error codes from GLU to Util, to prepare for glu to be moved to lwjgl_utils
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java
trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java 2008-01-21 20:21:21 UTC (rev 2937)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java 2008-01-21 20:28:53 UTC (rev 2938)
@@ -43,11 +43,43 @@
/** No c'tor */
private Util() {
}
-
- public static void checkGLError() {
+
+ /**
+ * Throws OpenGLException if GL11.glGetError() returns anything else than GL11.GL_NO_ERROR
+ *
+ */
+ public static void checkGLError() throws OpenGLException {
int err = GL11.glGetError();
if ( err != GL11.GL_NO_ERROR ) {
throw new OpenGLException(err);
}
}
+
+ /**
+ * Translate a GL error code to a String describing the error
+ */
+ public static String translateGLErrorString(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";
+ default:
+ return null;
+ }
+ }
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java 2008-01-21 20:21:21 UTC (rev 2937)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java 2008-01-21 20:28:53 UTC (rev 2938)
@@ -36,6 +36,7 @@
import org.lwjgl.opengl.ARBImaging;
import org.lwjgl.opengl.EXTFramebufferObject;
import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.Util;
/**
* GLU.java
@@ -411,24 +412,6 @@
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:
@@ -436,7 +419,7 @@
case GLU.GLU_OUT_OF_MEMORY:
return "Out of memory (glu)";
default:
- return null;
+ return Util.translateGLErrorString(error_code);
}
}
}
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:21:22
|
Revision: 2937
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2937&view=rev
Author: elias_naur
Date: 2008-01-21 12:21:21 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
Display: Removed display_impl.update() from isCloseRequested(), isVisible(), isDirty() and isActive() since it can be an expensive call on at least linux. Display.update() is now required to be called to update the internal state.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java 2008-01-21 18:59:12 UTC (rev 2936)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java 2008-01-21 20:21:21 UTC (rev 2937)
@@ -531,7 +531,6 @@
synchronized (GlobalLock.lock) {
if (!isCreated())
throw new IllegalStateException("Cannot determine close requested state of uncreated window");
- display_impl.update();
return display_impl.isCloseRequested();
}
}
@@ -543,7 +542,6 @@
synchronized (GlobalLock.lock) {
if (!isCreated())
throw new IllegalStateException("Cannot determine minimized state of uncreated window");
- display_impl.update();
return display_impl.isVisible();
}
}
@@ -555,7 +553,6 @@
synchronized (GlobalLock.lock) {
if (!isCreated())
throw new IllegalStateException("Cannot determine focused state of uncreated window");
- display_impl.update();
return display_impl.isActive();
}
}
@@ -574,7 +571,6 @@
synchronized (GlobalLock.lock) {
if (!isCreated())
throw new IllegalStateException("Cannot determine dirty state of uncreated window");
- display_impl.update();
return display_impl.isDirty();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-01-21 18:59:18
|
Revision: 2936
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2936&view=rev
Author: matzon
Date: 2008-01-21 10:59:12 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
tagging 1.1.4
Added Paths:
-----------
tags/lwjgl1.1.4/
Copied: tags/lwjgl1.1.4 (from rev 2935, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1095 messages has been excluded from this view by a project administrator.
