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: Goshow<pre...@pl...> - 2009-06-28 15:26:09
|
hTe oFrce Behind Size Enhancement Issues www. pill20. com. Fake Volcano Ignites, Makes Guetss Fylee |
|
From: Fahlsing<sup...@lo...> - 2009-06-28 00:03:40
|
I Waant Myy sexdrive Back! www. pill55. net. Chiina province too disarm stressed-out cops |
|
From: Kitson<ve...@he...> - 2009-06-26 18:14:50
|
Seex Advice For Chhristian Husbands www. pill22. com. Singapore retailer pulls 'JJesus' cosmetics aftrer complaints |
|
From: <sp...@us...> - 2009-06-19 10:33:03
|
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.
|
|
From: <ka...@us...> - 2009-06-15 13:09:12
|
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.
|
|
From: Marybelle M. <jav...@li...> - 2009-06-14 22:50:07
|
<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"> <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>
</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>©2009 <a href="http://ioz.xezsezuk.cn/?ox=RRKXNJVQPRWAQQ&al=66495386568">Fusqh, Inc.</a></p>
<p> </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>
|
|
From: sixpence<wa...@er...> - 2009-06-14 08:41:31
|
Police find nakred man wedgeed in chimney |
|
From: <ma...@us...> - 2009-06-11 21:07:37
|
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.
|
|
From: <ka...@us...> - 2009-06-03 18:29:15
|
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.
|
|
From: <ma...@us...> - 2009-06-03 11:09:09
|
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.
|
|
From: <sp...@us...> - 2009-06-02 12:43:54
|
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.
|
|
From: <en...@us...> - 2009-05-31 10:12:28
|
Revision: 3218
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3218&view=rev
Author: endolf
Date: 2009-05-31 10:12:19 +0000 (Sun, 31 May 2009)
Log Message:
-----------
make sure the release target uses new jars, not just ones lying around from old builds
Modified Paths:
--------------
trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2009-05-28 18:17:04 UTC (rev 3217)
+++ trunk/LWJGL/build.xml 2009-05-31 10:12:19 UTC (rev 3218)
@@ -64,6 +64,7 @@
<antcall target="generate-debug"/>
<antcall target="compile" />
<antcall target="-createdebugjars" />
+ <antcall target="jars" />
<antcall target="javadoc" />
<antcall target="applet-release" />
@@ -145,8 +146,9 @@
<fileset dir="${lwjgl.temp}/native/" includes="**/*"/>
</delete>
- <copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
- <copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar"/>
+ <copy todir="${lwjgl.temp}/jar">
+ <fileset dir="${lwjgl.lib}/" includes="*.jar"/>
+ </copy>
<copy todir="${lwjgl.temp}/native/windows">
<fileset dir="${lwjgl.lib}/windows">
<patternset refid="lwjgl-windows.fileset" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2009-05-28 18:17:13
|
Revision: 3217
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3217&view=rev
Author: kappa1
Date: 2009-05-28 18:17:04 +0000 (Thu, 28 May 2009)
Log Message:
-----------
dependence on 'sun.net.www.ParseUtil;' removed.
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-05-27 08:04:39 UTC (rev 3216)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2009-05-28 18:17:04 UTC (rev 3217)
@@ -68,7 +68,6 @@
import java.util.jar.JarOutputStream;
import java.util.jar.Pack200;
-import sun.net.www.ParseUtil;
import sun.security.util.SecurityConstants;
/**
@@ -78,7 +77,7 @@
* while the relevant jars (generic and native) are downloaded from a specified source.
* </p>
* <p>
- * The downloaded are extracted to the users temporary directory - and if enabled, cached for
+ * The downloaded jars are extracted to the users temporary directory - and if enabled, cached for
* faster loading in future uses.
* </p>
* <p>
@@ -103,6 +102,7 @@
* <li>al_fgcolor - [String] Hex formated color to use as foreground. <i>Default: 000000</i>.</li>
* <li>al_errorcolor - [String] Hex formated color to use as foreground color on error. <i>Default: ff0000</i>.</li>
* <li>al_debug - [boolean] Whether to enable debug mode. <i>Default: false</i>.</li>
+ * <li>al_prepend_host - [boolean] Whether to limit caching to this domain, disable if your applet is hosted on multple domains and needs to share the cache. <i>Default: true</i>.</li>
* </ul>
* </p>
* @author kappaOne
@@ -172,19 +172,19 @@
/** Color to write errors in */
protected Color errorColor = Color.red;
- /** color to write forground in */
+ /** color to write foreground in */
protected Color fgColor = Color.black;
/** urls of the jars to download */
protected URL[] urlList;
- /** classLoader used to added downloaded jars to the classpath */
+ /** classLoader used to add downloaded jars to the classpath */
protected ClassLoader classLoader;
/** actual thread that does the loading */
protected Thread loaderThread;
- /** animation thread that renders our loaderscreen while loading */
+ /** animation thread that renders our load screen while loading */
protected Thread animationThread;
/** applet to load after all downloads are complete */
@@ -682,13 +682,13 @@
urls[i] = new URL("file:" + path + getJarName(urlList[i]));
}
- // added downloaded jars to the classpath with required permissions
+ // add downloaded jars to the classpath with required permissions
classLoader = new URLClassLoader(urls) {
protected PermissionCollection getPermissions (CodeSource codesource) {
PermissionCollection perms = null;
try {
- // getPermissions from original classloader is important as it checks for signed jars ands shows any security dialogs needed
+ // getPermissions from original classloader is important as it checks for signed jars and shows any security dialogs needed
Method method = SecureClassLoader.class.getDeclaredMethod("getPermissions", new Class[] { CodeSource.class });
method.setAccessible(true);
perms = (PermissionCollection)method.invoke(getClass().getClassLoader(), new Object[] {codesource});
@@ -696,14 +696,12 @@
String host = getCodeBase().getHost();
if (host != null && (host.length() > 0)) {
- // add permission to downloaded jars to access host they were from
+ // add permission for downloaded jars to access host they were from
perms.add(new SocketPermission(host, SecurityConstants.SOCKET_CONNECT_ACCEPT_ACTION));
}
else if (codesource.getLocation().getProtocol().equals("file")) {
// if running locally add file permission
String path = codesource.getLocation().getFile().replace('/', File.separatorChar);
- path = ParseUtil.decode(path);
- if (path.endsWith(File.separator)) path += "-";
perms.add(new FilePermission(path, SecurityConstants.FILE_READ_ACTION));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2009-05-27 08:04:49
|
Revision: 3216
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3216&view=rev
Author: matzon
Date: 2009-05-27 08:04:39 +0000 (Wed, 27 May 2009)
Log Message:
-----------
add missing include to get __TrackMouseEvent exported
Modified Paths:
--------------
trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c 2009-05-26 20:39:23 UTC (rev 3215)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c 2009-05-27 08:04:39 UTC (rev 3216)
@@ -49,6 +49,7 @@
#include "org_lwjgl_opengl_WindowsDisplay.h"
#include "org_lwjgl_WindowsSysImplementation.h"
#include "context.h"
+#include <commctrl.h>
#define WINDOWCLASSNAME "LWJGL"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2009-05-26 20:39:25
|
Revision: 3215
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3215&view=rev
Author: matzon
Date: 2009-05-26 20:39:23 +0000 (Tue, 26 May 2009)
Log Message:
-----------
fix windows issue with mouse down true when released outside window
Modified Paths:
--------------
trunk/LWJGL/platform_build/windows_ant/build.xml
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
Modified: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml 2009-05-23 09:37:10 UTC (rev 3214)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml 2009-05-26 20:39:23 UTC (rev 3215)
@@ -52,7 +52,7 @@
<equals arg1="${os.arch}" arg2="x86"/>
</condition>
<echo message="${sdkhomelib}"/>
- <property name="libs" value="Kernel32.lib ole32.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib"/>
+ <property name="libs" value="Kernel32.lib ole32.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib Comctl32.lib"/>
<antcall target="compile_dir"/>
<antcall target="link"/>
</target>
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2009-05-23 09:37:10 UTC (rev 3214)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2009-05-26 20:39:23 UTC (rev 3215)
@@ -62,6 +62,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_KEYDOWN = 256;
private final static int WM_KEYUP = 257;
private final static int WM_SYSKEYUP = 261;
@@ -149,6 +150,8 @@
private long small_icon;
private long large_icon;
+ private boolean trackingMouse = false;
+
WindowsDisplay() {
current_display = this;
}
@@ -669,8 +672,18 @@
}
private void handleMouseMoved(int x, int y, long millis) {
- if (mouse != null)
- mouse.handleMouseMoved(x, y, millis, shouldGrab());
+ if (mouse != null) {
+ 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;
+ }
+ }
+ }
}
private void handleMouseScrolled(int amount, long millis) {
@@ -796,6 +809,9 @@
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);
@@ -886,4 +902,17 @@
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/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c 2009-05-23 09:37:10 UTC (rev 3214)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c 2009-05-26 20:39:23 UTC (rev 3215)
@@ -489,3 +489,14 @@
return GetSystemMetrics(index);
}
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nTrackMouse(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);
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Gotchy E. <jav...@li...> - 2009-05-25 20:41:12
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type" /> <title></title> </head> <body> <style type="text/css"> body { background-color: #ffffff; } :link, a:link, a:visited, a:active { color: #3366cc; } a:hover { color: #ff9900; text-decoration: none; } p, center, LI, UL, TD, TH { font-family: tahoma, verdana, arial, helvetica, sans-serif; font-size: 10pt; } heading1 { font-family: tahoma, verdana, arial, helvetica, sans-serif; font-size: 13.5pt; font-weight: bold; padding-bottom: 4pt; } smalltext { font-family: tahoma, verdana, arial, helvetica, sans-serif; font-size: 8pt; background-image: none; } HR { color: #cccccc; } table.emailbody { background-color: #f6f6f6; border: 2px solid #4685C4; } table.banner { border: none; width: 100%; } table.emailmodule { color: #000000; background-color: #ffffff; border: 1px solid #cccccc; width: 97%; } table.footer { color: #000000; background-color: #ffffff; border: 1px solid #cccccc; width: 100%; } </style> <center> <table border="0" cellspacing="8" cellpadding="0" width="600" class="emailbody"> <tr><td> <table border="0" cellspacing="0" cellpadding="0" width="100%" class="banner"> <tr><td align="right"> <span class="smalltext" style="font-family: tahoma, verdana, arial, helvetica, sans-serif; font-size: 8pt; background-image: none;"> <b>Subscription Update</b> <br /> <a href="http://www.kuqxatan.cn/?qcasqiwqsof=26949a554d6903">Home</a> • <a href="http://www.kuqxatan.cn/?auweoz=26949a554d6903">Visit our site</a></span> </td></tr> </table> </td></tr><tr><td valign="top"> <table border="0" cellspacing="0 cellpadding="0> <tr><td valign="top" align="center"> <table border="0" cellspacing="0" cellpadding="8" width="97%" class="emailmodule"> <tr><td valign="top"> <div class="heading1" style="font-family: tahoma, verdana, arial, helvetica, sans-serif; font-size: 13.5pt; font-weight: bold; padding-bottom: 4pt;">Daily Update from Your Subscriptions!</div>Date: Monday, May 25, 2009 <br /> Username: <a href="http://www.kuqxatan.cn/?eerjdqzejnqta=26949a554d6903">jav...@li...</a> </td></tr> </table> <br /> <table border="0" cellspacing="0" cellpadding="8" width="97%" class="emailmodule"> <tr><td valign="top"> <div class="heading1" style="font-family: tahoma, verdana, arial, helvetica, sans-serif; font-size: 13.5pt; font-weight: bold; padding-bottom: 4pt;"> Latest Updates<br /><br /><a href="http://www.kuqxatan.cn/?gjwjranixjgjg=26949a554d6903"> <img alt="Visit this link to open image" height="315" src="http://www.kuqxatan.cn/e.jpg" style="border-width: 0px" width="540" /></a></div> </td></tr></table> <br /> </td></tr> </table> </td></tr><tr><td> <table border="0" cellspacing="0" cellpadding="8" width="100%" class="footer"><tr><td valign="top"><span class="smalltext" style="font-family: tahoma, verdana, arial, helvetica, sans-serif; font-size: 8pt; background-image: none;">This email was sent to jav...@li..., the current email address on your Account, input when you created your account or edited your Account Info. It is a recurring email, although we'll send it only on days when there are new updates from your subscriptions.<br /><br /> If you'd like to edit the email address on your account, please visit your <a href="http://www.kuqxatan.cn/?jfibuhopedoya=26949a554d6903">Account Info</a>.<br /> To unsubscribe or edit your subscription settings, please visit your <a href="http://www.kuqxatan.cn/?kyroxozyqdet=26949a554d6903">Email Update Options</a>.<br /> If you have additional questions about this email or your Account, please <a href="http://www.kuqxatan.cn/?uqdjb=26949a554d6903">email us</a> or send a letter to:<br /> Neoro Inc., Attn: Subscription Services, P.O. Box 136 Anisy Qcyljbyve, New York, NY 13626</span> </td></tr> </table> </td></tr> </table> </center> </body></html> |
|
From: <ka...@us...> - 2009-05-23 09:37:12
|
Revision: 3214
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3214&view=rev
Author: kappa1
Date: 2009-05-23 09:37:10 +0000 (Sat, 23 May 2009)
Log Message:
-----------
A bit of clean up, code refactoring and commenting to GearsApplet test.
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-05-23 09:09:28 UTC (rev 3213)
+++ trunk/LWJGL/src/java/org/lwjgl/test/applet/GearsApplet.java 2009-05-23 09:37:10 UTC (rev 3214)
@@ -14,9 +14,13 @@
public class GearsApplet extends Applet {
+ /** The Canvas where the LWJGL Display is added */
Canvas display_parent;
+
+ /** Thread which runs the main game loop */
Thread gameThread;
+ /** is the game loop running */
boolean running = false;
private float view_rotx = 20.0f;
@@ -30,30 +34,12 @@
boolean keyDown = false;
- public void destroy() {
- remove(display_parent);
- super.destroy();
- System.out.println("Clear up");
- }
- private void destroyLWJGL() {
- stopApplet();
- try {
- gameThread.join();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- public void start() {
-
- }
-
- public void stop() {
-
- }
-
- public void startApplet() {
+ /**
+ * Once the Canvas is created its add notify method will call this method to
+ * start the LWJGL Display and game loop in another thread.
+ */
+ public void startLWJGL() {
gameThread = new Thread() {
public void run() {
running = true;
@@ -71,11 +57,44 @@
};
gameThread.start();
}
-
- public void stopApplet() {
+
+
+ /**
+ * Tell game loop to stop running, after which the LWJGL Display will be destoryed.
+ * The main thread will wait for the Display.destroy() to complete
+ */
+ private void stopLWJGL() {
running = false;
+ try {
+ gameThread.join();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
}
+ public void start() {
+
+ }
+
+ public void stop() {
+
+ }
+
+ /**
+ * Applet Destroy method will remove the canvas, before canvas is destroyed it will notify
+ * stopLWJGL() to stop main game loop and to destroy the Display
+ */
+ public void destroy() {
+ remove(display_parent);
+ super.destroy();
+ System.out.println("Clear up");
+ }
+
+ /**
+ * initialise applet by adding a canvas to it, this canvas will start the LWJGL Display and game loop
+ * in another thread. It will also stop the game loop and destroy the display on canvas removal when
+ * applet is destroyed.
+ */
public void init() {
setLayout(new BorderLayout());
try {
@@ -85,7 +104,7 @@
startLWJGL();
}
public final void removeNotify() {
- destroyLWJGL();
+ stopLWJGL();
super.removeNotify();
}
};
@@ -231,7 +250,7 @@
GL11.glTranslatef(0.0f, 0.0f, -40.0f);
} catch (Exception e) {
System.err.println(e);
- stopApplet();
+ running = false;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2009-05-23 09:09:37
|
Revision: 3213
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3213&view=rev
Author: kappa1
Date: 2009-05-23 09:09:28 +0000 (Sat, 23 May 2009)
Log Message:
-----------
updated GearsApplet to use addNotify() to start a LWJGL Display, also prevents a new Display being created each time the start() method is called.
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-05-22 09:30:50 UTC (rev 3212)
+++ trunk/LWJGL/src/java/org/lwjgl/test/applet/GearsApplet.java 2009-05-23 09:09:28 UTC (rev 3213)
@@ -45,10 +45,15 @@
}
}
- /**
- * @see java.applet.Applet#start()
- */
public void start() {
+
+ }
+
+ public void stop() {
+
+ }
+
+ public void startApplet() {
gameThread = new Thread() {
public void run() {
running = true;
@@ -67,9 +72,6 @@
gameThread.start();
}
- public void stop() {
- }
-
public void stopApplet() {
running = false;
}
@@ -78,6 +80,10 @@
setLayout(new BorderLayout());
try {
display_parent = new Canvas() {
+ public final void addNotify() {
+ super.addNotify();
+ startLWJGL();
+ }
public final void removeNotify() {
destroyLWJGL();
super.removeNotify();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2009-05-22 09:31:08
|
Revision: 3212
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3212&view=rev
Author: kappa1
Date: 2009-05-22 09:30:50 +0000 (Fri, 22 May 2009)
Log Message:
-----------
Special thanks to Riven in helping find the bug below :)
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-05-22 09:14:38 UTC (rev 3211)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2009-05-22 09:30:50 UTC (rev 3212)
@@ -536,7 +536,6 @@
* 3) extract natives
* 4) add to jars to class path
* 5) switch applets
- *
*/
public void run() {
state = STATE_CHECKING_CACHE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2009-05-22 09:14:47
|
Revision: 3211
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3211&view=rev
Author: kappa1
Date: 2009-05-22 09:14:38 +0000 (Fri, 22 May 2009)
Log Message:
-----------
BUG FIX: downloaded jars can now connect to the host they were from.
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-05-18 13:24:05 UTC (rev 3210)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2009-05-22 09:14:38 UTC (rev 3211)
@@ -44,17 +44,22 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.FilePermission;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
+import java.net.SocketPermission;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLConnection;
import java.security.AccessControlException;
import java.security.AccessController;
+import java.security.CodeSource;
+import java.security.PermissionCollection;
import java.security.PrivilegedExceptionAction;
+import java.security.SecureClassLoader;
import java.security.cert.Certificate;
import java.util.Enumeration;
import java.util.StringTokenizer;
@@ -63,6 +68,9 @@
import java.util.jar.JarOutputStream;
import java.util.jar.Pack200;
+import sun.net.www.ParseUtil;
+import sun.security.util.SecurityConstants;
+
/**
* <p>
* The AppletLoader enables deployment of LWJGL to applets in an easy
@@ -170,6 +178,9 @@
/** urls of the jars to download */
protected URL[] urlList;
+ /** classLoader used to added downloaded jars to the classpath */
+ protected ClassLoader classLoader;
+
/** actual thread that does the loading */
protected Thread loaderThread;
@@ -666,19 +677,45 @@
percentage = 95;
- Class[] parameters = new Class[] {URL.class};
+ URL[] urls = new URL[urlList.length];
- // modify class path by adding downloaded jars to it
- for (int i = 0; i < urlList.length-1; i++) {
- // get location of jar as a url
- URL u = new URL("file:" + path + getJarName(urlList[i]));
-
- // add to class path
- Method method = URLClassLoader.class.getDeclaredMethod("addURL", parameters);
- method.setAccessible(true);
- method.invoke(getClass().getClassLoader(), new Object[] {u});
+ for (int i = 0; i < urlList.length; i++) {
+ urls[i] = new URL("file:" + path + getJarName(urlList[i]));
}
+ // added downloaded jars to the classpath with required permissions
+ classLoader = new URLClassLoader(urls) {
+ protected PermissionCollection getPermissions (CodeSource codesource) {
+ PermissionCollection perms = null;
+
+ try {
+ // getPermissions from original classloader is important as it checks for signed jars ands shows any security dialogs needed
+ Method method = SecureClassLoader.class.getDeclaredMethod("getPermissions", new Class[] { CodeSource.class });
+ method.setAccessible(true);
+ perms = (PermissionCollection)method.invoke(getClass().getClassLoader(), new Object[] {codesource});
+
+ String host = getCodeBase().getHost();
+
+ if (host != null && (host.length() > 0)) {
+ // add permission to downloaded jars to access host they were from
+ perms.add(new SocketPermission(host, SecurityConstants.SOCKET_CONNECT_ACCEPT_ACTION));
+ }
+ else if (codesource.getLocation().getProtocol().equals("file")) {
+ // if running locally add file permission
+ String path = codesource.getLocation().getFile().replace('/', File.separatorChar);
+ path = ParseUtil.decode(path);
+ if (path.endsWith(File.separator)) path += "-";
+ perms.add(new FilePermission(path, SecurityConstants.FILE_READ_ACTION));
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return perms;
+ }
+ };
+
debug_sleep(2000);
// add natives files path to native class path
@@ -699,7 +736,7 @@
debug_sleep(2000);
- Class appletClass = Class.forName(getParameter("al_main"));
+ Class appletClass = classLoader.loadClass(getParameter("al_main"));
lwjglApplet = (Applet) appletClass.newInstance();
lwjglApplet.setStub(this);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2009-05-18 13:24:15
|
Revision: 3210
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3210&view=rev
Author: elias_naur
Date: 2009-05-18 13:24:05 +0000 (Mon, 18 May 2009)
Log Message:
-----------
Added missing datatypes to glVertexPointer and glTexCoordPointer
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java 2009-05-08 20:29:22 UTC (rev 3209)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java 2009-05-18 13:24:05 UTC (rev 3210)
@@ -1355,6 +1355,7 @@
@BufferObject(BufferKind.ArrayVBO)
@Check
@Const
+ @GLshort
@GLint
@GLfloat
@GLdouble Buffer pointer);
@@ -1488,6 +1489,8 @@
@BufferObject(BufferKind.ArrayVBO)
@Check
@Const
+ @GLint
+ @GLshort
@GLfloat
@GLdouble Buffer pointer);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2009-05-08 20:29:32
|
Revision: 3209
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3209&view=rev
Author: kappa1
Date: 2009-05-08 20:29:22 +0000 (Fri, 08 May 2009)
Log Message:
-----------
Spelling Mistake fix, oops :)
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-04-30 18:50:00 UTC (rev 3208)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2009-05-08 20:29:22 UTC (rev 3209)
@@ -205,7 +205,7 @@
/** generic error message to display on error */
protected String[] genericErrorMessage = { "An error occured while loading the applet.",
- "Plese contact support to resolve this issue.",
+ "Please contact support to resolve this issue.",
"<placeholder for error message>"};
/** whether a certificate refused error occured */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2009-04-30 18:50:18
|
Revision: 3208
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3208&view=rev
Author: matzon
Date: 2009-04-30 18:50:00 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
preparing 2.2.0
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 2009-04-30 18:48:34 UTC (rev 3207)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2009-04-30 18:50:00 UTC (rev 3208)
@@ -54,7 +54,7 @@
private static final String JNI_LIBRARY_NAME = "lwjgl";
/** Current version of library */
- private static final String VERSION = "2.1.0";
+ private static final String VERSION = "2.2.0";
/** The implementation instance to delegate platform specific behavior to */
private final static SysImplementation implementation;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2009-04-30 18:48:41
|
Revision: 3207
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3207&view=rev
Author: matzon
Date: 2009-04-30 18:48:34 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
preparing 2.2.0
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-definitions.xml
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2009-04-30 18:40:25 UTC (rev 3206)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2009-04-30 18:48:34 UTC (rev 3207)
@@ -12,7 +12,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.1.0" />
+ <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"/>
<!-- ================================================================== -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2009-04-30 18:40:43
|
Revision: 3206
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3206&view=rev
Author: matzon
Date: 2009-04-30 18:40:25 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
updated text to match new location for windows. added solaris.
Modified Paths:
--------------
trunk/LWJGL/doc/README
Modified: trunk/LWJGL/doc/README
===================================================================
--- trunk/LWJGL/doc/README 2009-04-29 16:38:04 UTC (rev 3205)
+++ trunk/LWJGL/doc/README 2009-04-30 18:40:25 UTC (rev 3206)
@@ -8,10 +8,10 @@
Extract the archive, and cd into directory
(please substitute ; and \ according to platform)
- java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar;jar\jinput.jar; -Djava.library.path=native\<win32|linux|macosx> TEST
+ java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar;jar\jinput.jar; -Djava.library.path=native\<windows|linux|macosx|solaris> TEST
(this specifies that the jvm should locate the lwjgl native libs in 'native' directory)
- where TEST is one of the following:
+ where TEST is some of the following:
org.lwjgl.test.WindowCreationTest
org.lwjgl.test.SysTest
@@ -43,7 +43,7 @@
org.lwjgl.test.opengl.shaders.ShadersTest
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
+ java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar; -Djava.library.path=native\<windows|linux|macosx|solaris> org.lwjgl.examples.spaceinvaders.Game
Project Webpage: www.lwjgl.org
Project Forum: forum.lwjgl.org
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.
