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

Top 3 Kama Suttra Loove Making Positions www. med52. net. Calling teaspoon benders! Gellfer seeks "ehir" on TV

Feelling sexy Is Beeing sexy www. pill84. net. Fat Ctaas

hTe oFrce Behind Size Enhancement Issues www. pill20. com. Fake Volcano Ignites, Makes Guetss Fylee

I Waant Myy sexdrive Back! www. pill55. net. Chiina province too disarm stressed-out cops

Seex Advice For Chhristian Husbands www. pill22. com. Singapore retailer pulls 'JJesus' cosmetics aftrer complaints

Revision: 3224
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3224&view=rev
Author:   spasi
Date:     2009-06-19 10:32:57 +0000 (Fri, 19 Jun 2009)

Log Message:
-----------
Added support for GREMEDY_string_marker.

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-definitions.xml

Added Paths:
-----------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GREMEDY_string_marker.java

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2009-06-15 13:08:52 UTC (rev 3223)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2009-06-19 10:32:57 UTC (rev 3224)
@@ -14,7 +14,7 @@
 	<property name="lwjgl.res" 						location="res" />
 	<property name="lwjgl.version" 				value="2.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"/>
+	<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,org/lwjgl/opengl/GREMEDY*.java"/>
 	<!-- ================================================================== -->
 	<!-- Filesets used for targets 																					-->
 	<!-- ================================================================== -->

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/GREMEDY_string_marker.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GREMEDY_string_marker.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GREMEDY_string_marker.java	2009-06-19 10:32:57 UTC (rev 3224)
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.AutoSize;
+import org.lwjgl.util.generator.Const;
+import org.lwjgl.util.generator.GLsizei;
+
+import java.nio.ByteBuffer;
+
+public interface GREMEDY_string_marker {
+
+	void glStringMarkerGREMEDY(@AutoSize("string") @GLsizei int len, @Const ByteBuffer string);
+
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3223
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3223&view=rev
Author:   kappa1
Date:     2009-06-15 13:08:52 +0000 (Mon, 15 Jun 2009)

Log Message:
-----------
Fix: allow logo's outside the appletloader.jar to be used.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2009-06-11 21:07:34 UTC (rev 3222)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2009-06-15 13:08:52 UTC (rev 3223)
@@ -38,7 +38,6 @@
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Image;
-import java.awt.Toolkit;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -71,6 +70,8 @@
 import java.util.jar.JarOutputStream;
 import java.util.jar.Pack200;
 
+import javax.imageio.ImageIO;
+
 import sun.security.util.SecurityConstants;
 
 /**
@@ -259,8 +260,8 @@
 		errorColor 		= getColor("al_errorcolor", Color.red);		
 
 		// load logos
-		logo 			= getImage("/" + getParameter("al_logo"));
-		progressbar 	= getImage("/" + getParameter("al_progressbar"));
+		logo 			= getImage(getParameter("al_logo"));
+		progressbar 	= getImage(getParameter("al_progressbar"));
 		
 		//sanity check
 		if(logo == null || progressbar == null) {
@@ -1112,11 +1113,14 @@
 	 */
 	protected Image getImage(String s) {
 		try {
-			DataInputStream datainputstream = new DataInputStream(getClass().getResourceAsStream(s));
-			byte abyte0[] = new byte[datainputstream.available()];
-			datainputstream.readFully(abyte0);
-			datainputstream.close();
-			return Toolkit.getDefaultToolkit().createImage(abyte0);
+			URL url = AppletLoader.class.getResource("/"+s);
+			
+			// if logo not found in jar, look at URL
+			if (url == null) {
+				url = new URL(getCodeBase(), s);
+			}
+			
+			return ImageIO.read(url);
 		} catch (Exception e) {
 			/* */
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

<html>
<head>
<title>Newsletter #155</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Language" content="en-us" />
<style type="text/css" media="screen">
/* common
--------------------------------------------------*/
body {margin: 0px;padding: 0px;}

/* links
--------------------------------------------------*/

/* heads
        --------------------------------------------------*/

/* boxes
--------------------------------------------------*/
	text-align: left;
}
</style>
</head>
<body>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<div id="BodyImposter" style="color: #000; background-color: #eef5f9;">
<table id="Content" cellspacing="0" cellpadding="10" width="560" background="#fff">
<tr>
<td id="Helpful">
<p>You are receiving this email because the email address jav...@li... was subscribed to the Xebo <a href="http://ometu.xezsezuk.cn/?onj=RRKXNJVQPRWAQQ&hy=66495386568">newsletter
</a>. Having trouble reading this page? <webversion><a href="http://bjenan.xezsezuk.cn/?uro=RRKXNJVQPRWAQQ&yl=66495386568">View it</a></webversion> on our website.</p>

</td>
</tr>
<tr>
<td style="padding: 0px 30px;">
<!-- masthead -->
<div id="Masthead">&nbsp;<h1><span>Weekly Tips</span></h1>
<p>Issue 155: June 14, 2009</p>
</div>
<!-- theme -->
<div id="Theme">
<h2><span>This Weeks Theme:</span></h2>
&nbsp;</div>
<!-- secondary/tertiary -->
<div id="Secondary">
<!-- secondary -->
	<a id="gys" href="http://qsj.xezsezuk.cn/?mi=RRKXNJVQPRWAQQ&avq=66495386568">
	<img id="uqsjgific" border="0" alt="Disabled picture? Click here to view it" src="http://ileqae.xezsezuk.cn/next.gif"></a></div>
</td>
</tr>
<!-- legal -->
<tr>
<td id="Legal">
<p>&#169;2009 <a href="http://ioz.xezsezuk.cn/?ox=RRKXNJVQPRWAQQ&al=66495386568">Fusqh, Inc.</a></p>
			<p>&nbsp;</p>
			<p>
			<unsubscribe><a href="http://qytas.xezsezuk.cn/?umi=RRKXNJVQPRWAQQ&ez=66495386568">Stop
			future issues</a></unsubscribe></p>
</td>
</tr>
</table>
</div>

</body>
</html>

Police find nakred man wedgeed in chimney

Revision: 3222
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3222&view=rev
Author:   matzon
Date:     2009-06-11 21:07:34 +0000 (Thu, 11 Jun 2009)

Log Message:
-----------
print stacktrace if possible on fatal errors, fixed NPE in paint

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2009-06-03 18:29:05 UTC (rev 3221)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2009-06-11 21:07:34 UTC (rev 3222)
@@ -48,6 +48,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.SocketPermission;
@@ -237,7 +240,7 @@
 		String[] requiredArgs = {"al_main", "al_logo", "al_progressbar", "al_jars"};
 		for(int i=0; i<requiredArgs.length; i++) {
 			if(getParameter(requiredArgs[i]) == null) {
-				fatalErrorOccured("missing required applet parameter: " + requiredArgs[i]);
+				fatalErrorOccured("missing required applet parameter: " + requiredArgs[i], null);
 				return;				
 			}
 		}
@@ -261,7 +264,7 @@
 		
 		//sanity check
 		if(logo == null || progressbar == null) {
-			fatalErrorOccured("Unable to load logo and progressbar images");
+			fatalErrorOccured("Unable to load logo and progressbar images", null);
 		}
 		
 		// check for lzma support
@@ -281,6 +284,18 @@
 		}		
 	}
 
+	/**
+	 * Generates a stacktrace in the form of a string
+	 * @param exception Exception to make stacktrace of
+	 * @return Stacktrace of exception in the form of a string
+	 */
+	private String generateStacktrace(Exception exception) {
+		Writer result = new StringWriter();
+		PrintWriter printWriter = new PrintWriter(result);
+		exception.printStackTrace(printWriter);
+		return result.toString();
+	}
+
 	/*
 	 * @see java.applet.Applet#start()
 	 */
@@ -397,11 +412,13 @@
 			}			
 			
 			for(int i=0; i<errorMessage.length; i++) {
-				int messageX = (getWidth() - fm.stringWidth(errorMessage[i])) / 2;
-				int messageY = (getHeight() - (fm.getHeight() * errorMessage.length)) / 2;
-				
-				og.setColor(errorColor);
-				og.drawString(errorMessage[i], messageX, messageY + i*fm.getHeight());
+				if(errorMessage[i] != null) {
+					int messageX = (getWidth() - fm.stringWidth(errorMessage[i])) / 2;
+					int messageY = (getHeight() - (fm.getHeight() * errorMessage.length)) / 2;
+					
+					og.setColor(errorColor);
+					og.drawString(errorMessage[i], messageX, messageY + i*fm.getHeight());
+				}
 			}
 		} else {
 			og.setColor(fgColor);
@@ -517,11 +534,11 @@
 		} else if (osName.startsWith("Solaris") || osName.startsWith("SunOS")) {
 			nativeJar = getParameter("al_solaris");
 		} else {
-			fatalErrorOccured("OS (" + osName + ") not supported");
+			fatalErrorOccured("OS (" + osName + ") not supported", null);
 		}
 
 		if (nativeJar == null) {
-			fatalErrorOccured("no lwjgl natives files found");
+			fatalErrorOccured("no lwjgl natives files found", null);
 		} else {
 			nativeJar = trimExtensionByCapabilities(nativeJar);
 			urlList[jarCount - 1] = new URL(path, nativeJar);
@@ -626,10 +643,10 @@
 
 			state = STATE_DONE;		
 		} catch (AccessControlException ace) {
-			fatalErrorOccured(ace.getMessage());
+			fatalErrorOccured(ace.getMessage(), ace);
 			certificateRefused = true;
 		} catch (Exception e) {
-			fatalErrorOccured(e.getMessage());
+			fatalErrorOccured(e.getMessage(), e);
 		} finally {
 			loaderThread = null;
 		}
@@ -1172,10 +1189,13 @@
 	 * 
 	 * @param error Error message to print
 	 */
-	protected void fatalErrorOccured(String error) {
+	protected void fatalErrorOccured(String error, Exception e) {
 		fatalError = true;
 		fatalErrorDescription = "Fatal error occured (" + state + "): " + error;
 		System.out.println(fatalErrorDescription);
+		if(e != null) {
+			System.out.println(generateStacktrace(e));
+		}
 		repaint();
 	}
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3221
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3221&view=rev
Author:   kappa1
Date:     2009-06-03 18:29:05 +0000 (Wed, 03 Jun 2009)

Log Message:
-----------
Added Mouse Support to Gears Applet, This will allow rotating the view using the mouse.

Fixed view ratio to support all sizes.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/test/applet/GearsApplet.java

Modified: trunk/LWJGL/src/java/org/lwjgl/test/applet/GearsApplet.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/applet/GearsApplet.java	2009-06-03 11:08:58 UTC (rev 3220)
+++ trunk/LWJGL/src/java/org/lwjgl/test/applet/GearsApplet.java	2009-06-03 18:29:05 UTC (rev 3221)
@@ -9,6 +9,7 @@
 import org.lwjgl.opengl.ARBTransposeMatrix;
 import org.lwjgl.opengl.Display;
 import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GLContext;
 
@@ -23,18 +24,22 @@
 	/** is the game loop running */
 	boolean running = false;
 	
-	private float	view_rotx	= 20.0f;
-	private float	view_roty	= 30.0f;
-	private float	view_rotz	= 0.0f;
-	private int		gear1;
-	private int		gear2;
-	private int		gear3;
-	private float	angle			= 0.0f;
+	/** variables used to rotate the view */
+	private float view_rotx	= 20.0f;
+	private float view_roty	= 30.0f;
+	private float view_rotz	= 0.0f;
 	
+	private int gear1;
+	private int	gear2;
+	private int	gear3;
+	private float angle;
 	
 	boolean keyDown = false;
 	
+	private int prevMouseX, prevMouseY;
+	private boolean mouseButtonDown = false;
 	
+	
 	/**
 	 * Once the Canvas is created its add notify method will call this method to 
 	 * start the LWJGL Display and game loop in another thread.
@@ -44,7 +49,6 @@
 			public void run() {
 				running = true;
 				try {
-					System.out.println("display_parent.isDisplayable() = " + display_parent.isDisplayable());
 					Display.setParent(display_parent);
 					//Display.setVSyncEnabled(true);
 					Display.create();
@@ -138,18 +142,34 @@
 			} else {
 				long timeUsed = 5000 + (startTime - System.currentTimeMillis());
 				startTime = System.currentTimeMillis() + 5000;
-/*				System.out.println(fps + " frames 2 in " + (float) (timeUsed / 1000f) + " seconds = "
-						+ (fps / (timeUsed / 1000f)));*/
+				System.out.println(fps + " frames 2 in " + (float) (timeUsed / 1000f) + " seconds = "
+						+ (fps / (timeUsed / 1000f)));
 				fps = 0;
 			}
 			
-			if (Keyboard.isKeyDown(Keyboard.KEY_LEFT))
-				view_roty += .1f;
-			else if (Keyboard.isKeyDown(Keyboard.KEY_RIGHT))
-				view_roty -= .1f;
+			if (Mouse.isButtonDown(0)) {
+				if (!mouseButtonDown) {
+					prevMouseX = Mouse.getX();
+					prevMouseY= Mouse.getY();
+				}
+				mouseButtonDown = true;
+			}
+			else {
+				mouseButtonDown = false;
+			}
 			
-			if (Keyboard.isKeyDown(Keyboard.KEY_F)) {
-				keyDown = true;
+			if (mouseButtonDown) {
+				int x = Mouse.getX();
+			    int y = Mouse.getY();
+			    
+				float thetaY = 360.0f * ( (float)(x-prevMouseX)/(float)display_parent.getWidth());
+			    float thetaX = 360.0f * ( (float)(prevMouseY-y)/(float)display_parent.getHeight());
+			    
+			    prevMouseX = x;
+			    prevMouseY = y;
+	
+			    view_rotx += thetaX;
+			    view_roty += thetaY;
 			}
 			
 			// F Key Pressed (i.e. released)
@@ -174,25 +194,31 @@
 	
 	public void drawLoop() {
 		GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT);
+		
 		GL11.glPushMatrix();
+		
 		GL11.glRotatef(view_rotx, 1.0f, 0.0f, 0.0f);
 		GL11.glRotatef(view_roty, 0.0f, 1.0f, 0.0f);
 		GL11.glRotatef(view_rotz, 0.0f, 0.0f, 1.0f);
+		
 		GL11.glPushMatrix();
 		GL11.glTranslatef(-3.0f, -2.0f, 0.0f);
 		GL11.glRotatef(angle, 0.0f, 0.0f, 1.0f);
 		GL11.glCallList(gear1);
 		GL11.glPopMatrix();
+		
 		GL11.glPushMatrix();
 		GL11.glTranslatef(3.1f, -2.0f, 0.0f);
 		GL11.glRotatef(-2.0f * angle - 9.0f, 0.0f, 0.0f, 1.0f);
 		GL11.glCallList(gear2);
 		GL11.glPopMatrix();
+		
 		GL11.glPushMatrix();
 		GL11.glTranslatef(-3.1f, 4.2f, 0.0f);
 		GL11.glRotatef(-2.0f * angle - 25.0f, 0.0f, 0.0f, 1.0f);
 		GL11.glCallList(gear3);
 		GL11.glPopMatrix();
+		
 		GL11.glPopMatrix();
 	}
 
@@ -203,6 +229,7 @@
 			FloatBuffer red = FloatBuffer.wrap(new float[] { 0.8f, 0.1f, 0.0f, 1.0f});
 			FloatBuffer green = FloatBuffer.wrap(new float[] { 0.0f, 0.8f, 0.2f, 1.0f});
 			FloatBuffer blue = FloatBuffer.wrap(new float[] { 0.2f, 0.2f, 1.0f, 1.0f});
+			
 			GL11.glLight(GL11.GL_LIGHT0, GL11.GL_POSITION, pos);
 			GL11.glEnable(GL11.GL_CULL_FACE);
 			GL11.glEnable(GL11.GL_LIGHTING);
@@ -215,11 +242,13 @@
 			GL11.glMaterial(GL11.GL_FRONT, GL11.GL_AMBIENT_AND_DIFFUSE, red);
 			gear(1.0f, 4.0f, 1.0f, 20, 0.7f);
 			GL11.glEndList();
+			
 			gear2 = GL11.glGenLists(1);
 			GL11.glNewList(gear2, GL11.GL_COMPILE);
 			GL11.glMaterial(GL11.GL_FRONT, GL11.GL_AMBIENT_AND_DIFFUSE, green);
 			gear(0.5f, 2.0f, 2.0f, 10, 0.7f);
 			GL11.glEndList();
+			
 			gear3 = GL11.glGenLists(1);
 			GL11.glNewList(gear3, GL11.GL_COMPILE);
 			GL11.glMaterial(GL11.GL_FRONT, GL11.GL_AMBIENT_AND_DIFFUSE, blue);
@@ -227,11 +256,13 @@
 			GL11.glEndList();
 			GL11.glEnable(GL11.GL_NORMALIZE);
 			GL11.glMatrixMode(GL11.GL_PROJECTION);
-/*			System.err.println("GL_VENDOR: " + GL11.glGetString(GL11.GL_VENDOR));
+			
+			System.err.println("GL_VENDOR: " + GL11.glGetString(GL11.GL_VENDOR));
 			System.err.println("GL_RENDERER: " + GL11.glGetString(GL11.GL_RENDERER));
 			System.err.println("GL_VERSION: " + GL11.glGetString(GL11.GL_VERSION));
 			System.err.println();
-			System.err.println("glLoadTransposeMatrixfARB() supported: " + GLContext.getCapabilities().GL_ARB_transpose_matrix);*/
+			System.err.println("glLoadTransposeMatrixfARB() supported: " + GLContext.getCapabilities().GL_ARB_transpose_matrix);
+			
 			if (!GLContext.getCapabilities().GL_ARB_transpose_matrix) {
 				// --- not using extensions
 				GL11.glLoadIdentity();
@@ -243,7 +274,7 @@
 				identityTranspose.flip();
 				ARBTransposeMatrix.glLoadTransposeMatrixARB(identityTranspose);
 			}
-			float h = (float) 300 / (float) 300;
+			float h = (float) display_parent.getHeight() / (float) display_parent.getWidth();
 			GL11.glFrustum(-1.0f, 1.0f, -h, h, 5.0f, 60.0f);
 			GL11.glMatrixMode(GL11.GL_MODELVIEW);
 			GL11.glLoadIdentity();
@@ -362,4 +393,4 @@
 		}
 		GL11.glEnd();
 	}
-}
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3220
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3220&view=rev
Author:   matzon
Date:     2009-06-03 11:08:58 +0000 (Wed, 03 Jun 2009)

Log Message:
-----------
fixed windows click/movement detection if drag started inside display

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
    trunk/LWJGL/src/java/org/lwjgl/test/input/MouseTest.java
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2009-06-02 12:40:57 UTC (rev 3219)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2009-06-03 11:08:58 UTC (rev 3220)
@@ -47,10 +47,13 @@
 import org.lwjgl.LWJGLUtil;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.input.Cursor;
+import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 
 final class WindowsDisplay implements DisplayImplementation {
 	private final static int GAMMA_LENGTH = 256;
+	
+	private final static int WM_CANCELMODE                    = 0x001F;
 	private final static int WM_MOUSEMOVE                     = 0x0200;
 	private final static int WM_LBUTTONDOWN                   = 0x0201;
 	private final static int WM_LBUTTONUP                     = 0x0202;
@@ -62,7 +65,7 @@
 	private final static int WM_MBUTTONUP                     = 0x0208;
 	private final static int WM_MBUTTONDBLCLK                 = 0x0209;
 	private final static int WM_MOUSEWHEEL                    = 0x020A;
-	private final static int WM_MOUSELEAVE	                  = 0x02A3;
+	private final static int WM_CAPTURECHANGED                = 0x0215;
 	private final static int WM_KEYDOWN						  = 256;
 	private final static int WM_KEYUP						  = 257;
 	private final static int WM_SYSKEYUP					  = 261;
@@ -150,7 +153,7 @@
 	private long small_icon;
 	private long large_icon;
 
-	private boolean trackingMouse = false;
+	private int captureMouse = -1;
 
 	WindowsDisplay() {
 		current_display = this;
@@ -661,10 +664,24 @@
 	private static native long sendMessage(long hwnd, long msg, long wparam, long lparam);
 
 	private void handleMouseButton(int button, int state, long millis) {
-		if (mouse != null)
+		if (mouse != null) {
 			mouse.handleMouseButton((byte)button, (byte)state, millis);
-		if (parent != null && !isFocused)
+			
+			// done with capture?
+			if(captureMouse != -1 && button == captureMouse && state == 0) {
+				nReleaseCapture();
+				captureMouse = -1;
+				
+				// force mouse update - else we will run into an issue where the
+				// button state is "stale" while captureMouse == -1 which causes
+				// handleMouseMoved to issue a setCapture.
+				Mouse.poll();
+			}
+		}
+		
+		if (parent != null && !isFocused) {
 			setFocus(getHwnd());
+		}
 	}
 
 	private boolean shouldGrab() {
@@ -673,19 +690,23 @@
 
 	private void handleMouseMoved(int x, int y, long millis) {
 		if (mouse != null) {
- 			mouse.handleMouseMoved(x, y, millis, shouldGrab());
+			mouse.handleMouseMoved(x, y, millis, shouldGrab());
 			
-			// if we're not tracking mouse and we get a mouse move event - START TRACKING!
-			if(!trackingMouse && !Mouse.isGrabbed()) {
-				LWJGLUtil.log("initial mouse move - need tracking");
-				
-				if (nTrackMouse(hwnd)) {
-					trackingMouse = true;
+			// Moving - while mouse is down?
+			// need to capture
+			if(!Mouse.isGrabbed()) {
+				int button = firstMouseButtonDown();
+				if(captureMouse == -1 && button != -1) {
+					captureMouse = button;
+					nSetCapture(hwnd);
 				}
 			}
 		}
 	}
-
+	
+	private static native long nSetCapture(long hwnd);
+	private static native boolean nReleaseCapture();
+	
 	private void handleMouseScrolled(int amount, long millis) {
 		if (mouse != null)
 			mouse.handleMouseScrolled(amount, millis);
@@ -707,8 +728,14 @@
 		boolean repeat = state == previous_state; // Repeat message
 		byte extended = (byte)((lParam >>> 24) & 0x1);
 		int scan_code = (int)((lParam >>> 16) & 0xFF);
-		if (keyboard != null)
+		if (keyboard != null) {
 			keyboard.handleKey((int)wParam, scan_code, extended != 0, state, millis, repeat);
+			
+			if(captureMouse != -1 && keyboard.isKeyDown(Keyboard.KEY_ESCAPE)) {
+				nReleaseCapture();
+				captureMouse = -1;
+			}
+		}
 	}
 
 	private static int transformY(long hwnd, int y) {
@@ -809,9 +836,6 @@
 			case WM_MBUTTONUP:
 				handleMouseButton(2, 0, millis);
 				return 0;
-			case WM_MOUSELEAVE:
-				handleMouseLeave(millis);
-				return 0;
 			case WM_SYSCHAR:
 			case WM_CHAR:
 				handleChar(wParam, lParam, millis);
@@ -854,6 +878,15 @@
 			case WM_PAINT:
 				is_dirty = true;
 				return defWindowProc(hwnd, msg, wParam, lParam);
+			case WM_CANCELMODE:
+				nReleaseCapture();
+				/* fall through */
+			case WM_CAPTURECHANGED:
+				if(captureMouse != -1) {
+					handleMouseButton(captureMouse, 0, millis);
+					captureMouse = -1;
+				}
+				return 0;
 			default:
 				return defWindowProc(hwnd, msg, wParam, lParam);
 		}
@@ -866,6 +899,15 @@
 	public int getHeight() {
 		return Display.getDisplayMode().getHeight();
 	}
+	
+	private int firstMouseButtonDown() {
+		for(int i=0; i<Mouse.getButtonCount(); i++) {
+			if(Mouse.isButtonDown(i)) {
+				return i;
+			}
+		}
+		return -1;
+	}
 
 	private static final class Rect {
 		public int top;
@@ -902,17 +944,4 @@
 			return "Rect: top = " + top + " bottom = " + bottom + " left = " + left + " right = " + right;
 		}
 	}
-
-
-
-	
-	private static native boolean nTrackMouse(long hwnd);
-	
-	private void handleMouseLeave(long millis) {
-		handleMouseButton(0, 0, millis);
-		handleMouseButton(1, 0, millis);
-		handleMouseButton(2, 0, millis);
-		trackingMouse = false;
-	}
-
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/test/input/MouseTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/input/MouseTest.java	2009-06-02 12:40:57 UTC (rev 3219)
+++ trunk/LWJGL/src/java/org/lwjgl/test/input/MouseTest.java	2009-06-03 11:08:58 UTC (rev 3220)
@@ -238,6 +238,8 @@
    */
   private void handleMouse() {
   	readBufferedMouse();
+  	
+  	Display.setTitle("x: " + Mouse.getX() + ", y: " + Mouse.getY() + ", [0]: " + Mouse.isButtonDown(0) + ", [1]: " + Mouse.isButtonDown(1) + ", [2]: " + Mouse.isButtonDown(2));
   }
   
   /**

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2009-06-02 12:40:57 UTC (rev 3219)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2009-06-03 11:08:58 UTC (rev 3220)
@@ -490,14 +490,11 @@
 	return GetSystemMetrics(index);
 }
 
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nTrackMouse(JNIEnv *env, jclass unused, jlong hwnd_int) {
+JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nSetCapture(JNIEnv *env, jclass unused, jlong hwnd_int) {
 	HWND hwnd = (HWND)(INT_PTR)hwnd_int;
-
-	TRACKMOUSEEVENT tme;
-	tme.cbSize		= sizeof(TRACKMOUSEEVENT);
-	tme.dwFlags		= TME_LEAVE;
-	tme.hwndTrack	= hwnd;
-
-	return _TrackMouseEvent(&tme);
+	return (INT_PTR) SetCapture(hwnd);
 }
 
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nReleaseCapture(JNIEnv *env, jclass unused) {
+	return ReleaseCapture();
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3219
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3219&view=rev
Author:   spasi
Date:     2009-06-02 12:40:57 +0000 (Tue, 02 Jun 2009)

Log Message:
-----------
Added missing @OutParameters

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java	2009-05-31 10:12:19 UTC (rev 3218)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java	2009-06-02 12:40:57 UTC (rev 3219)
@@ -186,12 +186,14 @@
 			             @OutParameter
 	                     @Check(value = "1", canBeNull = true)
 	                     @GLsizei IntBuffer length,
+			             @OutParameter
 	                     @GLcharARB ByteBuffer infoLog);
 
 	void glGetAttachedObjectsARB(@GLhandleARB int containerObj, @AutoSize("obj") @GLsizei int maxCount,
 			                     @OutParameter
 	                             @Check(value = "1", canBeNull = true)
 	                             @GLsizei IntBuffer count,
+			                     @OutParameter
 	                             @GLhandleARB IntBuffer obj);
 
 	/**
@@ -209,6 +211,7 @@
 	                           @Check("1") IntBuffer size,
 	                           @Check("1")
 	                           @GLenum IntBuffer type,
+	                           @OutParameter
 	                           @GLcharARB ByteBuffer name);
 
 	@StripPostfix("params")
@@ -221,5 +224,6 @@
 			                  @OutParameter
 	                          @Check(value = "1", canBeNull = true)
 	                          @GLsizei IntBuffer length,
+			                  @OutParameter
 	                          @GLcharARB ByteBuffer source);
 }

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2009-05-31 10:12:19 UTC (rev 3218)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2009-06-02 12:40:57 UTC (rev 3219)
@@ -202,18 +202,21 @@
 			                @OutParameter
 	                        @GLsizei
 	                        @Check(value = "1", canBeNull = true) IntBuffer length,
-	                        @GLchar ByteBuffer infoLog);
+			                @OutParameter
+			                @GLchar ByteBuffer infoLog);
 
 	void glGetProgramInfoLog(@GLuint int program, @AutoSize("infoLog") @GLsizei int maxLength,
 			                 @OutParameter
 	                         @GLsizei
 	                         @Check(value = "1", canBeNull = true) IntBuffer length,
+			                 @OutParameter
 	                         @GLchar ByteBuffer infoLog);
 
 	void glGetAttachedShaders(@GLuint int program, @AutoSize("shaders") @GLsizei int maxCount,
 			                  @OutParameter
 	                          @GLsizei
 	                          @Check(value = "1", canBeNull = true) IntBuffer count,
+			                  @OutParameter
 	                          @GLuint IntBuffer shaders);
 
 	/**
@@ -241,9 +244,10 @@
 	@StripPostfix("params")
 	void glGetUniformiv(@GLuint int program, int location, @OutParameter @Check IntBuffer params);
 
-	void glGetShaderSource(@GLuint int shader, @OutParameter @AutoSize("source") @GLsizei int maxLength,
+	void glGetShaderSource(@GLuint int shader, @AutoSize("source") @GLsizei int maxLength,
 	                       @Check(value = "1", canBeNull = true)
 	                       @GLsizei IntBuffer length,
+	                       @OutParameter
 	                       @GLchar ByteBuffer source);
 
 	// ------------------------------------------------------------------
@@ -358,9 +362,8 @@
 	                       @Check(value = "1", canBeNull = true)
 	                       @GLsizei IntBuffer length,
 	                       @Check("1") IntBuffer size,
-	                       @Check("1")
-	                       @GLenum IntBuffer type,
-	                       @Const
+	                       @Check("1") @GLenum IntBuffer type,
+	                       @OutParameter
 	                       @GLchar ByteBuffer name);
 
 	int glGetAttribLocation(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.