java-game-lib-cvs Mailing List for Lightweight Java Game Library

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

Modified Files:
	org_lwjgl_opengl_Display.c 
Log Message:
Fix native code to work with RGBA rather than RBGR.

Index: org_lwjgl_opengl_Display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- org_lwjgl_opengl_Display.c	5 Jul 2005 22:08:55 -0000	1.25
+++ org_lwjgl_opengl_Display.c	10 Jul 2005 20:16:53 -0000	1.26
@@ -446,9 +446,9 @@
 	for (y = 0; y < height; y++ ) {
 		dstPtr = ptrCursorImage + wordAlignedWidth*y;;
 		for (x = 0; x < width; x++ ) {
-			dstPtr[2] = (pixels[y*width+x] >> 0x10) & 0xFF;
+			dstPtr[0] = (pixels[y*width+x] >> 0x10) & 0xFF;
 			dstPtr[1] = (pixels[y*width+x] >> 0x08) & 0xFF;
-			dstPtr[0] = pixels[y*width+x] & 0xFF;
+			dstPtr[2] = pixels[y*width+x] & 0xFF;
 			dstPtr += 3;
 		}
 	}
@@ -477,22 +477,22 @@
 	maskPixels = (unsigned char*)malloc(sizeof(unsigned char)*imageSize);
 	memset(maskPixels, 0, imageSize);
 	for (y = 0; y < height; y++) {
-		leftShift = 17;
+		leftShift = 7;
 		mask = 0;
 		maskPixelsOff = scanlineWidth*y;
 		for (x = 0; x < width; x++) {
-			col = (pixels[width*y+x] & 0x01000000) >> leftShift;
+			col = (pixels[width*y+x] & 0x00000001) << leftShift;
 			mask = mask | col;
-			leftShift++;
-			if (leftShift == 25) {
+			leftShift--;
+			if (leftShift == -1) {
 				maskPixels[maskPixelsOff++] = ~mask;
-				leftShift = 17;
+				leftShift = 7;
 				mask = 0;
 			}
 		}
 		
 		// write what is left over
-		if (leftShift != 17) {
+		if (leftShift != 7) {
 			maskPixels[maskPixelsOff++] = ~mask;
 		}
 	}

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

Modified Files:
	LinuxDisplay.java Win32Display.java 
Log Message:
Fix size check bug in icon setting. Divide by four to get the size of the buffer in pixels.

Index: Win32Display.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Win32Display.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Win32Display.java	5 Jul 2005 22:09:44 -0000	1.20
+++ Win32Display.java	10 Jul 2005 20:15:55 -0000	1.21
@@ -176,7 +176,7 @@
 		int used = 0;
 		
 		for (int i=0;i<icons.length;i++) {
-			int size = icons[i].limit();
+			int size = icons[i].limit() / 4;
 			
 			if ((((int) Math.sqrt(size)) == 16) && (!done16)) {
 				nSetWindowIcon16(icons[i].asIntBuffer());

Index: LinuxDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- LinuxDisplay.java	5 Jul 2005 21:54:12 -0000	1.27
+++ LinuxDisplay.java	10 Jul 2005 20:15:55 -0000	1.28
@@ -452,7 +452,7 @@
 	 */
 	public int setIcon(ByteBuffer[] icons) {
 		for (int i=0;i<icons.length;i++) {
-			int size = icons[i].limit();
+			int size = icons[i].limit() / 4;
 			
 			if (((int) Math.sqrt(size)) == 32) {
 				nSetWindowIcon(icons[i]);