java-game-lib-cvs Mailing List for Lightweight Java Game Library (Page 2)

Update of /cvsroot/java-game-lib/LWJGL/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13268

Modified Files:
	projects.php 
Log Message:
added Ultratron
added JGLMark

Index: projects.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/projects.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- projects.php	21 Sep 2005 17:22:33 -0000	1.10
+++ projects.php	15 Oct 2005 08:54:40 -0000	1.11
@@ -133,6 +133,39 @@
 								       2 => array('small' => 'subhunt_small_3.jpg',
 												  'big'   => 'subhunt_3.jpg')));
 												  
+	$projects[] = array(
+						'name'    => 'Ultratron',
+						'url'     => 'http://www.puppygames.net/',
+						'type'    => 'Commercial game',
+						'desc'    => 'The last human has been slain by evil killer robots. You are the one remaining humanoid battle droid. Your mission is to avenge the human race, and destroy the four bots of the Apocalypse - Ieiunitas, Bellum, Lues and Letum!
+													Power up your droid with ever more powerful weaponry as you blast your way through the levels, avoiding Chasers, Turrets, Spawners, Minelayers, bombs, and bullets!',
+						'screens' => array(
+							0 => array(
+								'small' => 'ultratron_small_1.jpg',
+								'big'   => 'ultratron_1.jpg'),
+							1 => array(
+								'small' => 'ultratron_small_2.jpg',
+								'big'   => 'ultratron_2.jpg'),
+							2 => array(
+								'small' => 'ultratron_small_3.jpg',
+								'big'   => 'ultratron_3.jpg')));												  
+								
+	$projects[] = array(
+						'name'    => 'JGLMark',
+						'url'     => 'http://jglmark.dev.java.net',
+						'type'    => 'Benchmark',
+						'desc'    => 'JGLMark is intended is a platform independent OpenGL benchmark. JGLMark may also be used as a system stress and stability test tool. JGLMark will benchmark the ability of a system to perform various OpenGL tasks.',
+						'screens' => array(
+							0 => array(
+								'small' => 'jglmark_small_1.jpg',
+								'big'   => 'jglmark_1.jpg'),
+							1 => array(
+								'small' => 'jglmark_small_2.jpg',
+								'big'   => 'jglmark_2.jpg'),
+							2 => array(
+								'small' => 'jglmark_small_3.jpg',
+								'big'   => 'jglmark_3.jpg')));												  								
+												  
 function displayProjects() {
 	
 	GLOBAL $projects;

Update of /cvsroot/java-game-lib/LWJGL/www/_gfx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13193

Added Files:
	paypal.png 
Log Message:
added paypal donation icon

--- NEW FILE: paypal.png ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/java-game-lib/LWJGL/www/_gfx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13147

Added Files:
	button_backwards.png button_forwards.png 
Log Message:
added log forward/backwards icons

--- NEW FILE: button_backwards.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: button_forwards.png ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/java-game-lib/LWJGL/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12993

Modified Files:
	index.php 
Log Message:
added money status overview

Index: index.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/index.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- index.php	10 Sep 2005 22:59:54 -0000	1.12
+++ index.php	15 Oct 2005 08:52:05 -0000	1.13
@@ -6,6 +6,61 @@
 <p>LWJGL is available under a <a href="license.php">BSD license</a>, which means it's open source and freely available at no charge.</p>
 <p>Please visit us on the Freenode IRC Network: <a href="irc://irc.freenode.net/lwjgl" target="_blank">#LWJGL</a>. Do idle if there is no one to answer any of your questions, we are on different timezones.</p>
 
+
+<h1>LWJGL Monetary situation as of 3rd October 2005</h1>
+<p>The following table displays the current monetary situation of LWJGL. It is purely made to get an overview and does not necessarily accurately display the exact current funds of LWJGL.
+	<br/>
+	Please note that the total expenses are currently 0$ since the hosting is provided free of charge by <a href="http://puppygames.net">Puppygames</a> and that the domains (lwjgl.org and lwjgl.com) are paid by <a href="mailto:br...@ma...">Brian Matzon</a>.
+</p>
+<table>
+	<tr>
+		<td colspan="2"><b>Income</b></td>
+	</tr>
+	<tr>
+		<td width="100">Adsense</td>
+		<td align="right">$101.20</td>
+	</tr>
+	<tr>
+		<td>Paypal</td>
+		<td align="right">$28.48</td>
+	</tr>
+	<tr>
+		<td>Total income</td>
+		<td align="right">$129.68</td>
+	</tr>
+	<tr>
+		<td colspan="2">&nbsp;</td>
+	</tr>
+	<tr>
+		<td colspan="2"><b>Expenses</b></td>
+	</tr>
+	<tr>
+		<td>Hosting</td>
+		<td align="right">$0.00</td>
+	</tr>
+	<tr>
+		<td>Domains</td>
+		<td align="right">$0.00</td>
+	</tr>
+	<tr>
+		<td>Total expenses</td>
+		<td align="right">$0.00</td>
+	</tr>
+</table>
+<br/>
+<i>Adsense currently averages at $0.92/day</i>
+<br/>
+<br/>
+<h2>Planned expenses</h2>
+<p>
+	* LWJGL Developer Guide - $1000/onetime
+</p>
+<br/>
+<h2>Wishlist</h2>
+<p>
+	* LWJGL Code signing certificate - $200/year
+</p>
+
 <h1>News</h1>
 <p style="border-bottom: 1px solid #cccccc;">
 	<b>Another release! 0.98</b> <span class="newsdate">Thursday, August 18th, 2005</span><br/>

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7753/src/native/common

Modified Files:
	extal.h 
Log Message:
OpenAL: Fixed native headers, now that altypes.h and alctypes are gone

Index: extal.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- extal.h	9 Mar 2005 13:06:17 -0000	1.35
+++ extal.h	10 Oct 2005 12:50:10 -0000	1.36
@@ -37,28 +37,15 @@
 #include <windows.h>
 #endif
 
-#ifdef _X11
-#include <AL/altypes.h>
-#include <AL/alctypes.h>
-#endif
-#ifdef _WIN32
-#include <altypes.h>
-#include <alctypes.h>
-#endif
-#ifdef _MACOSX
-#include <AL/alctypes.h>
-#include <AL/altypes.h>
-#endif
-
 #include <jni.h>
 #include "common_tools.h"
 
-void extal_InitializeClass(JNIEnv *env, jclass clazz, int num_functions, JavaMethodAndExtFunction *functions);
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+void extal_InitializeClass(JNIEnv *env, jclass clazz, int num_functions, JavaMethodAndExtFunction *functions);
+
 #if defined(_WIN32)
  #ifdef _OPENAL32LIB
   #define ALCAPI __declspec(dllexport)
@@ -66,9 +53,6 @@
   #define ALCAPI __declspec(dllimport)
  #endif
 
- typedef struct ALCdevice_struct ALCdevice;
- typedef struct ALCcontext_struct ALCcontext;
-
  #define ALCAPIENTRY __cdecl
 #else
   #define ALCAPI
@@ -93,6 +77,89 @@
 #define INITGUID
 #define OPENAL
 
+// ALC typedefs
+typedef struct ALCdevice_struct ALCdevice;
+typedef struct ALCcontext_struct ALCcontext;
+/** 8-bit boolean */
+typedef char ALCboolean;
+
+/** character */
+typedef char ALCchar;
+
+/** signed 8-bit 2's complement integer */
+typedef char ALCbyte;
+
+/** unsigned 8-bit integer */
+typedef unsigned char ALCubyte;
+
+/** signed 16-bit 2's complement integer */
+typedef short ALCshort;
+
+/** unsigned 16-bit integer */
+typedef unsigned short ALCushort;
+
+/** signed 32-bit 2's complement integer */
+typedef int ALCint;
+
+/** unsigned 32-bit integer */
+typedef unsigned int ALCuint;
+
+/** non-negative 32-bit binary integer size */
+typedef int ALCsizei;
+
+/** enumerated 32-bit value */
+typedef int ALCenum;
+
+/** 32-bit IEEE754 floating-point */
+typedef float ALCfloat;
+
+/** 64-bit IEEE754 floating-point */
+typedef double ALCdouble;
+
+/** void type (for opaque pointers only) */
+typedef void ALCvoid;
+
+// AL typedefs
+/** 8-bit boolean */
+typedef char ALboolean;
+
+/** character */
+typedef char ALchar;
+
+/** signed 8-bit 2's complement integer */
+typedef char ALbyte;
+
+/** unsigned 8-bit integer */
+typedef unsigned char ALubyte;
+
+/** signed 16-bit 2's complement integer */
+typedef short ALshort;
+
+/** unsigned 16-bit integer */
+typedef unsigned short ALushort;
+
+/** signed 32-bit 2's complement integer */
+typedef int ALint;
+
+/** unsigned 32-bit integer */
+typedef unsigned int ALuint;
+
+/** non-negative 32-bit binary integer size */
+typedef int ALsizei;
+
+/** enumerated 32-bit value */
+typedef int ALenum;
+
+/** 32-bit IEEE754 floating-point */
+typedef float ALfloat;
+
+/** 64-bit IEEE754 floating-point */
+typedef double ALdouble;
+
+/** void type (for opaque pointers only) */
+typedef void ALvoid;
+
+
 void InitializeOpenAL(JNIEnv *env, jobjectArray oalPaths);
 void DeInitializeOpenAL();
 

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7753/src/native/linux

Modified Files:
	Makefile 
Log Message:
OpenAL: Fixed native headers, now that altypes.h and alctypes are gone

Index: Makefile
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile	29 Sep 2005 17:13:37 -0000	1.22
+++ Makefile	10 Oct 2005 12:50:10 -0000	1.23
@@ -5,7 +5,7 @@
 STRIP=strip
 CFLAGS_LINK=-shared -Wall
 LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-call_shared
-CFLAGS_O=-fPIC -O2 -D_X11 -Wall -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+CFLAGS_O=-fPIC -O2 -D_X11 -Wall -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(AL_HOME)/include
 SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../generated/*c)
 OBJECTS=$(subst .c,.o,$(SRC))
 LIBRARY=liblwjgl.so

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24149/src/native/linux

Modified Files:
	org_lwjgl_input_Mouse.c 
Log Message:
Linux: Fix Mouse.setCursorPosition()

Index: org_lwjgl_input_Mouse.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- org_lwjgl_input_Mouse.c	28 Apr 2005 09:57:45 -0000	1.36
+++ org_lwjgl_input_Mouse.c	10 Oct 2005 09:11:24 -0000	1.37
@@ -344,14 +344,7 @@
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nSetCursorPosition(JNIEnv * env, jclass clazz, jint x, jint y) {
-	XWindowAttributes attributes;
-	if (!XGetWindowAttributes(getDisplay(), getCurrentWindow(), &attributes)) {
-		printfDebugJava(env, "XGetWindowAttributes failed");
-		return;
-	}
-	int transformed_x = attributes.x + x;
-	int transformed_y = attributes.y + transformY(y);
-	XWarpPointer(getDisplay(), None, getCurrentWindow(), 0, 0, 0, 0, transformed_x, transformed_y);
+	XWarpPointer(getDisplay(), None, getCurrentWindow(), 0, 0, 0, 0, x, transformY(y));
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGrabMouse(JNIEnv * env, jclass clazz, jboolean new_grab) {

Update of /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32612/src/generated/org/lwjgl/opengl

Modified Files:
	GL11.java 
Log Message:
Added float format to GL11.glReadPixels

Index: GL11.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL11.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- GL11.java	6 Oct 2005 19:30:35 -0000	1.2
+++ GL11.java	6 Oct 2005 20:03:01 -0000	1.3
@@ -1900,6 +1900,13 @@
 		BufferChecks.checkBuffer(pixels, GLChecks.calculateImageStorage(pixels, format, type, width, height, 1));
 		nglReadPixels(x, y, width, height, format, type, pixels, pixels.position(), function_pointer);
 	}
+	public static void glReadPixels(int x, int y, int width, int height, int format, int type, FloatBuffer pixels) {
+		long function_pointer = GLContext.getCapabilities().GL11_glReadPixels_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		GLChecks.ensurePackPBOdisabled();
+		BufferChecks.checkBuffer(pixels, GLChecks.calculateImageStorage(pixels, format, type, width, height, 1));
+		nglReadPixels(x, y, width, height, format, type, pixels, pixels.position() << 2, function_pointer);
+	}
 	public static void glReadPixels(int x, int y, int width, int height, int format, int type, IntBuffer pixels) {
 		long function_pointer = GLContext.getCapabilities().GL11_glReadPixels_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);

Update of /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32612/src/templates/org/lwjgl/opengl

Modified Files:
	GL11.java 
Log Message:
Added float format to GL11.glReadPixels

Index: GL11.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL11.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- GL11.java	6 Oct 2005 19:30:36 -0000	1.5
+++ GL11.java	6 Oct 2005 20:03:01 -0000	1.6
@@ -1031,6 +1031,7 @@
 			@GLbyte
 			@GLshort
 			@GLint
+			@GLfloat
 			Buffer pixels);
 
 	void glReadBuffer(@GLenum int mode);

Update of /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23552/src/generated/org/lwjgl/opengl

Modified Files:
	GL11.java 
Log Message:
Added float type to GL11.glGetTexImage

Index: GL11.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL11.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GL11.java	29 Sep 2005 17:13:36 -0000	1.1
+++ GL11.java	6 Oct 2005 19:30:35 -0000	1.2
@@ -1345,6 +1345,13 @@
 		BufferChecks.checkBuffer(pixels, GLChecks.calculateImageStorage(pixels, format, type, 1, 1, 1));
 		nglGetTexImage(target, level, format, type, pixels, pixels.position(), function_pointer);
 	}
+	public static void glGetTexImage(int target, int level, int format, int type, FloatBuffer pixels) {
+		long function_pointer = GLContext.getCapabilities().GL11_glGetTexImage_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		GLChecks.ensurePackPBOdisabled();
+		BufferChecks.checkBuffer(pixels, GLChecks.calculateImageStorage(pixels, format, type, 1, 1, 1));
+		nglGetTexImage(target, level, format, type, pixels, pixels.position() << 2, function_pointer);
+	}
 	public static void glGetTexImage(int target, int level, int format, int type, IntBuffer pixels) {
 		long function_pointer = GLContext.getCapabilities().GL11_glGetTexImage_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);

Update of /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23552/src/templates/org/lwjgl/opengl

Modified Files:
	GL11.java 
Log Message:
Added float type to GL11.glGetTexImage

Index: GL11.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL11.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- GL11.java	21 Mar 2005 08:27:45 -0000	1.4
+++ GL11.java	6 Oct 2005 19:30:36 -0000	1.5
@@ -909,6 +909,7 @@
 			@GLbyte
 			@GLshort
 			@GLint
+			@GLfloat
 			Buffer pixels);
 
 	@StripPostfix("params")

Update of /cvsroot/java-game-lib/LWJGL/src/native/macosx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11742

Modified Files:
	Makefile 
Log Message:
Mac OS X: Makefile now supports building an universal version of the lwjgl natives

Index: Makefile
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	29 Sep 2005 17:13:38 -0000	1.7
+++ Makefile	4 Oct 2005 07:43:50 -0000	1.8
@@ -1,9 +1,14 @@
 CC=gcc
 LINKER=gcc
 STRIP=strip
-CFLAGS_LINK=-dynamiclib -Wall
+# Replace SDK_ROOT and ARCHS with the following to enable universal binary build
+#SDK_ROOT=/Developer/SDKs/MacOSX10.4u.sdk
+#ARCHS=-arch i386 -arch ppc
+SDK_ROOT=/
+ARCHS=
+CFLAGS_LINK=-Wl,-syslibroot,$(SDK_ROOT) $(ARCHS) -dynamiclib -Wall
 FRAMEWORKS=-framework Foundation -framework AppKit -framework JavaVM -framework Carbon
-CFLAGS_O=-fPIC -O2 -D_MACOSX -Wall -c -I${AL}/include -I../common -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers
+CFLAGS_O=-isysroot $(SDK_ROOT) $(ARCHS) -fPIC -O2 -D_MACOSX -Wall -c -I${AL}/include -I../common -I$(SDK_ROOT)/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers
 SRC=$(wildcard *.m) $(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../generated/*.c)
 OBJECTS=$(subst .m,.o, $(subst .c,.o,$(SRC)))
 LIBRARY=liblwjgl.jnilib