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
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
(3) |
2
|
3
(2) |
4
|
5
|
|
6
|
7
|
8
|
9
|
10
(5) |
11
|
12
|
|
13
|
14
|
15
|
16
(1) |
17
|
18
(8) |
19
|
|
20
(1) |
21
(2) |
22
(2) |
23
|
24
|
25
(1) |
26
|
|
27
|
28
|
29
|
30
(1) |
31
(2) |
|
|
|
From: <ma...@us...> - 2006-08-31 16:41:11
|
Revision: 2567
http://svn.sourceforge.net/java-game-lib/?rev=2567&view=rev
Author: matzon
Date: 2006-08-31 09:40:53 -0700 (Thu, 31 Aug 2006)
Log Message:
-----------
fixed params (int -> float)
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/fmod3/FSound.java
trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c
Modified: trunk/LWJGL/src/java/org/lwjgl/fmod3/FSound.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/fmod3/FSound.java 2006-08-31 13:35:36 UTC (rev 2566)
+++ trunk/LWJGL/src/java/org/lwjgl/fmod3/FSound.java 2006-08-31 16:40:53 UTC (rev 2567)
@@ -1656,7 +1656,7 @@
* @param max The channels maximum volume distance in "units". See remarks for more on units.
* @return On success, TRUE is returned. On failure, FALSE is returned.
*/
- public static native boolean FSOUND_3D_SetMinMaxDistance(int channel, int min, int max);
+ public static native boolean FSOUND_3D_SetMinMaxDistance(int channel, float min, float max);
/**
* Sets the current position of the sound in SAMPLES not bytes
Modified: trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c
===================================================================
--- trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c 2006-08-31 13:35:36 UTC (rev 2566)
+++ trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c 2006-08-31 16:40:53 UTC (rev 2567)
@@ -730,7 +730,7 @@
* Method: FSOUND_3D_SetMinMaxDistance
* Signature: (III)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_13D_1SetMinMaxDistance(JNIEnv * env, jclass clazz, jint channel, jint min, jint max) {
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_13D_1SetMinMaxDistance(JNIEnv * env, jclass clazz, jint channel, jfloat min, jfloat max) {
return fmod_instance->FSOUND_3D_SetMinMaxDistance(channel, min, max);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-08-31 13:36:06
|
Revision: 2566
http://svn.sourceforge.net/java-game-lib/?rev=2566&view=rev
Author: elias_naur
Date: 2006-08-31 06:35:36 -0700 (Thu, 31 Aug 2006)
Log Message:
-----------
Don't throw exceptions on Mouse.getEventButtonState
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2006-08-30 02:47:49 UTC (rev 2565)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2006-08-31 13:35:36 UTC (rev 2566)
@@ -394,13 +394,10 @@
}
/**
- * Get the current events button state. If <code>getEventButton()</code> is -1,
- * and IllegalStateException is thrown.
+ * Get the current events button state.
* @return Current events button state.
*/
public static boolean getEventButtonState() {
- if (eventButton == -1)
- throw new IllegalStateException("Current event has no button state change");
return eventState;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kev...@us...> - 2006-08-30 02:47:56
|
Revision: 2565 Author: kevglass Date: 2006-08-29 19:47:49 -0700 (Tue, 29 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2565&view=rev Log Message: ----------- Removed sanity checks for controllers. All controllers are now reported allowing the developer to make the decision over which ones to display to the user. Modified Paths: -------------- trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java Modified: trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java =================================================================== --- trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java 2006-08-25 05:47:59 UTC (rev 2564) +++ trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java 2006-08-30 02:47:49 UTC (rev 2565) @@ -72,18 +72,6 @@ if (sub.length == 0) { JInputController controller = new JInputController(controllerCount,c); - // sanity checks to ensure we're actually getting game controllers rather than - // any old detected device - - // if we've got no buttons at all we're not a game controller - if (controller.getButtonCount() == 0) { - return; - } - // if we've got no axis at all we're not a game controller - if (controller.getAxisCount() == 0) { - return; - } - controllers.add(controller); controllerCount++; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-08-25 05:48:29
|
Revision: 2564 Author: elias_naur Date: 2006-08-24 22:47:59 -0700 (Thu, 24 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2564&view=rev Log Message: ----------- Updated jinput.jar Modified Paths: -------------- trunk/LWJGL/libs/jinput.jar Modified: trunk/LWJGL/libs/jinput.jar =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-08-22 21:21:46
|
Revision: 2563 Author: elias_naur Date: 2006-08-22 14:21:37 -0700 (Tue, 22 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2563&view=rev Log Message: ----------- Updated jinput.jar Modified Paths: -------------- trunk/LWJGL/libs/jinput.jar Modified: trunk/LWJGL/libs/jinput.jar =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-08-22 09:24:51
|
Revision: 2562 Author: elias_naur Date: 2006-08-22 02:24:20 -0700 (Tue, 22 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2562&view=rev Log Message: ----------- Updated jinput.jar Modified Paths: -------------- trunk/LWJGL/libs/jinput.jar Modified: trunk/LWJGL/libs/jinput.jar =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kev...@us...> - 2006-08-21 17:26:34
|
Revision: 2561 Author: kevglass Date: 2006-08-21 10:26:28 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2561&view=rev Log Message: ----------- Added sanity checks on reported controllers to prune out one with no Axis or no Buttons. Modified Paths: -------------- trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java Modified: trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java =================================================================== --- trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java 2006-08-21 17:25:49 UTC (rev 2560) +++ trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java 2006-08-21 17:26:28 UTC (rev 2561) @@ -71,6 +71,19 @@ net.java.games.input.Controller[] sub = c.getControllers(); if (sub.length == 0) { JInputController controller = new JInputController(controllerCount,c); + + // sanity checks to ensure we're actually getting game controllers rather than + // any old detected device + + // if we've got no buttons at all we're not a game controller + if (controller.getButtonCount() == 0) { + return; + } + // if we've got no axis at all we're not a game controller + if (controller.getAxisCount() == 0) { + return; + } + controllers.add(controller); controllerCount++; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kev...@us...> - 2006-08-21 17:25:55
|
Revision: 2560 Author: kevglass Date: 2006-08-21 10:25:49 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2560&view=rev Log Message: ----------- Update controllers test to not poll() the controllers from multiple threads. Modified Paths: -------------- trunk/LWJGL/src/java/org/lwjgl/test/input/TestControllers.java Modified: trunk/LWJGL/src/java/org/lwjgl/test/input/TestControllers.java =================================================================== --- trunk/LWJGL/src/java/org/lwjgl/test/input/TestControllers.java 2006-08-20 18:01:20 UTC (rev 2559) +++ trunk/LWJGL/src/java/org/lwjgl/test/input/TestControllers.java 2006-08-21 17:25:49 UTC (rev 2560) @@ -96,21 +96,9 @@ frame.setSize(230,400); frame.setLocation(index*30,index*30); frame.setVisible(true); - - Thread t = new Thread() { - public void run() { - while (true) { - try { Thread.sleep(100); } catch (Exception e) {}; - pollAndUpdate(); - } - } - }; - t.start(); } - public void pollAndUpdate() { - Controllers.poll(); - + public void updateDetails() { for (int i=0;i<controller.getButtonCount();i++) { values[i].setText(""+controller.isButtonPressed(i)); } @@ -120,12 +108,6 @@ values[itemCount-2].setText(""+controller.getPovX()); values[itemCount-1].setText(""+controller.getPovY()); - - while (Controllers.next()) { - System.out.println("Event Fired: "); - System.out.println("\t"+Controllers.getEventSource()+":"+Controllers.getEventControlIndex()+":"+Controllers.isEventButton()); - System.out.println("\t"+Controllers.isEventXAxis()+":"+Controllers.isEventYAxis()); - } } public static void main(String[] argv) { @@ -147,8 +129,26 @@ System.exit(0); } + TestControllers[] controllerWindows = new TestControllers[count]; for (int i=0;i<count;i++) { - new TestControllers(i); + controllerWindows[i] = new TestControllers(i); } + + boolean running = true; + while (running) { + try { Thread.sleep(100); } catch (Exception e) {}; + + Controllers.poll(); + + while (Controllers.next()) { + System.out.println("Event Fired: "); + System.out.println("\t"+Controllers.getEventSource()+":"+Controllers.getEventControlIndex()+":"+Controllers.isEventButton()); + System.out.println("\t"+Controllers.isEventXAxis()+":"+Controllers.isEventYAxis()); + } + + for (int i=0;i<count;i++) { + controllerWindows[i].updateDetails(); + } + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-08-20 18:01:28
|
Revision: 2559 Author: matzon Date: 2006-08-20 11:01:20 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2559&view=rev Log Message: ----------- only print last changelog - rest is linked Modified Paths: -------------- trunk/LWJGL/www/changelog.php Modified: trunk/LWJGL/www/changelog.php =================================================================== --- trunk/LWJGL/www/changelog.php 2006-08-18 22:31:23 UTC (rev 2558) +++ trunk/LWJGL/www/changelog.php 2006-08-20 18:01:20 UTC (rev 2559) @@ -17,47 +17,30 @@ </p> <ul> <li><a href="http://www.lwjgl.org/changelogs/full-changelog.txt" target="_blank">Full changelog</a></li> - <li><a href="#1.0beta">LWJGL 1.0beta</a></li> - <li><a href="#0.99">LWJGL 0.99</a></li> - <li><a href="#0.98">LWJGL 0.98</a></li> - <li><a href="#0.97">LWJGL 0.97</a></li> - <li><a href="#0.96">LWJGL 0.96</a></li> - <li><a href="#0.95">LWJGL 0.95</a></li> - <li><a href="#0.94">LWJGL 0.94</a></li> - <li><a href="#0.93">LWJGL 0.93</a></li> - <li><a href="#0.92">LWJGL 0.92</a></li> - <li><a href="#0.90">LWJGL 0.90</a></li> - <li><a href="#0.89">LWJGL 0.89</a></li> - <li><a href="#0.80">LWJGL 0.80</a></li> - <li><a href="#0.70">LWJGL 0.70</a></li> - <li><a href="#0.60">LWJGL 0.60</a></li> - <li><a href="#0.50">LWJGL 0.50</a></li> - <li><a href="#0.40">LWJGL 0.40</a></li> - <li><a href="#0.30">LWJGL 0.30</a></li> - <li><a href="#0.20">LWJGL 0.20</a></li> - <li><a href="#0.10">LWJGL 0.10</a></li> + <li><a href="#1.0beta3">LWJGL 1.0beta3</a></li> + <li><a href="http://www.lwjgl.org/changelogs/1.0beta2-changelog.txt" target="_blank">LWJGL 1.0beta2</a></li> + <li><a href="http://www.lwjgl.org/changelogs/1.0beta-changelog.txt" target="_blank">LWJGL 1.0beta</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.99-changelog.txt" target="_blank">LWJGL 0.99</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.98-changelog.txt" target="_blank">LWJGL 0.98</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.97-changelog.txt" target="_blank">LWJGL 0.97</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.96-changelog.txt" target="_blank">LWJGL 0.96</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.95-changelog.txt" target="_blank">LWJGL 0.95</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.94-changelog.txt" target="_blank">LWJGL 0.94</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.93-changelog.txt" target="_blank">LWJGL 0.93</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.92-changelog.txt" target="_blank">LWJGL 0.92</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.90-changelog.txt" target="_blank">LWJGL 0.90</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.89-changelog.txt" target="_blank">LWJGL 0.89</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.80-changelog.txt" target="_blank">LWJGL 0.80</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.70-changelog.txt" target="_blank">LWJGL 0.70</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.60-changelog.txt" target="_blank">LWJGL 0.60</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.50-changelog.txt" target="_blank">LWJGL 0.50</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.40-changelog.txt" target="_blank">LWJGL 0.40</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.30-changelog.txt" target="_blank">LWJGL 0.30</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.20-changelog.txt" target="_blank">LWJGL 0.20</a></li> + <li><a href="http://www.lwjgl.org/changelogs/0.10-changelog.txt" target="_blank">LWJGL 0.10</a></li> </ul> <? -displayChangelog('1.0beta'); -displayChangelog('0.99'); -displayChangelog('0.98'); -displayChangelog('0.97'); -displayChangelog('0.96'); -displayChangelog('0.95'); -displayChangelog('0.94'); -displayChangelog('0.93'); -displayChangelog('0.92'); -displayChangelog('0.90'); -displayChangelog('0.89'); -displayChangelog('0.80'); -displayChangelog('0.70'); -displayChangelog('0.60'); -displayChangelog('0.50'); -displayChangelog('0.40'); -displayChangelog('0.30'); -displayChangelog('0.20'); -displayChangelog('0.10'); - +displayChangelog('1.0beta3'); require('_include/footer.php'); ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-08-18 22:31:32
|
Revision: 2558 Author: elias_naur Date: 2006-08-18 15:31:23 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2558&view=rev Log Message: ----------- Mac OS X: re-imported jinput library Modified Paths: -------------- trunk/LWJGL/libs/macosx/libjinput-osx.jnilib Modified: trunk/LWJGL/libs/macosx/libjinput-osx.jnilib =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-08-18 22:18:25
|
Revision: 2557 Author: elias_naur Date: 2006-08-18 15:17:32 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2557&view=rev Log Message: ----------- Win32: Re-imported jinput libraries Modified Paths: -------------- trunk/LWJGL/libs/win32/jinput-dx8.dll trunk/LWJGL/libs/win32/jinput-raw.dll Modified: trunk/LWJGL/libs/win32/jinput-dx8.dll =================================================================== (Binary files differ) Modified: trunk/LWJGL/libs/win32/jinput-raw.dll =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-08-18 22:06:03
|
Revision: 2556 Author: elias_naur Date: 2006-08-18 15:05:09 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2556&view=rev Log Message: ----------- Mac OS X: Set binary mime type on jinput library Property Changed: ---------------- trunk/LWJGL/libs/macosx/libjinput-osx.jnilib Property changes on: trunk/LWJGL/libs/macosx/libjinput-osx.jnilib ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-08-18 22:04:01
|
Revision: 2555 Author: elias_naur Date: 2006-08-18 15:03:54 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2555&view=rev Log Message: ----------- Win32: Set binary mime type on jinput libs Property Changed: ---------------- trunk/LWJGL/libs/win32/jinput-dx8.dll trunk/LWJGL/libs/win32/jinput-raw.dll Property changes on: trunk/LWJGL/libs/win32/jinput-dx8.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: trunk/LWJGL/libs/win32/jinput-raw.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-08-18 09:44:36
|
Revision: 2554 Author: elias_naur Date: 2006-08-18 02:01:48 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2554&view=rev Log Message: ----------- Removed wrong 1.0beta3 tag Removed Paths: ------------- tags/1.0beta3/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-08-18 09:44:30
|
Revision: 2551 Author: matzon Date: 2006-08-18 01:41:19 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2551&view=rev Log Message: ----------- using statically linked support libs Modified Paths: -------------- trunk/LWJGL/libs/linux/libIL.so trunk/LWJGL/libs/linux/libILU.so trunk/LWJGL/libs/linux/libILUT.so Modified: trunk/LWJGL/libs/linux/libIL.so =================================================================== (Binary files differ) Modified: trunk/LWJGL/libs/linux/libILU.so =================================================================== (Binary files differ) Modified: trunk/LWJGL/libs/linux/libILUT.so =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-08-18 09:41:15
|
Revision: 2553 Author: elias_naur Date: 2006-08-18 02:00:25 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2553&view=rev Log Message: ----------- Tagged 1.0beta3 (again) Added Paths: ----------- tags/lwjgl1.0beta3/ Copied: tags/lwjgl1.0beta3 (from rev 2552, trunk/LWJGL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-08-18 08:50:08
|
Revision: 2552 Author: matzon Date: 2006-08-18 01:49:25 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2552&view=rev Log Message: ----------- using statically linked support libs Modified Paths: -------------- trunk/LWJGL/libs/macosx/libIL.dylib trunk/LWJGL/libs/macosx/libILU.dylib trunk/LWJGL/libs/macosx/libILUT.dylib Modified: trunk/LWJGL/libs/macosx/libIL.dylib =================================================================== (Binary files differ) Modified: trunk/LWJGL/libs/macosx/libILU.dylib =================================================================== (Binary files differ) Modified: trunk/LWJGL/libs/macosx/libILUT.dylib =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sp...@us...> - 2006-08-16 10:43:12
|
Revision: 2550 Author: spasi Date: 2006-08-16 03:42:43 -0700 (Wed, 16 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2550&view=rev Log Message: ----------- Added EXT_blend_color & EXT_blend_minmax extensions. Modified Paths: -------------- trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java Added Paths: ----------- trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTBlendColor.java trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTBlendMinmax.java trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTBlendColor.c trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTBlendMinmax.c trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_blend_color.java trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_blend_minmax.java Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java =================================================================== --- trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java 2006-08-10 09:27:38 UTC (rev 2549) +++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java 2006-08-16 10:42:43 UTC (rev 2550) @@ -64,8 +64,10 @@ public final boolean GL_ATI_vertex_streams; public final boolean GL_EXT_abgr; public final boolean GL_EXT_bgra; + public final boolean GL_EXT_blend_color; public final boolean GL_EXT_blend_equation_separate; public final boolean GL_EXT_blend_func_separate; + public final boolean GL_EXT_blend_minmax; public final boolean GL_EXT_blend_subtract; public final boolean GL_EXT_cg_shader; public final boolean GL_EXT_compiled_vertex_array; @@ -421,8 +423,10 @@ long ATI_vertex_streams_glClientActiveVertexStreamATI_pointer; long ATI_vertex_streams_glVertexBlendEnvfATI_pointer; long ATI_vertex_streams_glVertexBlendEnviATI_pointer; + long EXT_blend_color_glBlendColorEXT_pointer; long EXT_blend_equation_separate_glBlendEquationSeparateEXT_pointer; long EXT_blend_func_separate_glBlendFuncSeparateEXT_pointer; + long EXT_blend_minmax_glBlendEquationEXT_pointer; long EXT_compiled_vertex_array_glLockArraysEXT_pointer; long EXT_compiled_vertex_array_glUnlockArraysEXT_pointer; long EXT_depth_bounds_test_glDepthBoundsEXT_pointer; @@ -1386,6 +1390,11 @@ (ATI_vertex_streams_glVertexBlendEnviATI_pointer = GLContext.getFunctionAddress("glVertexBlendEnviATI")) != 0; } + private boolean EXT_blend_color_initNativeFunctionAddresses() { + return + (EXT_blend_color_glBlendColorEXT_pointer = GLContext.getFunctionAddress("glBlendColorEXT")) != 0; + } + private boolean EXT_blend_equation_separate_initNativeFunctionAddresses() { return (EXT_blend_equation_separate_glBlendEquationSeparateEXT_pointer = GLContext.getFunctionAddress("glBlendEquationSeparateEXT")) != 0; @@ -1396,6 +1405,11 @@ (EXT_blend_func_separate_glBlendFuncSeparateEXT_pointer = GLContext.getFunctionAddress("glBlendFuncSeparateEXT")) != 0; } + private boolean EXT_blend_minmax_initNativeFunctionAddresses() { + return + (EXT_blend_minmax_glBlendEquationEXT_pointer = GLContext.getFunctionAddress("glBlendEquationEXT")) != 0; + } + private boolean EXT_compiled_vertex_array_initNativeFunctionAddresses() { return (EXT_compiled_vertex_array_glLockArraysEXT_pointer = GLContext.getFunctionAddress("glLockArraysEXT")) != 0 && @@ -2196,10 +2210,14 @@ supported_extensions.remove("GL_ATI_vertex_attrib_array_object"); if (supported_extensions.contains("GL_ATI_vertex_streams") && !ATI_vertex_streams_initNativeFunctionAddresses()) supported_extensions.remove("GL_ATI_vertex_streams"); + if (supported_extensions.contains("GL_EXT_blend_color") && !EXT_blend_color_initNativeFunctionAddresses()) + supported_extensions.remove("GL_EXT_blend_color"); if (supported_extensions.contains("GL_EXT_blend_equation_separate") && !EXT_blend_equation_separate_initNativeFunctionAddresses()) supported_extensions.remove("GL_EXT_blend_equation_separate"); if (supported_extensions.contains("GL_EXT_blend_func_separate") && !EXT_blend_func_separate_initNativeFunctionAddresses()) supported_extensions.remove("GL_EXT_blend_func_separate"); + if (supported_extensions.contains("GL_EXT_blend_minmax") && !EXT_blend_minmax_initNativeFunctionAddresses()) + supported_extensions.remove("GL_EXT_blend_minmax"); if (supported_extensions.contains("GL_EXT_compiled_vertex_array") && !EXT_compiled_vertex_array_initNativeFunctionAddresses()) supported_extensions.remove("GL_EXT_compiled_vertex_array"); if (supported_extensions.contains("GL_EXT_depth_bounds_test") && !EXT_depth_bounds_test_initNativeFunctionAddresses()) @@ -2336,8 +2354,10 @@ this.GL_ATI_vertex_streams = supported_extensions.contains("GL_ATI_vertex_streams"); this.GL_EXT_abgr = supported_extensions.contains("GL_EXT_abgr"); this.GL_EXT_bgra = supported_extensions.contains("GL_EXT_bgra"); + this.GL_EXT_blend_color = supported_extensions.contains("GL_EXT_blend_color"); this.GL_EXT_blend_equation_separate = supported_extensions.contains("GL_EXT_blend_equation_separate"); this.GL_EXT_blend_func_separate = supported_extensions.contains("GL_EXT_blend_func_separate"); + this.GL_EXT_blend_minmax = supported_extensions.contains("GL_EXT_blend_minmax"); this.GL_EXT_blend_subtract = supported_extensions.contains("GL_EXT_blend_subtract"); this.GL_EXT_cg_shader = supported_extensions.contains("GL_EXT_cg_shader"); this.GL_EXT_compiled_vertex_array = supported_extensions.contains("GL_EXT_compiled_vertex_array"); Added: trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTBlendColor.java =================================================================== --- trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTBlendColor.java (rev 0) +++ trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTBlendColor.java 2006-08-16 10:42:43 UTC (rev 2550) @@ -0,0 +1,33 @@ +/* MACHINE GENERATED FILE, DO NOT EDIT */ + +package org.lwjgl.opengl; + +import org.lwjgl.LWJGLException; +import org.lwjgl.BufferChecks; +import java.nio.*; + +public final class EXTBlendColor { + /** + *Accepted by the <sfactor> and <dfactor> parameters of BlendFunc. + */ + public static final int GL_CONSTANT_COLOR_EXT = 0x8001; + public static final int GL_ONE_MINUS_CONSTANT_COLOR_EXT = 0x8002; + public static final int GL_CONSTANT_ALPHA_EXT = 0x8003; + public static final int GL_ONE_MINUS_CONSTANT_ALPHA_EXT = 0x8004; + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev. + */ + public static final int GL_BLEND_COLOR_EXT = 0x8005; + + private EXTBlendColor() { + } + + + public static void glBlendColorEXT(float red, float green, float blue, float alpha) { + long function_pointer = GLContext.getCapabilities().EXT_blend_color_glBlendColorEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglBlendColorEXT(red, green, blue, alpha, function_pointer); + } + private static native void nglBlendColorEXT(float red, float green, float blue, float alpha, long function_pointer); +} Added: trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTBlendMinmax.java =================================================================== --- trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTBlendMinmax.java (rev 0) +++ trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTBlendMinmax.java 2006-08-16 10:42:43 UTC (rev 2550) @@ -0,0 +1,32 @@ +/* MACHINE GENERATED FILE, DO NOT EDIT */ + +package org.lwjgl.opengl; + +import org.lwjgl.LWJGLException; +import org.lwjgl.BufferChecks; +import java.nio.*; + +public final class EXTBlendMinmax { + /** + *Accepted by the <mode> parameter of BlendEquationEXT. + */ + public static final int GL_FUNC_ADD_EXT = 0x8006; + public static final int GL_MIN_EXT = 0x8007; + public static final int GL_MAX_EXT = 0x8008; + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev. + */ + public static final int GL_BLEND_EQUATION_EXT = 0x8009; + + private EXTBlendMinmax() { + } + + + public static void glBlendEquationEXT(int mode) { + long function_pointer = GLContext.getCapabilities().EXT_blend_minmax_glBlendEquationEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglBlendEquationEXT(mode, function_pointer); + } + private static native void nglBlendEquationEXT(int mode, long function_pointer); +} Added: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTBlendColor.c =================================================================== --- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTBlendColor.c (rev 0) +++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTBlendColor.c 2006-08-16 10:42:43 UTC (rev 2550) @@ -0,0 +1,12 @@ +/* MACHINE GENERATED FILE, DO NOT EDIT */ + +#include <jni.h> +#include "extgl.h" + +typedef void (APIENTRY *glBlendColorEXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTBlendColor_nglBlendColorEXT(JNIEnv *env, jclass clazz, jfloat red, jfloat green, jfloat blue, jfloat alpha, jlong function_pointer) { + glBlendColorEXTPROC glBlendColorEXT = (glBlendColorEXTPROC)((intptr_t)function_pointer); + glBlendColorEXT(red, green, blue, alpha); +} + Added: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTBlendMinmax.c =================================================================== --- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTBlendMinmax.c (rev 0) +++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTBlendMinmax.c 2006-08-16 10:42:43 UTC (rev 2550) @@ -0,0 +1,12 @@ +/* MACHINE GENERATED FILE, DO NOT EDIT */ + +#include <jni.h> +#include "extgl.h" + +typedef void (APIENTRY *glBlendEquationEXTPROC) (GLenum mode); + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTBlendMinmax_nglBlendEquationEXT(JNIEnv *env, jclass clazz, jint mode, jlong function_pointer) { + glBlendEquationEXTPROC glBlendEquationEXT = (glBlendEquationEXTPROC)((intptr_t)function_pointer); + glBlendEquationEXT(mode); +} + Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_blend_color.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_blend_color.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_blend_color.java 2006-08-16 10:42:43 UTC (rev 2550) @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2002-2006 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengl; + +import org.lwjgl.util.generator.*; + +public interface EXT_blend_color { + + /** Accepted by the <sfactor> and <dfactor> parameters of BlendFunc. */ + int GL_CONSTANT_COLOR_EXT = 0x8001; + int GL_ONE_MINUS_CONSTANT_COLOR_EXT = 0x8002; + int GL_CONSTANT_ALPHA_EXT = 0x8003; + int GL_ONE_MINUS_CONSTANT_ALPHA_EXT = 0x8004; + + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev. + */ + int GL_BLEND_COLOR_EXT = 0x8005; + + void glBlendColorEXT(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha); + +} \ No newline at end of file Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_blend_minmax.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_blend_minmax.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_blend_minmax.java 2006-08-16 10:42:43 UTC (rev 2550) @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2002-2006 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengl; + +import org.lwjgl.util.generator.*; + +public interface EXT_blend_minmax { + + /** Accepted by the <mode> parameter of BlendEquationEXT. */ + int GL_FUNC_ADD_EXT = 0x8006; + int GL_MIN_EXT = 0x8007; + int GL_MAX_EXT = 0x8008; + + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev. + */ + int GL_BLEND_EQUATION_EXT = 0x8009; + + void glBlendEquationEXT(@GLenum int mode); + +} \ 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: <eli...@us...> - 2006-08-10 09:27:49
|
Revision: 2549 Author: elias_naur Date: 2006-08-10 02:27:38 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2549&view=rev Log Message: ----------- 1.0beta3 tag Added Paths: ----------- tags/1.0beta3/ Copied: tags/1.0beta3 (from rev 2548, trunk/LWJGL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-08-10 09:05:58
|
Revision: 2548 Author: elias_naur Date: 2006-08-10 02:05:54 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2548&view=rev Log Message: ----------- Mac OS X: build fixes Modified Paths: -------------- trunk/LWJGL/platform_build/macosx_ant/build.xml Modified: trunk/LWJGL/platform_build/macosx_ant/build.xml =================================================================== --- trunk/LWJGL/platform_build/macosx_ant/build.xml 2006-08-10 08:45:10 UTC (rev 2547) +++ trunk/LWJGL/platform_build/macosx_ant/build.xml 2006-08-10 09:05:54 UTC (rev 2548) @@ -29,11 +29,11 @@ </target> <target name="link"> - <apply dir="." parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true"> - <arg line="${linkerflags} -exported_symbols_list lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon"/> + <apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true"> + <arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon"/> <fileset dir="${objdir}" includes="*.o"/> </apply> - <apply dir="." executable="strip" os="Mac OS X" failonerror="true"> + <apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true"> <arg line="-S -X"/> <fileset dir="." file="${libname}"/> </apply> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-08-10 08:45:50
|
Revision: 2547 Author: elias_naur Date: 2006-08-10 01:45:10 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2547&view=rev Log Message: ----------- Update to beta3 Modified Paths: -------------- trunk/LWJGL/build.xml trunk/LWJGL/src/java/org/lwjgl/Sys.java trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java trunk/LWJGL/src/native/common/devil/extil.c trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2006-08-10 08:16:03 UTC (rev 2546) +++ trunk/LWJGL/build.xml 2006-08-10 08:45:10 UTC (rev 2547) @@ -13,7 +13,7 @@ <property name="lwjgl.docs" location="doc" /> <property name="lwjgl.temp" location="temp" /> <property name="lwjgl.res" location="res" /> - <property name="lwjgl.version" value="1.0beta2" /> + <property name="lwjgl.version" value="1.0beta3" /> <property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java"/> <!-- ================================================================== --> Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java =================================================================== --- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2006-08-10 08:16:03 UTC (rev 2546) +++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2006-08-10 08:45:10 UTC (rev 2547) @@ -54,7 +54,7 @@ private static final String JNI_LIBRARY_NAME = "lwjgl"; /** Current version of library */ - private static final String VERSION = "1.0beta2"; + private static final String VERSION = "1.0beta3"; /** Current version of the JNI library */ static final int JNI_VERSION = 3; Modified: trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java =================================================================== --- trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java 2006-08-10 08:16:03 UTC (rev 2546) +++ trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java 2006-08-10 08:45:10 UTC (rev 2547) @@ -53,7 +53,7 @@ private static String JNI_LIBRARY_NAME = "lwjgl-devil"; /** Version of IL */ - public static final String VERSION = "1.0beta2"; + public static final String VERSION = "1.0beta3"; private static void loadLibrary(final String lib_name) { AccessController.doPrivileged(new PrivilegedAction() { Modified: trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java =================================================================== --- trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java 2006-08-10 08:16:03 UTC (rev 2546) +++ trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java 2006-08-10 08:45:10 UTC (rev 2547) @@ -193,7 +193,7 @@ private static String JNI_LIBRARY_NAME = "lwjgl-fmod3"; /** Version of FMOD */ - public static final String VERSION = "1.0beta2"; + public static final String VERSION = "1.0beta3"; static { initialize(); Modified: trunk/LWJGL/src/native/common/devil/extil.c =================================================================== --- trunk/LWJGL/src/native/common/devil/extil.c 2006-08-10 08:16:03 UTC (rev 2546) +++ trunk/LWJGL/src/native/common/devil/extil.c 2006-08-10 08:45:10 UTC (rev 2547) @@ -8,7 +8,7 @@ static void* devILhandle; #endif -static const char* VERSION = "1.0beta2"; +static const char* VERSION = "1.0beta3"; /* * Class: org_lwjgl_devil_ILNative Modified: trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c =================================================================== --- trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c 2006-08-10 08:16:03 UTC (rev 2546) +++ trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c 2006-08-10 08:45:10 UTC (rev 2547) @@ -33,7 +33,7 @@ #include "org_lwjgl_fmod3_FMOD.h" #include "extfmod3.h" -static const char* VERSION = "1.0beta2"; +static const char* VERSION = "1.0beta3"; /* * Class: org_lwjgl_fmod3_FMOD This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-08-10 08:16:09
|
Revision: 2546 Author: elias_naur Date: 2006-08-10 01:16:03 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2546&view=rev Log Message: ----------- Windows: Updated jinput-dx8.dll Modified Paths: -------------- trunk/LWJGL/libs/win32/jinput-dx8.dll Modified: trunk/LWJGL/libs/win32/jinput-dx8.dll =================================================================== --- trunk/LWJGL/libs/win32/jinput-dx8.dll 2006-08-10 08:06:00 UTC (rev 2545) +++ trunk/LWJGL/libs/win32/jinput-dx8.dll 2006-08-10 08:16:03 UTC (rev 2546) @@ -1,120 +1,52 @@ -MZ\x90 |
|
From: <eli...@us...> - 2006-08-10 08:06:31
|
Revision: 2545 Author: elias_naur Date: 2006-08-10 01:06:00 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2545&view=rev Log Message: ----------- Updated jinput.jar Modified Paths: -------------- trunk/LWJGL/libs/jinput.jar Modified: trunk/LWJGL/libs/jinput.jar =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sp...@us...> - 2006-08-03 10:00:20
|
Revision: 2544 Author: spasi Date: 2006-08-03 03:00:11 -0700 (Thu, 03 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2544&view=rev Log Message: ----------- Added OpenGL 2.1 support Modified Paths: -------------- trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java =================================================================== --- trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java 2006-08-03 09:51:45 UTC (rev 2543) +++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java 2006-08-03 10:00:11 UTC (rev 2544) @@ -52,7 +52,7 @@ * pointers. * * This class is thread-safe in the sense that multiple threads can safely call all public methods. The class is also - * thread-aware in the sense that it tracks a per-thread current context (including capabilities and function pointers). + * thread-aware in the sense that it tracks a per-thread current context (including capabilities and function pointers). * That way, multiple threads can have multiple contexts current and render to them concurrently. * * @author elias_naur <eli...@us...> @@ -64,7 +64,7 @@ * Maps threads to their current context's ContextCapabilities, if any */ private final static ThreadLocal current_capabilities = new ThreadLocal(); - + /** * The getCapabilities() method is a potential hot spot in any LWJGL application, since * it is needed for context capability discovery (e.g. is OpenGL 2.0 supported?), and @@ -90,14 +90,14 @@ * since no other thread can set the owner to anyone else than itself. */ private static CapabilitiesCacheEntry fast_path_cache = new CapabilitiesCacheEntry(); - + /** * Simple lock-free cache of CapabilitesEntryCache to avoid allocating more than one * cache entry per thread */ private final static ThreadLocal thread_cache_entries = new ThreadLocal(); - - /** + + /** * The weak mapping from context Object instances to ContextCapabilities. Used * to avoid recreating a ContextCapabilities every time a context is made current. */ @@ -121,14 +121,14 @@ CapabilitiesCacheEntry recent_cache_entry = fast_path_cache; // Check owner of cache entry if (recent_cache_entry.owner == Thread.currentThread()) { - /* The owner ship test succeeded, so the cache must contain the current ContextCapabilities instance + /* The owner ship test succeeded, so the cache must contain the current ContextCapabilities instance * assert recent_cache_entry.capabilities == getThreadLocalCapabilities(); */ return recent_cache_entry.capabilities; } else // Some other thread has written to the cache since, and we fall back to the slower path return getThreadLocalCapabilities(); } - + private static ContextCapabilities getThreadLocalCapabilities() { return ((ContextCapabilities)current_capabilities.get()); } @@ -152,7 +152,7 @@ fast_path_cache = thread_cache_entry; } - + /** * Helper method to get a pointer to a named function in the OpenGL library * with a name dependent on the current platform @@ -210,7 +210,13 @@ if (majorVersion >= 2) { // ----------------------[ 2.X ]---------------------- - supported_extensions.add("OpenGL20"); + switch (minorVersion) { + case 1: + supported_extensions.add("OpenGL21"); + // Intentional fall through + case 0: + supported_extensions.add("OpenGL20"); + } // ----------------------[ 1.X ]---------------------- supported_extensions.add("OpenGL11"); supported_extensions.add("OpenGL12"); @@ -335,4 +341,4 @@ Thread owner; ContextCapabilities capabilities; } -} +} \ 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: <sp...@us...> - 2006-08-03 09:52:15
|
Revision: 2543 Author: spasi Date: 2006-08-03 02:51:45 -0700 (Thu, 03 Aug 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2543&view=rev Log Message: ----------- Modified Paths: -------------- trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java Added Paths: ----------- trunk/LWJGL/src/generated/org/lwjgl/opengl/GL21.java trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL21.c trunk/LWJGL/src/templates/org/lwjgl/opengl/GL21.java Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java =================================================================== --- trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java 2006-08-01 14:10:17 UTC (rev 2542) +++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java 2006-08-03 09:51:45 UTC (rev 2543) @@ -107,6 +107,7 @@ public final boolean OpenGL14; public final boolean OpenGL15; public final boolean OpenGL20; + public final boolean OpenGL21; public final boolean GL_HP_occlusion_test; public final boolean GL_IBM_rasterpos_clip; public final boolean GL_NV_blend_square; @@ -874,6 +875,12 @@ long GL20_glStencilFuncSeparate_pointer; long GL20_glStencilMaskSeparate_pointer; long GL20_glBlendEquationSeparate_pointer; + long GL21_glUniformMatrix2x3fv_pointer; + long GL21_glUniformMatrix3x2fv_pointer; + long GL21_glUniformMatrix2x4fv_pointer; + long GL21_glUniformMatrix4x2fv_pointer; + long GL21_glUniformMatrix3x4fv_pointer; + long GL21_glUniformMatrix4x3fv_pointer; long NV_evaluators_glGetMapControlPointsNV_pointer; long NV_evaluators_glMapControlPointsNV_pointer; long NV_evaluators_glMapParameterfvNV_pointer; @@ -1929,6 +1936,16 @@ (GL20_glBlendEquationSeparate_pointer = GLContext.getFunctionAddress("glBlendEquationSeparate")) != 0; } + private boolean GL21_initNativeFunctionAddresses() { + return + (GL21_glUniformMatrix2x3fv_pointer = GLContext.getFunctionAddress("glUniformMatrix2x3fv")) != 0 && + (GL21_glUniformMatrix3x2fv_pointer = GLContext.getFunctionAddress("glUniformMatrix3x2fv")) != 0 && + (GL21_glUniformMatrix2x4fv_pointer = GLContext.getFunctionAddress("glUniformMatrix2x4fv")) != 0 && + (GL21_glUniformMatrix4x2fv_pointer = GLContext.getFunctionAddress("glUniformMatrix4x2fv")) != 0 && + (GL21_glUniformMatrix3x4fv_pointer = GLContext.getFunctionAddress("glUniformMatrix3x4fv")) != 0 && + (GL21_glUniformMatrix4x3fv_pointer = GLContext.getFunctionAddress("glUniformMatrix4x3fv")) != 0; + } + private boolean NV_evaluators_initNativeFunctionAddresses() { return (NV_evaluators_glGetMapControlPointsNV_pointer = GLContext.getFunctionAddress("glGetMapControlPointsNV")) != 0 && @@ -2225,6 +2242,8 @@ supported_extensions.remove("OpenGL15"); if (supported_extensions.contains("OpenGL20") && !GL20_initNativeFunctionAddresses()) supported_extensions.remove("OpenGL20"); + if (supported_extensions.contains("OpenGL21") && !GL21_initNativeFunctionAddresses()) + supported_extensions.remove("OpenGL21"); if (supported_extensions.contains("GL_NV_evaluators") && !NV_evaluators_initNativeFunctionAddresses()) supported_extensions.remove("GL_NV_evaluators"); if (supported_extensions.contains("GL_NV_fence") && !NV_fence_initNativeFunctionAddresses()) @@ -2361,6 +2380,7 @@ this.OpenGL14 = supported_extensions.contains("OpenGL14"); this.OpenGL15 = supported_extensions.contains("OpenGL15"); this.OpenGL20 = supported_extensions.contains("OpenGL20"); + this.OpenGL21 = supported_extensions.contains("OpenGL21"); this.GL_HP_occlusion_test = supported_extensions.contains("GL_HP_occlusion_test"); this.GL_IBM_rasterpos_clip = supported_extensions.contains("GL_IBM_rasterpos_clip"); this.GL_NV_blend_square = supported_extensions.contains("GL_NV_blend_square"); Added: trunk/LWJGL/src/generated/org/lwjgl/opengl/GL21.java =================================================================== --- trunk/LWJGL/src/generated/org/lwjgl/opengl/GL21.java (rev 0) +++ trunk/LWJGL/src/generated/org/lwjgl/opengl/GL21.java 2006-08-03 09:51:45 UTC (rev 2543) @@ -0,0 +1,95 @@ +/* MACHINE GENERATED FILE, DO NOT EDIT */ + +package org.lwjgl.opengl; + +import org.lwjgl.LWJGLException; +import org.lwjgl.BufferChecks; +import java.nio.*; + +public final class GL21 { + /** + * Accepted by the <target> parameters of BindBuffer, BufferData, + * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, + * GetBufferParameteriv, and GetBufferPointerv: + */ + public static final int GL_PIXEL_PACK_BUFFER = 0x88eb; + public static final int GL_PIXEL_UNPACK_BUFFER = 0x88ec; + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ + public static final int GL_PIXEL_PACK_BUFFER_BINDING = 0x88ed; + public static final int GL_PIXEL_UNPACK_BUFFER_BINDING = 0x88ef; + /** + * Accepted by the <internalformat> parameter of TexImage1D, TexImage2D, + * TexImage3D, CopyTexImage1D, CopyTexImage2D. + */ + public static final int GL_SRGB = 0x8c40; + public static final int GL_SRGB8 = 0x8c41; + public static final int GL_SRGB_ALPHA = 0x8c42; + public static final int GL_SRGB8_ALPHA8 = 0x8c43; + public static final int GL_SLUMINANCE_ALPHA = 0x8c44; + public static final int GL_SLUMINANCE8_ALPHA8 = 0x8c45; + public static final int GL_SLUMINANCE = 0x8c46; + public static final int GL_SLUMINANCE8 = 0x8c47; + public static final int GL_COMPRESSED_SRGB = 0x8c48; + public static final int GL_COMPRESSED_SRGB_ALPHA = 0x8c49; + public static final int GL_COMPRESSED_SLUMINANCE = 0x8c4a; + public static final int GL_COMPRESSED_SLUMINANCE_ALPHA = 0x8c4b; + /** + * Accepted by the <pname> parameter of GetIntegerv and GetFloatv. + */ + public static final int GL_CURRENT_RASTER_SECONDARY_COLOR = 0xffffffff; + + private GL21() { + } + + + public static void glUniformMatrix2x3(int location, boolean transpose, FloatBuffer matrices) { + long function_pointer = GLContext.getCapabilities().GL21_glUniformMatrix2x3fv_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(matrices); + nglUniformMatrix2x3fv(location, (matrices.remaining()) / (2 * 3), transpose, matrices, matrices.position(), function_pointer); + } + private static native void nglUniformMatrix2x3fv(int location, int count, boolean transpose, FloatBuffer matrices, int matrices_position, long function_pointer); + + public static void glUniformMatrix3x2(int location, boolean transpose, FloatBuffer matrices) { + long function_pointer = GLContext.getCapabilities().GL21_glUniformMatrix3x2fv_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(matrices); + nglUniformMatrix3x2fv(location, (matrices.remaining()) / (3 * 2), transpose, matrices, matrices.position(), function_pointer); + } + private static native void nglUniformMatrix3x2fv(int location, int count, boolean transpose, FloatBuffer matrices, int matrices_position, long function_pointer); + + public static void glUniformMatrix2x4(int location, boolean transpose, FloatBuffer matrices) { + long function_pointer = GLContext.getCapabilities().GL21_glUniformMatrix2x4fv_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(matrices); + nglUniformMatrix2x4fv(location, (matrices.remaining()) >> 3, transpose, matrices, matrices.position(), function_pointer); + } + private static native void nglUniformMatrix2x4fv(int location, int count, boolean transpose, FloatBuffer matrices, int matrices_position, long function_pointer); + + public static void glUniformMatrix4x2(int location, boolean transpose, FloatBuffer matrices) { + long function_pointer = GLContext.getCapabilities().GL21_glUniformMatrix4x2fv_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(matrices); + nglUniformMatrix4x2fv(location, (matrices.remaining()) >> 3, transpose, matrices, matrices.position(), function_pointer); + } + private static native void nglUniformMatrix4x2fv(int location, int count, boolean transpose, FloatBuffer matrices, int matrices_position, long function_pointer); + + public static void glUniformMatrix3x4(int location, boolean transpose, FloatBuffer matrices) { + long function_pointer = GLContext.getCapabilities().GL21_glUniformMatrix3x4fv_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(matrices); + nglUniformMatrix3x4fv(location, (matrices.remaining()) / (3 * 4), transpose, matrices, matrices.position(), function_pointer); + } + private static native void nglUniformMatrix3x4fv(int location, int count, boolean transpose, FloatBuffer matrices, int matrices_position, long function_pointer); + + public static void glUniformMatrix4x3(int location, boolean transpose, FloatBuffer matrices) { + long function_pointer = GLContext.getCapabilities().GL21_glUniformMatrix4x3fv_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(matrices); + nglUniformMatrix4x3fv(location, (matrices.remaining()) / (4 * 3), transpose, matrices, matrices.position(), function_pointer); + } + private static native void nglUniformMatrix4x3fv(int location, int count, boolean transpose, FloatBuffer matrices, int matrices_position, long function_pointer); +} Added: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL21.c =================================================================== --- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL21.c (rev 0) +++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL21.c 2006-08-03 09:51:45 UTC (rev 2543) @@ -0,0 +1,48 @@ +/* MACHINE GENERATED FILE, DO NOT EDIT */ + +#include <jni.h> +#include "extgl.h" + +typedef void (APIENTRY *glUniformMatrix2x3fvPROC) (GLint location, GLsizei count, GLboolean transpose, GLfloat * matrices); +typedef void (APIENTRY *glUniformMatrix3x2fvPROC) (GLint location, GLsizei count, GLboolean transpose, GLfloat * matrices); +typedef void (APIENTRY *glUniformMatrix2x4fvPROC) (GLint location, GLsizei count, GLboolean transpose, GLfloat * matrices); +typedef void (APIENTRY *glUniformMatrix4x2fvPROC) (GLint location, GLsizei count, GLboolean transpose, GLfloat * matrices); +typedef void (APIENTRY *glUniformMatrix3x4fvPROC) (GLint location, GLsizei count, GLboolean transpose, GLfloat * matrices); +typedef void (APIENTRY *glUniformMatrix4x3fvPROC) (GLint location, GLsizei count, GLboolean transpose, GLfloat * matrices); + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL21_nglUniformMatrix2x3fv(JNIEnv *env, jclass clazz, jint location, jint count, jboolean transpose, jobject matrices, jint matrices_position, jlong function_pointer) { + GLfloat *matrices_address = ((GLfloat *)(*env)->GetDirectBufferAddress(env, matrices)) + matrices_position; + glUniformMatrix2x3fvPROC glUniformMatrix2x3fv = (glUniformMatrix2x3fvPROC)((intptr_t)function_pointer); + glUniformMatrix2x3fv(location, count, transpose, matrices_address); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL21_nglUniformMatrix3x2fv(JNIEnv *env, jclass clazz, jint location, jint count, jboolean transpose, jobject matrices, jint matrices_position, jlong function_pointer) { + GLfloat *matrices_address = ((GLfloat *)(*env)->GetDirectBufferAddress(env, matrices)) + matrices_position; + glUniformMatrix3x2fvPROC glUniformMatrix3x2fv = (glUniformMatrix3x2fvPROC)((intptr_t)function_pointer); + glUniformMatrix3x2fv(location, count, transpose, matrices_address); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL21_nglUniformMatrix2x4fv(JNIEnv *env, jclass clazz, jint location, jint count, jboolean transpose, jobject matrices, jint matrices_position, jlong function_pointer) { + GLfloat *matrices_address = ((GLfloat *)(*env)->GetDirectBufferAddress(env, matrices)) + matrices_position; + glUniformMatrix2x4fvPROC glUniformMatrix2x4fv = (glUniformMatrix2x4fvPROC)((intptr_t)function_pointer); + glUniformMatrix2x4fv(location, count, transpose, matrices_address); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL21_nglUniformMatrix4x2fv(JNIEnv *env, jclass clazz, jint location, jint count, jboolean transpose, jobject matrices, jint matrices_position, jlong function_pointer) { + GLfloat *matrices_address = ((GLfloat *)(*env)->GetDirectBufferAddress(env, matrices)) + matrices_position; + glUniformMatrix4x2fvPROC glUniformMatrix4x2fv = (glUniformMatrix4x2fvPROC)((intptr_t)function_pointer); + glUniformMatrix4x2fv(location, count, transpose, matrices_address); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL21_nglUniformMatrix3x4fv(JNIEnv *env, jclass clazz, jint location, jint count, jboolean transpose, jobject matrices, jint matrices_position, jlong function_pointer) { + GLfloat *matrices_address = ((GLfloat *)(*env)->GetDirectBufferAddress(env, matrices)) + matrices_position; + glUniformMatrix3x4fvPROC glUniformMatrix3x4fv = (glUniformMatrix3x4fvPROC)((intptr_t)function_pointer); + glUniformMatrix3x4fv(location, count, transpose, matrices_address); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL21_nglUniformMatrix4x3fv(JNIEnv *env, jclass clazz, jint location, jint count, jboolean transpose, jobject matrices, jint matrices_position, jlong function_pointer) { + GLfloat *matrices_address = ((GLfloat *)(*env)->GetDirectBufferAddress(env, matrices)) + matrices_position; + glUniformMatrix4x3fvPROC glUniformMatrix4x3fv = (glUniformMatrix4x3fvPROC)((intptr_t)function_pointer); + glUniformMatrix4x3fv(location, count, transpose, matrices_address); +} + Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL21.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL21.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL21.java 2006-08-03 09:51:45 UTC (rev 2543) @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2002-2004 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengl; + +import org.lwjgl.util.generator.*; + +import java.nio.*; + +public interface GL21 { + + // ------------------------------------------------------------------ + // --------------------------[ GLSL 1.20 ]--------------------------- + // ------------------------------------------------------------------ + + @StripPostfix("matrices") + void glUniformMatrix2x3fv(int location, @AutoSize(value = "matrices", expression = " / (2 * 3)") @GLsizei int count, + boolean transpose, FloatBuffer matrices); + + @StripPostfix("matrices") + void glUniformMatrix3x2fv(int location, @AutoSize(value = "matrices", expression = " / (3 * 2)") @GLsizei int count, + boolean transpose, FloatBuffer matrices); + + @StripPostfix("matrices") + void glUniformMatrix2x4fv(int location, @AutoSize(value = "matrices", expression = " >> 3") @GLsizei int count, + boolean transpose, FloatBuffer matrices); + + @StripPostfix("matrices") + void glUniformMatrix4x2fv(int location, @AutoSize(value = "matrices", expression = " >> 3") @GLsizei int count, + boolean transpose, FloatBuffer matrices); + + @StripPostfix("matrices") + void glUniformMatrix3x4fv(int location, @AutoSize(value = "matrices", expression = " / (3 * 4)") @GLsizei int count, + boolean transpose, FloatBuffer matrices); + + @StripPostfix("matrices") + void glUniformMatrix4x3fv(int location, @AutoSize(value = "matrices", expression = " / (4 * 3)") @GLsizei int count, + boolean transpose, FloatBuffer matrices); + + // ------------------------------------------------------------------ + // -------------------[ ARB_pixel_buffer_object ]-------------------- + // ------------------------------------------------------------------ + + /** + * Accepted by the <target> parameters of BindBuffer, BufferData, + * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, + * GetBufferParameteriv, and GetBufferPointerv: + */ + int GL_PIXEL_PACK_BUFFER = 0x88EB; + int GL_PIXEL_UNPACK_BUFFER = 0x88EC; + + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ + int GL_PIXEL_PACK_BUFFER_BINDING = 0x88ED; + int GL_PIXEL_UNPACK_BUFFER_BINDING = 0x88EF; + + // ------------------------------------------------------------------ + // ----------------------[ EXT_texture_sRGB ]------------------------ + // ------------------------------------------------------------------ + + /** + * Accepted by the <internalformat> parameter of TexImage1D, TexImage2D, + * TexImage3D, CopyTexImage1D, CopyTexImage2D. + */ + int GL_SRGB = 0x8C40; + int GL_SRGB8 = 0x8C41; + int GL_SRGB_ALPHA = 0x8C42; + int GL_SRGB8_ALPHA8 = 0x8C43; + int GL_SLUMINANCE_ALPHA = 0x8C44; + int GL_SLUMINANCE8_ALPHA8 = 0x8C45; + int GL_SLUMINANCE = 0x8C46; + int GL_SLUMINANCE8 = 0x8C47; + int GL_COMPRESSED_SRGB = 0x8C48; + int GL_COMPRESSED_SRGB_ALPHA = 0x8C49; + int GL_COMPRESSED_SLUMINANCE = 0x8C4A; + int GL_COMPRESSED_SLUMINANCE_ALPHA = 0x8C4B; + + // ------------------------------------------------------------------ + // -----------------------[ Misc additions ]------------------------- + // ------------------------------------------------------------------ + + /** + * Accepted by the <pname> parameter of GetIntegerv and GetFloatv. + */ + int GL_CURRENT_RASTER_SECONDARY_COLOR = -1; // TODO: Find this value + +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
