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
|
2
(14) |
3
|
4
(5) |
5
(3) |
|
6
|
7
(1) |
8
|
9
|
10
(3) |
11
|
12
|
|
13
|
14
|
15
(1) |
16
(2) |
17
|
18
|
19
|
|
20
(4) |
21
(18) |
22
(10) |
23
(6) |
24
(3) |
25
|
26
|
|
27
|
28
(4) |
29
|
30
|
|
|
|
|
From: Brian M. <ma...@us...> - 2005-11-10 21:16:37
|
Update of /cvsroot/java-game-lib/LWJGL/www In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23333 Modified Files: index.php Added Files: donations.php Log Message: added donations page --- NEW FILE: donations.php --- <? require('_include/header.php'); ?> <h1>Donations</h1> <p> In the span of LWJGL's lifetime a series of donations have enabled us to advance the project further by purchasing hardware and services to make LWJGL an even better solution for your problems. Should you wish to donate to the project too, please do so using the paypal link to the lower left in the menu. <br/> <i>If you are not on this list and have donated please contact <a href="mailto:don...@lw...">don...@lw...</a> and we will fix this ASAP</i> <br/> <br/> The following is a randomized list of users that have donated to the LWJGL project:<br/> <i>If you want a link associated with your name, please mention this when donating or send an email to <a href="mailto:don...@lw...">don...@lw...</a><br/> </p> <ul> <? $donations[] = array("Brian Matzon", "mailto:br...@ma..."); $donations[] = array("Anthony Rogers [tomato.co.uk]", "http://www.tomato.co.uk/"); $donations[] = array("Anthony Lovell", ""); $donations[] = array("Shane Essary", ""); $donations[] = array("Gavia", ""); $donations[] = array("Oliver Due Billing", ""); $donations[] = array("Apostolos Tsakpinis [zdimensions.gr]", "http://www.zdimensions.gr/"); $donations[] = array("Scott Palmer", ""); $donations[] = array("Chris Heimpel", ""); $donations[] = array("Caspian Rychlik-Prince [puppygames.com]", "http://puppygames.net/"); $donations[] = array("Christiaan Ghijselinck", ""); $donations[] = array("David Hope", ""); $donations[] = array("Ruben Steins", ""); $donations[] = array("Sharp Production", ""); $donations[] = array("John Yates", ""); $donations[] = array("Benoit Hambucken", ""); $donations[] = array("John Watson", ""); $donations[] = array("Elias Naur [oddlabs.com]", "http://oddlabs.com"); $donations[] = array("Andrew Kelly", "http://games.swizel-studios.com/"); shuffle($donations); foreach($donations as $key => $value) { echo '<li>'; if($value[1] != '') { echo '<a href="' . $value[1] . '" target="_blank">' . $value[0] . '</a>'; } else { echo $value[0]; } echo '</li>'; } ?> </ul> <p> <b>LWJGL Monetary situation as of 8th November 2005</b> <p>The following table displays the current monetary situation of LWJGL. It is purely made to get an overview and does not necessarily accurately display the exact current funds of LWJGL. <br/> Please note that the total expenses are currently 0$ since the hosting is provided free of charge by <a href="http://puppygames.net">Puppygames</a> and that the domains (lwjgl.org and lwjgl.com) are paid by <a href="mailto:br...@ma...">Brian Matzon</a>. </p> <table align="center"> <tr> <td colspan="2"><b>Income</b></td> </tr> <tr> <td width="100">Adsense</td> <td align="right">$212.63</td> </tr> <tr> <td>Paypal</td> <td align="right">$89.74</td> </tr> <tr> <td>Total income</td> <td align="right">$302,37</td> </tr> <tr> <td colspan="2"> </td> </tr> <tr> <td colspan="2"><b>Expenses</b></td> </tr> <tr> <td>Hosting</td> <td align="right">$0.00</td> </tr> <tr> <td>Domains</td> <td align="right">$0.00</td> </tr> <tr> <td>Total expenses</td> <td align="right">$0.00</td> </tr> </table> <div align="center"> <br/> <i>Adsense currently averages at $1.47/day</i> <br/> <br/> <h2>Planned expenses</h2> <p> * LWJGL Developer Guide - $1000/onetime </p> <br/> <h2>Wishlist</h2> <p> * LWJGL Code signing certificate - $200/year </p> </p> </div> <? require('_include/footer.php'); ?> Index: index.php =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/www/index.php,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- index.php 15 Oct 2005 08:52:05 -0000 1.13 +++ index.php 10 Nov 2005 21:16:27 -0000 1.14 @@ -6,62 +6,15 @@ <p>LWJGL is available under a <a href="license.php">BSD license</a>, which means it's open source and freely available at no charge.</p> <p>Please visit us on the Freenode IRC Network: <a href="irc://irc.freenode.net/lwjgl" target="_blank">#LWJGL</a>. Do idle if there is no one to answer any of your questions, we are on different timezones.</p> - -<h1>LWJGL Monetary situation as of 3rd October 2005</h1> -<p>The following table displays the current monetary situation of LWJGL. It is purely made to get an overview and does not necessarily accurately display the exact current funds of LWJGL. - <br/> - Please note that the total expenses are currently 0$ since the hosting is provided free of charge by <a href="http://puppygames.net">Puppygames</a> and that the domains (lwjgl.org and lwjgl.com) are paid by <a href="mailto:br...@ma...">Brian Matzon</a>. -</p> -<table> - <tr> - <td colspan="2"><b>Income</b></td> - </tr> - <tr> - <td width="100">Adsense</td> - <td align="right">$101.20</td> - </tr> - <tr> - <td>Paypal</td> - <td align="right">$28.48</td> - </tr> - <tr> - <td>Total income</td> - <td align="right">$129.68</td> - </tr> - <tr> - <td colspan="2"> </td> - </tr> - <tr> - <td colspan="2"><b>Expenses</b></td> - </tr> - <tr> - <td>Hosting</td> - <td align="right">$0.00</td> - </tr> - <tr> - <td>Domains</td> - <td align="right">$0.00</td> - </tr> - <tr> - <td>Total expenses</td> - <td align="right">$0.00</td> - </tr> -</table> -<br/> -<i>Adsense currently averages at $0.92/day</i> -<br/> -<br/> -<h2>Planned expenses</h2> -<p> - * LWJGL Developer Guide - $1000/onetime +<h1>News</h1> +<p style="border-bottom: 1px solid #cccccc;"> + <b>Added donations page</b> <span class="newsdate">Thursday, November 10th, 2005</span><br/> + Added a <a href="donations.php">donations page</a> which shows a list of users and/or companies that have donated to LWJGL.<br/><br/> </p> -<br/> -<h2>Wishlist</h2> -<p> - * LWJGL Code signing certificate - $200/year +<p style="border-bottom: 1px solid #cccccc;"> + <b>LWJGL featured in new Eclipse 3.2 Milestone 3</b> <span class="newsdate">Monday, November 8th, 2005</span><br/> + <a href="http://www.eclipse.org/">Eclipse</a> has been working on an <a href="http://www.eclipse.org/swt/opengl/">SWT/OpenGL</a> component and has released it as part of the 3.2 release. It features LWJGL as the primary 3rdparty OpenGL component. Additionally the <a href="http://download.eclipse.org/eclipse/downloads/drops/S-3.2M3-200511021600/eclipse-news-M3.html">New and Noteworthy</a> page displays a sample screenshot at the top with the following title 'SWT/LWJGL Example'<br/><br/> </p> - -<h1>News</h1> <p style="border-bottom: 1px solid #cccccc;"> <b>Another release! 0.98</b> <span class="newsdate">Thursday, August 18th, 2005</span><br/> Getting closer to 1.0 with this latest release. <a href="http://lwjgl.org/forum/viewtopic.php?t=1238">Grab and discuss</a><br/><br/> |
|
From: Elias N. <eli...@us...> - 2005-11-07 08:49:58
|
Update of /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv827/src/generated/org/lwjgl/opengl Modified Files: ContextCapabilities.java References.java Log Message: Added missing generated stuff Index: References.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/References.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- References.java 29 Sep 2005 17:13:36 -0000 1.1 +++ References.java 7 Nov 2005 08:49:50 -0000 1.2 @@ -6,6 +6,7 @@ java.nio.Buffer ARB_matrix_palette_glMatrixIndexPointerARB_pPointer; java.nio.Buffer ARB_vertex_blend_glWeightPointerARB_pPointer; java.nio.Buffer ARB_vertex_program_glVertexAttribPointerARB_buffer; + java.nio.Buffer ARB_vertex_shader_glVertexAttribPointerARB_buffer; java.nio.Buffer ATI_element_array_glElementPointerATI_pPointer; java.nio.Buffer EXT_fog_coord_glFogCoordPointerEXT_data; java.nio.Buffer EXT_secondary_color_glSecondaryColorPointerEXT_pPointer; @@ -25,6 +26,7 @@ this.ARB_matrix_palette_glMatrixIndexPointerARB_pPointer = references.ARB_matrix_palette_glMatrixIndexPointerARB_pPointer; this.ARB_vertex_blend_glWeightPointerARB_pPointer = references.ARB_vertex_blend_glWeightPointerARB_pPointer; this.ARB_vertex_program_glVertexAttribPointerARB_buffer = references.ARB_vertex_program_glVertexAttribPointerARB_buffer; + this.ARB_vertex_shader_glVertexAttribPointerARB_buffer = references.ARB_vertex_shader_glVertexAttribPointerARB_buffer; this.ATI_element_array_glElementPointerATI_pPointer = references.ATI_element_array_glElementPointerATI_pPointer; this.EXT_fog_coord_glFogCoordPointerEXT_data = references.EXT_fog_coord_glFogCoordPointerEXT_data; this.EXT_secondary_color_glSecondaryColorPointerEXT_pPointer = references.EXT_secondary_color_glSecondaryColorPointerEXT_pPointer; Index: ContextCapabilities.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ContextCapabilities.java 2 Nov 2005 09:28:09 -0000 1.2 +++ ContextCapabilities.java 7 Nov 2005 08:49:50 -0000 1.3 @@ -316,9 +316,29 @@ long ARB_vertex_program_glGetVertexAttribdvARB_pointer; long ARB_vertex_program_glGetVertexAttribivARB_pointer; long ARB_vertex_program_glGetVertexAttribPointervARB_pointer; + long ARB_vertex_shader_glVertexAttrib1sARB_pointer; + long ARB_vertex_shader_glVertexAttrib1fARB_pointer; + long ARB_vertex_shader_glVertexAttrib1dARB_pointer; + long ARB_vertex_shader_glVertexAttrib2sARB_pointer; + long ARB_vertex_shader_glVertexAttrib2fARB_pointer; + long ARB_vertex_shader_glVertexAttrib2dARB_pointer; + long ARB_vertex_shader_glVertexAttrib3sARB_pointer; + long ARB_vertex_shader_glVertexAttrib3fARB_pointer; + long ARB_vertex_shader_glVertexAttrib3dARB_pointer; + long ARB_vertex_shader_glVertexAttrib4sARB_pointer; + long ARB_vertex_shader_glVertexAttrib4fARB_pointer; + long ARB_vertex_shader_glVertexAttrib4dARB_pointer; + long ARB_vertex_shader_glVertexAttrib4NubARB_pointer; + long ARB_vertex_shader_glVertexAttribPointerARB_pointer; + long ARB_vertex_shader_glEnableVertexAttribArrayARB_pointer; + long ARB_vertex_shader_glDisableVertexAttribArrayARB_pointer; long ARB_vertex_shader_glBindAttribLocationARB_pointer; long ARB_vertex_shader_glGetActiveAttribARB_pointer; long ARB_vertex_shader_glGetAttribLocationARB_pointer; + long ARB_vertex_shader_glGetVertexAttribfvARB_pointer; + long ARB_vertex_shader_glGetVertexAttribdvARB_pointer; + long ARB_vertex_shader_glGetVertexAttribivARB_pointer; + long ARB_vertex_shader_glGetVertexAttribPointervARB_pointer; long ARB_window_pos_glWindowPos2fARB_pointer; long ARB_window_pos_glWindowPos2dARB_pointer; long ARB_window_pos_glWindowPos2iARB_pointer; @@ -1203,9 +1223,29 @@ private boolean ARB_vertex_shader_initNativeFunctionAddresses() { return + (ARB_vertex_shader_glVertexAttrib1sARB_pointer = GLContext.getFunctionAddress("glVertexAttrib1sARB")) != 0 && + (ARB_vertex_shader_glVertexAttrib1fARB_pointer = GLContext.getFunctionAddress("glVertexAttrib1fARB")) != 0 && + (ARB_vertex_shader_glVertexAttrib1dARB_pointer = GLContext.getFunctionAddress("glVertexAttrib1dARB")) != 0 && + (ARB_vertex_shader_glVertexAttrib2sARB_pointer = GLContext.getFunctionAddress("glVertexAttrib2sARB")) != 0 && + (ARB_vertex_shader_glVertexAttrib2fARB_pointer = GLContext.getFunctionAddress("glVertexAttrib2fARB")) != 0 && + (ARB_vertex_shader_glVertexAttrib2dARB_pointer = GLContext.getFunctionAddress("glVertexAttrib2dARB")) != 0 && + (ARB_vertex_shader_glVertexAttrib3sARB_pointer = GLContext.getFunctionAddress("glVertexAttrib3sARB")) != 0 && + (ARB_vertex_shader_glVertexAttrib3fARB_pointer = GLContext.getFunctionAddress("glVertexAttrib3fARB")) != 0 && + (ARB_vertex_shader_glVertexAttrib3dARB_pointer = GLContext.getFunctionAddress("glVertexAttrib3dARB")) != 0 && + (ARB_vertex_shader_glVertexAttrib4sARB_pointer = GLContext.getFunctionAddress("glVertexAttrib4sARB")) != 0 && + (ARB_vertex_shader_glVertexAttrib4fARB_pointer = GLContext.getFunctionAddress("glVertexAttrib4fARB")) != 0 && + (ARB_vertex_shader_glVertexAttrib4dARB_pointer = GLContext.getFunctionAddress("glVertexAttrib4dARB")) != 0 && + (ARB_vertex_shader_glVertexAttrib4NubARB_pointer = GLContext.getFunctionAddress("glVertexAttrib4NubARB")) != 0 && + (ARB_vertex_shader_glVertexAttribPointerARB_pointer = GLContext.getFunctionAddress("glVertexAttribPointerARB")) != 0 && + (ARB_vertex_shader_glEnableVertexAttribArrayARB_pointer = GLContext.getFunctionAddress("glEnableVertexAttribArrayARB")) != 0 && + (ARB_vertex_shader_glDisableVertexAttribArrayARB_pointer = GLContext.getFunctionAddress("glDisableVertexAttribArrayARB")) != 0 && (ARB_vertex_shader_glBindAttribLocationARB_pointer = GLContext.getFunctionAddress("glBindAttribLocationARB")) != 0 && (ARB_vertex_shader_glGetActiveAttribARB_pointer = GLContext.getFunctionAddress("glGetActiveAttribARB")) != 0 && - (ARB_vertex_shader_glGetAttribLocationARB_pointer = GLContext.getFunctionAddress("glGetAttribLocationARB")) != 0; + (ARB_vertex_shader_glGetAttribLocationARB_pointer = GLContext.getFunctionAddress("glGetAttribLocationARB")) != 0 && + (ARB_vertex_shader_glGetVertexAttribfvARB_pointer = GLContext.getFunctionAddress("glGetVertexAttribfvARB")) != 0 && + (ARB_vertex_shader_glGetVertexAttribdvARB_pointer = GLContext.getFunctionAddress("glGetVertexAttribdvARB")) != 0 && + (ARB_vertex_shader_glGetVertexAttribivARB_pointer = GLContext.getFunctionAddress("glGetVertexAttribivARB")) != 0 && + (ARB_vertex_shader_glGetVertexAttribPointervARB_pointer = GLContext.getFunctionAddress("glGetVertexAttribPointervARB")) != 0; } private boolean ARB_window_pos_initNativeFunctionAddresses() { |
|
From: Ioannis T. <sp...@us...> - 2005-11-05 18:57:34
|
Update of /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25100 Modified Files: ARBVertexShader.java Log Message: Added missing functions in ARB_vertex_shader Index: ARBVertexShader.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexShader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBVertexShader.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBVertexShader.java 5 Nov 2005 18:57:25 -0000 1.2 @@ -38,6 +38,160 @@ } + public static void glVertexAttrib1sARB(int index, short v0) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttrib1sARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib1sARB(index, v0, function_pointer); + } + private static native void nglVertexAttrib1sARB(int index, short v0, long function_pointer); + + public static void glVertexAttrib1fARB(int index, float v0) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttrib1fARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib1fARB(index, v0, function_pointer); + } + private static native void nglVertexAttrib1fARB(int index, float v0, long function_pointer); + + public static void glVertexAttrib1dARB(int index, double v0) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttrib1dARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib1dARB(index, v0, function_pointer); + } + private static native void nglVertexAttrib1dARB(int index, double v0, long function_pointer); + + public static void glVertexAttrib2sARB(int index, short v0, short v1) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttrib2sARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib2sARB(index, v0, v1, function_pointer); + } + private static native void nglVertexAttrib2sARB(int index, short v0, short v1, long function_pointer); + + public static void glVertexAttrib2fARB(int index, float v0, float v1) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttrib2fARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib2fARB(index, v0, v1, function_pointer); + } + private static native void nglVertexAttrib2fARB(int index, float v0, float v1, long function_pointer); + + public static void glVertexAttrib2dARB(int index, double v0, double v1) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttrib2dARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib2dARB(index, v0, v1, function_pointer); + } + private static native void nglVertexAttrib2dARB(int index, double v0, double v1, long function_pointer); + + public static void glVertexAttrib3sARB(int index, short v0, short v1, short v2) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttrib3sARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib3sARB(index, v0, v1, v2, function_pointer); + } + private static native void nglVertexAttrib3sARB(int index, short v0, short v1, short v2, long function_pointer); + + public static void glVertexAttrib3fARB(int index, float v0, float v1, float v2) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttrib3fARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib3fARB(index, v0, v1, v2, function_pointer); + } + private static native void nglVertexAttrib3fARB(int index, float v0, float v1, float v2, long function_pointer); + + public static void glVertexAttrib3dARB(int index, double v0, double v1, double v2) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttrib3dARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib3dARB(index, v0, v1, v2, function_pointer); + } + private static native void nglVertexAttrib3dARB(int index, double v0, double v1, double v2, long function_pointer); + + public static void glVertexAttrib4sARB(int index, short v0, short v1, short v2, short v3) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttrib4sARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib4sARB(index, v0, v1, v2, v3, function_pointer); + } + private static native void nglVertexAttrib4sARB(int index, short v0, short v1, short v2, short v3, long function_pointer); + + public static void glVertexAttrib4fARB(int index, float v0, float v1, float v2, float v3) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttrib4fARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib4fARB(index, v0, v1, v2, v3, function_pointer); + } + private static native void nglVertexAttrib4fARB(int index, float v0, float v1, float v2, float v3, long function_pointer); + + public static void glVertexAttrib4dARB(int index, double v0, double v1, double v2, double v3) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttrib4dARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib4dARB(index, v0, v1, v2, v3, function_pointer); + } + private static native void nglVertexAttrib4dARB(int index, double v0, double v1, double v2, double v3, long function_pointer); + + public static void glVertexAttrib4NubARB(int index, byte x, byte y, byte z, byte w) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttrib4NubARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib4NubARB(index, x, y, z, w, function_pointer); + } + private static native void nglVertexAttrib4NubARB(int index, byte x, byte y, byte z, byte w, long function_pointer); + + public static void glVertexAttribPointerARB(int index, int size, boolean normalized, int stride, DoubleBuffer buffer) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttribPointerARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(buffer); + GLChecks.getReferences().ARB_vertex_shader_glVertexAttribPointerARB_buffer = buffer; + nglVertexAttribPointerARB(index, size, GL11.GL_DOUBLE, normalized, stride, buffer, buffer.position() << 3, function_pointer); + } + public static void glVertexAttribPointerARB(int index, int size, boolean normalized, int stride, FloatBuffer buffer) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttribPointerARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(buffer); + GLChecks.getReferences().ARB_vertex_shader_glVertexAttribPointerARB_buffer = buffer; + nglVertexAttribPointerARB(index, size, GL11.GL_FLOAT, normalized, stride, buffer, buffer.position() << 2, function_pointer); + } + public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, ByteBuffer buffer) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttribPointerARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(buffer); + GLChecks.getReferences().ARB_vertex_shader_glVertexAttribPointerARB_buffer = buffer; + nglVertexAttribPointerARB(index, size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, normalized, stride, buffer, buffer.position(), function_pointer); + } + public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, IntBuffer buffer) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttribPointerARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(buffer); + GLChecks.getReferences().ARB_vertex_shader_glVertexAttribPointerARB_buffer = buffer; + nglVertexAttribPointerARB(index, size, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, normalized, stride, buffer, buffer.position() << 2, function_pointer); + } + public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, ShortBuffer buffer) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttribPointerARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(buffer); + GLChecks.getReferences().ARB_vertex_shader_glVertexAttribPointerARB_buffer = buffer; + nglVertexAttribPointerARB(index, size, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, normalized, stride, buffer, buffer.position() << 1, function_pointer); + } + private static native void nglVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride, Buffer buffer, int buffer_position, long function_pointer); + public static void glVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride, int buffer_buffer_offset) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttribPointerARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOenabled(); + nglVertexAttribPointerARBBO(index, size, type, normalized, stride, buffer_buffer_offset, function_pointer); + } + private static native void nglVertexAttribPointerARBBO(int index, int size, int type, boolean normalized, int stride, int buffer_buffer_offset, long function_pointer); + + public static void glEnableVertexAttribArrayARB(int index) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glEnableVertexAttribArrayARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglEnableVertexAttribArrayARB(index, function_pointer); + } + private static native void nglEnableVertexAttribArrayARB(int index, long function_pointer); + + public static void glDisableVertexAttribArrayARB(int index) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glDisableVertexAttribArrayARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglDisableVertexAttribArrayARB(index, function_pointer); + } + private static native void nglDisableVertexAttribArrayARB(int index, long function_pointer); + public static void glBindAttribLocationARB(int programObj, int index, ByteBuffer name) { long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glBindAttribLocationARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -68,4 +222,36 @@ return __result; } private static native int nglGetAttribLocationARB(int programObj, ByteBuffer name, int name_position, long function_pointer); + + public static void glGetVertexAttribARB(int index, int pname, FloatBuffer params) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glGetVertexAttribfvARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(params); + nglGetVertexAttribfvARB(index, pname, params, params.position(), function_pointer); + } + private static native void nglGetVertexAttribfvARB(int index, int pname, FloatBuffer params, int params_position, long function_pointer); + + public static void glGetVertexAttribARB(int index, int pname, DoubleBuffer params) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glGetVertexAttribdvARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(params); + nglGetVertexAttribdvARB(index, pname, params, params.position(), function_pointer); + } + private static native void nglGetVertexAttribdvARB(int index, int pname, DoubleBuffer params, int params_position, long function_pointer); + + public static void glGetVertexAttribARB(int index, int pname, IntBuffer params) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glGetVertexAttribivARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(params); + nglGetVertexAttribivARB(index, pname, params, params.position(), function_pointer); + } + private static native void nglGetVertexAttribivARB(int index, int pname, IntBuffer params, int params_position, long function_pointer); + + public static java.nio.ByteBuffer glGetVertexAttribPointerARB(int index, int pname, int result_size) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glGetVertexAttribPointervARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + java.nio.ByteBuffer __result = nglGetVertexAttribPointervARB(index, pname, result_size, function_pointer); + return __result; + } + private static native java.nio.ByteBuffer nglGetVertexAttribPointervARB(int index, int pname, int result_size, long function_pointer); } |
|
From: Ioannis T. <sp...@us...> - 2005-11-05 18:57:03
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/generated In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24977 Modified Files: org_lwjgl_opengl_ARBVertexShader.c Log Message: Added missing functions in ARB_vertex_shader Index: org_lwjgl_opengl_ARBVertexShader.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBVertexShader.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_ARBVertexShader.c 5 Nov 2005 18:56:55 -0000 1.2 @@ -3,9 +3,116 @@ #include <jni.h> #include "extgl.h" +typedef void (APIENTRY *glVertexAttrib1sARBPROC) (GLuint index, GLshort v0); +typedef void (APIENTRY *glVertexAttrib1fARBPROC) (GLuint index, GLfloat v0); +typedef void (APIENTRY *glVertexAttrib1dARBPROC) (GLuint index, GLdouble v0); +typedef void (APIENTRY *glVertexAttrib2sARBPROC) (GLuint index, GLshort v0, GLshort v1); +typedef void (APIENTRY *glVertexAttrib2fARBPROC) (GLuint index, GLfloat v0, GLfloat v1); +typedef void (APIENTRY *glVertexAttrib2dARBPROC) (GLuint index, GLdouble v0, GLdouble v1); +typedef void (APIENTRY *glVertexAttrib3sARBPROC) (GLuint index, GLshort v0, GLshort v1, GLshort v2); +typedef void (APIENTRY *glVertexAttrib3fARBPROC) (GLuint index, GLfloat v0, GLfloat v1, GLfloat v2); +typedef void (APIENTRY *glVertexAttrib3dARBPROC) (GLuint index, GLdouble v0, GLdouble v1, GLdouble v2); +typedef void (APIENTRY *glVertexAttrib4sARBPROC) (GLuint index, GLshort v0, GLshort v1, GLshort v2, GLshort v3); +typedef void (APIENTRY *glVertexAttrib4fARBPROC) (GLuint index, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); +typedef void (APIENTRY *glVertexAttrib4dARBPROC) (GLuint index, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3); +typedef void (APIENTRY *glVertexAttrib4NubARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); +typedef void (APIENTRY *glVertexAttribPointerARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * buffer); +typedef void (APIENTRY *glEnableVertexAttribArrayARBPROC) (GLuint index); +typedef void (APIENTRY *glDisableVertexAttribArrayARBPROC) (GLuint index); typedef void (APIENTRY *glBindAttribLocationARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB * name); typedef void (APIENTRY *glGetActiveAttribARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); typedef GLint (APIENTRY *glGetAttribLocationARBPROC) (GLhandleARB programObj, const GLcharARB * name); +typedef void (APIENTRY *glGetVertexAttribfvARBPROC) (GLuint index, GLenum pname, GLfloat * params); +typedef void (APIENTRY *glGetVertexAttribdvARBPROC) (GLuint index, GLenum pname, GLdouble * params); +typedef void (APIENTRY *glGetVertexAttribivARBPROC) (GLuint index, GLenum pname, GLint * params); +typedef void (APIENTRY *glGetVertexAttribPointervARBPROC) (GLuint index, GLenum pname, GLvoid ** result); + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttrib1sARB(JNIEnv *env, jclass clazz, jint index, jshort v0, jlong function_pointer) { + glVertexAttrib1sARBPROC glVertexAttrib1sARB = (glVertexAttrib1sARBPROC)((intptr_t)function_pointer); + glVertexAttrib1sARB(index, v0); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttrib1fARB(JNIEnv *env, jclass clazz, jint index, jfloat v0, jlong function_pointer) { + glVertexAttrib1fARBPROC glVertexAttrib1fARB = (glVertexAttrib1fARBPROC)((intptr_t)function_pointer); + glVertexAttrib1fARB(index, v0); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttrib1dARB(JNIEnv *env, jclass clazz, jint index, jdouble v0, jlong function_pointer) { + glVertexAttrib1dARBPROC glVertexAttrib1dARB = (glVertexAttrib1dARBPROC)((intptr_t)function_pointer); + glVertexAttrib1dARB(index, v0); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttrib2sARB(JNIEnv *env, jclass clazz, jint index, jshort v0, jshort v1, jlong function_pointer) { + glVertexAttrib2sARBPROC glVertexAttrib2sARB = (glVertexAttrib2sARBPROC)((intptr_t)function_pointer); + glVertexAttrib2sARB(index, v0, v1); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttrib2fARB(JNIEnv *env, jclass clazz, jint index, jfloat v0, jfloat v1, jlong function_pointer) { + glVertexAttrib2fARBPROC glVertexAttrib2fARB = (glVertexAttrib2fARBPROC)((intptr_t)function_pointer); + glVertexAttrib2fARB(index, v0, v1); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttrib2dARB(JNIEnv *env, jclass clazz, jint index, jdouble v0, jdouble v1, jlong function_pointer) { + glVertexAttrib2dARBPROC glVertexAttrib2dARB = (glVertexAttrib2dARBPROC)((intptr_t)function_pointer); + glVertexAttrib2dARB(index, v0, v1); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttrib3sARB(JNIEnv *env, jclass clazz, jint index, jshort v0, jshort v1, jshort v2, jlong function_pointer) { + glVertexAttrib3sARBPROC glVertexAttrib3sARB = (glVertexAttrib3sARBPROC)((intptr_t)function_pointer); + glVertexAttrib3sARB(index, v0, v1, v2); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttrib3fARB(JNIEnv *env, jclass clazz, jint index, jfloat v0, jfloat v1, jfloat v2, jlong function_pointer) { + glVertexAttrib3fARBPROC glVertexAttrib3fARB = (glVertexAttrib3fARBPROC)((intptr_t)function_pointer); + glVertexAttrib3fARB(index, v0, v1, v2); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttrib3dARB(JNIEnv *env, jclass clazz, jint index, jdouble v0, jdouble v1, jdouble v2, jlong function_pointer) { + glVertexAttrib3dARBPROC glVertexAttrib3dARB = (glVertexAttrib3dARBPROC)((intptr_t)function_pointer); + glVertexAttrib3dARB(index, v0, v1, v2); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttrib4sARB(JNIEnv *env, jclass clazz, jint index, jshort v0, jshort v1, jshort v2, jshort v3, jlong function_pointer) { + glVertexAttrib4sARBPROC glVertexAttrib4sARB = (glVertexAttrib4sARBPROC)((intptr_t)function_pointer); + glVertexAttrib4sARB(index, v0, v1, v2, v3); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttrib4fARB(JNIEnv *env, jclass clazz, jint index, jfloat v0, jfloat v1, jfloat v2, jfloat v3, jlong function_pointer) { + glVertexAttrib4fARBPROC glVertexAttrib4fARB = (glVertexAttrib4fARBPROC)((intptr_t)function_pointer); + glVertexAttrib4fARB(index, v0, v1, v2, v3); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttrib4dARB(JNIEnv *env, jclass clazz, jint index, jdouble v0, jdouble v1, jdouble v2, jdouble v3, jlong function_pointer) { + glVertexAttrib4dARBPROC glVertexAttrib4dARB = (glVertexAttrib4dARBPROC)((intptr_t)function_pointer); + glVertexAttrib4dARB(index, v0, v1, v2, v3); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttrib4NubARB(JNIEnv *env, jclass clazz, jint index, jbyte x, jbyte y, jbyte z, jbyte w, jlong function_pointer) { + glVertexAttrib4NubARBPROC glVertexAttrib4NubARB = (glVertexAttrib4NubARBPROC)((intptr_t)function_pointer); + glVertexAttrib4NubARB(index, x, y, z, w); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttribPointerARB(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jobject buffer, jint buffer_position, jlong function_pointer) { + const GLvoid *buffer_address = ((const GLvoid *)(((char *)(*env)->GetDirectBufferAddress(env, buffer)) + buffer_position)); + glVertexAttribPointerARBPROC glVertexAttribPointerARB = (glVertexAttribPointerARBPROC)((intptr_t)function_pointer); + glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_address); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttribPointerARBBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jint buffer_buffer_offset, jlong function_pointer) { + const GLvoid *buffer_address = ((const GLvoid *)offsetToPointer(buffer_buffer_offset)); + glVertexAttribPointerARBPROC glVertexAttribPointerARB = (glVertexAttribPointerARBPROC)((intptr_t)function_pointer); + glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_address); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglEnableVertexAttribArrayARB(JNIEnv *env, jclass clazz, jint index, jlong function_pointer) { + glEnableVertexAttribArrayARBPROC glEnableVertexAttribArrayARB = (glEnableVertexAttribArrayARBPROC)((intptr_t)function_pointer); + glEnableVertexAttribArrayARB(index); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglDisableVertexAttribArrayARB(JNIEnv *env, jclass clazz, jint index, jlong function_pointer) { + glDisableVertexAttribArrayARBPROC glDisableVertexAttribArrayARB = (glDisableVertexAttribArrayARBPROC)((intptr_t)function_pointer); + glDisableVertexAttribArrayARB(index); +} JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglBindAttribLocationARB(JNIEnv *env, jclass clazz, jint programObj, jint index, jobject name, jint name_position, jlong function_pointer) { const GLcharARB *name_address = ((const GLcharARB *)(*env)->GetDirectBufferAddress(env, name)) + name_position; @@ -29,3 +136,28 @@ return __result; } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglGetVertexAttribfvARB(JNIEnv *env, jclass clazz, jint index, jint pname, jobject params, jint params_position, jlong function_pointer) { + GLfloat *params_address = ((GLfloat *)(*env)->GetDirectBufferAddress(env, params)) + params_position; + glGetVertexAttribfvARBPROC glGetVertexAttribfvARB = (glGetVertexAttribfvARBPROC)((intptr_t)function_pointer); + glGetVertexAttribfvARB(index, pname, params_address); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglGetVertexAttribdvARB(JNIEnv *env, jclass clazz, jint index, jint pname, jobject params, jint params_position, jlong function_pointer) { + GLdouble *params_address = ((GLdouble *)(*env)->GetDirectBufferAddress(env, params)) + params_position; + glGetVertexAttribdvARBPROC glGetVertexAttribdvARB = (glGetVertexAttribdvARBPROC)((intptr_t)function_pointer); + glGetVertexAttribdvARB(index, pname, params_address); +} + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglGetVertexAttribivARB(JNIEnv *env, jclass clazz, jint index, jint pname, jobject params, jint params_position, jlong function_pointer) { + GLint *params_address = ((GLint *)(*env)->GetDirectBufferAddress(env, params)) + params_position; + glGetVertexAttribivARBPROC glGetVertexAttribivARB = (glGetVertexAttribivARBPROC)((intptr_t)function_pointer); + glGetVertexAttribivARB(index, pname, params_address); +} + +JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglGetVertexAttribPointervARB(JNIEnv *env, jclass clazz, jint index, jint pname, jint result_size, jlong function_pointer) { + glGetVertexAttribPointervARBPROC glGetVertexAttribPointervARB = (glGetVertexAttribPointervARBPROC)((intptr_t)function_pointer); + GLvoid * __result; + glGetVertexAttribPointervARB(index, pname, &__result); + return safeNewBuffer(env, __result, result_size); +} + |
|
From: Ioannis T. <sp...@us...> - 2005-11-05 18:56:27
|
Update of /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24801 Modified Files: ARB_vertex_shader.java Log Message: Added missing functions in ARB_vertex_shader Index: ARB_vertex_shader.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ARB_vertex_shader.java 20 Feb 2005 20:53:49 -0000 1.3 +++ ARB_vertex_shader.java 5 Nov 2005 18:56:19 -0000 1.4 @@ -31,12 +31,12 @@ */ package org.lwjgl.opengl; -import java.nio.ByteBuffer; -import java.nio.IntBuffer; - import org.lwjgl.util.generator.*; +import java.nio.*; + public interface ARB_vertex_shader { + /* * Accepted by the <shaderType> argument of CreateShaderObjectARB and * returned by the <params> parameter of GetObjectParameter{if}vARB: @@ -95,23 +95,74 @@ int GL_FLOAT_MAT3_ARB = 0x8B5B; int GL_FLOAT_MAT4_ARB = 0x8B5C; + void glVertexAttrib1sARB(@GLuint int index, short v0); + + void glVertexAttrib1fARB(@GLuint int index, float v0); + + void glVertexAttrib1dARB(@GLuint int index, double v0); + + void glVertexAttrib2sARB(@GLuint int index, short v0, short v1); + + void glVertexAttrib2fARB(@GLuint int index, float v0, float v1); + + void glVertexAttrib2dARB(@GLuint int index, double v0, double v1); + + void glVertexAttrib3sARB(@GLuint int index, short v0, short v1, short v2); + + void glVertexAttrib3fARB(@GLuint int index, float v0, float v1, float v2); + + void glVertexAttrib3dARB(@GLuint int index, double v0, double v1, double v2); + + void glVertexAttrib4sARB(@GLuint int index, short v0, short v1, short v2, short v3); + + void glVertexAttrib4fARB(@GLuint int index, float v0, float v1, float v2, float v3); + + void glVertexAttrib4dARB(@GLuint int index, double v0, double v1, double v2, double v3); + + void glVertexAttrib4NubARB(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w); + + void glVertexAttribPointerARB(@GLuint int index, int size, @AutoType("buffer") @GLenum int type, boolean normalized, @GLsizei int stride, + @CachedReference + @BufferObject(BufferKind.ArrayVBO) + @Check + @Const + @GLbyte + @GLubyte + @GLshort + @GLushort + @GLint + @GLuint + @GLfloat + @GLdouble Buffer buffer); + + void glEnableVertexAttribArrayARB(@GLuint int index); + + void glDisableVertexAttribArrayARB(@GLuint int index); + void glBindAttribLocationARB(@GLhandleARB int programObj, @GLuint int index, @NullTerminated @Const @GLcharARB ByteBuffer name); - // --------------------------- void glGetActiveAttribARB(@GLhandleARB int programObj, @GLuint int index, - @AutoSize("name") - @GLsizei - int maxLength, - @Check(value="1", canBeNull=true) - @GLsizei - IntBuffer length, - @Check("1") - IntBuffer size, - @Check("1") - @GLenum - IntBuffer type, - @GLcharARB - ByteBuffer name); + @AutoSize("name") + @GLsizei int maxLength, + @Check(value = "1", canBeNull = true) + @GLsizei IntBuffer length, + @Check("1") IntBuffer size, + @Check("1") + @GLenum IntBuffer type, + @GLcharARB ByteBuffer name); int glGetAttribLocationARB(@GLhandleARB int programObj, @NullTerminated @Const @GLcharARB ByteBuffer name); + + @StripPostfix("params") + void glGetVertexAttribfvARB(@GLuint int index, @GLenum int pname, @Check FloatBuffer params); + + @StripPostfix("params") + void glGetVertexAttribdvARB(@GLuint int index, @GLenum int pname, @Check DoubleBuffer params); + + @StripPostfix("params") + void glGetVertexAttribivARB(@GLuint int index, @GLenum int pname, @Check IntBuffer params); + + @StripPostfix("result") + void glGetVertexAttribPointervARB(@GLuint int index, @GLenum int pname, @Result @GLvoid ByteBuffer result); + } |
|
From: Brian M. <ma...@us...> - 2005-11-04 19:29:01
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/devil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31825 Modified Files: org_lwjgl_devil_IL.c Log Message: silly debug leftovers nuked Index: org_lwjgl_devil_IL.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/org_lwjgl_devil_IL.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- org_lwjgl_devil_IL.c 4 Nov 2005 19:21:50 -0000 1.21 +++ org_lwjgl_devil_IL.c 4 Nov 2005 19:28:34 -0000 1.22 @@ -998,7 +998,5 @@ {"ilSaveData", "(Ljava/lang/String;)Z", (void*)&Java_org_lwjgl_devil_IL_ilSaveData, "ilSaveData", (void*)&ilSaveData} }; int num_functions = NUMFUNCTIONS(functions); - printf("hrmph\n"); - extil_InitializeClass(env, il_class, num_functions, functions); } |
|
From: Brian M. <ma...@us...> - 2005-11-04 19:23:00
|
Update of /cvsroot/java-game-lib/LWJGL In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30634 Modified Files: build.xml Log Message: reworked devil dynamic stub to use generated header using a new ILNative class Index: build.xml =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- build.xml 2 Nov 2005 22:09:18 -0000 1.93 +++ build.xml 4 Nov 2005 19:22:52 -0000 1.94 @@ -395,6 +395,11 @@ <class name="org.lwjgl.fmod3.FMusic" /> <class name="org.lwjgl.fmod3.FSound" /> </javah> + + <!-- DevIL --> + <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/devil" force="yes"> + <class name="org.lwjgl.devil.ILNative" /> + </javah> </target> <!-- Creates the Javadoc --> |
|
From: Brian M. <ma...@us...> - 2005-11-04 19:22:28
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30364 Modified Files: IL.java ILU.java ILUT.java ILinfo.java ILpointf.java ILpointi.java Added Files: ILNative.java Log Message: reworked devil dynamic stub to use generated header using a new ILNative class Index: ILUT.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/ILUT.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ILUT.java 2 Nov 2005 22:08:27 -0000 1.14 +++ ILUT.java 4 Nov 2005 19:22:18 -0000 1.15 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2004 LWJGL Project + * Copyright (c) 2002-2005 LWJGL Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,6 @@ import java.nio.IntBuffer; import org.lwjgl.LWJGLException; -import org.lwjgl.LWJGLUtil; /** * $Id$ @@ -83,9 +82,6 @@ public static final int ILUT_VENDOR = IL.IL_VENDOR; public static final int ILUT_VERSION_NUM = IL.IL_VERSION_NUM; - /** Have we been created? */ - protected static boolean created; - public static native boolean ilutRenderer(int renderer); public static native boolean ilutDisable(int mode); public static native boolean ilutEnable(int mode); @@ -94,7 +90,7 @@ public static native void ilutGetBooleanv(int mode, ByteBuffer param); public static native void ilutGetIntegerv(int mode, IntBuffer Param); public static native String ilutGetString(int stringName); - private static native void ilutInit(); + static native void ilutInit(); public static native boolean ilutIsDisabled(int mode); public static native boolean ilutIsEnabled(int mode); public static native void ilutPopAttrib(); @@ -112,13 +108,9 @@ public static native boolean ilutGLSaveImage(String fileName, int texID); public static native boolean ilutGLSetTex(int texID); public static native boolean ilutGLTexImage(int level); - - /** - * @return true if ILUT has been created - */ - public static boolean isCreated() { - return created; - } + + /** Have we been created? */ + protected static boolean created; /** * Creates a new instance of ILUT. Cannot be created unless IL has been created. @@ -127,56 +119,25 @@ if(!IL.isCreated()) { throw new LWJGLException("Cannot create ILUT without having created IL instance"); } - - String[] ilutPaths = LWJGLUtil.getLibraryPaths(new String[]{ - "ILUT", "ILUT.dll", - "ILUT", "libILUT.so", - "ILUT", "libILUT.dylib"}, ILUT.class.getClassLoader()); - nCreate(ilutPaths); - - try { - ILUT.initNativeStubs(); - ILUT.ilutInit(); - created = true; - } catch (LWJGLException e) { - destroy(); - throw e; - } + + ILNative.createILUT(); + created = true; } - static native void initNativeStubs() throws LWJGLException; - - static native void resetNativeStubs(Class clazz); - /** * Exit cleanly by calling destroy. */ public static void destroy() { - resetNativeStubs(ILUT.class); if (created) { - nDestroy(); + ILNative.destroyILUT(); + created = false; } - created = false; } - - /** - * Native method to create ILUT instance - * - * @param ilutPaths Array of strings containing paths to search for ILUT library - */ - protected static native void nCreate(String[] ilutPaths) throws LWJGLException; - - /** - * Native method the destroy the ILUT - */ - protected static native void nDestroy(); - + /** - * Forcefully set created. Used internally by mac platform since - * it loads ilu/ilut in IL and needs to mark them as created - * @param created value to set created to + * @return true if ILUT has been created */ - static void setCreated(boolean created) { - ILUT.created = created; - } + public static boolean isCreated() { + return created; + } } Index: IL.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/IL.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- IL.java 2 Nov 2005 22:08:27 -0000 1.21 +++ IL.java 4 Nov 2005 19:22:18 -0000 1.22 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2004 LWJGL Project + * Copyright (c) 2002-2005 LWJGL Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -41,7 +41,6 @@ import org.lwjgl.BufferChecks; import org.lwjgl.LWJGLException; -import org.lwjgl.LWJGLUtil; /** * $Id$ @@ -295,9 +294,6 @@ public static final int IL_SEEK_END = 2; public static final int IL_EOF = -1; - /** Have we been created? */ - protected static boolean created; - public static native boolean ilActiveImage(int Number); public static native boolean ilActiveLayer(int Number); public static native boolean ilActiveMipmap(int Number); @@ -362,7 +358,7 @@ public static native ByteBuffer ilGetPalette(); public static native String ilGetString(int StringName); public static native void ilHint(int Target, int Mode); - private static native void ilInit(); + static native void ilInit(); public static native boolean ilIsDisabled(int Mode); public static native boolean ilIsEnabled(int Mode); public static native boolean ilIsImage(int Image); @@ -573,41 +569,9 @@ return result; } - // public static native int ilGetDXTCData(ILvoid *Buffer, int BufferSize, int DXTCFormat); - // public static native boolean ilIsValidF(int Type, ILHANDLE File); - // public static native boolean ilLoadF(int Type, ILHANDLE File); - // public static native boolean ilLoadDataF(ILHANDLE File, int Width, int Height, int Depth, ILubyte Bpp); - // public static native int ilSaveF(int Type, ILHANDLE File); - // public static native void ilRegisterFormat(int Format); - // public static native boolean ilRegisterLoad(String Ext, IL_LOADPROC Load); - // public static native boolean ilRegisterMipNum(int Num); - // public static native boolean ilRegisterNumImages(int Num); - // public static native void ilRegisterOrigin(int Origin); - // public static void ilRegisterPal(ByteBuffer Pal, int Size, int Type); - // public static native void nilRegisterPal(ByteBuffer Pal, int pal_position, int Size, int Type); - // public static native boolean ilRegisterSave(String Ext, IL_SAVEPROC Save); - // public static native void ilRegisterType(int Type); - // public static native void ilSetMemory(mAlloc, mFree); - // public static native void ilSetRead(fOpenRProc, fCloseRProc, fEofProc, fGetcProc, fReadProc, fSeekRProc, fTellRProc); - // public static native void ilSetWrite(fOpenWProc, fCloseWProc, fPutcProc, fSeekWProc, fTellWProc, fWriteProc); - - - static { - System.loadLibrary("lwjgl-devil"); - } - - - /** - * @return true if DevIL has been created - */ - public static boolean isCreated() { - return created; - } - - private static native void initNativeStubs() throws LWJGLException; - - private static native void resetNativeStubs(Class clazz); - + /** Have we been created? */ + protected static boolean created; + /** * Creates a new instance of IL. */ @@ -616,43 +580,24 @@ return; } - String[] illPaths = LWJGLUtil.getLibraryPaths(new String[]{ - "DevIL", "DevIL.dll", - "IL", "libIL.so", - "IL", "libIL.dylib"}, IL.class.getClassLoader()); - nCreate(illPaths); - - try { - IL.initNativeStubs(); - IL.ilInit(); - created = true; - } catch (LWJGLException e) { - destroy(); - throw e; - } + ILNative.createIL(); + created = true; } /** * Exit cleanly by calling destroy. */ public static void destroy() { - resetNativeStubs(IL.class); - if (created) { - nDestroy(); + ILNative.destroyIL(); + created = false; } - created = false; } - - /** - * Native method to create IL instance - * - * @param ilPaths Array of strings containing paths to search for Devil library - */ - protected static native void nCreate(String[] ilPaths) throws LWJGLException; - + /** - * Native method the destroy the IL + * @return true if DevIL has been created */ - protected static native void nDestroy(); + public static boolean isCreated() { + return created; + } } Index: ILU.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/ILU.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ILU.java 2 Nov 2005 22:08:27 -0000 1.14 +++ ILU.java 4 Nov 2005 19:22:18 -0000 1.15 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2004 LWJGL Project + * Copyright (c) 2002-2005 LWJGL Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,6 @@ import org.lwjgl.BufferChecks; import org.lwjgl.LWJGLException; -import org.lwjgl.LWJGLUtil; /** * $Id$ @@ -79,16 +78,6 @@ public static final int ILU_VERSION_NUM = IL.IL_VERSION_NUM; public static final int ILU_VENDOR = IL.IL_VENDOR; - /** Have we been created? */ - protected static boolean created; - - /** - * @return true if ILU has been created - */ - public static boolean isCreated() { - return created; - } - public static native boolean iluAlienify(); public static native boolean iluBlurAvg(int iter); public static native boolean iluBlurGaussian(int iter); @@ -118,7 +107,7 @@ private static native void niluGetIntegerv(int mode, IntBuffer param, int param_offset); public static native String iluGetString(int stringName); public static native void iluImageParameter(int pName, int param); - private static native void iluInit(); + static native void iluInit(); public static native boolean iluInvertAlpha(); public static native int iluLoadImage(String fileName); public static native boolean iluMirror(); @@ -154,6 +143,9 @@ iluScaleColours(r, g, b); } // ------------------------------------------------------------------------ + + /** Have we been created? */ + protected static boolean created; /** * Creates a new instance of ILU. Cannot be created unless IL has been created. @@ -163,55 +155,24 @@ throw new LWJGLException("Cannot create ILU without having created IL instance"); } - String[] iluPaths = LWJGLUtil.getLibraryPaths(new String[]{ - "ILU", "ILU.dll", - "ILU", "libILU.so", - "ILU", "libILU.dylib"}, ILU.class.getClassLoader()); - nCreate(iluPaths); - - try { - ILU.initNativeStubs(); - ILU.iluInit(); - created = true; - } catch (LWJGLException e) { - destroy(); - throw e; - } + ILNative.createILU(); + created = true; } - static native void initNativeStubs() throws LWJGLException; - - static native void resetNativeStubs(Class clazz); - /** * Exit cleanly by calling destroy. */ public static void destroy() { - resetNativeStubs(ILU.class); if (created) { - nDestroy(); + ILNative.destroyILU(); + created = false; } - created = false; } - - /** - * Native method to create ILU instance - * - * @param iluPaths Array of strings containing paths to search for ILU library - */ - protected static native void nCreate(String[] iluPaths) throws LWJGLException; - - /** - * Native method the destroy the ILU - */ - static native void nDestroy(); - + /** - * Forcefully set created. Used internally by mac platform since - * it loads ilu/ilut in IL and needs to mark them as created - * @param created value to set created to + * @return true if ILU has been created */ - static void setCreated(boolean created) { - ILU.created = created; - } + public static boolean isCreated() { + return created; + } } Index: ILpointi.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/ILpointi.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ILpointi.java 9 Jan 2005 23:59:33 -0000 1.2 +++ ILpointi.java 4 Nov 2005 19:22:18 -0000 1.3 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2004 LWJGL Project + * Copyright (c) 2002-2005 LWJGL Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without Index: ILpointf.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/ILpointf.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ILpointf.java 9 Jan 2005 23:59:33 -0000 1.2 +++ ILpointf.java 4 Nov 2005 19:22:18 -0000 1.3 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2004 LWJGL Project + * Copyright (c) 2002-2005 LWJGL Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without --- NEW FILE: ILNative.java --- /* * Copyright (c) 2002-2005 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.devil; import org.lwjgl.LWJGLException; import org.lwjgl.LWJGLUtil; /** * $Id: ILNative.java,v 1.1 2005/11/04 19:22:18 matzon Exp $ * <p> * Native interface for DevIL * </p> * * @author Brian Matzon <br...@ma...> * @version $Revision: 1.1 $ */ class ILNative { static { System.loadLibrary("lwjgl-devil"); } // IL // =========================================================== static native void initNativeStubsIL(Class clazz) throws LWJGLException; static native void resetNativeStubsIL(Class clazz); static native void nCreateIL(String[] ilPaths) throws LWJGLException; static native void nDestroyIL(); static void createIL() throws LWJGLException { String[] illPaths = LWJGLUtil.getLibraryPaths(new String[]{ "DevIL", "DevIL.dll", "IL", "libIL.so", "IL", "libIL.dylib"}, IL.class.getClassLoader()); ILNative.nCreateIL(illPaths); try { ILNative.initNativeStubsIL(IL.class); IL.ilInit(); } catch (LWJGLException e) { IL.destroy(); throw e; } } public static void destroyIL() { ILNative.resetNativeStubsIL(IL.class); ILNative.nDestroyIL(); } // ----------------------------------------------------------- // ILU // =========================================================== static native void initNativeStubsILU(Class clazz) throws LWJGLException; static native void resetNativeStubsILU(Class clazz); static native void nCreateILU(String[] iluPaths) throws LWJGLException; static native void nDestroyILU(); static void createILU() throws LWJGLException { String[] iluPaths = LWJGLUtil.getLibraryPaths(new String[]{ "ILU", "ILU.dll", "ILU", "libILU.so", "ILU", "libILU.dylib"}, ILU.class.getClassLoader()); ILNative.nCreateILU(iluPaths); try { ILNative.initNativeStubsILU(ILU.class); ILU.iluInit(); } catch (LWJGLException e) { ILU.destroy(); throw e; } } public static void destroyILU() { ILNative.resetNativeStubsILU(ILU.class); ILNative.nDestroyILU(); } // ----------------------------------------------------------- // ILU // =========================================================== static native void initNativeStubsILUT(Class clazz) throws LWJGLException; static native void resetNativeStubsILUT(Class clazz); static native void nCreateILUT(String[] ilutPaths) throws LWJGLException; static native void nDestroyILUT(); static void createILUT() throws LWJGLException { String[] ilutPaths = LWJGLUtil.getLibraryPaths(new String[]{ "ILUT", "ILUT.dll", "ILUT", "libILUT.so", "ILUT", "libILUT.dylib"}, ILUT.class.getClassLoader()); ILNative.nCreateILUT(ilutPaths); try { ILNative.initNativeStubsILUT(ILUT.class); ILUT.ilutInit(); } catch (LWJGLException e) { ILUT.destroy(); throw e; } } public static void destroyILUT() { ILNative.resetNativeStubsILUT(ILUT.class); ILNative.nDestroyILUT(); } // ----------------------------------------------------------- } Index: ILinfo.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/ILinfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ILinfo.java 9 Jan 2005 23:59:32 -0000 1.2 +++ ILinfo.java 4 Nov 2005 19:22:18 -0000 1.3 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2004 LWJGL Project + * Copyright (c) 2002-2005 LWJGL Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -41,16 +41,16 @@ */ public class ILinfo { public int id; // the image's id - public byte data[]; // the image's data + public byte data[]; // the image's data public int width; // the image's width public int height; // the image's height public int depth; // the image's depth - public byte bpp; // bytes per pixel (not bits) of the image + public byte bpp; // bytes per pixel (not bits) of the image public int sizeOfData; // the total size of the data (in bytes) public int format; // image format (in IL enum style) public int type; // image type (in IL enum style) public int origin; // origin of the image - public byte palette[]; // the image's palette + public byte palette[]; // the image's palette public int palType; // palette type public int palSize; // palette size public int cubeFlags; // flags for what cube map sides are present |
|
From: Brian M. <ma...@us...> - 2005-11-04 19:21:58
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/devil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30266 Modified Files: .cvsignore org_lwjgl_devil_IL.c org_lwjgl_devil_ILU.c org_lwjgl_devil_ILUT.c Removed Files: org_lwjgl_devil_IL.h org_lwjgl_devil_ILU.h org_lwjgl_devil_ILUT.h Log Message: reworked devil dynamic stub to use generated header using a new ILNative class --- org_lwjgl_devil_IL.h DELETED --- Index: .cvsignore =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- .cvsignore 2 Nov 2005 22:01:26 -0000 1.4 +++ .cvsignore 4 Nov 2005 19:21:50 -0000 1.5 @@ -0,0 +1 @@ +org_lwjgl_devil_ILNative.h \ No newline at end of file Index: org_lwjgl_devil_IL.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/org_lwjgl_devil_IL.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- org_lwjgl_devil_IL.c 2 Nov 2005 22:04:15 -0000 1.20 +++ org_lwjgl_devil_IL.c 4 Nov 2005 19:21:50 -0000 1.21 @@ -1,5 +1,5 @@ #include "extil.h" -#include "org_lwjgl_devil_IL.h" +#include "org_lwjgl_devil_ILNative.h" typedef ILboolean (ILAPIENTRY *ilActiveImagePROC) (ILuint Number); typedef ILboolean (ILAPIENTRY *ilActiveLayerPROC) (ILuint Number); @@ -911,22 +911,22 @@ * Method: nCreate * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_nCreate(JNIEnv *env, jclass clazz, jobjectArray ilPaths) { +JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILNative_nCreateIL(JNIEnv *env, jclass clazz, jobjectArray ilPaths) { if (!extil_Open(env, ilPaths)) { throwException(env, "Failed to load DevIL library"); return; } } -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_nDestroy(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILNative_nDestroyIL(JNIEnv *env, jclass clazz) { extil_Close(); } -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_resetNativeStubs(JNIEnv *env, jclass clazz, jclass il_class) { +JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILNative_resetNativeStubsIL(JNIEnv *env, jclass clazz, jclass il_class) { (*env)->UnregisterNatives(env, il_class); } -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_initNativeStubs(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILNative_initNativeStubsIL(JNIEnv *env, jclass clazz, jclass il_class) { JavaMethodAndExtFunction functions[] = { {"ilActiveImage", "(I)Z", (void*)&Java_org_lwjgl_devil_IL_ilActiveImage, "ilActiveImage", (void*)&ilActiveImage}, {"ilActiveLayer", "(I)Z", (void*)&Java_org_lwjgl_devil_IL_ilActiveLayer, "ilActiveLayer", (void*)&ilActiveLayer}, @@ -998,5 +998,7 @@ {"ilSaveData", "(Ljava/lang/String;)Z", (void*)&Java_org_lwjgl_devil_IL_ilSaveData, "ilSaveData", (void*)&ilSaveData} }; int num_functions = NUMFUNCTIONS(functions); - extil_InitializeClass(env, clazz, num_functions, functions); + printf("hrmph\n"); + + extil_InitializeClass(env, il_class, num_functions, functions); } --- org_lwjgl_devil_ILUT.h DELETED --- --- org_lwjgl_devil_ILU.h DELETED --- Index: org_lwjgl_devil_ILUT.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/org_lwjgl_devil_ILUT.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- org_lwjgl_devil_ILUT.c 2 Nov 2005 22:04:15 -0000 1.5 +++ org_lwjgl_devil_ILUT.c 4 Nov 2005 19:21:50 -0000 1.6 @@ -1,5 +1,5 @@ #include "extilut.h" -#include "org_lwjgl_devil_ILUT.h" +#include "org_lwjgl_devil_ILNative.h" typedef ILboolean (ILAPIENTRY *ilutRendererPROC) (ILenum Renderer); typedef ILboolean (ILAPIENTRY *ilutDisablePROC) (ILenum Mode); @@ -269,22 +269,22 @@ * Method: nCreate * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILUT_nCreate(JNIEnv *env, jclass clazz, jobjectArray ilutPaths){ +JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILNative_nCreateILUT(JNIEnv *env, jclass clazz, jobjectArray ilutPaths){ if (!extilut_Open(env, ilutPaths)) { throwException(env, "Failed to load ILUT library"); return; } } -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILUT_nDestroy(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILNative_nDestroyILUT(JNIEnv *env, jclass clazz) { extilut_Close(); } -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILUT_resetNativeStubs(JNIEnv *env, jclass clazz, jclass ilut_class) { +JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILNative_resetNativeStubsILUT(JNIEnv *env, jclass clazz, jclass ilut_class) { (*env)->UnregisterNatives(env, ilut_class); } -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILUT_initNativeStubs(JNIEnv *env, jclass clazz){ +JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILNative_initNativeStubsILUT(JNIEnv *env, jclass clazz, jclass ilut_class){ JavaMethodAndExtFunction functions[] = { {"ilutRenderer", "(I)Z", (void*)&Java_org_lwjgl_devil_ILUT_ilutRenderer, "ilutRenderer", (void*)&ilutRenderer}, {"ilutDisable", "(I)Z", (void*)&Java_org_lwjgl_devil_ILUT_ilutDisable, "ilutDisable", (void*)&ilutDisable}, @@ -312,5 +312,5 @@ {"ilutGLTexImage", "(I)Z", (void*)&Java_org_lwjgl_devil_ILUT_ilutGLTexImage, "ilutGLTexImage", (void*)&ilutGLTexImage}, }; int num_functions = NUMFUNCTIONS(functions); - extilut_InitializeClass(env, clazz, num_functions, functions); + extilut_InitializeClass(env, ilut_class, num_functions, functions); } Index: org_lwjgl_devil_ILU.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/org_lwjgl_devil_ILU.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- org_lwjgl_devil_ILU.c 2 Nov 2005 22:04:15 -0000 1.6 +++ org_lwjgl_devil_ILU.c 4 Nov 2005 19:21:50 -0000 1.7 @@ -1,5 +1,5 @@ #include "extilu.h" -#include "org_lwjgl_devil_ILU.h" +#include "org_lwjgl_devil_ILNative.h" typedef ILboolean (ILAPIENTRY *iluAlienifyPROC) (ILvoid); typedef ILboolean (ILAPIENTRY *iluBlurAvgPROC) (ILuint Iter); @@ -531,22 +531,22 @@ * Method: nCreate * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_nCreate(JNIEnv *env, jclass clazz, jobjectArray iluPaths) { +JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILNative_nCreateILU(JNIEnv *env, jclass clazz, jobjectArray iluPaths) { if (!extilu_Open(env, iluPaths)) { throwException(env, "Failed to load ILU library"); return; } } -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_nDestroy(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILNative_nDestroyILU(JNIEnv *env, jclass clazz) { extilu_Close(); } -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_resetNativeStubs(JNIEnv *env, jclass clazz, jclass ilu_class) { +JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILNative_resetNativeStubsILU(JNIEnv *env, jclass clazz, jclass ilu_class) { (*env)->UnregisterNatives(env, ilu_class); } -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_initNativeStubs(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILNative_initNativeStubsILU(JNIEnv *env, jclass clazz, jclass ilu_class) { JavaMethodAndExtFunction functions[] = { {"iluAlienify", "()Z", (void*)&Java_org_lwjgl_devil_ILU_iluAlienify, "iluAlienify", (void*)&iluAlienify}, {"iluBlurAvg", "(I)Z", (void*)&Java_org_lwjgl_devil_ILU_iluBlurAvg, "iluBlurAvg", (void*)&iluBlurAvg}, @@ -591,5 +591,5 @@ {"iluWave", "(F)Z", (void*)&Java_org_lwjgl_devil_ILU_iluWave, "iluWave", (void*)&iluWave}, }; int num_functions = NUMFUNCTIONS(functions); - extilu_InitializeClass(env, clazz, num_functions, functions); + extilu_InitializeClass(env, ilu_class, num_functions, functions); } |
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10840/src/java/org/lwjgl/opengl Modified Files: MacOSXAWTGLCanvasPeerInfo.java MacOSXCanvasImplementation.java MacOSXCanvasPeerInfo.java MacOSXDisplay.java MacOSXDisplayPeerInfo.java Log Message: Mac OS X: Fixed an issue where pbuffer contexts could not share with the display context. Index: MacOSXCanvasImplementation.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasImplementation.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MacOSXCanvasImplementation.java 4 May 2005 20:59:36 -0000 1.2 +++ MacOSXCanvasImplementation.java 4 Nov 2005 12:38:59 -0000 1.3 @@ -44,7 +44,11 @@ */ final class MacOSXCanvasImplementation implements AWTCanvasImplementation { public PeerInfo createPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format) throws LWJGLException { - return new MacOSXAWTGLCanvasPeerInfo(canvas, pixel_format); + try { + return new MacOSXAWTGLCanvasPeerInfo(canvas, pixel_format, true); + } catch (LWJGLException e) { + return new MacOSXAWTGLCanvasPeerInfo(canvas, pixel_format, false); + } } /** Index: MacOSXDisplay.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- MacOSXDisplay.java 31 Oct 2005 10:51:54 -0000 1.37 +++ MacOSXDisplay.java 4 Nov 2005 12:38:59 -0000 1.38 @@ -215,7 +215,11 @@ } public PeerInfo createPeerInfo(PixelFormat pixel_format) throws LWJGLException { - return new MacOSXDisplayPeerInfo(pixel_format); + try { + return new MacOSXDisplayPeerInfo(pixel_format, true); + } catch (LWJGLException e) { + return new MacOSXDisplayPeerInfo(pixel_format, false); + } } private final static IntBuffer current_viewport = BufferUtils.createIntBuffer(16); Index: MacOSXAWTGLCanvasPeerInfo.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTGLCanvasPeerInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MacOSXAWTGLCanvasPeerInfo.java 4 May 2005 20:59:38 -0000 1.2 +++ MacOSXAWTGLCanvasPeerInfo.java 4 Nov 2005 12:38:59 -0000 1.3 @@ -42,8 +42,8 @@ final class MacOSXAWTGLCanvasPeerInfo extends MacOSXCanvasPeerInfo { private final AWTGLCanvas canvas; - public MacOSXAWTGLCanvasPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format) throws LWJGLException { - super(pixel_format); + public MacOSXAWTGLCanvasPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format, boolean support_pbuffer) throws LWJGLException { + super(pixel_format, support_pbuffer); this.canvas = canvas; } Index: MacOSXDisplayPeerInfo.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplayPeerInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MacOSXDisplayPeerInfo.java 4 May 2005 20:59:33 -0000 1.2 +++ MacOSXDisplayPeerInfo.java 4 Nov 2005 12:38:59 -0000 1.3 @@ -44,8 +44,8 @@ final class MacOSXDisplayPeerInfo extends MacOSXCanvasPeerInfo { private boolean locked = false; - public MacOSXDisplayPeerInfo(PixelFormat pixel_format) throws LWJGLException { - super(pixel_format); + public MacOSXDisplayPeerInfo(PixelFormat pixel_format, boolean support_pbuffer) throws LWJGLException { + super(pixel_format, support_pbuffer); } protected void doLockAndInitHandle() throws LWJGLException { Index: MacOSXCanvasPeerInfo.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MacOSXCanvasPeerInfo.java 4 May 2005 20:59:36 -0000 1.2 +++ MacOSXCanvasPeerInfo.java 4 Nov 2005 12:38:59 -0000 1.3 @@ -45,8 +45,8 @@ abstract class MacOSXCanvasPeerInfo extends MacOSXPeerInfo { private final AWTSurfaceLock awt_surface = new AWTSurfaceLock(); - public MacOSXCanvasPeerInfo(PixelFormat pixel_format) throws LWJGLException { - super(pixel_format, true, true, false, true); + public MacOSXCanvasPeerInfo(PixelFormat pixel_format, boolean support_pbuffer) throws LWJGLException { + super(pixel_format, true, true, support_pbuffer, true); } protected void initHandle(Canvas canvas) throws LWJGLException { |
|
From: Brian M. <ma...@us...> - 2005-11-02 22:09:26
|
Update of /cvsroot/java-game-lib/LWJGL In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27322 Modified Files: build.xml Log Message: dont javah devil Index: build.xml =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- build.xml 20 Oct 2005 21:31:00 -0000 1.92 +++ build.xml 2 Nov 2005 22:09:18 -0000 1.93 @@ -395,13 +395,6 @@ <class name="org.lwjgl.fmod3.FMusic" /> <class name="org.lwjgl.fmod3.FSound" /> </javah> - - <!-- devil --> - <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/devil" force="yes"> - <class name="org.lwjgl.devil.IL"/> - <class name="org.lwjgl.devil.ILU"/> - <class name="org.lwjgl.devil.ILUT"/> - </javah> </target> <!-- Creates the Javadoc --> |
|
From: Brian M. <ma...@us...> - 2005-11-02 22:08:39
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27102/src/java/org/lwjgl/devil Modified Files: IL.java ILUT.java ILU.java Log Message: removed premature created = true Index: ILUT.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/ILUT.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ILUT.java 22 May 2005 11:09:02 -0000 1.13 +++ ILUT.java 2 Nov 2005 22:08:27 -0000 1.14 @@ -133,7 +133,6 @@ "ILUT", "libILUT.so", "ILUT", "libILUT.dylib"}, ILUT.class.getClassLoader()); nCreate(ilutPaths); - created = true; try { ILUT.initNativeStubs(); Index: IL.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/IL.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- IL.java 7 Sep 2005 16:06:06 -0000 1.20 +++ IL.java 2 Nov 2005 22:08:27 -0000 1.21 @@ -621,7 +621,6 @@ "IL", "libIL.so", "IL", "libIL.dylib"}, IL.class.getClassLoader()); nCreate(illPaths); - created = true; try { IL.initNativeStubs(); Index: ILU.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/ILU.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ILU.java 22 May 2005 11:09:02 -0000 1.13 +++ ILU.java 2 Nov 2005 22:08:27 -0000 1.14 @@ -168,7 +168,6 @@ "ILU", "libILU.so", "ILU", "libILU.dylib"}, ILU.class.getClassLoader()); nCreate(iluPaths); - created = true; try { ILU.initNativeStubs(); |
|
From: Brian M. <ma...@us...> - 2005-11-02 22:04:23
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/devil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24665 Modified Files: devil-common.h org_lwjgl_devil_IL.c org_lwjgl_devil_ILU.c org_lwjgl_devil_ILUT.c Added Files: org_lwjgl_devil_IL.h org_lwjgl_devil_ILU.h org_lwjgl_devil_ILUT.h Log Message: dynamic stub support --- NEW FILE: org_lwjgl_devil_IL.h --- /* DO NOT EDIT THIS FILE - it is machine generated */ #include <jni.h> /* Header for class org_lwjgl_devil_IL */ #ifndef _Included_org_lwjgl_devil_IL #define _Included_org_lwjgl_devil_IL #ifdef __cplusplus extern "C" { #endif /* * Class: org_lwjgl_devil_IL * Method: initNativeStubs * Signature: ()V */ JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_initNativeStubs (JNIEnv *, jclass); /* * Class: org_lwjgl_devil_IL * Method: resetNativeStubs * Signature: (Ljava/lang/Class;)V */ JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_resetNativeStubs (JNIEnv *, jclass, jclass); /* * Class: org_lwjgl_devil_IL * Method: nCreate * Signature: ([Ljava/lang/String;)V */ JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_nCreate (JNIEnv *, jclass, jobjectArray); /* * Class: org_lwjgl_devil_IL * Method: nDestroy * Signature: ()V */ JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_nDestroy (JNIEnv *, jclass); #ifdef __cplusplus } #endif #endif Index: org_lwjgl_devil_IL.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/org_lwjgl_devil_IL.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- org_lwjgl_devil_IL.c 28 Mar 2005 11:04:46 -0000 1.19 +++ org_lwjgl_devil_IL.c 2 Nov 2005 22:04:15 -0000 1.20 @@ -1,4 +1,5 @@ #include "extil.h" +#include "org_lwjgl_devil_IL.h" typedef ILboolean (ILAPIENTRY *ilActiveImagePROC) (ILuint Number); typedef ILboolean (ILAPIENTRY *ilActiveLayerPROC) (ILuint Number); @@ -184,7 +185,7 @@ * Method: ilActiveImage * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilActiveImage(JNIEnv *env, jclass clazz, jint number) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilActiveImage(JNIEnv *env, jclass clazz, jint number) { return ilActiveImage((ILuint)number); } @@ -193,7 +194,7 @@ * Method: ilActiveLayer * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilActiveLayer(JNIEnv *env, jclass clazz, jint number) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilActiveLayer(JNIEnv *env, jclass clazz, jint number) { return ilActiveLayer((ILuint)number); } @@ -202,7 +203,7 @@ * Method: ilActiveMipmap * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilActiveMipmap(JNIEnv *env, jclass clazz, jint number) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilActiveMipmap(JNIEnv *env, jclass clazz, jint number) { return ilActiveMipmap((ILuint)number); } @@ -211,7 +212,7 @@ * Method: ilApplyPal * Signature: (Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilApplyPal(JNIEnv *env, jclass clazz, jstring fileName) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilApplyPal(JNIEnv *env, jclass clazz, jstring fileName) { char *strFileName = GetStringNativeChars(env, fileName); jboolean result = ilApplyPal((const ILstring)strFileName); free(strFileName); @@ -224,7 +225,7 @@ * Method: ilApplyProfile * Signature: (Ljava/lang/String;Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilApplyProfile(JNIEnv *env, jclass clazz, jstring inProfile, jstring outProfile) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilApplyProfile(JNIEnv *env, jclass clazz, jstring inProfile, jstring outProfile) { char *strInProfile = GetStringNativeChars(env, inProfile); char *strOutProfile = GetStringNativeChars(env, outProfile); jboolean result = ilApplyProfile((const ILstring)strInProfile, (const ILstring)strOutProfile); @@ -239,7 +240,7 @@ * Method: ilBindImage * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilBindImage(JNIEnv *env, jclass clazz, jint image) { +static void JNICALL Java_org_lwjgl_devil_IL_ilBindImage(JNIEnv *env, jclass clazz, jint image) { ilBindImage(image); } @@ -249,7 +250,7 @@ * Method: ilBlit * Signature: (IIIIIIIIII)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilBlit(JNIEnv *env, jclass clazz, jint source, jint destX, jint destY, jint destZ, jint srcX, jint srcY, jint srcZ, jint width, jint height, jint depth) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilBlit(JNIEnv *env, jclass clazz, jint source, jint destX, jint destY, jint destZ, jint srcX, jint srcY, jint srcZ, jint width, jint height, jint depth) { return ilBlit((ILuint)source, (ILint)destX, (ILint)destY, (ILint)destZ, (ILuint)srcX, (ILuint)srcY, (ILuint)srcZ, (ILuint)width, (ILuint)height, (ILuint)depth); } @@ -258,7 +259,7 @@ * Method: ilClearColour * Signature: (FFFF)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilClearColour(JNIEnv *env, jclass clazz, jfloat red, jfloat green, jfloat blue, jfloat alpha) { +static void JNICALL Java_org_lwjgl_devil_IL_ilClearColour(JNIEnv *env, jclass clazz, jfloat red, jfloat green, jfloat blue, jfloat alpha) { ilClearColour((ILclampf)red, (ILclampf)green, (ILclampf)blue, (ILclampf)alpha); } @@ -267,7 +268,7 @@ * Method: ilClearImage * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilClearImage(JNIEnv *env, jclass clazz) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilClearImage(JNIEnv *env, jclass clazz) { return ilClearImage(); } @@ -276,7 +277,7 @@ * Method: ilCloneCurImage * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_IL_ilCloneCurImage(JNIEnv *env, jclass clazz) { +static jint JNICALL Java_org_lwjgl_devil_IL_ilCloneCurImage(JNIEnv *env, jclass clazz) { return ilCloneCurImage(); } @@ -285,7 +286,7 @@ * Method: ilCompressFunc * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilCompressFunc(JNIEnv *env, jclass clazz, jint mode) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilCompressFunc(JNIEnv *env, jclass clazz, jint mode) { return ilCompressFunc((ILenum)mode); } @@ -294,7 +295,7 @@ * Method: ilConvertImage * Signature: (II)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilConvertImage(JNIEnv *env, jclass clazz, jint destFormat, jint destType) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilConvertImage(JNIEnv *env, jclass clazz, jint destFormat, jint destType) { return ilConvertImage((ILenum)destFormat, (ILenum)destType); } @@ -303,7 +304,7 @@ * Method: ilConvertPal * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilConvertPal(JNIEnv *env, jclass clazz, jint destFormat) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilConvertPal(JNIEnv *env, jclass clazz, jint destFormat) { return ilConvertPal((ILenum)destFormat); } @@ -312,7 +313,7 @@ * Method: ilCopyImage * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilCopyImage(JNIEnv *env, jclass clazz, jint src) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilCopyImage(JNIEnv *env, jclass clazz, jint src) { return ilCopyImage((ILuint)src); } @@ -321,7 +322,7 @@ * Method: nilCopyPixels * Signature: (IIIIIIIILjava/nio/ByteBuffer;I)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_IL_nilCopyPixels(JNIEnv *env, jclass clazz, jint xOff, jint yOff, jint zOff, jint width, jint height, jint depth, jint format, jint type, jobject data_buffer, jint data_offset) { +static jint JNICALL Java_org_lwjgl_devil_IL_nilCopyPixels(JNIEnv *env, jclass clazz, jint xOff, jint yOff, jint zOff, jint width, jint height, jint depth, jint format, jint type, jobject data_buffer, jint data_offset) { ILbyte *data = (ILbyte *)(*env)->GetDirectBufferAddress(env, data_buffer); return ilCopyPixels((ILuint)xOff, (ILuint)yOff, (ILuint)zOff, (ILuint)width, (ILuint)height, (ILuint)depth, (ILenum)format, (ILenum)type, (ILvoid *)(data + data_offset)); @@ -332,7 +333,7 @@ * Method: ilCreateSubImage * Signature: (II)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_IL_ilCreateSubImage(JNIEnv *env, jclass clazz, jint type, jint num) { +static jint JNICALL Java_org_lwjgl_devil_IL_ilCreateSubImage(JNIEnv *env, jclass clazz, jint type, jint num) { return ilCreateSubImage((ILenum)type, (ILuint)num); } @@ -341,7 +342,7 @@ * Method: ilDefaultImage * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilDefaultImage(JNIEnv *env, jclass clazz) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilDefaultImage(JNIEnv *env, jclass clazz) { return ilDefaultImage(); } @@ -350,7 +351,7 @@ * Method: nilDeleteImages * Signature: (ILjava/nio/IntBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_nilDeleteImages(JNIEnv * env, jclass clazz, jint num, jobject lists_buffer, jint lists_offset) { +static void JNICALL Java_org_lwjgl_devil_IL_nilDeleteImages(JNIEnv * env, jclass clazz, jint num, jobject lists_buffer, jint lists_offset) { ILbyte *lists = (ILbyte *) safeGetBufferAddress(env, lists_buffer) + lists_offset; ilDeleteImages((ILsizei)num, (ILuint *)lists); } @@ -361,7 +362,7 @@ * Method: ilDisable * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilDisable(JNIEnv *env, jclass clazz, jint mode) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilDisable(JNIEnv *env, jclass clazz, jint mode) { return ilDisable((ILenum)mode); } @@ -370,7 +371,7 @@ * Method: ilEnable * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilEnable(JNIEnv *env, jclass clazz, jint mode) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilEnable(JNIEnv *env, jclass clazz, jint mode) { return ilEnable((ILenum)mode); } @@ -379,7 +380,7 @@ * Method: ilFormatFunc * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilFormatFunc(JNIEnv *env, jclass clazz, jint mode) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilFormatFunc(JNIEnv *env, jclass clazz, jint mode) { return ilFormatFunc((ILenum)mode); } @@ -388,7 +389,7 @@ * Method: nilGenImages * Signature: (ILjava/nio/IntBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_nilGenImages(JNIEnv *env , jclass clazz, jint num, jobject lists_buffer, jint lists_offset) { +static void JNICALL Java_org_lwjgl_devil_IL_nilGenImages(JNIEnv *env , jclass clazz, jint num, jobject lists_buffer, jint lists_offset) { ILbyte *lists = (ILbyte *) safeGetBufferAddress(env, lists_buffer) + lists_offset; ilGenImages((ILsizei)num, (ILuint *)lists); } @@ -398,7 +399,7 @@ * Method: ilGetAlpha * Signature: (I)[B */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_devil_IL_ilGetAlpha(JNIEnv *env, jclass clazz, jint type) { +static jobject JNICALL Java_org_lwjgl_devil_IL_ilGetAlpha(JNIEnv *env, jclass clazz, jint type) { ILubyte *alpha = ilGetAlpha((ILenum)type); int size = sizeof(alpha); @@ -412,7 +413,7 @@ * Method: ilModAlpha * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilModAlpha(JNIEnv *env, jclass clazz, jint alphaValue) { +static void JNICALL Java_org_lwjgl_devil_IL_ilModAlpha(JNIEnv *env, jclass clazz, jint alphaValue) { ilModAlpha((ILint)alphaValue); } @@ -421,7 +422,7 @@ * Method: ilSetAlpha * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilSetAlpha(JNIEnv *env, jclass clazz, jint alphaValue) { +static void JNICALL Java_org_lwjgl_devil_IL_ilSetAlpha(JNIEnv *env, jclass clazz, jint alphaValue) { ilSetAlpha((ILuint)alphaValue); } @@ -430,7 +431,7 @@ * Method: ilGetBoolean * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilGetBoolean(JNIEnv *env, jclass clazz, jint mode) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilGetBoolean(JNIEnv *env, jclass clazz, jint mode) { return ilGetBoolean((ILenum)mode); } @@ -439,7 +440,7 @@ * Method: nilGetBooleanv * Signature: (ILjava/nio/ByteBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_nilGetBooleanv(JNIEnv *env, jclass clazz, jint mode, jobject param, jint param_offset) { +static void JNICALL Java_org_lwjgl_devil_IL_nilGetBooleanv(JNIEnv *env, jclass clazz, jint mode, jobject param, jint param_offset) { ILboolean *nParam = (ILboolean *) safeGetBufferAddress(env, param) + param_offset; ilGetBooleanv(mode, nParam); } @@ -449,7 +450,7 @@ * Method: nilGetIntegerv * Signature: (ILjava/nio/IntBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_nilGetIntegerv(JNIEnv *env, jclass clazz, jint mode, jobject param, jint param_offset) { +static void JNICALL Java_org_lwjgl_devil_IL_nilGetIntegerv(JNIEnv *env, jclass clazz, jint mode, jobject param, jint param_offset) { ILint *nParam = (ILint *) safeGetBufferAddress(env, param) + param_offset; ilGetIntegerv(mode, nParam); } @@ -459,7 +460,7 @@ * Method: ilGetData * Signature: ()[B */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_devil_IL_ilGetData(JNIEnv * env, jclass clazz) { +static jobject JNICALL Java_org_lwjgl_devil_IL_ilGetData(JNIEnv * env, jclass clazz) { ILubyte *data = ilGetData(); int size = ilGetInteger(IL_IMAGE_WIDTH) * ilGetInteger(IL_IMAGE_HEIGHT) * ilGetInteger(IL_IMAGE_BYTES_PER_PIXEL); @@ -473,7 +474,8 @@ * Method: ilGetError * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_IL_ilGetError(JNIEnv *env, jclass clazz) { +static jint JNICALL Java_org_lwjgl_devil_IL_ilGetError(JNIEnv *env, jclass clazz) { + printf("Java_org_lwjgl_devil_IL_ilGetError\n"); return ilGetError(); } @@ -482,7 +484,7 @@ * Method: ilGetInteger * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_IL_ilGetInteger(JNIEnv *env, jclass clazz, jint mode) { +static jint JNICALL Java_org_lwjgl_devil_IL_ilGetInteger(JNIEnv *env, jclass clazz, jint mode) { return ilGetInteger((ILenum)mode); } @@ -492,7 +494,7 @@ * Method: ilGetLumpPos * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_IL_ilGetLumpPos(JNIEnv *env, jclass clazz) { +static jint JNICALL Java_org_lwjgl_devil_IL_ilGetLumpPos(JNIEnv *env, jclass clazz) { return ilGetLumpPos(); } @@ -501,7 +503,7 @@ * Method: ilGetPalette * Signature: ()[B */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_devil_IL_ilGetPalette(JNIEnv *env, jclass clazz) { +static jobject JNICALL Java_org_lwjgl_devil_IL_ilGetPalette(JNIEnv *env, jclass clazz) { ILubyte *pal = ilGetPalette(); int size = sizeof(pal); @@ -515,7 +517,7 @@ * Method: ilGetString * Signature: (I)Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_devil_IL_ilGetString(JNIEnv *env, jclass clazz, jint stringName) { +static jstring JNICALL Java_org_lwjgl_devil_IL_ilGetString(JNIEnv *env, jclass clazz, jint stringName) { return NewStringNative(env, ilGetString((ILenum)stringName)); } @@ -524,7 +526,7 @@ * Method: ilHint * Signature: (II)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilHint(JNIEnv *env, jclass clazz, jint target, jint mode) { +static void JNICALL Java_org_lwjgl_devil_IL_ilHint(JNIEnv *env, jclass clazz, jint target, jint mode) { ilHint((ILenum)target, (ILenum)mode); } @@ -533,7 +535,7 @@ * Method: ilInit * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilInit(JNIEnv * env, jclass clazz) { +static void JNICALL Java_org_lwjgl_devil_IL_ilInit(JNIEnv * env, jclass clazz) { ilInit(); } @@ -542,7 +544,7 @@ * Method: ilIsDisabled * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilIsDisabled(JNIEnv *env, jclass clazz, jint mode) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilIsDisabled(JNIEnv *env, jclass clazz, jint mode) { return ilIsDisabled((ILenum)mode); } @@ -551,7 +553,7 @@ * Method: ilIsEnabled * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilIsEnabled(JNIEnv *env, jclass clazz, jint mode) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilIsEnabled(JNIEnv *env, jclass clazz, jint mode) { return ilIsEnabled((ILenum)mode); } @@ -560,7 +562,7 @@ * Method: ilIsImage * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilIsImage(JNIEnv *env, jclass clazz, jint image) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilIsImage(JNIEnv *env, jclass clazz, jint image) { return ilIsImage((ILuint)image); } @@ -569,7 +571,7 @@ * Method: ilIsValid * Signature: (ILjava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilIsValid(JNIEnv *env, jclass clazz, jint type, jstring fileName) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilIsValid(JNIEnv *env, jclass clazz, jint type, jstring fileName) { char *strFileName = GetStringNativeChars(env, fileName); jboolean result = ilIsValid((ILuint)type, (const ILstring)strFileName); free(strFileName); @@ -582,7 +584,7 @@ * Method: nilIsValidL * Signature: (ILjava/nio/ByteBuffer;II)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_nilIsValidL(JNIEnv *env, jclass clazz, jint type, jobject lump_buffer, jint lump_offset, jint size) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_nilIsValidL(JNIEnv *env, jclass clazz, jint type, jobject lump_buffer, jint lump_offset, jint size) { ILbyte *lump = (ILbyte *)(*env)->GetDirectBufferAddress(env, lump_buffer); return ilIsValidL((ILenum)type, (ILvoid *)(lump + lump_offset), (ILuint)size); @@ -593,7 +595,7 @@ * Method: ilKeyColour * Signature: (FFFF)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilKeyColour(JNIEnv *env, jclass clazz, jfloat red, jfloat green, jfloat blue, jfloat alpha) { +static void JNICALL Java_org_lwjgl_devil_IL_ilKeyColour(JNIEnv *env, jclass clazz, jfloat red, jfloat green, jfloat blue, jfloat alpha) { ilKeyColour((ILclampf)red, (ILclampf)green, (ILclampf)blue, (ILclampf)alpha); } @@ -602,7 +604,7 @@ * Method: ilLoad * Signature: (ILjava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilLoad(JNIEnv *env, jclass clazz, jint type, jstring fileName) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilLoad(JNIEnv *env, jclass clazz, jint type, jstring fileName) { char *strFileName = GetStringNativeChars(env, fileName); jboolean result = ilLoad((ILenum)type, (const ILstring)strFileName); free(strFileName); @@ -615,7 +617,7 @@ * Method: ilLoadImage * Signature: (Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilLoadImage(JNIEnv *env, jclass clazz, jstring fileName) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilLoadImage(JNIEnv *env, jclass clazz, jstring fileName) { char *strFileName = GetStringNativeChars(env, fileName); jboolean result = ilLoadImage((const ILstring)strFileName); free(strFileName); @@ -629,7 +631,7 @@ * Method: nilLoadL * Signature: (ILjava/nio/ByteBuffer;II)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_nilLoadL(JNIEnv *env, jclass clazz, jint type, jobject lump_buffer, jint lump_offset, jint size) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_nilLoadL(JNIEnv *env, jclass clazz, jint type, jobject lump_buffer, jint lump_offset, jint size) { ILbyte *lump = (ILbyte *)safeGetBufferAddress(env, lump_buffer) + lump_offset; return ilLoadL((ILenum)type, (ILvoid *)(lump), (ILuint)size); @@ -640,7 +642,7 @@ * Method: ilLoadPal * Signature: (Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilLoadPal(JNIEnv *env, jclass clazz, jstring fileName) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilLoadPal(JNIEnv *env, jclass clazz, jstring fileName) { char *strFileName = GetStringNativeChars(env, fileName); jboolean result = ilLoadPal((const ILstring)strFileName); free(strFileName); @@ -653,7 +655,7 @@ * Method: ilOriginFunc * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilOriginFunc(JNIEnv *env, jclass clazz, jint mode) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilOriginFunc(JNIEnv *env, jclass clazz, jint mode) { return ilOriginFunc((ILenum)mode); } @@ -662,7 +664,7 @@ * Method: ilOverlayImage * Signature: (IIII)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilOverlayImage(JNIEnv *env, jclass clazz, jint source, jint xCoord, jint yCoord, jint zCoord) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilOverlayImage(JNIEnv *env, jclass clazz, jint source, jint xCoord, jint yCoord, jint zCoord) { return ilOverlayImage((ILuint)source, (ILint)xCoord, (ILint)yCoord, (ILint)zCoord); } @@ -671,7 +673,7 @@ * Method: ilPopAttrib * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilPopAttrib(JNIEnv *env, jclass clazz) { +static void JNICALL Java_org_lwjgl_devil_IL_ilPopAttrib(JNIEnv *env, jclass clazz) { ilPopAttrib(); } @@ -680,7 +682,7 @@ * Method: ilPushAttrib * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilPushAttrib(JNIEnv *env, jclass clazz, jint bits) { +static void JNICALL Java_org_lwjgl_devil_IL_ilPushAttrib(JNIEnv *env, jclass clazz, jint bits) { ilPushAttrib((ILuint)bits); } @@ -689,7 +691,7 @@ * Method: ilRemoveLoad * Signature: (Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilRemoveLoad(JNIEnv *env, jclass clazz, jstring ext) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilRemoveLoad(JNIEnv *env, jclass clazz, jstring ext) { char *strExt = GetStringNativeChars(env, ext); jboolean result = ilRemoveLoad((const ILstring)strExt); free(strExt); @@ -702,7 +704,7 @@ * Method: ilRemoveSave * Signature: (Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilRemoveSave(JNIEnv *env, jclass clazz, jstring ext) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilRemoveSave(JNIEnv *env, jclass clazz, jstring ext) { char *strExt = GetStringNativeChars(env, ext); jboolean result = ilRemoveSave((const ILstring)strExt); free(strExt); @@ -715,7 +717,7 @@ * Method: ilResetMemory * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilResetMemory(JNIEnv *env, jclass clazz) { +static void JNICALL Java_org_lwjgl_devil_IL_ilResetMemory(JNIEnv *env, jclass clazz) { ilResetMemory(); } @@ -724,7 +726,7 @@ * Method: ilResetRead * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilResetRead(JNIEnv *env, jclass clazz) { +static void JNICALL Java_org_lwjgl_devil_IL_ilResetRead(JNIEnv *env, jclass clazz) { ilResetRead(); } @@ -733,7 +735,7 @@ * Method: ilResetWrite * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilResetWrite(JNIEnv *env, jclass clazz) { +static void JNICALL Java_org_lwjgl_devil_IL_ilResetWrite(JNIEnv *env, jclass clazz) { ilResetWrite(); } @@ -742,7 +744,7 @@ * Method: ilSave * Signature: (ILjava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilSave(JNIEnv *env, jclass clazz, jint type, jstring fileName) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilSave(JNIEnv *env, jclass clazz, jint type, jstring fileName) { char *strFileName = GetStringNativeChars(env, fileName); jboolean result = ilSave((ILenum)type, (const ILstring)strFileName); free(strFileName); @@ -755,7 +757,7 @@ * Method: ilSaveImage * Signature: (Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilSaveImage(JNIEnv *env, jclass clazz, jstring fileName) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilSaveImage(JNIEnv *env, jclass clazz, jstring fileName) { char *strFileName = GetStringNativeChars(env, fileName); jboolean result = ilSaveImage((const ILstring)strFileName); free(strFileName); @@ -768,7 +770,7 @@ * Method: nilSaveL * Signature: (ILjava/nio/ByteBuffer;II)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_IL_nilSaveL(JNIEnv *env, jclass clazz, jint type, jobject lump_buffer, jint lump_offset, jint size) { +static jint JNICALL Java_org_lwjgl_devil_IL_nilSaveL(JNIEnv *env, jclass clazz, jint type, jobject lump_buffer, jint lump_offset, jint size) { ILbyte *lump = (ILbyte *)(*env)->GetDirectBufferAddress(env, lump_buffer); return ilSaveL((ILenum)type, (ILvoid *)(lump + lump_offset), (ILuint)size); @@ -779,7 +781,7 @@ * Method: ilSavePal * Signature: (Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilSavePal(JNIEnv *env, jclass clazz, jstring fileName) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilSavePal(JNIEnv *env, jclass clazz, jstring fileName) { char *strFileName = GetStringNativeChars(env, fileName); jboolean result = ilSavePal((const ILstring)strFileName); free(strFileName); @@ -792,7 +794,7 @@ * Method: nilSetData * Signature: (Ljava/nio/ByteBuffer;I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_nilSetData(JNIEnv *env, jclass clazz, jobject data_buffer, jint data_offset) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_nilSetData(JNIEnv *env, jclass clazz, jobject data_buffer, jint data_offset) { ILbyte *data = (ILbyte *)(*env)->GetDirectBufferAddress(env, data_buffer); return ilSetData((ILvoid *)(data + data_offset)); @@ -803,7 +805,7 @@ * Method: ilSetDuration * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilSetDuration(JNIEnv *env, jclass clazz, jint duration) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilSetDuration(JNIEnv *env, jclass clazz, jint duration) { return ilSetDuration((ILuint)duration); } @@ -812,7 +814,7 @@ * Method: ilSetInteger * Signature: (II)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilSetInteger(JNIEnv *env, jclass clazz, jint mode, jint param) { +static void JNICALL Java_org_lwjgl_devil_IL_ilSetInteger(JNIEnv *env, jclass clazz, jint mode, jint param) { ilSetInteger((ILenum)mode, (ILint)param); } @@ -821,7 +823,7 @@ * Method: nilSetPixels * Signature: (IIIIIIIILjava/nio/ByteBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_nilSetPixels(JNIEnv *env, jclass clazz, jint xOff, jint yOff, jint zOff, jint width, jint height, jint depth, jint format, jint type, jobject data_buffer, jint data_offset) { +static void JNICALL Java_org_lwjgl_devil_IL_nilSetPixels(JNIEnv *env, jclass clazz, jint xOff, jint yOff, jint zOff, jint width, jint height, jint depth, jint format, jint type, jobject data_buffer, jint data_offset) { ILbyte *data = (ILbyte *)(*env)->GetDirectBufferAddress(env, data_buffer); ilSetPixels((ILint)xOff, (ILint)yOff, (ILint)zOff, (ILuint)width, (ILuint)height, (ILuint)depth, (ILenum)format, (ILenum)type, (ILvoid *)(data + data_offset)); @@ -832,7 +834,7 @@ * Method: ilSetString * Signature: (ILjava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilSetString(JNIEnv *env, jclass clazz, jint mode, jstring string) { +static void JNICALL Java_org_lwjgl_devil_IL_ilSetString(JNIEnv *env, jclass clazz, jint mode, jstring string) { char *strString = GetStringNativeChars(env, string); ilSetString(mode, (const ILstring)strString); @@ -844,7 +846,7 @@ * Method: ilShutDown * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilShutDown(JNIEnv *env, jclass clazz) { +static void JNICALL Java_org_lwjgl_devil_IL_ilShutDown(JNIEnv *env, jclass clazz) { ilShutDown(); } @@ -853,7 +855,7 @@ * Method: nilTexImage * Signature: (IIIBIILjava/nio/ByteBuffer;I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_nilTexImage(JNIEnv *env, jclass clazz, jint width, jint height, jint depth , jbyte bpp, jint format, jint type, jobject data_buffer, jint data_offset) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_nilTexImage(JNIEnv *env, jclass clazz, jint width, jint height, jint depth , jbyte bpp, jint format, jint type, jobject data_buffer, jint data_offset) { ILbyte *data = (ILbyte *)(*env)->GetDirectBufferAddress(env, data_buffer); return ilTexImage((ILuint)width, (ILuint)height, (ILuint)depth , (ILubyte)bpp, (ILenum)format, (ILenum)type, (ILvoid *)(data + data_offset)); } @@ -863,7 +865,7 @@ * Method: ilTypeFunc * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilTypeFunc(JNIEnv *env, jclass clazz, jint mode) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilTypeFunc(JNIEnv *env, jclass clazz, jint mode) { return ilTypeFunc((ILenum)mode); } @@ -872,7 +874,7 @@ * Method: ilLoadData * Signature: (Ljava/lang/String;IIIB)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilLoadData(JNIEnv *env, jclass clazz, jstring fileName, jint width, jint height, jint depth, jbyte bpp) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilLoadData(JNIEnv *env, jclass clazz, jstring fileName, jint width, jint height, jint depth, jbyte bpp) { char *strFileName = GetStringNativeChars(env, fileName); jboolean result = ilLoadData((const ILstring)strFileName, (ILuint)width, (ILuint)height, (ILuint)depth, (ILubyte)bpp); free(strFileName); @@ -885,7 +887,7 @@ * Method: nilLoadDataL * Signature: (Ljava/nio/ByteBuffer;IIIIIB)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_nilLoadDataL(JNIEnv *env, jclass clazz, jobject lump_buffer, jint lump_offset, jint size, jint width, jint height, jint depth, jbyte bpp) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_nilLoadDataL(JNIEnv *env, jclass clazz, jobject lump_buffer, jint lump_offset, jint size, jint width, jint height, jint depth, jbyte bpp) { ILbyte *lump = (ILbyte *)(*env)->GetDirectBufferAddress(env, lump_buffer); return ilLoadDataL((ILvoid *)(lump + lump_offset), (ILuint)size, (ILuint)width, (ILuint)height, (ILuint)depth, (ILubyte)bpp); @@ -896,7 +898,7 @@ * Method: ilSaveData * Signature: (Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilSaveData(JNIEnv *env, jclass clazz, jstring fileName) { +static jboolean JNICALL Java_org_lwjgl_devil_IL_ilSaveData(JNIEnv *env, jclass clazz, jstring fileName) { char *strFileName = GetStringNativeChars(env, fileName); jboolean result = ilSaveData((const ILstring)strFileName); free(strFileName); Index: devil-common.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/devil-common.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- devil-common.h 25 Mar 2005 10:25:06 -0000 1.2 +++ devil-common.h 2 Nov 2005 22:04:15 -0000 1.3 @@ -4,9 +4,6 @@ #include <jni.h> #include <stdio.h> #include <string.h> -#include "org_lwjgl_devil_IL.h" -#include "org_lwjgl_devil_ILU.h" -#include "org_lwjgl_devil_ILUT.h" #include "common_tools.h" #ifdef _X11 --- NEW FILE: org_lwjgl_devil_ILUT.h --- /* DO NOT EDIT THIS FILE - it is machine generated */ #include <jni.h> /* Header for class org_lwjgl_devil_ILUT */ #ifndef _Included_org_lwjgl_devil_ILUT #define _Included_org_lwjgl_devil_ILUT #ifdef __cplusplus extern "C" { #endif /* * Class: org_lwjgl_devil_ILUT * Method: initNativeStubs * Signature: ()V */ JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILUT_initNativeStubs (JNIEnv *, jclass); /* * Class: org_lwjgl_devil_ILUT * Method: resetNativeStubs * Signature: (Ljava/lang/Class;)V */ JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILUT_resetNativeStubs (JNIEnv *, jclass, jclass); /* * Class: org_lwjgl_devil_ILUT * Method: nCreate * Signature: ([Ljava/lang/String;)V */ JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILUT_nCreate (JNIEnv *, jclass, jobjectArray); /* * Class: org_lwjgl_devil_ILUT * Method: nDestroy * Signature: ()V */ JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILUT_nDestroy (JNIEnv *, jclass); #ifdef __cplusplus } #endif #endif --- NEW FILE: org_lwjgl_devil_ILU.h --- /* DO NOT EDIT THIS FILE - it is machine generated */ #include <jni.h> /* Header for class org_lwjgl_devil_ILU */ #ifndef _Included_org_lwjgl_devil_ILU #define _Included_org_lwjgl_devil_ILU #ifdef __cplusplus extern "C" { #endif /* * Class: org_lwjgl_devil_ILU * Method: initNativeStubs * Signature: ()V */ JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_initNativeStubs (JNIEnv *, jclass); /* * Class: org_lwjgl_devil_ILU * Method: resetNativeStubs * Signature: (Ljava/lang/Class;)V */ JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_resetNativeStubs (JNIEnv *, jclass, jclass); /* * Class: org_lwjgl_devil_ILU * Method: nCreate * Signature: ([Ljava/lang/String;)V */ JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_nCreate (JNIEnv *, jclass, jobjectArray); /* * Class: org_lwjgl_devil_ILU * Method: nDestroy * Signature: ()V */ JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_nDestroy (JNIEnv *, jclass); #ifdef __cplusplus } #endif #endif Index: org_lwjgl_devil_ILUT.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/org_lwjgl_devil_ILUT.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_devil_ILUT.c 25 Mar 2005 01:42:04 -0000 1.4 +++ org_lwjgl_devil_ILUT.c 2 Nov 2005 22:04:15 -0000 1.5 @@ -1,4 +1,5 @@ #include "extilut.h" +#include "org_lwjgl_devil_ILUT.h" typedef ILboolean (ILAPIENTRY *ilutRendererPROC) (ILenum Renderer); typedef ILboolean (ILAPIENTRY *ilutDisablePROC) (ILenum Mode); @@ -53,7 +54,7 @@ * Method: ilutRenderer * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutRenderer(JNIEnv *env, jclass clazz, jint renderer){ +static jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutRenderer(JNIEnv *env, jclass clazz, jint renderer){ return ilutRenderer((ILenum)renderer); } @@ -62,7 +63,7 @@ * Method: ilutDisable * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutDisable(JNIEnv *env, jclass clazz, jint mode){ +static jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutDisable(JNIEnv *env, jclass clazz, jint mode){ return ilutDisable((ILenum)mode); } @@ -71,7 +72,7 @@ * Method: ilutEnable * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutEnable(JNIEnv *env, jclass clazz, jint mode){ +static jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutEnable(JNIEnv *env, jclass clazz, jint mode){ return ilutEnable((ILenum)mode); } @@ -80,7 +81,7 @@ * Method: ilutGetBoolean * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutGetBoolean(JNIEnv *env, jclass clazz, jint mode){ +static jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutGetBoolean(JNIEnv *env, jclass clazz, jint mode){ return ilutGetBoolean((ILenum)mode); } @@ -89,7 +90,7 @@ * Method: ilutGetInteger * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_ILUT_ilutGetInteger(JNIEnv *env, jclass clazz, jint mode){ +static jint JNICALL Java_org_lwjgl_devil_ILUT_ilutGetInteger(JNIEnv *env, jclass clazz, jint mode){ return ilutGetInteger((ILenum)mode); } @@ -98,7 +99,7 @@ * Method: ilutGetBooleanv * Signature: (ILjava/nio/CharBuffer;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILUT_ilutGetBooleanv(JNIEnv *env, jclass clazz, jint mode, jobject param) { +static void JNICALL Java_org_lwjgl_devil_ILUT_ilutGetBooleanv(JNIEnv *env, jclass clazz, jint mode, jobject param) { ILboolean* destination = (ILboolean*) safeGetBufferAddress(env, param); ilutGetBooleanv(mode, destination); } @@ -108,7 +109,7 @@ * Method: ilutGetIntegerv * Signature: (ILjava/nio/IntBuffer;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILUT_ilutGetIntegerv(JNIEnv *env, jclass clazz, jint mode, jobject param) { +static void JNICALL Java_org_lwjgl_devil_ILUT_ilutGetIntegerv(JNIEnv *env, jclass clazz, jint mode, jobject param) { ILint* destination = (ILint*) safeGetBufferAddress(env, param); ilutGetIntegerv(mode, destination); } @@ -118,7 +119,7 @@ * Method: ilutGetString * Signature: (I)Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_devil_ILUT_ilutGetString(JNIEnv *env, jclass clazz, jint stringName){ +static jstring JNICALL Java_org_lwjgl_devil_ILUT_ilutGetString(JNIEnv *env, jclass clazz, jint stringName){ return NewStringNative(env, ilutGetString((ILenum)stringName)); } @@ -127,7 +128,7 @@ * Method: ilutInit * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILUT_ilutInit(JNIEnv *env, jclass clazz){ +static void JNICALL Java_org_lwjgl_devil_ILUT_ilutInit(JNIEnv *env, jclass clazz){ ilutInit(); } @@ -136,7 +137,7 @@ * Method: ilutIsDisabled * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutIsDisabled(JNIEnv *env, jclass clazz, jint mode){ +static jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutIsDisabled(JNIEnv *env, jclass clazz, jint mode){ return ilutIsDisabled((ILenum)mode); } @@ -145,7 +146,7 @@ * Method: ilutIsEnabled * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutIsEnabled(JNIEnv *env, jclass clazz, jint mode){ +static jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutIsEnabled(JNIEnv *env, jclass clazz, jint mode){ return ilutIsEnabled((ILenum)mode); } @@ -154,7 +155,7 @@ * Method: ilutPopAttrib * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILUT_ilutPopAttrib(JNIEnv *env, jclass clazz){ +static void JNICALL Java_org_lwjgl_devil_ILUT_ilutPopAttrib(JNIEnv *env, jclass clazz){ ilutPopAttrib(); } @@ -163,7 +164,7 @@ * Method: ilutPushAttrib * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILUT_ilutPushAttrib(JNIEnv *env, jclass clazz, jint bits){ +static void JNICALL Java_org_lwjgl_devil_ILUT_ilutPushAttrib(JNIEnv *env, jclass clazz, jint bits){ ilutPushAttrib((ILuint)bits); } @@ -172,7 +173,7 @@ * Method: ilutSetInteger * Signature: (II)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILUT_ilutSetInteger(JNIEnv *env, jclass clazz, jint mode, jint param){ +static void JNICALL Java_org_lwjgl_devil_ILUT_ilutSetInteger(JNIEnv *env, jclass clazz, jint mode, jint param){ ilutSetInteger((ILenum)mode, (ILint)param); } @@ -181,7 +182,7 @@ * Method: ilutGLBindTexImage * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_ILUT_ilutGLBindTexImage(JNIEnv *env, jclass clazz){ +static jint JNICALL Java_org_lwjgl_devil_ILUT_ilutGLBindTexImage(JNIEnv *env, jclass clazz){ return ilutGLBindTexImage(); } @@ -190,7 +191,7 @@ * Method: ilutGLBindMipmaps * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_ILUT_ilutGLBindMipmaps(JNIEnv *env, jclass clazz){ +static jint JNICALL Java_org_lwjgl_devil_ILUT_ilutGLBindMipmaps(JNIEnv *env, jclass clazz){ return ilutGLBindMipmaps(); } @@ -199,7 +200,7 @@ * Method: ilutGLBuildMipmaps * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutGLBuildMipmaps(JNIEnv *env, jclass clazz){ +static jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutGLBuildMipmaps(JNIEnv *env, jclass clazz){ return ilutGLBuildMipmaps(); } @@ -208,7 +209,7 @@ * Method: ilutGLLoadImage * Signature: (Ljava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_ILUT_ilutGLLoadImage(JNIEnv *env, jclass clazz, jstring fileName){ +static jint JNICALL Java_org_lwjgl_devil_ILUT_ilutGLLoadImage(JNIEnv *env, jclass clazz, jstring fileName){ char *strFileName = GetStringNativeChars(env, fileName); jint result = ilutGLLoadImage((const ILstring)strFileName); free(strFileName); @@ -220,7 +221,7 @@ * Method: ilutGLScreen * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutGLScreen(JNIEnv *env, jclass clazz){ +static jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutGLScreen(JNIEnv *env, jclass clazz){ return ilutGLScreen(); } @@ -229,7 +230,7 @@ * Method: ilutGLScreenie * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutGLScreenie(JNIEnv *env, jclass clazz){ +static jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutGLScreenie(JNIEnv *env, jclass clazz){ return ilutGLScreenie(); } @@ -238,7 +239,7 @@ * Method: ilutGLSaveImage * Signature: (Ljava/lang/String;I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutGLSaveImage(JNIEnv *env, jclass clazz, jstring fileName, jint texID){ +static jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutGLSaveImage(JNIEnv *env, jclass clazz, jstring fileName, jint texID){ char *strFileName = GetStringNativeChars(env, fileName); jboolean result = ilutGLSaveImage((const ILstring)strFileName, texID); free(strFileName); @@ -250,7 +251,7 @@ * Method: ilutGLSetTex * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutGLSetTex(JNIEnv *env, jclass clazz, jint texID){ +static jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutGLSetTex(JNIEnv *env, jclass clazz, jint texID){ return ilutGLSetTex(texID); } @@ -259,7 +260,7 @@ * Method: ilutGLTexImage * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutGLTexImage(JNIEnv *env, jclass clazz, jint level){ +static jboolean JNICALL Java_org_lwjgl_devil_ILUT_ilutGLTexImage(JNIEnv *env, jclass clazz, jint level){ return ilutGLTexImage(level); } Index: org_lwjgl_devil_ILU.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/org_lwjgl_devil_ILU.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- org_lwjgl_devil_ILU.c 28 Mar 2005 11:04:46 -0000 1.5 +++ org_lwjgl_devil_ILU.c 2 Nov 2005 22:04:15 -0000 1.6 @@ -1,4 +1,5 @@ #include "extilu.h" +#include "org_lwjgl_devil_ILU.h" typedef ILboolean (ILAPIENTRY *iluAlienifyPROC) (ILvoid); typedef ILboolean (ILAPIENTRY *iluBlurAvgPROC) (ILuint Iter); @@ -99,7 +100,7 @@ * Method: iluAlienify * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluAlienify(JNIEnv *env, jclass clazz) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluAlienify(JNIEnv *env, jclass clazz) { return iluAlienify(); } @@ -108,7 +109,7 @@ * Method: iluBlurAvg * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluBlurAvg(JNIEnv *env, jclass clazz, jint iter) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluBlurAvg(JNIEnv *env, jclass clazz, jint iter) { return iluBlurAvg((ILuint)iter); } @@ -117,7 +118,7 @@ * Method: iluBlurGaussian * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluBlurGaussian(JNIEnv *env, jclass clazz, jint iter) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluBlurGaussian(JNIEnv *env, jclass clazz, jint iter) { return iluBlurGaussian((ILuint)iter); } @@ -126,7 +127,7 @@ * Method: iluBuildMipmaps * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluBuildMipmaps(JNIEnv *env, jclass clazz) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluBuildMipmaps(JNIEnv *env, jclass clazz) { return iluBuildMipmaps(); } @@ -135,7 +136,7 @@ * Method: iluColoursUsed * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_ILU_iluColoursUsed(JNIEnv *env, jclass clazz) { +static jint JNICALL Java_org_lwjgl_devil_ILU_iluColoursUsed(JNIEnv *env, jclass clazz) { return iluColoursUsed(); } @@ -144,7 +145,7 @@ * Method: iluCompareImage * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluCompareImage(JNIEnv *env, jclass clazz, jint comp) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluCompareImage(JNIEnv *env, jclass clazz, jint comp) { return iluCompareImage((ILuint)comp); } @@ -153,7 +154,7 @@ * Method: iluContrast * Signature: (F)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluContrast(JNIEnv *env, jclass clazz, jfloat contrast) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluContrast(JNIEnv *env, jclass clazz, jfloat contrast) { return iluContrast((ILfloat)contrast); } @@ -162,7 +163,7 @@ * Method: iluCrop * Signature: (IIIIII)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluCrop(JNIEnv *env, jclass clazz, jint xOff, jint yOff, jint zOff, jint width, jint height, jint depth) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluCrop(JNIEnv *env, jclass clazz, jint xOff, jint yOff, jint zOff, jint width, jint height, jint depth) { return iluCrop((ILuint)xOff, (ILuint)yOff, (ILuint)zOff, (ILuint)width, (ILuint)height, (ILuint)depth); } @@ -171,7 +172,7 @@ * Method: iluDeleteImage * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_iluDeleteImage(JNIEnv *env, jclass clazz, jint id) { +static void JNICALL Java_org_lwjgl_devil_ILU_iluDeleteImage(JNIEnv *env, jclass clazz, jint id) { iluDeleteImage((ILuint)id); } @@ -180,7 +181,7 @@ * Method: iluEdgeDetectE * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEdgeDetectE(JNIEnv *env, jclass clazz) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEdgeDetectE(JNIEnv *env, jclass clazz) { return iluEdgeDetectE(); } @@ -189,7 +190,7 @@ * Method: iluEdgeDetectP * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEdgeDetectP(JNIEnv *env, jclass clazz) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEdgeDetectP(JNIEnv *env, jclass clazz) { return iluEdgeDetectP(); } @@ -198,7 +199,7 @@ * Method: iluEdgeDetectS * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEdgeDetectS(JNIEnv *env, jclass clazz) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEdgeDetectS(JNIEnv *env, jclass clazz) { return iluEdgeDetectS(); } @@ -207,7 +208,7 @@ * Method: iluEmboss * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEmboss(JNIEnv *env, jclass clazz) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEmboss(JNIEnv *env, jclass clazz) { return iluEmboss(); } @@ -216,7 +217,7 @@ * Method: iluEnlargeCanvas * Signature: (III)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEnlargeCanvas(JNIEnv *env, jclass clazz, jint width, jint height, jint depth) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEnlargeCanvas(JNIEnv *env, jclass clazz, jint width, jint height, jint depth) { return iluEnlargeCanvas((ILuint)width, (ILuint)height, (ILuint)depth); } @@ -225,7 +226,7 @@ * Method: iluEnlargeImage * Signature: (FFF)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEnlargeImage(JNIEnv *env, jclass clazz, jfloat xDim, jfloat yDim, jfloat zDim) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEnlargeImage(JNIEnv *env, jclass clazz, jfloat xDim, jfloat yDim, jfloat zDim) { return iluEnlargeImage((ILfloat)xDim, (ILfloat)yDim, (ILfloat)zDim); } @@ -234,7 +235,7 @@ * Method: iluEqualize * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEqualize(JNIEnv *env, jclass clazz) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEqualize(JNIEnv *env, jclass clazz) { return iluEqualize(); } @@ -243,7 +244,7 @@ * Method: iluErrorString * Signature: (I)Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_devil_ILU_iluErrorString(JNIEnv *env, jclass clazz, jint error) { +static jstring JNICALL Java_org_lwjgl_devil_ILU_iluErrorString(JNIEnv *env, jclass clazz, jint error) { return NewStringNative(env, iluErrorString((ILenum)error)); } @@ -252,7 +253,7 @@ * Method: iluFlipImage * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluFlipImage(JNIEnv *env, jclass clazz) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluFlipImage(JNIEnv *env, jclass clazz) { return iluFlipImage(); } @@ -261,7 +262,7 @@ * Method: iluGammaCorrect * Signature: (F)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluGammaCorrect(JNIEnv *env, jclass clazz, jfloat gamma) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluGammaCorrect(JNIEnv *env, jclass clazz, jfloat gamma) { return iluGammaCorrect((ILfloat)gamma); } @@ -270,7 +271,7 @@ * Method: iluGenImage * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_ILU_iluGenImage(JNIEnv *env, jclass clazz) { +static jint JNICALL Java_org_lwjgl_devil_ILU_iluGenImage(JNIEnv *env, jclass clazz) { return iluGenImage(); } @@ -279,7 +280,7 @@ * Method: iluGetImageInfo * Signature: (Lorg/lwjgl/devil/ILinfo;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_iluGetImageInfo(JNIEnv *env, jclass clazz, jobject info) { +static void JNICALL Java_org_lwjgl_devil_ILU_iluGetImageInfo(JNIEnv *env, jclass clazz, jobject info) { jfieldID fieldId; ILinfo *imageInfo; @@ -345,7 +346,7 @@ * Method: iluGetInteger * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_ILU_iluGetInteger(JNIEnv *env, jclass clazz, jint mode) { +static jint JNICALL Java_org_lwjgl_devil_ILU_iluGetInteger(JNIEnv *env, jclass clazz, jint mode) { return iluGetInteger((ILenum)mode); } @@ -354,7 +355,7 @@ * Method: iluGetIntegerv * Signature: (ILjava/nio/IntBuffer;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_niluGetIntegerv(JNIEnv *env, jclass clazz, jint mode, jobject param_buffer, jint param_offset) { +static void JNICALL Java_org_lwjgl_devil_ILU_niluGetIntegerv(JNIEnv *env, jclass clazz, jint mode, jobject param_buffer, jint param_offset) { ILbyte *lists = (ILbyte *) safeGetBufferAddress(env, param_buffer) + param_offset; iluGetIntegerv((ILsizei)mode, (ILuint *)lists); } @@ -364,7 +365,7 @@ * Method: iluGetString * Signature: (I)Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_devil_ILU_iluGetString(JNIEnv *env, jclass clazz, jint stringName) { +static jstring JNICALL Java_org_lwjgl_devil_ILU_iluGetString(JNIEnv *env, jclass clazz, jint stringName) { return NewStringNative(env, iluGetString((ILenum)stringName)); } @@ -373,7 +374,7 @@ * Method: iluImageParameter * Signature: (II)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_iluImageParameter(JNIEnv *env, jclass clazz, jint pName, jint param) { +static void JNICALL Java_org_lwjgl_devil_ILU_iluImageParameter(JNIEnv *env, jclass clazz, jint pName, jint param) { iluImageParameter((ILenum)pName, (ILenum)param); } @@ -382,7 +383,7 @@ * Method: iluInit * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_iluInit(JNIEnv *env, jclass clazz) { +static void JNICALL Java_org_lwjgl_devil_ILU_iluInit(JNIEnv *env, jclass clazz) { iluInit(); } @@ -391,7 +392,7 @@ * Method: iluInvertAlpha * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluInvertAlpha(JNIEnv *env, jclass clazz) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluInvertAlpha(JNIEnv *env, jclass clazz) { return iluInvertAlpha(); } @@ -400,7 +401,7 @@ * Method: iluLoadImage * Signature: (Ljava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_devil_ILU_iluLoadImage(JNIEnv *env, jclass clazz, jstring fileName) { +static jint JNICALL Java_org_lwjgl_devil_ILU_iluLoadImage(JNIEnv *env, jclass clazz, jstring fileName) { char *strFileName = GetStringNativeChars(env, fileName); jint result = iluLoadImage((const ILstring)strFileName); free(strFileName); @@ -413,7 +414,7 @@ * Method: iluMirror * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluMirror(JNIEnv *env, jclass clazz) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluMirror(JNIEnv *env, jclass clazz) { return iluMirror(); } @@ -422,7 +423,7 @@ * Method: iluNegative * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluNegative(JNIEnv *env, jclass clazz) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluNegative(JNIEnv *env, jclass clazz) { return iluNegative(); } @@ -431,7 +432,7 @@ * Method: iluNoisify * Signature: (F)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluNoisify(JNIEnv *env, jclass clazz, jfloat factor) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluNoisify(JNIEnv *env, jclass clazz, jfloat factor) { return iluNoisify((ILclampf)factor); } @@ -440,7 +441,7 @@ * Method: iluPixelize * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluPixelize(JNIEnv *env, jclass clazz, jint pixSize) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluPixelize(JNIEnv *env, jclass clazz, jint pixSize) { return iluPixelize((ILuint)pixSize); } @@ -449,7 +450,7 @@ * Method: iluReplaceColour * Signature: (BBBF)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluReplaceColour(JNIEnv *env, jclass clazz, jbyte red, jbyte green, jbyte blue, jfloat tolerence) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluReplaceColour(JNIEnv *env, jclass clazz, jbyte red, jbyte green, jbyte blue, jfloat tolerence) { return false; } @@ -458,7 +459,7 @@ * Method: iluRotate * Signature: (F)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluRotate(JNIEnv *env, jclass clazz, jfloat angle) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluRotate(JNIEnv *env, jclass clazz, jfloat angle) { return iluRotate((ILfloat)angle); } @@ -467,7 +468,7 @@ * Method: iluSaturate1f * Signature: (F)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluSaturate1f(JNIEnv *env, jclass clazz, jfloat saturation) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluSaturate1f(JNIEnv *env, jclass clazz, jfloat saturation) { return iluSaturate1f((ILfloat)saturation); } @@ -476,7 +477,7 @@ * Method: iluSaturate4f * Signature: (FFFF)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluSaturate4f(JNIEnv *env, jclass clazz, jfloat r, jfloat g, jfloat b, jfloat saturation) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluSaturate4f(JNIEnv *env, jclass clazz, jfloat r, jfloat g, jfloat b, jfloat saturation) { return iluSaturate4f((ILfloat)r, (ILfloat)g, (ILfloat)b, (ILfloat)saturation); } @@ -485,7 +486,7 @@ * Method: iluScale * Signature: (III)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluScale(JNIEnv *env, jclass clazz, jint width, jint height, jint depth) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluScale(JNIEnv *env, jclass clazz, jint width, jint height, jint depth) { return iluScale((ILuint)width, (ILuint)height, (ILuint)depth); } @@ -494,7 +495,7 @@ * Method: iluScaleColours * Signature: (FFF)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluScaleColours(JNIEnv *env, jclass clazz, jfloat r, jfloat g, jfloat b) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluScaleColours(JNIEnv *env, jclass clazz, jfloat r, jfloat g, jfloat b) { return iluScaleColours((ILfloat)r, (ILfloat)g, (ILfloat)b); } @@ -503,7 +504,7 @@ * Method: iluSharpen * Signature: (FI)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluSharpen(JNIEnv *env, jclass clazz, jfloat factor, jint iter) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluSharpen(JNIEnv *env, jclass clazz, jfloat factor, jint iter) { return iluSharpen((ILfloat)factor, (ILuint)iter); } @@ -512,7 +513,7 @@ * Method: iluSwapColours * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluSwapColours(JNIEnv *env, jclass clazz) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluSwapColours(JNIEnv *env, jclass clazz) { return iluSwapColours(); } @@ -521,7 +522,7 @@ * Method: iluWave * Signature: (F)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_ILU_iluWave(JNIEnv *env, jclass clazz, jfloat wave) { +static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluWave(JNIEnv *env, jclass clazz, jfloat wave) { return iluWave((ILfloat)wave); } |
|
From: Brian M. <ma...@us...> - 2005-11-02 22:01:37
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/devil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23577 Modified Files: .cvsignore Log Message: dont ignore devil headers Index: .cvsignore =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .cvsignore 19 Jan 2005 02:10:30 -0000 1.3 +++ .cvsignore 2 Nov 2005 22:01:26 -0000 1.4 @@ -1,3 +0,0 @@ -org_lwjgl_devil_IL.h -org_lwjgl_devil_ILU.h -org_lwjgl_devil_ILUT.h |
|
From: Brian M. <ma...@us...> - 2005-11-02 16:35:15
|
Update of /cvsroot/java-game-lib/LWJGL/www In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11308 Modified Files: projects.php Log Message: added Strategic Tetris Index: projects.php =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/www/projects.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- projects.php 30 Oct 2005 11:54:18 -0000 1.14 +++ projects.php 2 Nov 2005 16:35:03 -0000 1.15 @@ -180,7 +180,23 @@ 'big' => ''), 2 => array( 'small' => 'drommi_small_3.jpg', - 'big' => ''))); + 'big' => ''))); + + $projects[] = array( + 'name' => 'Strategic Tetris', + 'url' => 'http://donut.spitaki.org/', + 'type' => 'Shareware game', + 'desc' => 'multiplayer Tetris where two players play on the same board at the same time. It\'s not just about being fast. You have to co-operate and co-ordinate with your friend in order to go higher! Hitting each others pieces makes them move and rotate so its not as easy as it may sound! :) There are also online highscore tables for the registered users where they can compare themselves to other people from all over the world!', + 'screens' => array( + 0 => array( + 'small' => 'strategic_tetris_small_1.jpg', + 'big' => 'strategic_tetris_1.jpg'), + 1 => array( + 'small' => 'strategic_tetris_small_2.jpg', + 'big' => 'strategic_tetris_2.jpg'), + 2 => array( + 'small' => 'strategic_tetris_small_3.jpg', + 'big' => 'strategic_tetris_3.jpg'))); function displayProjects() { |
|
From: Brian M. <ma...@us...> - 2005-11-02 16:34:50
|
Update of /cvsroot/java-game-lib/LWJGL/www/_gfx/projects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11216 Added Files: strategic_tetris_1.jpg strategic_tetris_2.jpg strategic_tetris_3.jpg strategic_tetris_small_1.jpg strategic_tetris_small_2.jpg strategic_tetris_small_3.jpg Log Message: added Strategic Tetris --- NEW FILE: strategic_tetris_small_2.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: strategic_tetris_3.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: strategic_tetris_1.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: strategic_tetris_2.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: strategic_tetris_small_1.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: strategic_tetris_small_3.jpg --- (This appears to be a binary file; contents omitted.) |
Update of /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11245/src/generated/org/lwjgl/opengl Modified Files: ARBBufferObject.java ARBImaging.java ARBMultitexture.java ARBProgram.java ARBTextureCompression.java ARBVertexBlend.java ARBVertexProgram.java ARBWindowPos.java ATIVertexArrayObject.java ATIVertexStreams.java ContextCapabilities.java EXTFogCoord.java EXTPalettedTexture.java EXTSecondaryColor.java EXTVertexShader.java GL11.java GL12.java GL13.java GL14.java GL15.java GL20.java NVFragmentProgram.java NVPixelDataRange.java NVVertexArrayRange.java NVVertexProgram.java Log Message: Added support for doubles (ALdouble and GLdouble) Index: EXTVertexShader.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTVertexShader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EXTVertexShader.java 29 Sep 2005 17:13:36 -0000 1.1 +++ EXTVertexShader.java 2 Nov 2005 09:28:10 -0000 1.2 @@ -215,6 +215,12 @@ } private static native int nglGenSymbolsEXT(int dataType, int storageType, int range, int components, long function_pointer); + public static void glSetInvariantEXT(int id, DoubleBuffer pAddr) { + long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetInvariantEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkBuffer(pAddr, 4); + nglSetInvariantEXT(id, GL11.GL_DOUBLE, pAddr, pAddr.position() << 3, function_pointer); + } public static void glSetInvariantEXT(int id, FloatBuffer pAddr) { long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetInvariantEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -241,6 +247,12 @@ } private static native void nglSetInvariantEXT(int id, int type, Buffer pAddr, int pAddr_position, long function_pointer); + public static void glSetLocalConstantEXT(int id, DoubleBuffer pAddr) { + long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetLocalConstantEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkBuffer(pAddr, 4); + nglSetLocalConstantEXT(id, GL11.GL_DOUBLE, pAddr, pAddr.position() << 3, function_pointer); + } public static void glSetLocalConstantEXT(int id, FloatBuffer pAddr) { long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetLocalConstantEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -299,6 +311,14 @@ } private static native void nglVariantfvEXT(int id, FloatBuffer pAddr, int pAddr_position, long function_pointer); + public static void glVariantEXT(int id, DoubleBuffer pAddr) { + long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glVariantdvEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkBuffer(pAddr, 4); + nglVariantdvEXT(id, pAddr, pAddr.position(), function_pointer); + } + private static native void nglVariantdvEXT(int id, DoubleBuffer pAddr, int pAddr_position, long function_pointer); + public static void glVariantuEXT(int id, ByteBuffer pAddr) { long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glVariantubvEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -323,6 +343,14 @@ } private static native void nglVariantuivEXT(int id, IntBuffer pAddr, int pAddr_position, long function_pointer); + public static void glVariantPointerEXT(int id, int stride, DoubleBuffer pAddr) { + long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glVariantPointerEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pAddr); + GLChecks.getReferences().EXT_vertex_shader_glVariantPointerEXT_pAddr = pAddr; + nglVariantPointerEXT(id, GL11.GL_DOUBLE, stride, pAddr, pAddr.position() << 3, function_pointer); + } public static void glVariantPointerEXT(int id, int stride, FloatBuffer pAddr) { long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glVariantPointerEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); Index: GL13.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL13.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- GL13.java 29 Sep 2005 17:13:36 -0000 1.1 +++ GL13.java 2 Nov 2005 09:28:10 -0000 1.2 @@ -129,6 +129,13 @@ BufferChecks.checkDirect(data); nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position(), function_pointer); } + public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, DoubleBuffer data) { + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage1D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 3, function_pointer); + } public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage1D_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -166,6 +173,13 @@ BufferChecks.checkDirect(data); nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position(), function_pointer); } + public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, DoubleBuffer data) { + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 3, function_pointer); + } public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -203,6 +217,13 @@ BufferChecks.checkDirect(data); nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position(), function_pointer); } + public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, DoubleBuffer data) { + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage3D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 3, function_pointer); + } public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage3D_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -240,6 +261,13 @@ BufferChecks.checkDirect(data); nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position(), function_pointer); } + public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, DoubleBuffer data) { + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage1D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 3, function_pointer); + } public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage1D_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -277,6 +305,13 @@ BufferChecks.checkDirect(data); nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position(), function_pointer); } + public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, DoubleBuffer data) { + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 3, function_pointer); + } public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -314,6 +349,13 @@ BufferChecks.checkDirect(data); nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position(), function_pointer); } + public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, DoubleBuffer data) { + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage3D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 3, function_pointer); + } public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage3D_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -381,6 +423,13 @@ } private static native void nglMultiTexCoord1f(int target, float s, long function_pointer); + public static void glMultiTexCoord1d(int target, double s) { + long function_pointer = GLContext.getCapabilities().GL13_glMultiTexCoord1d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglMultiTexCoord1d(target, s, function_pointer); + } + private static native void nglMultiTexCoord1d(int target, double s, long function_pointer); + public static void glMultiTexCoord2f(int target, float s, float t) { long function_pointer = GLContext.getCapabilities().GL13_glMultiTexCoord2f_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -388,6 +437,13 @@ } private static native void nglMultiTexCoord2f(int target, float s, float t, long function_pointer); + public static void glMultiTexCoord2d(int target, double s, double t) { + long function_pointer = GLContext.getCapabilities().GL13_glMultiTexCoord2d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglMultiTexCoord2d(target, s, t, function_pointer); + } + private static native void nglMultiTexCoord2d(int target, double s, double t, long function_pointer); + public static void glMultiTexCoord3f(int target, float s, float t, float r) { long function_pointer = GLContext.getCapabilities().GL13_glMultiTexCoord3f_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -395,6 +451,13 @@ } private static native void nglMultiTexCoord3f(int target, float s, float t, float r, long function_pointer); + public static void glMultiTexCoord3d(int target, double s, double t, double r) { + long function_pointer = GLContext.getCapabilities().GL13_glMultiTexCoord3d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglMultiTexCoord3d(target, s, t, r, function_pointer); + } + private static native void nglMultiTexCoord3d(int target, double s, double t, double r, long function_pointer); + public static void glMultiTexCoord4f(int target, float s, float t, float r, float q) { long function_pointer = GLContext.getCapabilities().GL13_glMultiTexCoord4f_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -402,6 +465,13 @@ } private static native void nglMultiTexCoord4f(int target, float s, float t, float r, float q, long function_pointer); + public static void glMultiTexCoord4d(int target, double s, double t, double r, double q) { + long function_pointer = GLContext.getCapabilities().GL13_glMultiTexCoord4d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglMultiTexCoord4d(target, s, t, r, q, function_pointer); + } + private static native void nglMultiTexCoord4d(int target, double s, double t, double r, double q, long function_pointer); + public static void glLoadTransposeMatrix(FloatBuffer m) { long function_pointer = GLContext.getCapabilities().GL13_glLoadTransposeMatrixf_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -410,6 +480,14 @@ } private static native void nglLoadTransposeMatrixf(FloatBuffer m, int m_position, long function_pointer); + public static void glLoadTransposeMatrix(DoubleBuffer m) { + long function_pointer = GLContext.getCapabilities().GL13_glLoadTransposeMatrixd_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkBuffer(m, 16); + nglLoadTransposeMatrixd(m, m.position(), function_pointer); + } + private static native void nglLoadTransposeMatrixd(DoubleBuffer m, int m_position, long function_pointer); + public static void glMultTransposeMatrix(FloatBuffer m) { long function_pointer = GLContext.getCapabilities().GL13_glMultTransposeMatrixf_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -418,6 +496,14 @@ } private static native void nglMultTransposeMatrixf(FloatBuffer m, int m_position, long function_pointer); + public static void glMultTransposeMatrix(DoubleBuffer m) { + long function_pointer = GLContext.getCapabilities().GL13_glMultTransposeMatrixd_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkBuffer(m, 16); + nglMultTransposeMatrixd(m, m.position(), function_pointer); + } + private static native void nglMultTransposeMatrixd(DoubleBuffer m, int m_position, long function_pointer); + public static void glSampleCoverage(float value, boolean invert) { long function_pointer = GLContext.getCapabilities().GL13_glSampleCoverage_pointer; BufferChecks.checkFunctionAddress(function_pointer); Index: GL15.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL15.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- GL15.java 29 Sep 2005 17:13:36 -0000 1.1 +++ GL15.java 2 Nov 2005 09:28:10 -0000 1.2 @@ -92,6 +92,12 @@ BufferChecks.checkDirect(data); nglBufferData(target, (data.remaining()), data, data.position(), usage, function_pointer); } + public static void glBufferData(int target, DoubleBuffer data, int usage) { + long function_pointer = GLContext.getCapabilities().GL15_glBufferData_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(data); + nglBufferData(target, (data.remaining() << 3), data, data.position() << 3, usage, function_pointer); + } public static void glBufferData(int target, FloatBuffer data, int usage) { long function_pointer = GLContext.getCapabilities().GL15_glBufferData_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -118,6 +124,12 @@ BufferChecks.checkDirect(data); nglBufferSubData(target, offset, (data.remaining()), data, data.position(), function_pointer); } + public static void glBufferSubData(int target, int offset, DoubleBuffer data) { + long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(data); + nglBufferSubData(target, offset, (data.remaining() << 3), data, data.position() << 3, function_pointer); + } public static void glBufferSubData(int target, int offset, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -144,6 +156,12 @@ BufferChecks.checkDirect(data); nglGetBufferSubData(target, offset, (data.remaining()), data, data.position(), function_pointer); } + public static void glGetBufferSubData(int target, int offset, DoubleBuffer data) { + long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(data); + nglGetBufferSubData(target, offset, (data.remaining() << 3), data, data.position() << 3, function_pointer); + } public static void glGetBufferSubData(int target, int offset, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); Index: EXTSecondaryColor.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTSecondaryColor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EXTSecondaryColor.java 29 Sep 2005 17:13:36 -0000 1.1 +++ EXTSecondaryColor.java 2 Nov 2005 09:28:10 -0000 1.2 @@ -33,6 +33,13 @@ } private static native void nglSecondaryColor3fEXT(float red, float green, float blue, long function_pointer); + public static void glSecondaryColor3dEXT(double red, double green, double blue) { + long function_pointer = GLContext.getCapabilities().EXT_secondary_color_glSecondaryColor3dEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglSecondaryColor3dEXT(red, green, blue, function_pointer); + } + private static native void nglSecondaryColor3dEXT(double red, double green, double blue, long function_pointer); + public static void glSecondaryColor3ubEXT(byte red, byte green, byte blue) { long function_pointer = GLContext.getCapabilities().EXT_secondary_color_glSecondaryColor3ubEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -40,6 +47,14 @@ } private static native void nglSecondaryColor3ubEXT(byte red, byte green, byte blue, long function_pointer); + public static void glSecondaryColorPointerEXT(int size, int stride, DoubleBuffer pPointer) { + long function_pointer = GLContext.getCapabilities().EXT_secondary_color_glSecondaryColorPointerEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pPointer); + GLChecks.getReferences().EXT_secondary_color_glSecondaryColorPointerEXT_pPointer = pPointer; + nglSecondaryColorPointerEXT(size, GL11.GL_DOUBLE, stride, pPointer, pPointer.position() << 3, function_pointer); + } public static void glSecondaryColorPointerEXT(int size, int stride, FloatBuffer pPointer) { long function_pointer = GLContext.getCapabilities().EXT_secondary_color_glSecondaryColorPointerEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); Index: ARBVertexBlend.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexBlend.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBVertexBlend.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBVertexBlend.java 2 Nov 2005 09:28:09 -0000 1.2 @@ -86,6 +86,14 @@ } private static native void nglWeightfvARB(int size, FloatBuffer pWeights, int pWeights_position, long function_pointer); + public static void glWeightARB(DoubleBuffer pWeights) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_blend_glWeightdvARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(pWeights); + nglWeightdvARB((pWeights.remaining()), pWeights, pWeights.position(), function_pointer); + } + private static native void nglWeightdvARB(int size, DoubleBuffer pWeights, int pWeights_position, long function_pointer); + public static void glWeightuARB(ByteBuffer pWeights) { long function_pointer = GLContext.getCapabilities().ARB_vertex_blend_glWeightubvARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -110,6 +118,14 @@ } private static native void nglWeightuivARB(int size, IntBuffer pWeights, int pWeights_position, long function_pointer); + public static void glWeightPointerARB(int size, int stride, DoubleBuffer pPointer) { + long function_pointer = GLContext.getCapabilities().ARB_vertex_blend_glWeightPointerARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pPointer); + GLChecks.getReferences().ARB_vertex_blend_glWeightPointerARB_pPointer = pPointer; + nglWeightPointerARB(size, GL11.GL_DOUBLE, stride, pPointer, pPointer.position() << 3, function_pointer); + } public static void glWeightPointerARB(int size, int stride, FloatBuffer pPointer) { long function_pointer = GLContext.getCapabilities().ARB_vertex_blend_glWeightPointerARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); Index: GL14.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL14.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- GL14.java 29 Sep 2005 17:13:36 -0000 1.1 +++ GL14.java 2 Nov 2005 09:28:10 -0000 1.2 @@ -72,6 +72,21 @@ } private static native void nglFogCoordf(float coord, long function_pointer); + public static void glFogCoordd(double coord) { + long function_pointer = GLContext.getCapabilities().GL14_glFogCoordd_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglFogCoordd(coord, function_pointer); + } + private static native void nglFogCoordd(double coord, long function_pointer); + + public static void glFogCoordPointer(int stride, DoubleBuffer data) { + long function_pointer = GLContext.getCapabilities().GL14_glFogCoordPointer_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(data); + GLChecks.getReferences().GL14_glFogCoordPointer_data = data; + nglFogCoordPointer(GL11.GL_DOUBLE, stride, data, data.position() << 3, function_pointer); + } public static void glFogCoordPointer(int stride, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().GL14_glFogCoordPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -145,6 +160,13 @@ } private static native void nglSecondaryColor3f(float red, float green, float blue, long function_pointer); + public static void glSecondaryColor3d(double red, double green, double blue) { + long function_pointer = GLContext.getCapabilities().GL14_glSecondaryColor3d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglSecondaryColor3d(red, green, blue, function_pointer); + } + private static native void nglSecondaryColor3d(double red, double green, double blue, long function_pointer); + public static void glSecondaryColor3ub(byte red, byte green, byte blue) { long function_pointer = GLContext.getCapabilities().GL14_glSecondaryColor3ub_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -152,6 +174,13 @@ } private static native void nglSecondaryColor3ub(byte red, byte green, byte blue, long function_pointer); + public static void glSecondaryColorPointer(int size, int stride, DoubleBuffer data) { + long function_pointer = GLContext.getCapabilities().GL14_glSecondaryColorPointer_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(data); + nglSecondaryColorPointer(size, GL11.GL_DOUBLE, stride, data, data.position() << 3, function_pointer); + } public static void glSecondaryColorPointer(int size, int stride, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().GL14_glSecondaryColorPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -189,6 +218,13 @@ } private static native void nglWindowPos2f(float x, float y, long function_pointer); + public static void glWindowPos2d(double x, double y) { + long function_pointer = GLContext.getCapabilities().GL14_glWindowPos2d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglWindowPos2d(x, y, function_pointer); + } + private static native void nglWindowPos2d(double x, double y, long function_pointer); + public static void glWindowPos2i(int x, int y) { long function_pointer = GLContext.getCapabilities().GL14_glWindowPos2i_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -203,6 +239,13 @@ } private static native void nglWindowPos3f(float x, float y, float z, long function_pointer); + public static void glWindowPos3d(double x, double y, double z) { + long function_pointer = GLContext.getCapabilities().GL14_glWindowPos3d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglWindowPos3d(x, y, z, function_pointer); + } + private static native void nglWindowPos3d(double x, double y, double z, long function_pointer); + public static void glWindowPos3i(int x, int y, int z) { long function_pointer = GLContext.getCapabilities().GL14_glWindowPos3i_pointer; BufferChecks.checkFunctionAddress(function_pointer); Index: GL20.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL20.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- GL20.java 29 Sep 2005 17:13:36 -0000 1.1 +++ GL20.java 2 Nov 2005 09:28:10 -0000 1.2 @@ -459,6 +459,13 @@ } private static native void nglVertexAttrib1f(int index, float x, long function_pointer); + public static void glVertexAttrib1d(int index, double x) { + long function_pointer = GLContext.getCapabilities().GL20_glVertexAttrib1d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib1d(index, x, function_pointer); + } + private static native void nglVertexAttrib1d(int index, double x, long function_pointer); + public static void glVertexAttrib2s(int index, short x, short y) { long function_pointer = GLContext.getCapabilities().GL20_glVertexAttrib2s_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -473,6 +480,13 @@ } private static native void nglVertexAttrib2f(int index, float x, float y, long function_pointer); + public static void glVertexAttrib2d(int index, double x, double y) { + long function_pointer = GLContext.getCapabilities().GL20_glVertexAttrib2d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib2d(index, x, y, function_pointer); + } + private static native void nglVertexAttrib2d(int index, double x, double y, long function_pointer); + public static void glVertexAttrib3s(int index, short x, short y, short z) { long function_pointer = GLContext.getCapabilities().GL20_glVertexAttrib3s_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -487,6 +501,13 @@ } private static native void nglVertexAttrib3f(int index, float x, float y, float z, long function_pointer); + public static void glVertexAttrib3d(int index, double x, double y, double z) { + long function_pointer = GLContext.getCapabilities().GL20_glVertexAttrib3d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib3d(index, x, y, z, function_pointer); + } + private static native void nglVertexAttrib3d(int index, double x, double y, double z, long function_pointer); + public static void glVertexAttrib4s(int index, short x, short y, short z, short w) { long function_pointer = GLContext.getCapabilities().GL20_glVertexAttrib4s_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -501,6 +522,13 @@ } private static native void nglVertexAttrib4f(int index, float x, float y, float z, float w, long function_pointer); + public static void glVertexAttrib4d(int index, double x, double y, double z, double w) { + long function_pointer = GLContext.getCapabilities().GL20_glVertexAttrib4d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttrib4d(index, x, y, z, w, function_pointer); + } + private static native void nglVertexAttrib4d(int index, double x, double y, double z, double w, long function_pointer); + public static void glVertexAttrib4Nub(int index, byte x, byte y, byte z, byte w) { long function_pointer = GLContext.getCapabilities().GL20_glVertexAttrib4Nub_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -508,6 +536,14 @@ } private static native void nglVertexAttrib4Nub(int index, byte x, byte y, byte z, byte w, long function_pointer); + public static void glVertexAttribPointer(int index, int size, boolean normalized, int stride, DoubleBuffer buffer) { + long function_pointer = GLContext.getCapabilities().GL20_glVertexAttribPointer_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(buffer); + GLChecks.getReferences().GL20_glVertexAttribPointer_buffer = buffer; + nglVertexAttribPointer(index, size, GL11.GL_DOUBLE, normalized, stride, buffer, buffer.position() << 3, function_pointer); + } public static void glVertexAttribPointer(int index, int size, boolean normalized, int stride, FloatBuffer buffer) { long function_pointer = GLContext.getCapabilities().GL20_glVertexAttribPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -571,6 +607,14 @@ } private static native void nglGetVertexAttribfv(int index, int pname, FloatBuffer params, int params_position, long function_pointer); + public static void glGetVertexAttrib(int index, int pname, DoubleBuffer params) { + long function_pointer = GLContext.getCapabilities().GL20_glGetVertexAttribdv_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkBuffer(params, 4); + nglGetVertexAttribdv(index, pname, params, params.position(), function_pointer); + } + private static native void nglGetVertexAttribdv(int index, int pname, DoubleBuffer params, int params_position, long function_pointer); + public static void glGetVertexAttrib(int index, int pname, IntBuffer params) { long function_pointer = GLContext.getCapabilities().GL20_glGetVertexAttribiv_pointer; BufferChecks.checkFunctionAddress(function_pointer); Index: NVFragmentProgram.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/NVFragmentProgram.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NVFragmentProgram.java 29 Sep 2005 17:13:36 -0000 1.1 +++ NVFragmentProgram.java 2 Nov 2005 09:28:10 -0000 1.2 @@ -25,6 +25,14 @@ } private static native void nglProgramNamedParameter4fNV(int id, int length, ByteBuffer name, int name_position, float x, float y, float z, float w, long function_pointer); + public static void glProgramNamedParameter4dNV(int id, ByteBuffer name, double x, double y, double z, double w) { + long function_pointer = GLContext.getCapabilities().NV_fragment_program_glProgramNamedParameter4dNV_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(name); + nglProgramNamedParameter4dNV(id, (name.remaining()), name, name.position(), x, y, z, w, function_pointer); + } + private static native void nglProgramNamedParameter4dNV(int id, int length, ByteBuffer name, int name_position, double x, double y, double z, double w, long function_pointer); + public static void glGetProgramNamedParameterNV(int id, ByteBuffer name, FloatBuffer params) { long function_pointer = GLContext.getCapabilities().NV_fragment_program_glGetProgramNamedParameterfvNV_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -33,4 +41,13 @@ nglGetProgramNamedParameterfvNV(id, (name.remaining()), name, name.position(), params, params.position(), function_pointer); } private static native void nglGetProgramNamedParameterfvNV(int id, int length, ByteBuffer name, int name_position, FloatBuffer params, int params_position, long function_pointer); + + public static void glGetProgramNamedParameterNV(int id, ByteBuffer name, DoubleBuffer params) { + long function_pointer = GLContext.getCapabilities().NV_fragment_program_glGetProgramNamedParameterdvNV_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(name); + BufferChecks.checkBuffer(params, 4); + nglGetProgramNamedParameterdvNV(id, (name.remaining()), name, name.position(), params, params.position(), function_pointer); + } + private static native void nglGetProgramNamedParameterdvNV(int id, int length, ByteBuffer name, int name_position, DoubleBuffer params, int params_position, long function_pointer); } Index: NVPixelDataRange.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/NVPixelDataRange.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NVPixelDataRange.java 29 Sep 2005 17:13:36 -0000 1.1 +++ NVPixelDataRange.java 2 Nov 2005 09:28:10 -0000 1.2 @@ -24,6 +24,12 @@ BufferChecks.checkDirect(data); nglPixelDataRangeNV(target, (data.remaining()), data, data.position(), function_pointer); } + public static void glPixelDataRangeNV(int target, DoubleBuffer data) { + long function_pointer = GLContext.getCapabilities().NV_pixel_data_range_glPixelDataRangeNV_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(data); + nglPixelDataRangeNV(target, (data.remaining() << 3), data, data.position() << 3, function_pointer); + } public static void glPixelDataRangeNV(int target, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().NV_pixel_data_range_glPixelDataRangeNV_pointer; BufferChecks.checkFunctionAddress(function_pointer); Index: ATIVertexStreams.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ATIVertexStreams.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ATIVertexStreams.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ATIVertexStreams.java 2 Nov 2005 09:28:09 -0000 1.2 @@ -29,6 +29,13 @@ } private static native void nglVertexStream2fATI(int stream, float x, float y, long function_pointer); + public static void glVertexStream2dATI(int stream, double x, double y) { + long function_pointer = GLContext.getCapabilities().ATI_vertex_streams_glVertexStream2dATI_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexStream2dATI(stream, x, y, function_pointer); + } + private static native void nglVertexStream2dATI(int stream, double x, double y, long function_pointer); + public static void glVertexStream2iATI(int stream, int x, int y) { long function_pointer = GLContext.getCapabilities().ATI_vertex_streams_glVertexStream2iATI_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -50,6 +57,13 @@ } private static native void nglVertexStream3fATI(int stream, float x, float y, float z, long function_pointer); + public static void glVertexStream3dATI(int stream, double x, double y, double z) { + long function_pointer = GLContext.getCapabilities().ATI_vertex_streams_glVertexStream3dATI_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexStream3dATI(stream, x, y, z, function_pointer); + } + private static native void nglVertexStream3dATI(int stream, double x, double y, double z, long function_pointer); + public static void glVertexStream3iATI(int stream, int x, int y, int z) { long function_pointer = GLContext.getCapabilities().ATI_vertex_streams_glVertexStream3iATI_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -71,6 +85,13 @@ } private static native void nglVertexStream4fATI(int stream, float x, float y, float z, float w, long function_pointer); + public static void glVertexStream4dATI(int stream, double x, double y, double z, double w) { + long function_pointer = GLContext.getCapabilities().ATI_vertex_streams_glVertexStream4dATI_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexStream4dATI(stream, x, y, z, w, function_pointer); + } + private static native void nglVertexStream4dATI(int stream, double x, double y, double z, double w, long function_pointer); + public static void glVertexStream4iATI(int stream, int x, int y, int z, int w) { long function_pointer = GLContext.getCapabilities().ATI_vertex_streams_glVertexStream4iATI_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -99,6 +120,13 @@ } private static native void nglNormalStream3fATI(int stream, float x, float y, float z, long function_pointer); + public static void glNormalStream3dATI(int stream, double x, double y, double z) { + long function_pointer = GLContext.getCapabilities().ATI_vertex_streams_glNormalStream3dATI_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglNormalStream3dATI(stream, x, y, z, function_pointer); + } + private static native void nglNormalStream3dATI(int stream, double x, double y, double z, long function_pointer); + public static void glNormalStream3iATI(int stream, int x, int y, int z) { long function_pointer = GLContext.getCapabilities().ATI_vertex_streams_glNormalStream3iATI_pointer; BufferChecks.checkFunctionAddress(function_pointer); Index: GL11.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL11.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GL11.java 6 Oct 2005 20:03:01 -0000 1.3 +++ GL11.java 2 Nov 2005 09:28:10 -0000 1.4 @@ -721,6 +721,14 @@ } private static native void nglCopyPixels(int x, int y, int width, int height, int type, long function_pointer); + public static void glColorPointer(int size, int stride, DoubleBuffer pointer) { + long function_pointer = GLContext.getCapabilities().GL11_glColorPointer_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pointer); + GLChecks.getReferences().GL11_glColorPointer_pointer = pointer; + nglColorPointer(size, GL11.GL_DOUBLE, stride, pointer, pointer.position() << 3, function_pointer); + } public static void glColorPointer(int size, int stride, FloatBuffer pointer) { long function_pointer = GLContext.getCapabilities().GL11_glColorPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -774,6 +782,13 @@ } private static native void nglColor3f(float red, float green, float blue, long function_pointer); + public static void glColor3d(double red, double green, double blue) { + long function_pointer = GLContext.getCapabilities().GL11_glColor3d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglColor3d(red, green, blue, function_pointer); + } + private static native void nglColor3d(double red, double green, double blue, long function_pointer); + public static void glColor3ub(byte red, byte green, byte blue) { long function_pointer = GLContext.getCapabilities().GL11_glColor3ub_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -795,6 +810,13 @@ } private static native void nglColor4f(float red, float green, float blue, float alpha, long function_pointer); + public static void glColor4d(double red, double green, double blue, double alpha) { + long function_pointer = GLContext.getCapabilities().GL11_glColor4d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglColor4d(red, green, blue, alpha, function_pointer); + } + private static native void nglColor4d(double red, double green, double blue, double alpha, long function_pointer); + public static void glColor4ub(byte red, byte green, byte blue, byte alpha) { long function_pointer = GLContext.getCapabilities().GL11_glColor4ub_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -817,13 +839,6 @@ } private static native void nglClearStencil(int s, long function_pointer); - public static void glClearIndex(float c) { - long function_pointer = GLContext.getCapabilities().GL11_glClearIndex_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglClearIndex(c, function_pointer); - } - private static native void nglClearIndex(float c, long function_pointer); - public static void glEvalPoint1(int i) { long function_pointer = GLContext.getCapabilities().GL11_glEvalPoint1_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -859,6 +874,13 @@ } private static native void nglEvalCoord1f(float u, long function_pointer); + public static void glEvalCoord1d(double u) { + long function_pointer = GLContext.getCapabilities().GL11_glEvalCoord1d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglEvalCoord1d(u, function_pointer); + } + private static native void nglEvalCoord1d(double u, long function_pointer); + public static void glEvalCoord2f(float u, float v) { long function_pointer = GLContext.getCapabilities().GL11_glEvalCoord2f_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -866,6 +888,13 @@ } private static native void nglEvalCoord2f(float u, float v, long function_pointer); + public static void glEvalCoord2d(double u, double v) { + long function_pointer = GLContext.getCapabilities().GL11_glEvalCoord2d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglEvalCoord2d(u, v, function_pointer); + } + private static native void nglEvalCoord2d(double u, double v, long function_pointer); + public static void glEnableClientState(int cap) { long function_pointer = GLContext.getCapabilities().GL11_glEnableClientState_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1093,6 +1122,14 @@ } private static native void nglGetMapfv(int target, int query, FloatBuffer v, int v_position, long function_pointer); + public static void glGetMap(int target, int query, DoubleBuffer v) { + long function_pointer = GLContext.getCapabilities().GL11_glGetMapdv_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkBuffer(v, 256); + nglGetMapdv(target, query, v, v.position(), function_pointer); + } + private static native void nglGetMapdv(int target, int query, DoubleBuffer v, int v_position, long function_pointer); + public static void glGetMap(int target, int query, IntBuffer v) { long function_pointer = GLContext.getCapabilities().GL11_glGetMapiv_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1262,6 +1299,13 @@ BufferChecks.checkDirect(pointer); nglInterleavedArrays(format, stride, pointer, pointer.position(), function_pointer); } + public static void glInterleavedArrays(int format, int stride, DoubleBuffer pointer) { + long function_pointer = GLContext.getCapabilities().GL11_glInterleavedArrays_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pointer); + nglInterleavedArrays(format, stride, pointer, pointer.position() << 3, function_pointer); + } public static void glInterleavedArrays(int format, int stride, FloatBuffer pointer) { long function_pointer = GLContext.getCapabilities().GL11_glInterleavedArrays_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1345,6 +1389,13 @@ BufferChecks.checkBuffer(pixels, GLChecks.calculateImageStorage(pixels, format, type, 1, 1, 1)); nglGetTexImage(target, level, format, type, pixels, pixels.position(), function_pointer); } + public static void glGetTexImage(int target, int level, int format, int type, DoubleBuffer pixels) { + long function_pointer = GLContext.getCapabilities().GL11_glGetTexImage_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensurePackPBOdisabled(); + BufferChecks.checkBuffer(pixels, GLChecks.calculateImageStorage(pixels, format, type, 1, 1, 1)); + nglGetTexImage(target, level, format, type, pixels, pixels.position() << 3, function_pointer); + } public static void glGetTexImage(int target, int level, int format, int type, FloatBuffer pixels) { long function_pointer = GLContext.getCapabilities().GL11_glGetTexImage_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1391,6 +1442,14 @@ } private static native void nglGetTexGenfv(int coord, int pname, FloatBuffer params, int params_position, long function_pointer); + public static void glGetTexGen(int coord, int pname, DoubleBuffer params) { + long function_pointer = GLContext.getCapabilities().GL11_glGetTexGendv_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkBuffer(params, 4); + nglGetTexGendv(coord, pname, params, params.position(), function_pointer); + } + private static native void nglGetTexGendv(int coord, int pname, DoubleBuffer params, int params_position, long function_pointer); + public static void glGetTexEnv(int coord, int pname, IntBuffer params) { long function_pointer = GLContext.getCapabilities().GL11_glGetTexEnviv_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1476,6 +1535,13 @@ } private static native void nglMapGrid1f(int un, float u1, float u2, long function_pointer); + public static void glMapGrid1d(int un, double u1, double u2) { + long function_pointer = GLContext.getCapabilities().GL11_glMapGrid1d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglMapGrid1d(un, u1, u2, function_pointer); + } + private static native void nglMapGrid1d(int un, double u1, double u2, long function_pointer); + public static void glMapGrid2f(int un, float u1, float u2, int vn, float v1, float v2) { long function_pointer = GLContext.getCapabilities().GL11_glMapGrid2f_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1483,6 +1549,13 @@ } private static native void nglMapGrid2f(int un, float u1, float u2, int vn, float v1, float v2, long function_pointer); + public static void glMapGrid2d(int un, double u1, double u2, int vn, double v1, double v2) { + long function_pointer = GLContext.getCapabilities().GL11_glMapGrid2d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglMapGrid2d(un, u1, u2, vn, v1, v2, function_pointer); + } + private static native void nglMapGrid2d(int un, double u1, double u2, int vn, double v1, double v2, long function_pointer); + public static void glMap2f(int target, float u1, float u2, int ustride, int uorder, float v1, float v2, int vstride, int vorder, FloatBuffer points) { long function_pointer = GLContext.getCapabilities().GL11_glMap2f_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1491,6 +1564,14 @@ } private static native void nglMap2f(int target, float u1, float u2, int ustride, int uorder, float v1, float v2, int vstride, int vorder, FloatBuffer points, int points_position, long function_pointer); + public static void glMap2d(int target, double u1, double u2, int ustride, int uorder, double v1, double v2, int vstride, int vorder, DoubleBuffer points) { + long function_pointer = GLContext.getCapabilities().GL11_glMap2d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(points); + nglMap2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points, points.position(), function_pointer); + } + private static native void nglMap2d(int target, double u1, double u2, int ustride, int uorder, double v1, double v2, int vstride, int vorder, DoubleBuffer points, int points_position, long function_pointer); + public static void glMap1f(int target, float u1, float u2, int stride, int order, FloatBuffer points) { long function_pointer = GLContext.getCapabilities().GL11_glMap1f_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1499,6 +1580,14 @@ } private static native void nglMap1f(int target, float u1, float u2, int stride, int order, FloatBuffer points, int points_position, long function_pointer); + public static void glMap1d(int target, double u1, double u2, int stride, int order, DoubleBuffer points) { + long function_pointer = GLContext.getCapabilities().GL11_glMap1d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkDirect(points); + nglMap1d(target, u1, u2, stride, order, points, points.position(), function_pointer); + } + private static native void nglMap1d(int target, double u1, double u2, int stride, int order, DoubleBuffer points, int points_position, long function_pointer); + public static void glLogicOp(int opcode) { long function_pointer = GLContext.getCapabilities().GL11_glLogicOp_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1521,6 +1610,14 @@ } private static native void nglLoadMatrixf(FloatBuffer m, int m_position, long function_pointer); + public static void glLoadMatrix(DoubleBuffer m) { + long function_pointer = GLContext.getCapabilities().GL11_glLoadMatrixd_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkBuffer(m, 16); + nglLoadMatrixd(m, m.position(), function_pointer); + } + private static native void nglLoadMatrixd(DoubleBuffer m, int m_position, long function_pointer); + public static void glLoadIdentity() { long function_pointer = GLContext.getCapabilities().GL11_glLoadIdentity_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1766,6 +1863,14 @@ GLChecks.getReferences().GL11_glNormalPointer_pointer = pointer; nglNormalPointer(GL11.GL_BYTE, stride, pointer, pointer.position(), function_pointer); } + public static void glNormalPointer(int stride, DoubleBuffer pointer) { + long function_pointer = GLContext.getCapabilities().GL11_glNormalPointer_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pointer); + GLChecks.getReferences().GL11_glNormalPointer_pointer = pointer; + nglNormalPointer(GL11.GL_DOUBLE, stride, pointer, pointer.position() << 3, function_pointer); + } public static void glNormalPointer(int stride, FloatBuffer pointer) { long function_pointer = GLContext.getCapabilities().GL11_glNormalPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1805,6 +1910,13 @@ } private static native void nglNormal3f(float nx, float ny, float nz, long function_pointer); + public static void glNormal3d(double nx, double ny, double nz) { + long function_pointer = GLContext.getCapabilities().GL11_glNormal3d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglNormal3d(nx, ny, nz, function_pointer); + } + private static native void nglNormal3d(double nx, double ny, double nz, long function_pointer); + public static void glNormal3i(int nx, int ny, int nz) { long function_pointer = GLContext.getCapabilities().GL11_glNormal3i_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1834,6 +1946,14 @@ } private static native void nglMultMatrixf(FloatBuffer m, int m_position, long function_pointer); + public static void glMultMatrix(DoubleBuffer m) { + long function_pointer = GLContext.getCapabilities().GL11_glMultMatrixd_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + BufferChecks.checkBuffer(m, 16); + nglMultMatrixd(m, m.position(), function_pointer); + } + private static native void nglMultMatrixd(DoubleBuffer m, int m_position, long function_pointer); + public static void glShadeModel(int mode) { long function_pointer = GLContext.getCapabilities().GL11_glShadeModel_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1864,6 +1984,13 @@ } private static native void nglScalef(float x, float y, float z, long function_pointer); + public static void glScaled(double x, double y, double z) { + long function_pointer = GLContext.getCapabilities().GL11_glScaled_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglScaled(x, y, z, function_pointer); + } + private static native void nglScaled(double x, double y, double z, long function_pointer); + public static void glRotatef(float angle, float x, float y, float z) { long function_pointer = GLContext.getCapabilities().GL11_glRotatef_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1886,6 +2013,13 @@ } private static native void nglRectf(float x1, float y1, float x2, float y2, long function_pointer); + public static void glRectd(double x1, double y1, double x2, double y2) { + long function_pointer = GLContext.getCapabilities().GL11_glRectd_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglRectd(x1, y1, x2, y2, function_pointer); + } + private static native void nglRectd(double x1, double y1, double x2, double y2, long function_pointer); + public static void glRecti(int x1, int y1, int x2, int y2) { long function_pointer = GLContext.getCapabilities().GL11_glRecti_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1900,6 +2034,13 @@ BufferChecks.checkBuffer(pixels, GLChecks.calculateImageStorage(pixels, format, type, width, height, 1)); nglReadPixels(x, y, width, height, format, type, pixels, pixels.position(), function_pointer); } + public static void glReadPixels(int x, int y, int width, int height, int format, int type, DoubleBuffer pixels) { + long function_pointer = GLContext.getCapabilities().GL11_glReadPixels_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensurePackPBOdisabled(); + BufferChecks.checkBuffer(pixels, GLChecks.calculateImageStorage(pixels, format, type, width, height, 1)); + nglReadPixels(x, y, width, height, format, type, pixels, pixels.position() << 3, function_pointer); + } public static void glReadPixels(int x, int y, int width, int height, int format, int type, FloatBuffer pixels) { long function_pointer = GLContext.getCapabilities().GL11_glReadPixels_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1944,6 +2085,13 @@ } private static native void nglRasterPos2f(float x, float y, long function_pointer); + public static void glRasterPos2d(double x, double y) { + long function_pointer = GLContext.getCapabilities().GL11_glRasterPos2d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglRasterPos2d(x, y, function_pointer); + } + private static native void nglRasterPos2d(double x, double y, long function_pointer); + public static void glRasterPos2i(int x, int y) { long function_pointer = GLContext.getCapabilities().GL11_glRasterPos2i_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1958,6 +2106,13 @@ } private static native void nglRasterPos3f(float x, float y, float z, long function_pointer); + public static void glRasterPos3d(double x, double y, double z) { + long function_pointer = GLContext.getCapabilities().GL11_glRasterPos3d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglRasterPos3d(x, y, z, function_pointer); + } + private static native void nglRasterPos3d(double x, double y, double z, long function_pointer); + public static void glRasterPos3i(int x, int y, int z) { long function_pointer = GLContext.getCapabilities().GL11_glRasterPos3i_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -1972,6 +2127,13 @@ } private static native void nglRasterPos4f(float x, float y, float z, float w, long function_pointer); + public static void glRasterPos4d(double x, double y, double z, double w) { + long function_pointer = GLContext.getCapabilities().GL11_glRasterPos4d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglRasterPos4d(x, y, z, w, function_pointer); + } + private static native void nglRasterPos4d(double x, double y, double z, double w, long function_pointer); + public static void glRasterPos4i(int x, int y, int z, int w) { long function_pointer = GLContext.getCapabilities().GL11_glRasterPos4i_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -2044,6 +2206,14 @@ } private static native void nglStencilFunc(int func, int ref, int mask, long function_pointer); + public static void glVertexPointer(int size, int stride, DoubleBuffer pointer) { + long function_pointer = GLContext.getCapabilities().GL11_glVertexPointer_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + GLChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pointer); + GLChecks.getReferences().GL11_glVertexPointer_pointer = pointer; + nglVertexPointer(size, GL11.GL_DOUBLE, stride, pointer, pointer.position() << 3, function_pointer); + } public static void glVertexPointer(int size, int stride, FloatBuffer pointer) { long function_pointer = GLContext.getCapabilities().GL11_glVertexPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -2076,6 +2246,13 @@ } private static native void nglVertex2f(float x, float y, long function_pointer); + public static void glVertex2d(double x, double y) { + long function_pointer = GLContext.getCapabilities().GL11_glVertex2d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertex2d(x, y, function_pointer); + } + private static native void nglVertex2d(double x, double y, long function_pointer); + public static void glVertex2i(int x, int y) { long function_pointer = GLContext.getCapabilities().GL11_glVertex2i_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -2090,6 +2267,13 @@ } private static native void nglVertex3f(float x, float y, float z, long function_pointer); + public static void glVertex3d(double x, double y, double z) { + long function_pointer = GLContext.getCapabilities().GL11_glVertex3d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertex3d(x, y, z, function_pointer); + } + private static native void nglVertex3d(double x, double y, double z, long function_pointer); + public static void glVertex3i(int x, int y, int z) { long function_pointer = GLContext.getCapabilities().GL11_glVertex3i_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -2104,6 +2288,13 @@ } private static native void nglVertex4f(float x, float y, float z, float w, long function_pointer); + public static void glVertex4d(double x, double y, double z, double w) { + long function_pointer = GLContext.getCapabilities().GL11_glVertex4d_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertex4d(x, y, z, w, function_pointer); + } + private static native void nglVertex4d(double x, double y, double z, double w, long function_pointer); + public static void glVertex4i(int x, int y, int z, int w) { long function_pointer = GLContext.getCapabilities().GL11_glVertex4i_pointer; BufferChecks.checkFunctionAddress(function_pointer); @@ -2118,6 +2309,13 @@ } private static native void nglTranslatef(float x, float y, float z, long function_pointer); + public static void glTranslated(double x, double y, double z) { + long function_pointer = GLContext.getCapabilities().GL11_glTranslated_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglTranslated(x, y, z, function_pointer); + } + private static native void nglTranslated(double x, double y, double z, long function_pointer); + public... [truncated message content] |
|
From: Elias N. <eli...@us...> - 2005-11-02 09:28:52
|
Update of /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/openal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11245/src/generated/org/lwjgl/openal Modified Files: AL10.java Log Message: Added support for doubles (ALdouble and GLdouble) Index: AL10.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/openal/AL10.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AL10.java 29 Sep 2005 17:13:36 -0000 1.1 +++ AL10.java 2 Nov 2005 09:28:09 -0000 1.2 @@ -425,6 +425,24 @@ * in specifying pName. The amount of memory required in the destination * depends on the actual state requested. * </p> + * @return double state described by pname will be returned. + */ + public static double alGetDouble(int pname) { + double __result = nalGetDouble(pname); + Util.checkALError(); + return __result; + } + private static native double nalGetDouble(int pname); + + /** + * Like OpenGL, AL uses a simplified interface for querying global state. + * Legal values are e.g. AL_DOPPLER_FACTOR, AL_DOPPLER_VELOCITY, + * AL_DISTANCE_MODEL. + * <p> + * <code>null</code> destinations are quietly ignored. AL_INVALID_ENUM is the response to errors + * in specifying pName. The amount of memory required in the destination + * depends on the actual state requested. + * </p> * @param pname state to be queried * @param data Buffer to place the integers in */ @@ -455,6 +473,25 @@ private static native void nalGetFloatv(int pname, FloatBuffer data, int data_position); /** + * Like OpenGL, AL uses a simplified interface for querying global state. + * Legal values are e.g. AL_DOPPLER_FACTOR, AL_DOPPLER_VELOCITY, + * AL_DISTANCE_MODEL. + * <p> + * <code>null</code> destinations are quietly ignored. AL_INVALID_ENUM is the response to errors + * in specifying pName. The amount of memory required in the destination + * depends on the actual state requested. + * </p> + * @param pname state to be queried + * @param data Buffer to place the doubles in + */ + public static void alGetDouble(int pname, DoubleBuffer data) { + BufferChecks.checkBuffer(data, 1); + nalGetDoublev(pname, data, data.position()); + Util.checkALError(); + } + private static native void nalGetDoublev(int pname, DoubleBuffer data, int data_position); + + /** * The application can retrieve state information global to the current AL Context. * GetString will return a pointer to a constant string. Valid values for param are * VERSION, RENDERER, VENDOR, and EXTENSIONS, as well as the error codes |
Update of /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11245/src/templates/org/lwjgl/opengl Modified Files: ARB_buffer_object.java ARB_imaging.java ARB_multitexture.java ARB_program.java ARB_texture_compression.java ARB_vertex_blend.java ARB_vertex_program.java ARB_window_pos.java ATI_vertex_array_object.java ATI_vertex_streams.java EXT_fog_coord.java EXT_paletted_texture.java EXT_secondary_color.java EXT_vertex_shader.java GL11.java GL12.java GL13.java GL14.java GL15.java GL20.java NV_fragment_program.java NV_pixel_data_range.java NV_vertex_array_range.java NV_vertex_program.java Log Message: Added support for doubles (ALdouble and GLdouble) Index: ARB_window_pos.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_window_pos.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARB_window_pos.java 15 Feb 2005 17:05:58 -0000 1.2 +++ ARB_window_pos.java 2 Nov 2005 09:28:12 -0000 1.3 @@ -34,6 +34,8 @@ public interface ARB_window_pos { void glWindowPos2fARB(float x, float y); + + void glWindowPos2dARB(double x, double y); void glWindowPos2iARB(int x, int y); @@ -41,6 +43,8 @@ void glWindowPos3fARB(float x, float y, float z); + void glWindowPos3dARB(double x, double y, double z); + void glWindowPos3iARB(int x, int y, int z); void glWindowPos3sARB(short x, short y, short z); Index: EXT_secondary_color.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/EXT_secondary_color.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- EXT_secondary_color.java 28 Oct 2005 15:43:51 -0000 1.5 +++ EXT_secondary_color.java 2 Nov 2005 09:28:12 -0000 1.6 @@ -47,6 +47,8 @@ void glSecondaryColor3bEXT(byte red, byte green, byte blue); void glSecondaryColor3fEXT(float red, float green, float blue); + + void glSecondaryColor3dEXT(double red, double green, double blue); void glSecondaryColor3ubEXT(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue); @@ -58,5 +60,6 @@ @GLbyte @GLubyte @GLfloat + @GLdouble Buffer pPointer); } Index: EXT_vertex_shader.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_shader.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- EXT_vertex_shader.java 28 Oct 2005 15:43:51 -0000 1.5 +++ EXT_vertex_shader.java 2 Nov 2005 09:28:12 -0000 1.6 @@ -31,11 +31,7 @@ */ package org.lwjgl.opengl; -import java.nio.Buffer; -import java.nio.ByteBuffer; -import java.nio.FloatBuffer; -import java.nio.IntBuffer; -import java.nio.ShortBuffer; +import java.nio.*; import org.lwjgl.util.generator.*; @@ -187,6 +183,7 @@ @GLint @GLuint @GLfloat + @GLdouble Buffer pAddr); void glSetLocalConstantEXT(@GLuint int id, @AutoType("pAddr") @GLenum int type, @@ -199,6 +196,7 @@ @GLint @GLuint @GLfloat + @GLdouble Buffer pAddr); @StripPostfix("pAddr") @@ -209,6 +207,8 @@ void glVariantivEXT(@GLuint int id, @Check("4") @Const IntBuffer pAddr); @StripPostfix("pAddr") void glVariantfvEXT(@GLuint int id, @Check("4") @Const FloatBuffer pAddr); + @StripPostfix("pAddr") + void glVariantdvEXT(@GLuint int id, @Check("4") @Const DoubleBuffer pAddr); @StripPostfix("pAddr") void glVariantubvEXT(@GLuint int id, @Check("4") @Const @GLubyte ByteBuffer pAddr); @@ -229,6 +229,7 @@ @GLushort @GLuint @GLfloat + @GLdouble Buffer pAddr); void glEnableVariantClientStateEXT(@GLuint int id); Index: GL13.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL13.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GL13.java 20 Feb 2005 20:53:49 -0000 1.3 +++ GL13.java 2 Nov 2005 09:28:12 -0000 1.4 @@ -33,6 +33,7 @@ import java.nio.Buffer; import java.nio.FloatBuffer; +import java.nio.DoubleBuffer; import org.lwjgl.util.generator.*; @@ -158,6 +159,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data); void glCompressedTexImage2D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, int border, @GLsizei int imageSize, @@ -168,6 +170,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data); void glCompressedTexImage3D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLsizei int imageSize, @@ -178,6 +181,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data); void glCompressedTexSubImage1D(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLsizei int imageSize, @@ -188,6 +192,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data); void glCompressedTexSubImage2D(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLsizei int imageSize, @@ -198,6 +203,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data); void glCompressedTexSubImage3D(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLsizei int imageSize, @@ -208,6 +214,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data); // TODO: check buffer size valid @@ -221,17 +228,31 @@ void glMultiTexCoord1f(@GLenum int target, float s); + void glMultiTexCoord1d(@GLenum int target, double s); + void glMultiTexCoord2f(@GLenum int target, float s, float t); + + void glMultiTexCoord2d(@GLenum int target, double s, double t); void glMultiTexCoord3f(@GLenum int target, float s, float t, float r); + + void glMultiTexCoord3d(@GLenum int target, double s, double t, double r); void glMultiTexCoord4f(@GLenum int target, float s, float t, float r, float q); + + void glMultiTexCoord4d(@GLenum int target, double s, double t, double r, double q); @StripPostfix("m") void glLoadTransposeMatrixf(@Check("16") @Const FloatBuffer m); + + @StripPostfix("m") + void glLoadTransposeMatrixd(@Check("16") @Const DoubleBuffer m); @StripPostfix("m") void glMultTransposeMatrixf(@Check("16") @Const FloatBuffer m); + + @StripPostfix("m") + void glMultTransposeMatrixd(@Check("16") @Const DoubleBuffer m); void glSampleCoverage(@GLclampf float value, boolean invert); } Index: ARB_multitexture.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_multitexture.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ARB_multitexture.java 20 Feb 2005 20:53:49 -0000 1.3 +++ ARB_multitexture.java 2 Nov 2005 09:28:12 -0000 1.4 @@ -75,18 +75,24 @@ void glActiveTextureARB(@GLenum int texture); void glMultiTexCoord1fARB(@GLenum int target, float s); + + void glMultiTexCoord1dARB(@GLenum int target, double s); void glMultiTexCoord1iARB(@GLenum int target, int s); void glMultiTexCoord1sARB(@GLenum int target, short s); void glMultiTexCoord2fARB(@GLenum int target, float s, float t); + + void glMultiTexCoord2dARB(@GLenum int target, double s, double t); void glMultiTexCoord2iARB(@GLenum int target, int s, int t); void glMultiTexCoord2sARB(@GLenum int target, short s, short t); void glMultiTexCoord3fARB(@GLenum int target, float s, float t, float r); + + void glMultiTexCoord3dARB(@GLenum int target, double s, double t, double r); void glMultiTexCoord3iARB(@GLenum int target, int s, int t, int r); @@ -94,6 +100,8 @@ void glMultiTexCoord4fARB(@GLenum int target, float s, float t, float r, float q); + void glMultiTexCoord4dARB(@GLenum int target, double s, double t, double r, double q); + void glMultiTexCoord4iARB(@GLenum int target, int s, int t, int r, int q); void glMultiTexCoord4sARB(@GLenum int target, short s, short t, short r, short q); Index: ARB_buffer_object.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ARB_buffer_object.java 21 Mar 2005 08:27:44 -0000 1.5 +++ ARB_buffer_object.java 2 Nov 2005 09:28:12 -0000 1.6 @@ -80,6 +80,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data, @GLenum int usage); void glBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size, @@ -89,6 +90,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data); void glGetBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size, @@ -97,6 +99,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data); /** Index: ARB_vertex_program.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_program.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ARB_vertex_program.java 21 Mar 2005 08:27:45 -0000 1.4 +++ ARB_vertex_program.java 2 Nov 2005 09:28:12 -0000 1.5 @@ -34,6 +34,7 @@ import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.FloatBuffer; +import java.nio.DoubleBuffer; import java.nio.IntBuffer; import org.lwjgl.util.generator.*; @@ -91,18 +92,26 @@ void glVertexAttrib1fARB(@GLuint int index, float x); + void glVertexAttrib1dARB(@GLuint int index, double x); + void glVertexAttrib2sARB(@GLuint int index, short x, short y); void glVertexAttrib2fARB(@GLuint int index, float x, float y); + void glVertexAttrib2dARB(@GLuint int index, double x, double y); + void glVertexAttrib3sARB(@GLuint int index, short x, short y, short z); void glVertexAttrib3fARB(@GLuint int index, float x, float y, float z); + + void glVertexAttrib3dARB(@GLuint int index, double x, double y, double z); void glVertexAttrib4sARB(@GLuint int index, short x, short y, short z, short w); void glVertexAttrib4fARB(@GLuint int index, float x, float y, float z, float w); + void glVertexAttrib4dARB(@GLuint int index, double x, double y, double z, double w); + void glVertexAttrib4NubARB(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w); void glVertexAttribPointerARB(@GLuint int index, int size, @AutoType("buffer") @GLenum int type, boolean normalized, @GLsizei int stride, @@ -117,6 +126,7 @@ @GLint @GLuint @GLfloat + @GLdouble Buffer buffer); void glEnableVertexAttribArrayARB(@GLuint int index); @@ -126,6 +136,8 @@ @StripPostfix("params") void glGetVertexAttribfvARB(@GLuint int index, @GLenum int pname, @Check FloatBuffer params); @StripPostfix("params") + void glGetVertexAttribdvARB(@GLuint int index, @GLenum int pname, @Check DoubleBuffer params); + @StripPostfix("params") void glGetVertexAttribivARB(@GLuint int index, @GLenum int pname, @Check IntBuffer params); @StripPostfix("result") Index: ATI_vertex_array_object.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ATI_vertex_array_object.java 20 Feb 2005 20:53:49 -0000 1.3 +++ ATI_vertex_array_object.java 2 Nov 2005 09:28:12 -0000 1.4 @@ -54,6 +54,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pPointer, @GLenum int usage); boolean glIsObjectBufferATI(@GLuint int buffer); @@ -64,6 +65,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pPointer, @GLenum int preserve); @StripPostfix("params") Index: ARB_vertex_blend.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_blend.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ARB_vertex_blend.java 21 Mar 2005 08:27:45 -0000 1.4 +++ ARB_vertex_blend.java 2 Nov 2005 09:28:12 -0000 1.5 @@ -34,6 +34,7 @@ import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.FloatBuffer; +import java.nio.DoubleBuffer; import java.nio.IntBuffer; import java.nio.ShortBuffer; @@ -91,6 +92,8 @@ void glWeightivARB(@AutoSize("pWeights") int size, IntBuffer pWeights); @StripPostfix("pWeights") void glWeightfvARB(@AutoSize("pWeights") int size, FloatBuffer pWeights); + @StripPostfix("pWeights") + void glWeightdvARB(@AutoSize("pWeights") int size, DoubleBuffer pWeights); @StripPostfix("pWeights") void glWeightubvARB(@AutoSize("pWeights") int size, @GLubyte ByteBuffer pWeights); @@ -111,6 +114,7 @@ @GLint @GLuint @GLfloat + @GLdouble Buffer pPointer); void glVertexBlendARB(int count); Index: GL15.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL15.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- GL15.java 21 Mar 2005 08:27:45 -0000 1.4 +++ GL15.java 2 Nov 2005 09:28:12 -0000 1.5 @@ -87,6 +87,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data, @GLenum int usage); void glBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size, @Check @@ -95,6 +96,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data); void glGetBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size, @@ -103,6 +105,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data); /** Index: ATI_vertex_streams.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_streams.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ATI_vertex_streams.java 20 Feb 2005 20:53:49 -0000 1.3 +++ ATI_vertex_streams.java 2 Nov 2005 09:28:12 -0000 1.4 @@ -46,6 +46,8 @@ int GL_VERTEX_STREAM7_ATI = 0x8774; void glVertexStream2fATI(@GLenum int stream, float x, float y); + + void glVertexStream2dATI(@GLenum int stream, double x, double y); void glVertexStream2iATI(@GLenum int stream, int x, int y); @@ -53,12 +55,16 @@ void glVertexStream3fATI(@GLenum int stream, float x, float y, float z); + void glVertexStream3dATI(@GLenum int stream, double x, double y, double z); + void glVertexStream3iATI(@GLenum int stream, int x, int y, int z); void glVertexStream3sATI(@GLenum int stream, short x, short y, short z); void glVertexStream4fATI(@GLenum int stream, float x, float y, float z, float w); + void glVertexStream4dATI(@GLenum int stream, double x, double y, double z, double w); + void glVertexStream4iATI(@GLenum int stream, int x, int y, int z, int w); void glVertexStream4sATI(@GLenum int stream, short x, short y, short z, short w); @@ -66,6 +72,8 @@ void glNormalStream3bATI(@GLenum int stream, byte x, byte y, byte z); void glNormalStream3fATI(@GLenum int stream, float x, float y, float z); + + void glNormalStream3dATI(@GLenum int stream, double x, double y, double z); void glNormalStream3iATI(@GLenum int stream, int x, int y, int z); Index: ARB_texture_compression.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ARB_texture_compression.java 20 Feb 2005 20:53:49 -0000 1.3 +++ ARB_texture_compression.java 2 Nov 2005 09:28:12 -0000 1.4 @@ -56,6 +56,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pData); void glCompressedTexImage2DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, int border, @GLsizei int imageSize, @@ -66,6 +67,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pData); void glCompressedTexImage3DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLsizei int imageSize, @@ -76,6 +78,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pData); void glCompressedTexSubImage1DARB(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLsizei int imageSize, @@ -86,6 +89,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pData); void glCompressedTexSubImage2DARB(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLsizei int imageSize, @@ -96,6 +100,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pData); void glCompressedTexSubImage3DARB(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLsizei int imageSize, @@ -106,6 +111,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pData); void glGetCompressedTexImageARB(@GLenum int target, int lod, @@ -115,5 +121,6 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pImg); } Index: GL11.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL11.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- GL11.java 6 Oct 2005 20:03:01 -0000 1.6 +++ GL11.java 2 Nov 2005 09:28:12 -0000 1.7 @@ -759,6 +759,7 @@ @BufferObject(BufferKind.ArrayVBO) @Const @GLfloat + @GLdouble @GLubyte @GLbyte Buffer pointer); @@ -767,21 +768,26 @@ void glColorMask(boolean red, boolean green, boolean blue, boolean alpha); void glColor3b(byte red, byte green, byte blue); void glColor3f(float red, float green, float blue); + void glColor3d(double red, double green, double blue); void glColor3ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue); void glColor4b(byte red, byte green, byte blue, byte alpha); void glColor4f(float red, float green, float blue, float alpha); + void glColor4d(double red, double green, double blue, double alpha); void glColor4ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue, @GLubyte byte alpha); void glClipPlane(@GLenum int plane, @Check("4") @Const DoubleBuffer equation); void glClearStencil(int s); - void glClearIndex(float c); + // This function is only used in indexed color mode +// void glClearIndex(float c); void glEvalPoint1(int i); void glEvalPoint2(int i, int j); void glEvalMesh1(@GLenum int mode, int i1, int i2); void glEvalMesh2(@GLenum int mode, int i1, int i2, int j1, int j2); void glEvalCoord1f(float u); + void glEvalCoord1d(double u); void glEvalCoord2f(float u, float v); + void glEvalCoord2d(double u, double v); void glEnableClientState(@GLenum int cap); void glDisableClientState(@GLenum int cap); void glEnable(@GLenum int cap); @@ -834,6 +840,8 @@ @StripPostfix("v") void glGetMapfv(@GLenum int target, @GLenum int query, @Check("256") FloatBuffer v); @StripPostfix("v") + void glGetMapdv(@GLenum int target, @GLenum int query, @Check("256") DoubleBuffer v); + @StripPostfix("v") void glGetMapiv(@GLenum int target, @GLenum int query, @Check("256") IntBuffer v); @StripPostfix("params") @@ -850,7 +858,7 @@ @StripPostfix("params") void glGetDoublev(@GLenum int pname, @Check("16") DoubleBuffer params); - + @StripPostfix("params") void glGetFloatv(@GLenum int pname, @Check("16") FloatBuffer params); @@ -867,7 +875,7 @@ @StripPostfix("params") void glFogfv(@GLenum int pname, @Check("4") @Const FloatBuffer params); - + @StripPostfix("params") void glFogiv(@GLenum int pname, @Check("4") @Const IntBuffer params); @@ -886,6 +894,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pointer); void glInitNames(); @@ -910,6 +919,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pixels); @StripPostfix("params") @@ -917,6 +927,9 @@ @StripPostfix("params") void glGetTexGenfv(@GLenum int coord, @GLenum int pname, @Check("4") FloatBuffer params); + + @StripPostfix("params") + void glGetTexGendv(@GLenum int coord, @GLenum int pname, @Check("4") DoubleBuffer params); @StripPostfix("params") void glGetTexEnviv(@GLenum int coord, @GLenum int pname, @Check("4") IntBuffer params); @@ -939,18 +952,25 @@ void glMaterialiv(@GLenum int face, @GLenum int pname, @Check("4") @Const IntBuffer params); void glMapGrid1f(int un, float u1, float u2); + void glMapGrid1d(int un, double u1, double u2); void glMapGrid2f(int un, float u1, float u2, int vn, float v1, float v2); + void glMapGrid2d(int un, double u1, double u2, int vn, double v1, double v2); // TODO: check buffer size valid void glMap2f(@GLenum int target, float u1, float u2, int ustride, int uorder, float v1, float v2, int vstride, int vorder, @Check @Const FloatBuffer points); + void glMap2d(@GLenum int target, double u1, double u2, int ustride, int uorder, double v1, double v2, int vstride, int vorder, @Check @Const DoubleBuffer points); // TODO: check buffer size valid void glMap1f(@GLenum int target, float u1, float u2, int stride, int order, @Check @Const FloatBuffer points); + void glMap1d(@GLenum int target, double u1, double u2, int stride, int order, @Check @Const DoubleBuffer points); void glLogicOp(@GLenum int opcode); void glLoadName(@GLuint int name); @StripPostfix("m") void glLoadMatrixf(@Check("16") @Const FloatBuffer m); + + @StripPostfix("m") + void glLoadMatrixd(@Check("16") @Const DoubleBuffer m); void glLoadIdentity(); void glListBase(@GLuint int base); @@ -1003,16 +1023,21 @@ @GLint @GLbyte @GLfloat + @GLdouble Buffer pointer); void glNormal3b(byte nx, byte ny, byte nz); void glNormal3f(float nx, float ny, float nz); + void glNormal3d(double nx, double ny, double nz); void glNormal3i(int nx, int ny, int nz); void glNewList(@GLuint int list, @GLenum int mode); void glEndList(); @StripPostfix("m") void glMultMatrixf(@Check("16") @Const FloatBuffer m); + + @StripPostfix("m") + void glMultMatrixd(@Check("16") @Const DoubleBuffer m); void glShadeModel(@GLenum int mode); @@ -1020,9 +1045,11 @@ void glScissor(int x, int y, @GLsizei int width, @GLsizei int height); void glScalef(float x, float y, float z); + void glScaled(double x, double y, double z); void glRotatef(float angle, float x, float y, float z); int glRenderMode(@GLenum int mode); void glRectf(float x1, float y1, float x2, float y2); + void glRectd(double x1, double y1, double x2, double y2); void glRecti(int x1, int y1, int x2, int y2); void glReadPixels(int x, int y, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type, @@ -1032,14 +1059,18 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pixels); void glReadBuffer(@GLenum int mode); void glRasterPos2f(float x, float y); + void glRasterPos2d(double x, double y); void glRasterPos2i(int x, int y); void glRasterPos3f(float x, float y, float z); + void glRasterPos3d(double x, double y, double z); void glRasterPos3i(int x, int y, int z); void glRasterPos4f(float x, float y, float z, float w); + void glRasterPos4d(double x, double y, double z, double w); void glRasterPos4i(int x, int y, int z, int w); void glPushName(@GLuint int name); void glPopName(); @@ -1063,15 +1094,20 @@ @Const @GLint @GLfloat + @GLdouble Buffer pointer); void glVertex2f(float x, float y); + void glVertex2d(double x, double y); void glVertex2i(int x, int y); void glVertex3f(float x, float y, float z); + void glVertex3d(double x, double y, double z); void glVertex3i(int x, int y, int z); void glVertex4f(float x, float y, float z, float w); + void glVertex4d(double x, double y, double z, double w); void glVertex4i(int x, int y, int z, int w); void glTranslatef(float x, float y, float z); + void glTranslated(double x, double y, double z); void glTexImage1D(@GLenum int target, int level, int internalformat, @GLsizei int width, int border, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) @@ -1081,6 +1117,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pixels); void glTexImage2D(@GLenum int target, int level, int internalformat, int width, int height, int border, @GLenum int format, @GLenum int type, @@ -1091,6 +1128,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pixels); void glTexSubImage1D(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) @@ -1100,6 +1138,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pixels); void glTexSubImage2D(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) @@ -1109,6 +1148,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pixels); void glTexParameterf(@GLenum int target, @GLenum int pname, float param); @@ -1120,10 +1160,14 @@ void glTexParameteriv(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer param); void glTexGenf(@GLenum int coord, @GLenum int pname, float param); + void glTexGend(@GLenum int coord, @GLenum int pname, double param); @StripPostfix("params") void glTexGenfv(@GLenum int coord, @GLenum int pname, @Check("4") @Const FloatBuffer params); + @StripPostfix("params") + void glTexGendv(@GLenum int coord, @GLenum int pname, @Check("4") @Const DoubleBuffer params); + void glTexGeni(@GLenum int coord, @GLenum int pname, int param); @StripPostfix("params") @@ -1144,12 +1188,17 @@ @Check @Const @GLfloat + @GLdouble Buffer pointer); void glTexCoord1f(float s); + void glTexCoord1d(double s); void glTexCoord2f(float s, float t); + void glTexCoord2d(double s, double t); void glTexCoord3f(float s, float t, float r); + void glTexCoord3d(double s, double t, double r); void glTexCoord4f(float s, float t, float r, float q); + void glTexCoord4d(double s, double t, double r, double q); void glStencilOp(@GLenum int fail, @GLenum int zfail, @GLenum int zpass); void glStencilMask(@GLuint int mask); void glViewport(int x, int y, @GLsizei int width, @GLsizei int height); Index: ARB_imaging.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_imaging.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ARB_imaging.java 28 Oct 2005 15:43:51 -0000 1.5 +++ ARB_imaging.java 2 Nov 2005 09:28:12 -0000 1.6 @@ -130,6 +130,7 @@ @Const @GLbyte @GLfloat + @GLdouble Buffer data); void glColorSubTable(@GLenum int target, @GLsizei int start, @GLsizei int count, @GLenum int format, @GLenum int type, @@ -138,6 +139,7 @@ @Const @GLbyte @GLfloat + @GLdouble Buffer data); @StripPostfix("params") @@ -154,6 +156,7 @@ @Check("256") @GLbyte @GLfloat + @GLdouble Buffer data); @StripPostfix("params") @@ -176,6 +179,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer values); @StripPostfix("params") @@ -194,6 +198,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer values); @StripPostfix("params") @@ -209,6 +214,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer image); void glConvolutionFilter2D(@GLenum int target, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type, @@ -242,6 +248,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer image); @StripPostfix("params") @@ -258,6 +265,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer row, @BufferObject(BufferKind.UnpackPBO) @Check @@ -266,6 +274,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer column); // TODO: check buffer size valid @@ -276,20 +285,21 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer row, @BufferObject(BufferKind.PackPBO) @Check @GLbyte @GLshort @GLint - @GLfloat + @GLdouble Buffer column, @BufferObject(BufferKind.PackPBO) @Check @GLbyte @GLshort @GLint - @GLfloat + @GLdouble Buffer span); } Index: GL12.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL12.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- GL12.java 21 Mar 2005 08:27:45 -0000 1.4 +++ GL12.java 2 Nov 2005 09:28:12 -0000 1.5 @@ -105,6 +105,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pixels); void glTexSubImage3D(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLenum int type, @@ -115,6 +116,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pixels); void glCopyTexSubImage3D(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, @GLsizei int width, @GLsizei int height); } Index: GL14.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL14.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- GL14.java 28 Oct 2005 15:43:51 -0000 1.5 +++ GL14.java 2 Nov 2005 09:28:12 -0000 1.6 @@ -91,6 +91,8 @@ void glBlendColor(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha); void glFogCoordf(float coord); + + void glFogCoordd(double coord); void glFogCoordPointer(@AutoType("data") @GLenum int type, @GLsizei int stride, @CachedReference @@ -98,6 +100,7 @@ @Check @Const @GLfloat + @GLdouble Buffer data); @Code( " if (piFirst.remaining() != piCount.remaining()) {\n" + @@ -116,6 +119,7 @@ void glSecondaryColor3b(byte red, byte green, byte blue); void glSecondaryColor3f(float red, float green, float blue); + void glSecondaryColor3d(double red, double green, double blue); void glSecondaryColor3ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue); void glSecondaryColorPointer(int size, @AutoType("data") @GLenum int type, @GLsizei int stride, @@ -125,12 +129,15 @@ @GLbyte @GLubyte @GLfloat + @GLdouble Buffer data); void glBlendFuncSeparate(@GLenum int sfactorRGB, @GLenum int dfactorRGB, @GLenum int sfactorAlpha, @GLenum int dfactorAlpha); void glWindowPos2f(float x, float y); + void glWindowPos2d(double x, double y); void glWindowPos2i(int x, int y); void glWindowPos3f(float x, float y, float z); + void glWindowPos3d(double x, double y, double z); void glWindowPos3i(int x, int y, int z); } Index: NV_vertex_program.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_program.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- NV_vertex_program.java 21 Mar 2005 08:27:45 -0000 1.4 +++ NV_vertex_program.java 2 Nov 2005 09:28:12 -0000 1.5 @@ -31,12 +31,7 @@ */ package org.lwjgl.opengl; -import java.nio.Buffer; -import java.nio.BufferOverflowException; -import java.nio.ByteBuffer; -import java.nio.FloatBuffer; -import java.nio.IntBuffer; -import java.nio.ShortBuffer; +import java.nio.*; import org.lwjgl.util.generator.*; @@ -200,10 +195,17 @@ void glGetProgramParameterfvNV(@GLenum int target, @GLuint int index, @GLenum int parameterName, @Check("4") FloatBuffer params); @StripPostfix("params") + void glGetProgramParameterdvNV(@GLenum int target, @GLuint int index, @GLenum int parameterName, @Check("4") DoubleBuffer params); + + @StripPostfix("params") void glGetTrackMatrixivNV(@GLenum int target, @GLuint int address, @GLenum int parameterName, @Check("4") IntBuffer params); @StripPostfix("params") void glGetVertexAttribfvNV(@GLuint int index, @GLenum int parameterName, @Check("4") FloatBuffer params); + + @StripPostfix("params") + void glGetVertexAttribdvNV(@GLuint int index, @GLenum int parameterName, @Check("4") DoubleBuffer params); + @StripPostfix("params") void glGetVertexAttribivNV(@GLuint int index, @GLenum int parameterName, @Check("4") IntBuffer params); @@ -211,11 +213,18 @@ void glGetVertexAttribPointervNV(@GLuint int index, @GLenum int parameterName, @Result @GLvoid ByteBuffer pointer); void glProgramParameter4fNV(@GLenum int target, @GLuint int index, float x, float y, float z, float w); + + void glProgramParameter4dNV(@GLenum int target, @GLuint int index, double x, double y, double z, double w); @StripPostfix("params") void glProgramParameters4fvNV(@GLenum int target, @GLuint int index, @AutoSize(value="params", expression=" >> 2") @GLuint int count, @Const FloatBuffer params); + + @StripPostfix("params") + void glProgramParameters4dvNV(@GLenum int target, @GLuint int index, @AutoSize(value="params", expression=" >> 2") @GLuint int count, + @Const + DoubleBuffer params); void glTrackMatrixNV(@GLenum int target, @GLuint int address, @GLenum int matrix, @GLenum int transform); @@ -231,23 +240,32 @@ @GLint @GLuint @GLfloat + @GLdouble Buffer buffer); void glVertexAttrib1sNV(@GLuint int index, short x); void glVertexAttrib1fNV(@GLuint int index, float x); + + void glVertexAttrib1dNV(@GLuint int index, double x); void glVertexAttrib2sNV(@GLuint int index, short x, short y); void glVertexAttrib2fNV(@GLuint int index, float x, float y); + + void glVertexAttrib2dNV(@GLuint int index, double x, double y); void glVertexAttrib3sNV(@GLuint int index, short x, short y, short z); void glVertexAttrib3fNV(@GLuint int index, float x, float y, float z); + + void glVertexAttrib3dNV(@GLuint int index, double x, double y, double z); void glVertexAttrib4sNV(@GLuint int index, short x, short y, short z, short w); void glVertexAttrib4fNV(@GLuint int index, float x, float y, float z, float w); + + void glVertexAttrib4dNV(@GLuint int index, double x, double y, double z, double w); void glVertexAttrib4ubNV(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w); @@ -255,19 +273,27 @@ void glVertexAttribs1svNV(@GLuint int index, @AutoSize("v") @GLsizei int n, @Const ShortBuffer v); @StripPostfix("v") void glVertexAttribs1fvNV(@GLuint int index, @AutoSize("v") @GLsizei int n, @Const FloatBuffer v); + @StripPostfix("v") + void glVertexAttribs1dvNV(@GLuint int index, @AutoSize("v") @GLsizei int n, @Const DoubleBuffer v); @StripPostfix("v") void glVertexAttribs2svNV(@GLuint int index, @AutoSize(value="v", expression=" >> 1") @GLsizei int n, @Const ShortBuffer v); @StripPostfix("v") void glVertexAttribs2fvNV(@GLuint int index, @AutoSize(value="v", expression=" >> 1") @GLsizei int n, @Const FloatBuffer v); + @StripPostfix("v") + void glVertexAttribs2dvNV(@GLuint int index, @AutoSize(value="v", expression=" >> 1") @GLsizei int n, @Const DoubleBuffer v); @StripPostfix("v") void glVertexAttribs3svNV(@GLuint int index, @AutoSize(value="v", expression=" / 3") @GLsizei int n, @Const ShortBuffer v); @StripPostfix("v") void glVertexAttribs3fvNV(@GLuint int index, @AutoSize(value="v", expression=" / 3") @GLsizei int n, @Const FloatBuffer v); + @StripPostfix("v") + void glVertexAttribs3dvNV(@GLuint int index, @AutoSize(value="v", expression=" / 3") @GLsizei int n, @Const DoubleBuffer v); @StripPostfix("v") void glVertexAttribs4svNV(@GLuint int index, @AutoSize(value="v", expression=" >> 2") @GLsizei int n, @Const ShortBuffer v); @StripPostfix("v") void glVertexAttribs4fvNV(@GLuint int index, @AutoSize(value="v", expression=" >> 2") @GLsizei int n, @Const FloatBuffer v); + @StripPostfix("v") + void glVertexAttribs4dvNV(@GLuint int index, @AutoSize(value="v", expression=" >> 2") @GLsizei int n, @Const DoubleBuffer v); } Index: ARB_program.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ARB_program.java 20 Feb 2005 20:53:49 -0000 1.3 +++ ARB_program.java 2 Nov 2005 09:28:12 -0000 1.4 @@ -33,6 +33,7 @@ import java.nio.Buffer; import java.nio.FloatBuffer; +import java.nio.DoubleBuffer; import java.nio.IntBuffer; import org.lwjgl.util.generator.*; @@ -136,19 +137,35 @@ void glProgramEnvParameter4fARB(int target, int index, float x, float y, float z, float w); + void glProgramEnvParameter4dARB(int target, int index, double x, double y, double z, double w); + @StripPostfix("params") void glProgramEnvParameter4fvARB(@GLenum int target, @GLuint int index, @Check("4") @Const FloatBuffer params); + + @StripPostfix("params") + void glProgramEnvParameter4dvARB(@GLenum int target, @GLuint int index, @Check("4") @Const DoubleBuffer params); void glProgramLocalParameter4fARB(@GLenum int target, @GLuint int index, float x, float y, float z, float w); + void glProgramLocalParameter4dARB(@GLenum int target, @GLuint int index, double x, double y, double z, double w); + @StripPostfix("params") void glProgramLocalParameter4fvARB(@GLenum int target, @GLuint int index, @Check("4") @Const FloatBuffer params); + + @StripPostfix("params") + void glProgramLocalParameter4dvARB(@GLenum int target, @GLuint int index, @Check("4") @Const DoubleBuffer params); @StripPostfix("params") void glGetProgramEnvParameterfvARB(@GLenum int target, @GLuint int index, @Check("4") FloatBuffer params); + + @StripPostfix("params") + void glGetProgramEnvParameterdvARB(@GLenum int target, @GLuint int index, @Check("4") DoubleBuffer params); @StripPostfix("params") void glGetProgramLocalParameterfvARB(@GLenum int target, @GLuint int index, @Check("4") FloatBuffer params); + + @StripPostfix("params") + void glGetProgramLocalParameterdvARB(@GLenum int target, @GLuint int index, @Check("4") DoubleBuffer params); @StripPostfix("params") void glGetProgramivARB(@GLenum int target, @GLenum int parameterName, @Check("4") IntBuffer params); Index: EXT_paletted_texture.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/EXT_paletted_texture.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EXT_paletted_texture.java 21 Mar 2005 08:27:45 -0000 1.4 +++ EXT_paletted_texture.java 2 Nov 2005 09:28:12 -0000 1.5 @@ -72,6 +72,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data); void glColorSubTableEXT(@GLenum int target, @GLsizei int start, @GLsizei int count, @GLenum int format, @GLenum int type, @@ -81,6 +82,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data); void glGetColorTableEXT(@GLenum int target, @GLenum int format, @GLenum int type, @@ -89,6 +91,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data); @StripPostfix("params") Index: GL20.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL20.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- GL20.java 21 Mar 2005 08:27:45 -0000 1.5 +++ GL20.java 2 Nov 2005 09:28:12 -0000 1.6 @@ -256,18 +256,26 @@ void glVertexAttrib1s(@GLuint int index, short x); void glVertexAttrib1f(@GLuint int index, float x); + + void glVertexAttrib1d(@GLuint int index, double x); void glVertexAttrib2s(@GLuint int index, short x, short y); void glVertexAttrib2f(@GLuint int index, float x, float y); + void glVertexAttrib2d(@GLuint int index, double x, double y); + void glVertexAttrib3s(@GLuint int index, short x, short y, short z); void glVertexAttrib3f(@GLuint int index, float x, float y, float z); + void glVertexAttrib3d(@GLuint int index, double x, double y, double z); + void glVertexAttrib4s(@GLuint int index, short x, short y, short z, short w); void glVertexAttrib4f(@GLuint int index, float x, float y, float z, float w); + + void glVertexAttrib4d(@GLuint int index, double x, double y, double z, double w); void glVertexAttrib4Nub(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w); @@ -283,6 +291,7 @@ @GLint @GLuint @GLfloat + @GLdouble Buffer buffer); void glEnableVertexAttribArray(@GLuint int index); @@ -291,6 +300,8 @@ @StripPostfix("params") void glGetVertexAttribfv(@GLuint int index, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") + void glGetVertexAttribdv(@GLuint int index, @GLenum int pname, @Check("4") DoubleBuffer params); + @StripPostfix("params") void glGetVertexAttribiv(@GLuint int index, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("pointer") Index: NV_pixel_data_range.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/NV_pixel_data_range.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- NV_pixel_data_range.java 20 Feb 2005 20:53:49 -0000 1.3 +++ NV_pixel_data_range.java 2 Nov 2005 09:28:12 -0000 1.4 @@ -62,6 +62,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer data); void glFlushPixelDataRangeNV(@GLenum int target); Index: NV_vertex_array_range.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- NV_vertex_array_range.java 20 Feb 2005 20:53:49 -0000 1.4 +++ NV_vertex_array_range.java 2 Nov 2005 09:28:12 -0000 1.5 @@ -49,6 +49,7 @@ @GLshort @GLint @GLfloat + @GLdouble Buffer pPointer); void glFlushVertexArrayRangeNV(); Index: NV_fragment_program.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/NV_fragment_program.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- NV_fragment_program.java 20 Feb 2005 20:53:49 -0000 1.3 +++ NV_fragment_program.java 2 Nov 2005 09:28:12 -0000 1.4 @@ -33,6 +33,7 @@ import java.nio.ByteBuffer; import java.nio.FloatBuffer; +import java.nio.DoubleBuffer; import org.lwjgl.util.generator.*; @@ -58,7 +59,12 @@ void glProgramNamedParameter4fNV(@GLuint int id, @AutoSize("name") @GLsizei int length, @Const @GLubyte ByteBuffer name, float x, float y, float z, float w); + void glProgramNamedParameter4dNV(@GLuint int id, @AutoSize("name") @GLsizei int length, @Const @GLubyte ByteBuffer name, double x, double y, double z, double w); + @StripPostfix("params") void glGetProgramNamedParameterfvNV(@GLuint int id, @AutoSize("name") @GLsizei int length, @Const @GLubyte ByteBuffer name, @Check("4") FloatBuffer params); + + @StripPostfix("params") + void glGetProgramNamedParameterdvNV(@GLuint int id, @AutoSize("name") @GLsizei int length, @Const @GLubyte ByteBuffer name, @Check("4") DoubleBuffer params); } Index: EXT_fog_coord.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/EXT_fog_coord.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EXT_fog_coord.java 21 Mar 2005 08:27:45 -0000 1.4 +++ EXT_fog_coord.java 2 Nov 2005 09:28:12 -0000 1.5 @@ -46,6 +46,7 @@ int GL_FOG_COORDINATE_ARRAY_EXT = 0x8457; void glFogCoordfEXT(float coord); + void glFogCoorddEXT(double coord); void glFogCoordPointerEXT(@AutoType("data") @GLenum int type, @GLsizei int stride, @CachedReference @@ -53,5 +54,6 @@ @Check @Const @GLfloat + @GLdouble Buffer data); } |
Update of /cvsroot/java-game-lib/LWJGL/src/native/generated In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11245/src/native/generated Modified Files: org_lwjgl_openal_AL10.c org_lwjgl_opengl_ARBMultitexture.c org_lwjgl_opengl_ARBProgram.c org_lwjgl_opengl_ARBVertexBlend.c org_lwjgl_opengl_ARBVertexProgram.c org_lwjgl_opengl_ARBWindowPos.c org_lwjgl_opengl_ATIVertexStreams.c org_lwjgl_opengl_EXTFogCoord.c org_lwjgl_opengl_EXTSecondaryColor.c org_lwjgl_opengl_EXTVertexShader.c org_lwjgl_opengl_GL11.c org_lwjgl_opengl_GL13.c org_lwjgl_opengl_GL14.c org_lwjgl_opengl_GL20.c org_lwjgl_opengl_NVFragmentProgram.c org_lwjgl_opengl_NVVertexProgram.c Log Message: Added support for doubles (ALdouble and GLdouble) Index: org_lwjgl_opengl_ARBVertexProgram.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBVertexProgram.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_ARBVertexProgram.c 2 Nov 2005 09:28:11 -0000 1.2 @@ -5,17 +5,22 @@ typedef void (APIENTRY *glVertexAttrib1sARBPROC) (GLuint index, GLshort x); typedef void (APIENTRY *glVertexAttrib1fARBPROC) (GLuint index, GLfloat x); +typedef void (APIENTRY *glVertexAttrib1dARBPROC) (GLuint index, GLdouble x); typedef void (APIENTRY *glVertexAttrib2sARBPROC) (GLuint index, GLshort x, GLshort y); typedef void (APIENTRY *glVertexAttrib2fARBPROC) (GLuint index, GLfloat x, GLfloat y); +typedef void (APIENTRY *glVertexAttrib2dARBPROC) (GLuint index, GLdouble x, GLdouble y); typedef void (APIENTRY *glVertexAttrib3sARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z); typedef void (APIENTRY *glVertexAttrib3fARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRY *glVertexAttrib3dARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); typedef void (APIENTRY *glVertexAttrib4sARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); typedef void (APIENTRY *glVertexAttrib4fARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRY *glVertexAttrib4dARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); typedef void (APIENTRY *glVertexAttrib4NubARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); typedef void (APIENTRY *glVertexAttribPointerARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * buffer); typedef void (APIENTRY *glEnableVertexAttribArrayARBPROC) (GLuint index); typedef void (APIENTRY *glDisableVertexAttribArrayARBPROC) (GLuint index); typedef void (APIENTRY *glGetVertexAttribfvARBPROC) (GLuint index, GLenum pname, GLfloat * params); +typedef void (APIENTRY *glGetVertexAttribdvARBPROC) (GLuint index, GLenum pname, GLdouble * params); typedef void (APIENTRY *glGetVertexAttribivARBPROC) (GLuint index, GLenum pname, GLint * params); typedef void (APIENTRY *glGetVertexAttribPointervARBPROC) (GLuint index, GLenum pname, GLvoid ** result); @@ -29,6 +34,11 @@ glVertexAttrib1fARB(index, x); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttrib1dARB(JNIEnv *env, jclass clazz, jint index, jdouble x, jlong function_pointer) { + glVertexAttrib1dARBPROC glVertexAttrib1dARB = (glVertexAttrib1dARBPROC)((intptr_t)function_pointer); + glVertexAttrib1dARB(index, x); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttrib2sARB(JNIEnv *env, jclass clazz, jint index, jshort x, jshort y, jlong function_pointer) { glVertexAttrib2sARBPROC glVertexAttrib2sARB = (glVertexAttrib2sARBPROC)((intptr_t)function_pointer); glVertexAttrib2sARB(index, x, y); @@ -39,6 +49,11 @@ glVertexAttrib2fARB(index, x, y); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttrib2dARB(JNIEnv *env, jclass clazz, jint index, jdouble x, jdouble y, jlong function_pointer) { + glVertexAttrib2dARBPROC glVertexAttrib2dARB = (glVertexAttrib2dARBPROC)((intptr_t)function_pointer); + glVertexAttrib2dARB(index, x, y); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttrib3sARB(JNIEnv *env, jclass clazz, jint index, jshort x, jshort y, jshort z, jlong function_pointer) { glVertexAttrib3sARBPROC glVertexAttrib3sARB = (glVertexAttrib3sARBPROC)((intptr_t)function_pointer); glVertexAttrib3sARB(index, x, y, z); @@ -49,6 +64,11 @@ glVertexAttrib3fARB(index, x, y, z); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttrib3dARB(JNIEnv *env, jclass clazz, jint index, jdouble x, jdouble y, jdouble z, jlong function_pointer) { + glVertexAttrib3dARBPROC glVertexAttrib3dARB = (glVertexAttrib3dARBPROC)((intptr_t)function_pointer); + glVertexAttrib3dARB(index, x, y, z); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttrib4sARB(JNIEnv *env, jclass clazz, jint index, jshort x, jshort y, jshort z, jshort w, jlong function_pointer) { glVertexAttrib4sARBPROC glVertexAttrib4sARB = (glVertexAttrib4sARBPROC)((intptr_t)function_pointer); glVertexAttrib4sARB(index, x, y, z, w); @@ -59,6 +79,11 @@ glVertexAttrib4fARB(index, x, y, z, w); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttrib4dARB(JNIEnv *env, jclass clazz, jint index, jdouble x, jdouble y, jdouble z, jdouble w, jlong function_pointer) { + glVertexAttrib4dARBPROC glVertexAttrib4dARB = (glVertexAttrib4dARBPROC)((intptr_t)function_pointer); + glVertexAttrib4dARB(index, x, y, z, w); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttrib4NubARB(JNIEnv *env, jclass clazz, jint index, jbyte x, jbyte y, jbyte z, jbyte w, jlong function_pointer) { glVertexAttrib4NubARBPROC glVertexAttrib4NubARB = (glVertexAttrib4NubARBPROC)((intptr_t)function_pointer); glVertexAttrib4NubARB(index, x, y, z, w); @@ -92,6 +117,12 @@ glGetVertexAttribfvARB(index, pname, params_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglGetVertexAttribdvARB(JNIEnv *env, jclass clazz, jint index, jint pname, jobject params, jint params_position, jlong function_pointer) { + GLdouble *params_address = ((GLdouble *)(*env)->GetDirectBufferAddress(env, params)) + params_position; + glGetVertexAttribdvARBPROC glGetVertexAttribdvARB = (glGetVertexAttribdvARBPROC)((intptr_t)function_pointer); + glGetVertexAttribdvARB(index, pname, params_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglGetVertexAttribivARB(JNIEnv *env, jclass clazz, jint index, jint pname, jobject params, jint params_position, jlong function_pointer) { GLint *params_address = ((GLint *)(*env)->GetDirectBufferAddress(env, params)) + params_position; glGetVertexAttribivARBPROC glGetVertexAttribivARB = (glGetVertexAttribivARBPROC)((intptr_t)function_pointer); Index: org_lwjgl_opengl_EXTVertexShader.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_EXTVertexShader.c 28 Oct 2005 15:43:50 -0000 1.2 +++ org_lwjgl_opengl_EXTVertexShader.c 2 Nov 2005 09:28:11 -0000 1.3 @@ -22,6 +22,7 @@ typedef void (APIENTRY *glVariantsvEXTPROC) (GLuint id, const GLshort * pAddr); typedef void (APIENTRY *glVariantivEXTPROC) (GLuint id, const GLint * pAddr); typedef void (APIENTRY *glVariantfvEXTPROC) (GLuint id, const GLfloat * pAddr); +typedef void (APIENTRY *glVariantdvEXTPROC) (GLuint id, const GLdouble * pAddr); typedef void (APIENTRY *glVariantubvEXTPROC) (GLuint id, const GLubyte * pAddr); typedef void (APIENTRY *glVariantusvEXTPROC) (GLuint id, const GLushort * pAddr); typedef void (APIENTRY *glVariantuivEXTPROC) (GLuint id, const GLuint * pAddr); @@ -148,6 +149,12 @@ glVariantfvEXT(id, pAddr_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantdvEXT(JNIEnv *env, jclass clazz, jint id, jobject pAddr, jint pAddr_position, jlong function_pointer) { + const GLdouble *pAddr_address = ((const GLdouble *)(*env)->GetDirectBufferAddress(env, pAddr)) + pAddr_position; + glVariantdvEXTPROC glVariantdvEXT = (glVariantdvEXTPROC)((intptr_t)function_pointer); + glVariantdvEXT(id, pAddr_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantubvEXT(JNIEnv *env, jclass clazz, jint id, jobject pAddr, jint pAddr_position, jlong function_pointer) { const GLubyte *pAddr_address = ((const GLubyte *)(*env)->GetDirectBufferAddress(env, pAddr)) + pAddr_position; glVariantubvEXTPROC glVariantubvEXT = (glVariantubvEXTPROC)((intptr_t)function_pointer); Index: org_lwjgl_opengl_ARBVertexBlend.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexBlend.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBVertexBlend.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_ARBVertexBlend.c 2 Nov 2005 09:28:11 -0000 1.2 @@ -7,6 +7,7 @@ typedef void (APIENTRY *glWeightsvARBPROC) (GLint size, GLshort * pWeights); typedef void (APIENTRY *glWeightivARBPROC) (GLint size, GLint * pWeights); typedef void (APIENTRY *glWeightfvARBPROC) (GLint size, GLfloat * pWeights); +typedef void (APIENTRY *glWeightdvARBPROC) (GLint size, GLdouble * pWeights); typedef void (APIENTRY *glWeightubvARBPROC) (GLint size, GLubyte * pWeights); typedef void (APIENTRY *glWeightusvARBPROC) (GLint size, GLushort * pWeights); typedef void (APIENTRY *glWeightuivARBPROC) (GLint size, GLuint * pWeights); @@ -37,6 +38,12 @@ glWeightfvARB(size, pWeights_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightdvARB(JNIEnv *env, jclass clazz, jint size, jobject pWeights, jint pWeights_position, jlong function_pointer) { + GLdouble *pWeights_address = ((GLdouble *)(*env)->GetDirectBufferAddress(env, pWeights)) + pWeights_position; + glWeightdvARBPROC glWeightdvARB = (glWeightdvARBPROC)((intptr_t)function_pointer); + glWeightdvARB(size, pWeights_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightubvARB(JNIEnv *env, jclass clazz, jint size, jobject pWeights, jint pWeights_position, jlong function_pointer) { GLubyte *pWeights_address = ((GLubyte *)(*env)->GetDirectBufferAddress(env, pWeights)) + pWeights_position; glWeightubvARBPROC glWeightubvARB = (glWeightubvARBPROC)((intptr_t)function_pointer); Index: org_lwjgl_opengl_EXTSecondaryColor.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_EXTSecondaryColor.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_EXTSecondaryColor.c 28 Oct 2005 15:43:50 -0000 1.2 +++ org_lwjgl_opengl_EXTSecondaryColor.c 2 Nov 2005 09:28:11 -0000 1.3 @@ -5,6 +5,7 @@ typedef void (APIENTRY *glSecondaryColor3bEXTPROC) (GLbyte red, GLbyte green, GLbyte blue); typedef void (APIENTRY *glSecondaryColor3fEXTPROC) (GLfloat red, GLfloat green, GLfloat blue); +typedef void (APIENTRY *glSecondaryColor3dEXTPROC) (GLdouble red, GLdouble green, GLdouble blue); typedef void (APIENTRY *glSecondaryColor3ubEXTPROC) (GLubyte red, GLubyte green, GLubyte blue); typedef void (APIENTRY *glSecondaryColorPointerEXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid * pPointer); @@ -18,6 +19,11 @@ glSecondaryColor3fEXT(red, green, blue); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColor3dEXT(JNIEnv *env, jclass clazz, jdouble red, jdouble green, jdouble blue, jlong function_pointer) { + glSecondaryColor3dEXTPROC glSecondaryColor3dEXT = (glSecondaryColor3dEXTPROC)((intptr_t)function_pointer); + glSecondaryColor3dEXT(red, green, blue); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColor3ubEXT(JNIEnv *env, jclass clazz, jbyte red, jbyte green, jbyte blue, jlong function_pointer) { glSecondaryColor3ubEXTPROC glSecondaryColor3ubEXT = (glSecondaryColor3ubEXTPROC)((intptr_t)function_pointer); glSecondaryColor3ubEXT(red, green, blue); Index: org_lwjgl_opengl_EXTFogCoord.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_EXTFogCoord.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_EXTFogCoord.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_EXTFogCoord.c 2 Nov 2005 09:28:11 -0000 1.2 @@ -4,6 +4,7 @@ #include "extgl.h" typedef void (APIENTRY *glFogCoordfEXTPROC) (GLfloat coord); +typedef void (APIENTRY *glFogCoorddEXTPROC) (GLdouble coord); typedef void (APIENTRY *glFogCoordPointerEXTPROC) (GLenum type, GLsizei stride, const GLvoid * data); JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordfEXT(JNIEnv *env, jclass clazz, jfloat coord, jlong function_pointer) { @@ -11,6 +12,11 @@ glFogCoordfEXT(coord); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoorddEXT(JNIEnv *env, jclass clazz, jdouble coord, jlong function_pointer) { + glFogCoorddEXTPROC glFogCoorddEXT = (glFogCoorddEXTPROC)((intptr_t)function_pointer); + glFogCoorddEXT(coord); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXT(JNIEnv *env, jclass clazz, jint type, jint stride, jobject data, jint data_position, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)(((char *)(*env)->GetDirectBufferAddress(env, data)) + data_position)); glFogCoordPointerEXTPROC glFogCoordPointerEXT = (glFogCoordPointerEXTPROC)((intptr_t)function_pointer); Index: org_lwjgl_opengl_ATIVertexStreams.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_ATIVertexStreams.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ATIVertexStreams.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_ATIVertexStreams.c 2 Nov 2005 09:28:11 -0000 1.2 @@ -4,16 +4,20 @@ #include "extgl.h" typedef void (APIENTRY *glVertexStream2fATIPROC) (GLenum stream, GLfloat x, GLfloat y); +typedef void (APIENTRY *glVertexStream2dATIPROC) (GLenum stream, GLdouble x, GLdouble y); typedef void (APIENTRY *glVertexStream2iATIPROC) (GLenum stream, GLint x, GLint y); typedef void (APIENTRY *glVertexStream2sATIPROC) (GLenum stream, GLshort x, GLshort y); typedef void (APIENTRY *glVertexStream3fATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRY *glVertexStream3dATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z); typedef void (APIENTRY *glVertexStream3iATIPROC) (GLenum stream, GLint x, GLint y, GLint z); typedef void (APIENTRY *glVertexStream3sATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z); typedef void (APIENTRY *glVertexStream4fATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRY *glVertexStream4dATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w); typedef void (APIENTRY *glVertexStream4iATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w); typedef void (APIENTRY *glVertexStream4sATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w); typedef void (APIENTRY *glNormalStream3bATIPROC) (GLenum stream, GLbyte x, GLbyte y, GLbyte z); typedef void (APIENTRY *glNormalStream3fATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRY *glNormalStream3dATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z); typedef void (APIENTRY *glNormalStream3iATIPROC) (GLenum stream, GLint x, GLint y, GLint z); typedef void (APIENTRY *glNormalStream3sATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z); typedef void (APIENTRY *glClientActiveVertexStreamATIPROC) (GLenum stream); @@ -25,6 +29,11 @@ glVertexStream2fATI(stream, x, y); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_nglVertexStream2dATI(JNIEnv *env, jclass clazz, jint stream, jdouble x, jdouble y, jlong function_pointer) { + glVertexStream2dATIPROC glVertexStream2dATI = (glVertexStream2dATIPROC)((intptr_t)function_pointer); + glVertexStream2dATI(stream, x, y); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_nglVertexStream2iATI(JNIEnv *env, jclass clazz, jint stream, jint x, jint y, jlong function_pointer) { glVertexStream2iATIPROC glVertexStream2iATI = (glVertexStream2iATIPROC)((intptr_t)function_pointer); glVertexStream2iATI(stream, x, y); @@ -40,6 +49,11 @@ glVertexStream3fATI(stream, x, y, z); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_nglVertexStream3dATI(JNIEnv *env, jclass clazz, jint stream, jdouble x, jdouble y, jdouble z, jlong function_pointer) { + glVertexStream3dATIPROC glVertexStream3dATI = (glVertexStream3dATIPROC)((intptr_t)function_pointer); + glVertexStream3dATI(stream, x, y, z); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_nglVertexStream3iATI(JNIEnv *env, jclass clazz, jint stream, jint x, jint y, jint z, jlong function_pointer) { glVertexStream3iATIPROC glVertexStream3iATI = (glVertexStream3iATIPROC)((intptr_t)function_pointer); glVertexStream3iATI(stream, x, y, z); @@ -55,6 +69,11 @@ glVertexStream4fATI(stream, x, y, z, w); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_nglVertexStream4dATI(JNIEnv *env, jclass clazz, jint stream, jdouble x, jdouble y, jdouble z, jdouble w, jlong function_pointer) { + glVertexStream4dATIPROC glVertexStream4dATI = (glVertexStream4dATIPROC)((intptr_t)function_pointer); + glVertexStream4dATI(stream, x, y, z, w); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_nglVertexStream4iATI(JNIEnv *env, jclass clazz, jint stream, jint x, jint y, jint z, jint w, jlong function_pointer) { glVertexStream4iATIPROC glVertexStream4iATI = (glVertexStream4iATIPROC)((intptr_t)function_pointer); glVertexStream4iATI(stream, x, y, z, w); @@ -75,6 +94,11 @@ glNormalStream3fATI(stream, x, y, z); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_nglNormalStream3dATI(JNIEnv *env, jclass clazz, jint stream, jdouble x, jdouble y, jdouble z, jlong function_pointer) { + glNormalStream3dATIPROC glNormalStream3dATI = (glNormalStream3dATIPROC)((intptr_t)function_pointer); + glNormalStream3dATI(stream, x, y, z); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_nglNormalStream3iATI(JNIEnv *env, jclass clazz, jint stream, jint x, jint y, jint z, jlong function_pointer) { glNormalStream3iATIPROC glNormalStream3iATI = (glNormalStream3iATIPROC)((intptr_t)function_pointer); glNormalStream3iATI(stream, x, y, z); Index: org_lwjgl_opengl_GL14.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_GL14.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_GL14.c 28 Oct 2005 15:43:50 -0000 1.2 +++ org_lwjgl_opengl_GL14.c 2 Nov 2005 09:28:11 -0000 1.3 @@ -6,6 +6,7 @@ typedef void (APIENTRY *glBlendEquationPROC) (GLenum mode); typedef void (APIENTRY *glBlendColorPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); typedef void (APIENTRY *glFogCoordfPROC) (GLfloat coord); +typedef void (APIENTRY *glFogCoorddPROC) (GLdouble coord); typedef void (APIENTRY *glFogCoordPointerPROC) (GLenum type, GLsizei stride, const GLvoid * data); typedef void (APIENTRY *glMultiDrawArraysPROC) (GLenum mode, GLint * piFirst, GLsizei * piCount, GLsizei primcount); typedef void (APIENTRY *glPointParameteriPROC) (GLenum pname, GLint param); @@ -14,12 +15,15 @@ typedef void (APIENTRY *glPointParameterfvPROC) (GLenum pname, const GLfloat * params); typedef void (APIENTRY *glSecondaryColor3bPROC) (GLbyte red, GLbyte green, GLbyte blue); typedef void (APIENTRY *glSecondaryColor3fPROC) (GLfloat red, GLfloat green, GLfloat blue); +typedef void (APIENTRY *glSecondaryColor3dPROC) (GLdouble red, GLdouble green, GLdouble blue); typedef void (APIENTRY *glSecondaryColor3ubPROC) (GLubyte red, GLubyte green, GLubyte blue); typedef void (APIENTRY *glSecondaryColorPointerPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid * data); typedef void (APIENTRY *glBlendFuncSeparatePROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); typedef void (APIENTRY *glWindowPos2fPROC) (GLfloat x, GLfloat y); +typedef void (APIENTRY *glWindowPos2dPROC) (GLdouble x, GLdouble y); typedef void (APIENTRY *glWindowPos2iPROC) (GLint x, GLint y); typedef void (APIENTRY *glWindowPos3fPROC) (GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRY *glWindowPos3dPROC) (GLdouble x, GLdouble y, GLdouble z); typedef void (APIENTRY *glWindowPos3iPROC) (GLint x, GLint y, GLint z); JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglBlendEquation(JNIEnv *env, jclass clazz, jint mode, jlong function_pointer) { @@ -37,6 +41,11 @@ glFogCoordf(coord); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordd(JNIEnv *env, jclass clazz, jdouble coord, jlong function_pointer) { + glFogCoorddPROC glFogCoordd = (glFogCoorddPROC)((intptr_t)function_pointer); + glFogCoordd(coord); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointer(JNIEnv *env, jclass clazz, jint type, jint stride, jobject data, jint data_position, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)(((char *)(*env)->GetDirectBufferAddress(env, data)) + data_position)); glFogCoordPointerPROC glFogCoordPointer = (glFogCoordPointerPROC)((intptr_t)function_pointer); @@ -88,6 +97,11 @@ glSecondaryColor3f(red, green, blue); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColor3d(JNIEnv *env, jclass clazz, jdouble red, jdouble green, jdouble blue, jlong function_pointer) { + glSecondaryColor3dPROC glSecondaryColor3d = (glSecondaryColor3dPROC)((intptr_t)function_pointer); + glSecondaryColor3d(red, green, blue); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColor3ub(JNIEnv *env, jclass clazz, jbyte red, jbyte green, jbyte blue, jlong function_pointer) { glSecondaryColor3ubPROC glSecondaryColor3ub = (glSecondaryColor3ubPROC)((intptr_t)function_pointer); glSecondaryColor3ub(red, green, blue); @@ -115,6 +129,11 @@ glWindowPos2f(x, y); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglWindowPos2d(JNIEnv *env, jclass clazz, jdouble x, jdouble y, jlong function_pointer) { + glWindowPos2dPROC glWindowPos2d = (glWindowPos2dPROC)((intptr_t)function_pointer); + glWindowPos2d(x, y); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglWindowPos2i(JNIEnv *env, jclass clazz, jint x, jint y, jlong function_pointer) { glWindowPos2iPROC glWindowPos2i = (glWindowPos2iPROC)((intptr_t)function_pointer); glWindowPos2i(x, y); @@ -125,6 +144,11 @@ glWindowPos3f(x, y, z); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglWindowPos3d(JNIEnv *env, jclass clazz, jdouble x, jdouble y, jdouble z, jlong function_pointer) { + glWindowPos3dPROC glWindowPos3d = (glWindowPos3dPROC)((intptr_t)function_pointer); + glWindowPos3d(x, y, z); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglWindowPos3i(JNIEnv *env, jclass clazz, jint x, jint y, jint z, jlong function_pointer) { glWindowPos3iPROC glWindowPos3i = (glWindowPos3iPROC)((intptr_t)function_pointer); glWindowPos3i(x, y, z); Index: org_lwjgl_opengl_ARBProgram.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_ARBProgram.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBProgram.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_ARBProgram.c 2 Nov 2005 09:28:11 -0000 1.2 @@ -8,11 +8,17 @@ typedef void (APIENTRY *glDeleteProgramsARBPROC) (GLsizei n, const GLuint * programs); typedef void (APIENTRY *glGenProgramsARBPROC) (GLsizei n, GLuint * programs); typedef void (APIENTRY *glProgramEnvParameter4fARBPROC) (GLint target, GLint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRY *glProgramEnvParameter4dARBPROC) (GLint target, GLint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); typedef void (APIENTRY *glProgramEnvParameter4fvARBPROC) (GLenum target, GLuint index, const GLfloat * params); +typedef void (APIENTRY *glProgramEnvParameter4dvARBPROC) (GLenum target, GLuint index, const GLdouble * params); typedef void (APIENTRY *glProgramLocalParameter4fARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRY *glProgramLocalParameter4dARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); typedef void (APIENTRY *glProgramLocalParameter4fvARBPROC) (GLenum target, GLuint index, const GLfloat * params); +typedef void (APIENTRY *glProgramLocalParameter4dvARBPROC) (GLenum target, GLuint index, const GLdouble * params); typedef void (APIENTRY *glGetProgramEnvParameterfvARBPROC) (GLenum target, GLuint index, GLfloat * params); +typedef void (APIENTRY *glGetProgramEnvParameterdvARBPROC) (GLenum target, GLuint index, GLdouble * params); typedef void (APIENTRY *glGetProgramLocalParameterfvARBPROC) (GLenum target, GLuint index, GLfloat * params); +typedef void (APIENTRY *glGetProgramLocalParameterdvARBPROC) (GLenum target, GLuint index, GLdouble * params); typedef void (APIENTRY *glGetProgramivARBPROC) (GLenum target, GLenum parameterName, GLint * params); typedef void (APIENTRY *glGetProgramStringARBPROC) (GLenum target, GLenum parameterName, GLvoid * paramString); typedef GLboolean (APIENTRY *glIsProgramARBPROC) (GLuint program); @@ -45,35 +51,69 @@ glProgramEnvParameter4fARB(target, index, x, y, z, w); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramEnvParameter4dARB(JNIEnv *env, jclass clazz, jint target, jint index, jdouble x, jdouble y, jdouble z, jdouble w, jlong function_pointer) { + glProgramEnvParameter4dARBPROC glProgramEnvParameter4dARB = (glProgramEnvParameter4dARBPROC)((intptr_t)function_pointer); + glProgramEnvParameter4dARB(target, index, x, y, z, w); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramEnvParameter4fvARB(JNIEnv *env, jclass clazz, jint target, jint index, jobject params, jint params_position, jlong function_pointer) { const GLfloat *params_address = ((const GLfloat *)(*env)->GetDirectBufferAddress(env, params)) + params_position; glProgramEnvParameter4fvARBPROC glProgramEnvParameter4fvARB = (glProgramEnvParameter4fvARBPROC)((intptr_t)function_pointer); glProgramEnvParameter4fvARB(target, index, params_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramEnvParameter4dvARB(JNIEnv *env, jclass clazz, jint target, jint index, jobject params, jint params_position, jlong function_pointer) { + const GLdouble *params_address = ((const GLdouble *)(*env)->GetDirectBufferAddress(env, params)) + params_position; + glProgramEnvParameter4dvARBPROC glProgramEnvParameter4dvARB = (glProgramEnvParameter4dvARBPROC)((intptr_t)function_pointer); + glProgramEnvParameter4dvARB(target, index, params_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramLocalParameter4fARB(JNIEnv *env, jclass clazz, jint target, jint index, jfloat x, jfloat y, jfloat z, jfloat w, jlong function_pointer) { glProgramLocalParameter4fARBPROC glProgramLocalParameter4fARB = (glProgramLocalParameter4fARBPROC)((intptr_t)function_pointer); glProgramLocalParameter4fARB(target, index, x, y, z, w); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramLocalParameter4dARB(JNIEnv *env, jclass clazz, jint target, jint index, jdouble x, jdouble y, jdouble z, jdouble w, jlong function_pointer) { + glProgramLocalParameter4dARBPROC glProgramLocalParameter4dARB = (glProgramLocalParameter4dARBPROC)((intptr_t)function_pointer); + glProgramLocalParameter4dARB(target, index, x, y, z, w); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramLocalParameter4fvARB(JNIEnv *env, jclass clazz, jint target, jint index, jobject params, jint params_position, jlong function_pointer) { const GLfloat *params_address = ((const GLfloat *)(*env)->GetDirectBufferAddress(env, params)) + params_position; glProgramLocalParameter4fvARBPROC glProgramLocalParameter4fvARB = (glProgramLocalParameter4fvARBPROC)((intptr_t)function_pointer); glProgramLocalParameter4fvARB(target, index, params_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramLocalParameter4dvARB(JNIEnv *env, jclass clazz, jint target, jint index, jobject params, jint params_position, jlong function_pointer) { + const GLdouble *params_address = ((const GLdouble *)(*env)->GetDirectBufferAddress(env, params)) + params_position; + glProgramLocalParameter4dvARBPROC glProgramLocalParameter4dvARB = (glProgramLocalParameter4dvARBPROC)((intptr_t)function_pointer); + glProgramLocalParameter4dvARB(target, index, params_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramEnvParameterfvARB(JNIEnv *env, jclass clazz, jint target, jint index, jobject params, jint params_position, jlong function_pointer) { GLfloat *params_address = ((GLfloat *)(*env)->GetDirectBufferAddress(env, params)) + params_position; glGetProgramEnvParameterfvARBPROC glGetProgramEnvParameterfvARB = (glGetProgramEnvParameterfvARBPROC)((intptr_t)function_pointer); glGetProgramEnvParameterfvARB(target, index, params_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramEnvParameterdvARB(JNIEnv *env, jclass clazz, jint target, jint index, jobject params, jint params_position, jlong function_pointer) { + GLdouble *params_address = ((GLdouble *)(*env)->GetDirectBufferAddress(env, params)) + params_position; + glGetProgramEnvParameterdvARBPROC glGetProgramEnvParameterdvARB = (glGetProgramEnvParameterdvARBPROC)((intptr_t)function_pointer); + glGetProgramEnvParameterdvARB(target, index, params_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramLocalParameterfvARB(JNIEnv *env, jclass clazz, jint target, jint index, jobject params, jint params_position, jlong function_pointer) { GLfloat *params_address = ((GLfloat *)(*env)->GetDirectBufferAddress(env, params)) + params_position; glGetProgramLocalParameterfvARBPROC glGetProgramLocalParameterfvARB = (glGetProgramLocalParameterfvARBPROC)((intptr_t)function_pointer); glGetProgramLocalParameterfvARB(target, index, params_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramLocalParameterdvARB(JNIEnv *env, jclass clazz, jint target, jint index, jobject params, jint params_position, jlong function_pointer) { + GLdouble *params_address = ((GLdouble *)(*env)->GetDirectBufferAddress(env, params)) + params_position; + glGetProgramLocalParameterdvARBPROC glGetProgramLocalParameterdvARB = (glGetProgramLocalParameterdvARBPROC)((intptr_t)function_pointer); + glGetProgramLocalParameterdvARB(target, index, params_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramivARB(JNIEnv *env, jclass clazz, jint target, jint parameterName, jobject params, jint params_position, jlong function_pointer) { GLint *params_address = ((GLint *)(*env)->GetDirectBufferAddress(env, params)) + params_position; glGetProgramivARBPROC glGetProgramivARB = (glGetProgramivARBPROC)((intptr_t)function_pointer); Index: org_lwjgl_opengl_GL20.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_GL20.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_GL20.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_GL20.c 2 Nov 2005 09:28:11 -0000 1.2 @@ -47,17 +47,22 @@ typedef void (APIENTRY *glGetShaderSourcePROC) (GLuint shader, GLsizei maxLength, GLsizei * length, GLchar * source); typedef void (APIENTRY *glVertexAttrib1sPROC) (GLuint index, GLshort x); typedef void (APIENTRY *glVertexAttrib1fPROC) (GLuint index, GLfloat x); +typedef void (APIENTRY *glVertexAttrib1dPROC) (GLuint index, GLdouble x); typedef void (APIENTRY *glVertexAttrib2sPROC) (GLuint index, GLshort x, GLshort y); typedef void (APIENTRY *glVertexAttrib2fPROC) (GLuint index, GLfloat x, GLfloat y); +typedef void (APIENTRY *glVertexAttrib2dPROC) (GLuint index, GLdouble x, GLdouble y); typedef void (APIENTRY *glVertexAttrib3sPROC) (GLuint index, GLshort x, GLshort y, GLshort z); typedef void (APIENTRY *glVertexAttrib3fPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRY *glVertexAttrib3dPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); typedef void (APIENTRY *glVertexAttrib4sPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); typedef void (APIENTRY *glVertexAttrib4fPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRY *glVertexAttrib4dPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); typedef void (APIENTRY *glVertexAttrib4NubPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); typedef void (APIENTRY *glVertexAttribPointerPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * buffer); typedef void (APIENTRY *glEnableVertexAttribArrayPROC) (GLuint index); typedef void (APIENTRY *glDisableVertexAttribArrayPROC) (GLuint index); typedef void (APIENTRY *glGetVertexAttribfvPROC) (GLuint index, GLenum pname, GLfloat * params); +typedef void (APIENTRY *glGetVertexAttribdvPROC) (GLuint index, GLenum pname, GLdouble * params); typedef void (APIENTRY *glGetVertexAttribivPROC) (GLuint index, GLenum pname, GLint * params); typedef void (APIENTRY *glGetVertexAttribPointervPROC) (GLuint index, GLenum pname, GLvoid ** pointer); typedef void (APIENTRY *glBindAttribLocationPROC) (GLuint program, GLuint index, const GLchar * name); @@ -323,6 +328,11 @@ glVertexAttrib1f(index, x); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglVertexAttrib1d(JNIEnv *env, jclass clazz, jint index, jdouble x, jlong function_pointer) { + glVertexAttrib1dPROC glVertexAttrib1d = (glVertexAttrib1dPROC)((intptr_t)function_pointer); + glVertexAttrib1d(index, x); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglVertexAttrib2s(JNIEnv *env, jclass clazz, jint index, jshort x, jshort y, jlong function_pointer) { glVertexAttrib2sPROC glVertexAttrib2s = (glVertexAttrib2sPROC)((intptr_t)function_pointer); glVertexAttrib2s(index, x, y); @@ -333,6 +343,11 @@ glVertexAttrib2f(index, x, y); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglVertexAttrib2d(JNIEnv *env, jclass clazz, jint index, jdouble x, jdouble y, jlong function_pointer) { + glVertexAttrib2dPROC glVertexAttrib2d = (glVertexAttrib2dPROC)((intptr_t)function_pointer); + glVertexAttrib2d(index, x, y); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglVertexAttrib3s(JNIEnv *env, jclass clazz, jint index, jshort x, jshort y, jshort z, jlong function_pointer) { glVertexAttrib3sPROC glVertexAttrib3s = (glVertexAttrib3sPROC)((intptr_t)function_pointer); glVertexAttrib3s(index, x, y, z); @@ -343,6 +358,11 @@ glVertexAttrib3f(index, x, y, z); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglVertexAttrib3d(JNIEnv *env, jclass clazz, jint index, jdouble x, jdouble y, jdouble z, jlong function_pointer) { + glVertexAttrib3dPROC glVertexAttrib3d = (glVertexAttrib3dPROC)((intptr_t)function_pointer); + glVertexAttrib3d(index, x, y, z); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglVertexAttrib4s(JNIEnv *env, jclass clazz, jint index, jshort x, jshort y, jshort z, jshort w, jlong function_pointer) { glVertexAttrib4sPROC glVertexAttrib4s = (glVertexAttrib4sPROC)((intptr_t)function_pointer); glVertexAttrib4s(index, x, y, z, w); @@ -353,6 +373,11 @@ glVertexAttrib4f(index, x, y, z, w); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglVertexAttrib4d(JNIEnv *env, jclass clazz, jint index, jdouble x, jdouble y, jdouble z, jdouble w, jlong function_pointer) { + glVertexAttrib4dPROC glVertexAttrib4d = (glVertexAttrib4dPROC)((intptr_t)function_pointer); + glVertexAttrib4d(index, x, y, z, w); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglVertexAttrib4Nub(JNIEnv *env, jclass clazz, jint index, jbyte x, jbyte y, jbyte z, jbyte w, jlong function_pointer) { glVertexAttrib4NubPROC glVertexAttrib4Nub = (glVertexAttrib4NubPROC)((intptr_t)function_pointer); glVertexAttrib4Nub(index, x, y, z, w); @@ -386,6 +411,12 @@ glGetVertexAttribfv(index, pname, params_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglGetVertexAttribdv(JNIEnv *env, jclass clazz, jint index, jint pname, jobject params, jint params_position, jlong function_pointer) { + GLdouble *params_address = ((GLdouble *)(*env)->GetDirectBufferAddress(env, params)) + params_position; + glGetVertexAttribdvPROC glGetVertexAttribdv = (glGetVertexAttribdvPROC)((intptr_t)function_pointer); + glGetVertexAttribdv(index, pname, params_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglGetVertexAttribiv(JNIEnv *env, jclass clazz, jint index, jint pname, jobject params, jint params_position, jlong function_pointer) { GLint *params_address = ((GLint *)(*env)->GetDirectBufferAddress(env, params)) + params_position; glGetVertexAttribivPROC glGetVertexAttribiv = (glGetVertexAttribivPROC)((intptr_t)function_pointer); Index: org_lwjgl_opengl_NVVertexProgram.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_NVVertexProgram.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_NVVertexProgram.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_NVVertexProgram.c 2 Nov 2005 09:28:11 -0000 1.2 @@ -5,31 +5,43 @@ typedef void (APIENTRY *glExecuteProgramNVPROC) (GLenum target, GLuint id, const GLfloat * params); typedef void (APIENTRY *glGetProgramParameterfvNVPROC) (GLenum target, GLuint index, GLenum parameterName, GLfloat * params); +typedef void (APIENTRY *glGetProgramParameterdvNVPROC) (GLenum target, GLuint index, GLenum parameterName, GLdouble * params); typedef void (APIENTRY *glGetTrackMatrixivNVPROC) (GLenum target, GLuint address, GLenum parameterName, GLint * params); typedef void (APIENTRY *glGetVertexAttribfvNVPROC) (GLuint index, GLenum parameterName, GLfloat * params); +typedef void (APIENTRY *glGetVertexAttribdvNVPROC) (GLuint index, GLenum parameterName, GLdouble * params); typedef void (APIENTRY *glGetVertexAttribivNVPROC) (GLuint index, GLenum parameterName, GLint * params); typedef void (APIENTRY *glGetVertexAttribPointervNVPROC) (GLuint index, GLenum parameterName, GLvoid ** pointer); typedef void (APIENTRY *glProgramParameter4fNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRY *glProgramParameter4dNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); typedef void (APIENTRY *glProgramParameters4fvNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat * params); +typedef void (APIENTRY *glProgramParameters4dvNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble * params); typedef void (APIENTRY *glTrackMatrixNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform); typedef void (APIENTRY *glVertexAttribPointerNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * buffer); typedef void (APIENTRY *glVertexAttrib1sNVPROC) (GLuint index, GLshort x); typedef void (APIENTRY *glVertexAttrib1fNVPROC) (GLuint index, GLfloat x); +typedef void (APIENTRY *glVertexAttrib1dNVPROC) (GLuint index, GLdouble x); typedef void (APIENTRY *glVertexAttrib2sNVPROC) (GLuint index, GLshort x, GLshort y); typedef void (APIENTRY *glVertexAttrib2fNVPROC) (GLuint index, GLfloat x, GLfloat y); +typedef void (APIENTRY *glVertexAttrib2dNVPROC) (GLuint index, GLdouble x, GLdouble y); typedef void (APIENTRY *glVertexAttrib3sNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z); typedef void (APIENTRY *glVertexAttrib3fNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRY *glVertexAttrib3dNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); typedef void (APIENTRY *glVertexAttrib4sNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); typedef void (APIENTRY *glVertexAttrib4fNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRY *glVertexAttrib4dNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); typedef void (APIENTRY *glVertexAttrib4ubNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); typedef void (APIENTRY *glVertexAttribs1svNVPROC) (GLuint index, GLsizei n, const GLshort * v); typedef void (APIENTRY *glVertexAttribs1fvNVPROC) (GLuint index, GLsizei n, const GLfloat * v); +typedef void (APIENTRY *glVertexAttribs1dvNVPROC) (GLuint index, GLsizei n, const GLdouble * v); typedef void (APIENTRY *glVertexAttribs2svNVPROC) (GLuint index, GLsizei n, const GLshort * v); typedef void (APIENTRY *glVertexAttribs2fvNVPROC) (GLuint index, GLsizei n, const GLfloat * v); +typedef void (APIENTRY *glVertexAttribs2dvNVPROC) (GLuint index, GLsizei n, const GLdouble * v); typedef void (APIENTRY *glVertexAttribs3svNVPROC) (GLuint index, GLsizei n, const GLshort * v); typedef void (APIENTRY *glVertexAttribs3fvNVPROC) (GLuint index, GLsizei n, const GLfloat * v); +typedef void (APIENTRY *glVertexAttribs3dvNVPROC) (GLuint index, GLsizei n, const GLdouble * v); typedef void (APIENTRY *glVertexAttribs4svNVPROC) (GLuint index, GLsizei n, const GLshort * v); typedef void (APIENTRY *glVertexAttribs4fvNVPROC) (GLuint index, GLsizei n, const GLfloat * v); +typedef void (APIENTRY *glVertexAttribs4dvNVPROC) (GLuint index, GLsizei n, const GLdouble * v); JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglExecuteProgramNV(JNIEnv *env, jclass clazz, jint target, jint id, jobject params, jint params_position, jlong function_pointer) { const GLfloat *params_address = ((const GLfloat *)(*env)->GetDirectBufferAddress(env, params)) + params_position; @@ -43,6 +55,12 @@ glGetProgramParameterfvNV(target, index, parameterName, params_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetProgramParameterdvNV(JNIEnv *env, jclass clazz, jint target, jint index, jint parameterName, jobject params, jint params_position, jlong function_pointer) { + GLdouble *params_address = ((GLdouble *)(*env)->GetDirectBufferAddress(env, params)) + params_position; + glGetProgramParameterdvNVPROC glGetProgramParameterdvNV = (glGetProgramParameterdvNVPROC)((intptr_t)function_pointer); + glGetProgramParameterdvNV(target, index, parameterName, params_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetTrackMatrixivNV(JNIEnv *env, jclass clazz, jint target, jint address, jint parameterName, jobject params, jint params_position, jlong function_pointer) { GLint *params_address = ((GLint *)(*env)->GetDirectBufferAddress(env, params)) + params_position; glGetTrackMatrixivNVPROC glGetTrackMatrixivNV = (glGetTrackMatrixivNVPROC)((intptr_t)function_pointer); @@ -55,6 +73,12 @@ glGetVertexAttribfvNV(index, parameterName, params_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetVertexAttribdvNV(JNIEnv *env, jclass clazz, jint index, jint parameterName, jobject params, jint params_position, jlong function_pointer) { + GLdouble *params_address = ((GLdouble *)(*env)->GetDirectBufferAddress(env, params)) + params_position; + glGetVertexAttribdvNVPROC glGetVertexAttribdvNV = (glGetVertexAttribdvNVPROC)((intptr_t)function_pointer); + glGetVertexAttribdvNV(index, parameterName, params_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetVertexAttribivNV(JNIEnv *env, jclass clazz, jint index, jint parameterName, jobject params, jint params_position, jlong function_pointer) { GLint *params_address = ((GLint *)(*env)->GetDirectBufferAddress(env, params)) + params_position; glGetVertexAttribivNVPROC glGetVertexAttribivNV = (glGetVertexAttribivNVPROC)((intptr_t)function_pointer); @@ -73,12 +97,23 @@ glProgramParameter4fNV(target, index, x, y, z, w); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglProgramParameter4dNV(JNIEnv *env, jclass clazz, jint target, jint index, jdouble x, jdouble y, jdouble z, jdouble w, jlong function_pointer) { + glProgramParameter4dNVPROC glProgramParameter4dNV = (glProgramParameter4dNVPROC)((intptr_t)function_pointer); + glProgramParameter4dNV(target, index, x, y, z, w); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglProgramParameters4fvNV(JNIEnv *env, jclass clazz, jint target, jint index, jint count, jobject params, jint params_position, jlong function_pointer) { const GLfloat *params_address = ((const GLfloat *)(*env)->GetDirectBufferAddress(env, params)) + params_position; glProgramParameters4fvNVPROC glProgramParameters4fvNV = (glProgramParameters4fvNVPROC)((intptr_t)function_pointer); glProgramParameters4fvNV(target, index, count, params_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglProgramParameters4dvNV(JNIEnv *env, jclass clazz, jint target, jint index, jint count, jobject params, jint params_position, jlong function_pointer) { + const GLdouble *params_address = ((const GLdouble *)(*env)->GetDirectBufferAddress(env, params)) + params_position; + glProgramParameters4dvNVPROC glProgramParameters4dvNV = (glProgramParameters4dvNVPROC)((intptr_t)function_pointer); + glProgramParameters4dvNV(target, index, count, params_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglTrackMatrixNV(JNIEnv *env, jclass clazz, jint target, jint address, jint matrix, jint transform, jlong function_pointer) { glTrackMatrixNVPROC glTrackMatrixNV = (glTrackMatrixNVPROC)((intptr_t)function_pointer); glTrackMatrixNV(target, address, matrix, transform); @@ -106,6 +141,11 @@ glVertexAttrib1fNV(index, x); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttrib1dNV(JNIEnv *env, jclass clazz, jint index, jdouble x, jlong function_pointer) { + glVertexAttrib1dNVPROC glVertexAttrib1dNV = (glVertexAttrib1dNVPROC)((intptr_t)function_pointer); + glVertexAttrib1dNV(index, x); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttrib2sNV(JNIEnv *env, jclass clazz, jint index, jshort x, jshort y, jlong function_pointer) { glVertexAttrib2sNVPROC glVertexAttrib2sNV = (glVertexAttrib2sNVPROC)((intptr_t)function_pointer); glVertexAttrib2sNV(index, x, y); @@ -116,6 +156,11 @@ glVertexAttrib2fNV(index, x, y); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttrib2dNV(JNIEnv *env, jclass clazz, jint index, jdouble x, jdouble y, jlong function_pointer) { + glVertexAttrib2dNVPROC glVertexAttrib2dNV = (glVertexAttrib2dNVPROC)((intptr_t)function_pointer); + glVertexAttrib2dNV(index, x, y); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttrib3sNV(JNIEnv *env, jclass clazz, jint index, jshort x, jshort y, jshort z, jlong function_pointer) { glVertexAttrib3sNVPROC glVertexAttrib3sNV = (glVertexAttrib3sNVPROC)((intptr_t)function_pointer); glVertexAttrib3sNV(index, x, y, z); @@ -126,6 +171,11 @@ glVertexAttrib3fNV(index, x, y, z); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttrib3dNV(JNIEnv *env, jclass clazz, jint index, jdouble x, jdouble y, jdouble z, jlong function_pointer) { + glVertexAttrib3dNVPROC glVertexAttrib3dNV = (glVertexAttrib3dNVPROC)((intptr_t)function_pointer); + glVertexAttrib3dNV(index, x, y, z); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttrib4sNV(JNIEnv *env, jclass clazz, jint index, jshort x, jshort y, jshort z, jshort w, jlong function_pointer) { glVertexAttrib4sNVPROC glVertexAttrib4sNV = (glVertexAttrib4sNVPROC)((intptr_t)function_pointer); glVertexAttrib4sNV(index, x, y, z, w); @@ -136,6 +186,11 @@ glVertexAttrib4fNV(index, x, y, z, w); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttrib4dNV(JNIEnv *env, jclass clazz, jint index, jdouble x, jdouble y, jdouble z, jdouble w, jlong function_pointer) { + glVertexAttrib4dNVPROC glVertexAttrib4dNV = (glVertexAttrib4dNVPROC)((intptr_t)function_pointer); + glVertexAttrib4dNV(index, x, y, z, w); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttrib4ubNV(JNIEnv *env, jclass clazz, jint index, jbyte x, jbyte y, jbyte z, jbyte w, jlong function_pointer) { glVertexAttrib4ubNVPROC glVertexAttrib4ubNV = (glVertexAttrib4ubNVPROC)((intptr_t)function_pointer); glVertexAttrib4ubNV(index, x, y, z, w); @@ -153,6 +208,12 @@ glVertexAttribs1fvNV(index, n, v_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs1dvNV(JNIEnv *env, jclass clazz, jint index, jint n, jobject v, jint v_position, jlong function_pointer) { + const GLdouble *v_address = ((const GLdouble *)(*env)->GetDirectBufferAddress(env, v)) + v_position; + glVertexAttribs1dvNVPROC glVertexAttribs1dvNV = (glVertexAttribs1dvNVPROC)((intptr_t)function_pointer); + glVertexAttribs1dvNV(index, n, v_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs2svNV(JNIEnv *env, jclass clazz, jint index, jint n, jobject v, jint v_position, jlong function_pointer) { const GLshort *v_address = ((const GLshort *)(*env)->GetDirectBufferAddress(env, v)) + v_position; glVertexAttribs2svNVPROC glVertexAttribs2svNV = (glVertexAttribs2svNVPROC)((intptr_t)function_pointer); @@ -165,6 +226,12 @@ glVertexAttribs2fvNV(index, n, v_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs2dvNV(JNIEnv *env, jclass clazz, jint index, jint n, jobject v, jint v_position, jlong function_pointer) { + const GLdouble *v_address = ((const GLdouble *)(*env)->GetDirectBufferAddress(env, v)) + v_position; + glVertexAttribs2dvNVPROC glVertexAttribs2dvNV = (glVertexAttribs2dvNVPROC)((intptr_t)function_pointer); + glVertexAttribs2dvNV(index, n, v_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs3svNV(JNIEnv *env, jclass clazz, jint index, jint n, jobject v, jint v_position, jlong function_pointer) { const GLshort *v_address = ((const GLshort *)(*env)->GetDirectBufferAddress(env, v)) + v_position; glVertexAttribs3svNVPROC glVertexAttribs3svNV = (glVertexAttribs3svNVPROC)((intptr_t)function_pointer); @@ -177,6 +244,12 @@ glVertexAttribs3fvNV(index, n, v_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs3dvNV(JNIEnv *env, jclass clazz, jint index, jint n, jobject v, jint v_position, jlong function_pointer) { + const GLdouble *v_address = ((const GLdouble *)(*env)->GetDirectBufferAddress(env, v)) + v_position; + glVertexAttribs3dvNVPROC glVertexAttribs3dvNV = (glVertexAttribs3dvNVPROC)((intptr_t)function_pointer); + glVertexAttribs3dvNV(index, n, v_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4svNV(JNIEnv *env, jclass clazz, jint index, jint n, jobject v, jint v_position, jlong function_pointer) { const GLshort *v_address = ((const GLshort *)(*env)->GetDirectBufferAddress(env, v)) + v_position; glVertexAttribs4svNVPROC glVertexAttribs4svNV = (glVertexAttribs4svNVPROC)((intptr_t)function_pointer); @@ -189,3 +262,9 @@ glVertexAttribs4fvNV(index, n, v_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4dvNV(JNIEnv *env, jclass clazz, jint index, jint n, jobject v, jint v_position, jlong function_pointer) { + const GLdouble *v_address = ((const GLdouble *)(*env)->GetDirectBufferAddress(env, v)) + v_position; + glVertexAttribs4dvNVPROC glVertexAttribs4dvNV = (glVertexAttribs4dvNVPROC)((intptr_t)function_pointer); + glVertexAttribs4dvNV(index, n, v_address); +} + Index: org_lwjgl_opengl_GL13.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_GL13.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_GL13.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_GL13.c 2 Nov 2005 09:28:11 -0000 1.2 @@ -13,11 +13,17 @@ typedef void (APIENTRY *glCompressedTexSubImage3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); typedef void (APIENTRY *glGetCompressedTexImagePROC) (GLenum target, GLint lod, GLvoid * img); typedef void (APIENTRY *glMultiTexCoord1fPROC) (GLenum target, GLfloat s); +typedef void (APIENTRY *glMultiTexCoord1dPROC) (GLenum target, GLdouble s); typedef void (APIENTRY *glMultiTexCoord2fPROC) (GLenum target, GLfloat s, GLfloat t); +typedef void (APIENTRY *glMultiTexCoord2dPROC) (GLenum target, GLdouble s, GLdouble t); typedef void (APIENTRY *glMultiTexCoord3fPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); +typedef void (APIENTRY *glMultiTexCoord3dPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); typedef void (APIENTRY *glMultiTexCoord4fPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); +typedef void (APIENTRY *glMultiTexCoord4dPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); typedef void (APIENTRY *glLoadTransposeMatrixfPROC) (const GLfloat * m); +typedef void (APIENTRY *glLoadTransposeMatrixdPROC) (const GLdouble * m); typedef void (APIENTRY *glMultTransposeMatrixfPROC) (const GLfloat * m); +typedef void (APIENTRY *glMultTransposeMatrixdPROC) (const GLdouble * m); typedef void (APIENTRY *glSampleCoveragePROC) (GLclampf value, GLboolean invert); JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglActiveTexture(JNIEnv *env, jclass clazz, jint texture, jlong function_pointer) { @@ -119,33 +125,65 @@ glMultiTexCoord1f(target, s); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglMultiTexCoord1d(JNIEnv *env, jclass clazz, jint target, jdouble s, jlong function_pointer) { + glMultiTexCoord1dPROC glMultiTexCoord1d = (glMultiTexCoord1dPROC)((intptr_t)function_pointer); + glMultiTexCoord1d(target, s); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglMultiTexCoord2f(JNIEnv *env, jclass clazz, jint target, jfloat s, jfloat t, jlong function_pointer) { glMultiTexCoord2fPROC glMultiTexCoord2f = (glMultiTexCoord2fPROC)((intptr_t)function_pointer); glMultiTexCoord2f(target, s, t); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglMultiTexCoord2d(JNIEnv *env, jclass clazz, jint target, jdouble s, jdouble t, jlong function_pointer) { + glMultiTexCoord2dPROC glMultiTexCoord2d = (glMultiTexCoord2dPROC)((intptr_t)function_pointer); + glMultiTexCoord2d(target, s, t); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglMultiTexCoord3f(JNIEnv *env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r, jlong function_pointer) { glMultiTexCoord3fPROC glMultiTexCoord3f = (glMultiTexCoord3fPROC)((intptr_t)function_pointer); glMultiTexCoord3f(target, s, t, r); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglMultiTexCoord3d(JNIEnv *env, jclass clazz, jint target, jdouble s, jdouble t, jdouble r, jlong function_pointer) { + glMultiTexCoord3dPROC glMultiTexCoord3d = (glMultiTexCoord3dPROC)((intptr_t)function_pointer); + glMultiTexCoord3d(target, s, t, r); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglMultiTexCoord4f(JNIEnv *env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r, jfloat q, jlong function_pointer) { glMultiTexCoord4fPROC glMultiTexCoord4f = (glMultiTexCoord4fPROC)((intptr_t)function_pointer); glMultiTexCoord4f(target, s, t, r, q); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglMultiTexCoord4d(JNIEnv *env, jclass clazz, jint target, jdouble s, jdouble t, jdouble r, jdouble q, jlong function_pointer) { + glMultiTexCoord4dPROC glMultiTexCoord4d = (glMultiTexCoord4dPROC)((intptr_t)function_pointer); + glMultiTexCoord4d(target, s, t, r, q); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglLoadTransposeMatrixf(JNIEnv *env, jclass clazz, jobject m, jint m_position, jlong function_pointer) { const GLfloat *m_address = ((const GLfloat *)(*env)->GetDirectBufferAddress(env, m)) + m_position; glLoadTransposeMatrixfPROC glLoadTransposeMatrixf = (glLoadTransposeMatrixfPROC)((intptr_t)function_pointer); glLoadTransposeMatrixf(m_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglLoadTransposeMatrixd(JNIEnv *env, jclass clazz, jobject m, jint m_position, jlong function_pointer) { + const GLdouble *m_address = ((const GLdouble *)(*env)->GetDirectBufferAddress(env, m)) + m_position; + glLoadTransposeMatrixdPROC glLoadTransposeMatrixd = (glLoadTransposeMatrixdPROC)((intptr_t)function_pointer); + glLoadTransposeMatrixd(m_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglMultTransposeMatrixf(JNIEnv *env, jclass clazz, jobject m, jint m_position, jlong function_pointer) { const GLfloat *m_address = ((const GLfloat *)(*env)->GetDirectBufferAddress(env, m)) + m_position; glMultTransposeMatrixfPROC glMultTransposeMatrixf = (glMultTransposeMatrixfPROC)((intptr_t)function_pointer); glMultTransposeMatrixf(m_address); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglMultTransposeMatrixd(JNIEnv *env, jclass clazz, jobject m, jint m_position, jlong function_pointer) { + const GLdouble *m_address = ((const GLdouble *)(*env)->GetDirectBufferAddress(env, m)) + m_position; + glMultTransposeMatrixdPROC glMultTransposeMatrixd = (glMultTransposeMatrixdPROC)((intptr_t)function_pointer); + glMultTransposeMatrixd(m_address); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglSampleCoverage(JNIEnv *env, jclass clazz, jfloat value, jboolean invert, jlong function_pointer) { glSampleCoveragePROC glSampleCoverage = (glSampleCoveragePROC)((intptr_t)function_pointer); glSampleCoverage(value, invert); Index: org_lwjgl_opengl_ARBWindowPos.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_ARBWindowPos.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBWindowPos.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_ARBWindowPos.c 2 Nov 2005 09:28:11 -0000 1.2 @@ -4,9 +4,11 @@ #include "extgl.h" typedef void (APIENTRY *glWindowPos2fARBPROC) (GLfloat x, GLfloat y); +typedef void (APIENTRY *glWindowPos2dARBPROC) (GLdouble x, GLdouble y); typedef void (APIENTRY *glWindowPos2iARBPROC) (GLint x, GLint y); typedef void (APIENTRY *glWindowPos2sARBPROC) (GLshort x, GLshort y); typedef void (APIENTRY *glWindowPos3fARBPROC) (GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRY *glWindowPos3dARBPROC) (GLdouble x, GLdouble y, GLdouble z); typedef void (APIENTRY *glWindowPos3iARBPROC) (GLint x, GLint y, GLint z); typedef void (APIENTRY *glWindowPos3sARBPROC) (GLshort x, GLshort y, GLshort z); @@ -15,6 +17,11 @@ glWindowPos2fARB(x, y); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBWindowPos_nglWindowPos2dARB(JNIEnv *env, jclass clazz, jdouble x, jdouble y, jlong function_pointer) { + glWindowPos2dARBPROC glWindowPos2dARB = (glWindowPos2dARBPROC)((intptr_t)function_pointer); + glWindowPos2dARB(x, y); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBWindowPos_nglWindowPos2iARB(JNIEnv *env, jclass clazz, jint x, jint y, jlong function_pointer) { glWindowPos2iARBPROC glWindowPos2iARB = (glWindowPos2iARBPROC)((intptr_t)function_pointer); glWindowPos2iARB(x, y); @@ -30,6 +37,11 @@ glWindowPos3fARB(x, y, z); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBWindowPos_nglWindowPos3dARB(JNIEnv *env, jclass clazz, jdouble x, jdouble y, jdouble z, jlong function_pointer) { + glWindowPos3dARBPROC glWindowPos3dARB = (glWindowPos3dARBPROC)((intptr_t)function_pointer); + glWindowPos3dA... [truncated message content] |
|
From: Elias N. <eli...@us...> - 2005-11-02 09:28:20
|
Update of /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/openal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11245/src/templates/org/lwjgl/openal Modified Files: AL10.java Log Message: Added support for doubles (ALdouble and GLdouble) Index: AL10.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/openal/AL10.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- AL10.java 28 Oct 2005 15:43:50 -0000 1.4 +++ AL10.java 2 Nov 2005 09:28:11 -0000 1.5 @@ -34,6 +34,7 @@ import java.nio.Buffer; import java.nio.IntBuffer; import java.nio.FloatBuffer; +import java.nio.DoubleBuffer; import org.lwjgl.util.generator.*; @@ -458,6 +459,21 @@ * in specifying pName. The amount of memory required in the destination * depends on the actual state requested. * </p> + * + * @return double state described by pname will be returned. + */ + double alGetDouble(@ALenum int pname); + + /** + * Like OpenGL, AL uses a simplified interface for querying global state. + * + * Legal values are e.g. AL_DOPPLER_FACTOR, AL_DOPPLER_VELOCITY, + * AL_DISTANCE_MODEL. + * <p> + * <code>null</code> destinations are quietly ignored. AL_INVALID_ENUM is the response to errors + * in specifying pName. The amount of memory required in the destination + * depends on the actual state requested. + * </p> * * @param pname state to be queried * @param data Buffer to place the integers in @@ -483,6 +499,24 @@ @StripPostfix("data") @ALvoid void alGetFloatv(@ALenum int pname, @Check("1") FloatBuffer data); + + /** + * Like OpenGL, AL uses a simplified interface for querying global state. + * + * Legal values are e.g. AL_DOPPLER_FACTOR, AL_DOPPLER_VELOCITY, + * AL_DISTANCE_MODEL. + * <p> + * <code>null</code> destinations are quietly ignored. AL_INVALID_ENUM is the response to errors + * in specifying pName. The amount of memory required in the destination + * depends on the actual state requested. + * </p> + * + * @param pname state to be queried + * @param data Buffer to place the doubles in + */ + @StripPostfix("data") + @ALvoid + void alGetDoublev(@ALenum int pname, @Check("1") DoubleBuffer data); /** * The application can retrieve state information global to the current AL Context. |
|
From: Elias N. <eli...@us...> - 2005-11-02 09:28:19
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11245/src/java/org/lwjgl/opengl Modified Files: Context.java Log Message: Added support for doubles (ALdouble and GLdouble) Index: Context.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Context.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Context.java 7 Aug 2005 12:19:09 -0000 1.6 +++ Context.java 2 Nov 2005 09:28:10 -0000 1.7 @@ -238,7 +238,8 @@ boolean was_current = isCurrent(); int error = GL11.GL_NO_ERROR; if (was_current) { - error = GL11.glGetError(); + if (GLContext.getCapabilities() != null && GLContext.getCapabilities().OpenGL11) + error = GL11.glGetError(); releaseCurrentContext(); } checkDestroy(); |
|
From: Elias N. <eli...@us...> - 2005-11-02 09:28:19
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11245/src/java/org/lwjgl/util/generator Modified Files: ALTypeMap.java GLTypeMap.java Added Files: ALdouble.java Log Message: Added support for doubles (ALdouble and GLdouble) Index: ALTypeMap.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator/ALTypeMap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ALTypeMap.java 5 May 2005 10:02:45 -0000 1.2 +++ ALTypeMap.java 2 Nov 2005 09:28:11 -0000 1.3 @@ -57,6 +57,7 @@ native_types_to_primitive.put(ALbyte.class, PrimitiveType.Kind.BYTE); native_types_to_primitive.put(ALenum.class, PrimitiveType.Kind.INT); native_types_to_primitive.put(ALfloat.class, PrimitiveType.Kind.FLOAT); + native_types_to_primitive.put(ALdouble.class, PrimitiveType.Kind.DOUBLE); native_types_to_primitive.put(ALint.class, PrimitiveType.Kind.INT); native_types_to_primitive.put(ALshort.class, PrimitiveType.Kind.SHORT); native_types_to_primitive.put(ALsizei.class, PrimitiveType.Kind.INT); @@ -96,6 +97,8 @@ return "b"; else if (annotation_type.equals(ALfloat.class)) return "f"; + else if (annotation_type.equals(ALdouble.class)) + return "d"; else if (annotation_type.equals(ALboolean.class) || annotation_type.equals(ALvoid.class)) return ""; else @@ -111,6 +114,9 @@ case FLOAT: type = ALfloat.class; break; + case DOUBLE: + type = ALdouble.class; + break; case SHORT: type = ALshort.class; break; @@ -136,7 +142,7 @@ else if (type.equals(ShortBuffer.class)) return new Class[]{ALshort.class}; else if (type.equals(DoubleBuffer.class)) - return new Class[]{}; + return new Class[]{ALdouble.class}; else return new Class[]{}; } @@ -145,7 +151,7 @@ if (type.equals(int.class)) return new Class[]{ALenum.class, ALint.class, ALsizei.class, ALuint.class}; else if (type.equals(double.class)) - return new Class[]{}; + return new Class[]{ALdouble.class}; else if (type.equals(float.class)) return new Class[]{ALfloat.class}; else if (type.equals(short.class)) Index: GLTypeMap.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- GLTypeMap.java 20 Feb 2005 19:28:32 -0000 1.1 +++ GLTypeMap.java 2 Nov 2005 09:28:11 -0000 1.2 @@ -125,6 +125,8 @@ return "b"; else if (annotation_type.equals(GLfloat.class)) return "f"; + else if (annotation_type.equals(GLdouble.class)) + return "d"; else if (annotation_type.equals(GLhalf.class)) return "h"; else if (annotation_type.equals(GLboolean.class) || annotation_type.equals(GLvoid.class)) @@ -258,6 +260,8 @@ return "GL11.GL_UNSIGNED_SHORT"; else if (annotation_class.equals(GLfloat.class)) return "GL11.GL_FLOAT"; + else if (annotation_class.equals(GLdouble.class)) + return "GL11.GL_DOUBLE"; else return null; } --- NEW FILE: ALdouble.java --- /* * 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.util.generator; /** * $Id: ALdouble.java,v 1.1 2005/11/02 09:28:11 elias_naur Exp $ * * @author elias_naur <eli...@us...> * @version $Revision: 1.1 $ */ import java.lang.annotation.Target; import java.lang.annotation.ElementType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) public @interface ALdouble { } |
|
From: Elias N. <eli...@us...> - 2005-11-02 09:28:19
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11245/src/java/org/lwjgl/util Modified Files: GL.java GLImpl.java IGL.java Log Message: Added support for doubles (ALdouble and GLdouble) Index: GLImpl.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/GLImpl.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- GLImpl.java 4 May 2005 20:59:42 -0000 1.11 +++ GLImpl.java 2 Nov 2005 09:28:10 -0000 1.12 @@ -541,10 +541,10 @@ /** * @param c */ - public void glClearIndex(float c) { +/* public void glClearIndex(float c) { GL.glClearIndex(c); } - +*/ /** * @param s */ Index: GL.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/GL.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- GL.java 4 May 2005 20:59:42 -0000 1.11 +++ GL.java 2 Nov 2005 09:28:10 -0000 1.12 @@ -204,10 +204,10 @@ } /** @param c */ - public static void glClearIndex(float c) { +/* public static void glClearIndex(float c) { GL11.glClearIndex(c); } - +*/ /** @param s */ public static void glClearStencil(int s) { GL11.glClearStencil(s); Index: IGL.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/IGL.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- IGL.java 4 May 2005 20:59:42 -0000 1.10 +++ IGL.java 2 Nov 2005 09:28:10 -0000 1.11 @@ -153,7 +153,7 @@ /** * @param c */ - void glClearIndex(float c); +// void glClearIndex(float c); /** * @param s |
