plib-cvs Mailing List for PLIB (Page 12)
Brought to you by:
sjbaker
You can subscribe to this list here.
2002 |
Jan
(25) |
Feb
(10) |
Mar
(60) |
Apr
(49) |
May
(54) |
Jun
(94) |
Jul
(82) |
Aug
(251) |
Sep
(366) |
Oct
(17) |
Nov
(20) |
Dec
(14) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(12) |
Feb
(8) |
Mar
(2) |
Apr
(4) |
May
(5) |
Jun
(8) |
Jul
(23) |
Aug
(8) |
Sep
(7) |
Oct
(5) |
Nov
(20) |
Dec
(20) |
2004 |
Jan
(19) |
Feb
(70) |
Mar
(108) |
Apr
(24) |
May
(6) |
Jun
(5) |
Jul
|
Aug
(8) |
Sep
(18) |
Oct
(27) |
Nov
|
Dec
(13) |
2005 |
Jan
(19) |
Feb
(13) |
Mar
(1) |
Apr
|
May
(10) |
Jun
(1) |
Jul
(10) |
Aug
(5) |
Sep
(2) |
Oct
(2) |
Nov
(6) |
Dec
(4) |
2006 |
Jan
(9) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Steve B. <sj...@us...> - 2004-03-20 04:32:06
|
Update of /cvsroot/plib/plib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21092/plib Modified Files: ChangeLog configure.in transferCvs2WebSite Log Message: Added a puAux.dsp (although I know it's not right). Updated transferCvs2WebSite to include new libraries. Index: ChangeLog =================================================================== RCS file: /cvsroot/plib/plib/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ChangeLog 2 Sep 2002 05:40:51 -0000 1.3 +++ ChangeLog 20 Mar 2004 04:22:04 -0000 1.4 @@ -2,6 +2,48 @@ PLIB Change Log. ================ +PLIB v1.8.0 (March 19th 2004) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + * puAux library added to provide a place for the + more obscure PUI widgets. + + * PW (PLIB Windowing) library added to provide a + built-in alternative to windowing libraries such + as GLUT and SDL. Applications that only need a + single window, mouse and keyboard (and no other + features of GLUT) can now have no dependencies + whatever outside of PLIB and OpenGL. + + * PLIB is now completely independent of GLUT. You + can even build it without GLUT being installed. + Modules to allow PUI to work with GLUT, freeglut, + SDL, FLTK and our own PW windowing library are + provided. + + * ssgAux now includes a relatively simple sky model + kindly donated by the SimGear project. Now you + can have sun, moon, stars and clouds with just + a handful of function calls. + + * PSL - a C-like interpreted scripting language + is now bundled into PLIB. It's a byte-code + interpreter - and it has some useful properties + for games and other interactive packages in + that it allows the application much finer control + over the running of the script(s) than traditional + scripting engines. + + * In the demos area, we added the 'simon' package + which provides a simple framework for PSL scripts + to be loaded - and they may in turn load 3D models, + move them around, etc. Astropong.psl (a simple 3D + 'Pong' game in PSL) is provided as a demo. + +And of course, many bugs have been slain and numerous +other smaller features have been added. + + PLIB v1.6.0 (Sept 2nd 2002) ~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: configure.in =================================================================== RCS file: /cvsroot/plib/plib/configure.in,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- configure.in 28 Feb 2004 00:54:02 -0000 1.56 +++ configure.in 20 Mar 2004 04:22:04 -0000 1.57 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/js/js.h) -AM_INIT_AUTOMAKE(plib, 1.7.0) +AM_INIT_AUTOMAKE(plib, 1.8.0) # This AC_PREFIX_DEFAULT will place the library files # into /usr/lib - but will put the include files into @@ -382,14 +382,14 @@ src/Makefile \ src/js/Makefile \ src/util/Makefile \ - src/pui/Makefile \ - src/puAux/Makefile \ src/sg/Makefile \ src/sl/Makefile \ src/psl/Makefile \ src/ssg/Makefile \ src/ssgAux/Makefile \ src/fnt/Makefile \ + src/pui/Makefile \ + src/puAux/Makefile \ src/pw/Makefile \ src/net/Makefile ) Index: transferCvs2WebSite =================================================================== RCS file: /cvsroot/plib/plib/transferCvs2WebSite,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- transferCvs2WebSite 14 Jun 2001 18:14:24 -0000 1.6 +++ transferCvs2WebSite 20 Mar 2004 04:22:04 -0000 1.7 @@ -30,6 +30,18 @@ rm -R fnt cvs -d:pserver:anonymous@cvs1:/cvsroot/plib export -Dtoday -d fnt plib/doc/fnt >/dev/null 2>&1 +echo handling "pw" +rm -R pw +cvs -d:pserver:anonymous@cvs1:/cvsroot/plib export -Dtoday -d pw plib/doc/pw >/dev/null 2>&1 + +echo handling "psl" +rm -R psl +cvs -d:pserver:anonymous@cvs1:/cvsroot/plib export -Dtoday -d psl plib/doc/psl >/dev/null 2>&1 + +echo handling "puAux" +rm -R puAux +cvs -d:pserver:anonymous@cvs1:/cvsroot/plib export -Dtoday -d puAux plib/doc/puAux >/dev/null 2>&1 + echo handling "ssgAux" rm -R ssgAux cvs -d:pserver:anonymous@cvs1:/cvsroot/plib export -Dtoday -d ssgAux plib/doc/ssgAux >/dev/null 2>&1 @@ -51,9 +63,12 @@ chmod -R u=rwX,g=rwX,o=rX /home/groups/p/pl/plib/htdocs/sl chmod -R u=rwX,g=rwX,o=rX /home/groups/p/pl/plib/htdocs/js chmod -R u=rwX,g=rwX,o=rX /home/groups/p/pl/plib/htdocs/fnt +chmod -R u=rwX,g=rwX,o=rX /home/groups/p/pl/plib/htdocs/puAux chmod -R u=rwX,g=rwX,o=rX /home/groups/p/pl/plib/htdocs/ssgAux chmod -R u=rwX,g=rwX,o=rX /home/groups/p/pl/plib/htdocs/util chmod -R u=rwX,g=rwX,o=rX /home/groups/p/pl/plib/htdocs/pui +chmod -R u=rwX,g=rwX,o=rX /home/groups/p/pl/plib/htdocs/psl +chmod -R u=rwX,g=rwX,o=rX /home/groups/p/pl/plib/htdocs/pw chmod -R u=rwX,g=rwX,o=rX /home/groups/p/pl/plib/htdocs/net echo done. |
From: Steve B. <sj...@us...> - 2004-03-20 04:32:06
|
Update of /cvsroot/plib/plib/src/puAux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21092/plib/src/puAux Added Files: puAux.dsp Log Message: Added a puAux.dsp (although I know it's not right). Updated transferCvs2WebSite to include new libraries. --- NEW FILE: puAux.dsp --- # Microsoft Developer Studio Project File - Name="pui" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Static Library" 0x0104 CFG=pui - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "pui.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "pui.mak" CFG="pui - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE [...217 lines suppressed...] SOURCE=.\puSpinBox.cxx # End Source File # Begin Source File SOURCE=.\puText.cxx # End Source File # Begin Source File SOURCE=.\puTriSlider.cxx # End Source File # Begin Source File SOURCE=.\puValue.cxx # End Source File # Begin Source File SOURCE=.\puVerticalMenu.cxx # End Source File # End Target # End Project |
From: Steve B. <sj...@us...> - 2004-03-20 04:32:06
|
Update of /cvsroot/plib/plib/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21092/plib/examples Modified Files: ChangeLog configure.in Log Message: Added a puAux.dsp (although I know it's not right). Updated transferCvs2WebSite to include new libraries. Index: ChangeLog =================================================================== RCS file: /cvsroot/plib/plib/examples/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ChangeLog 4 Sep 2002 21:20:06 -0000 1.3 +++ ChangeLog 20 Mar 2004 04:22:05 -0000 1.4 @@ -2,6 +2,11 @@ PLIB_Examples Change Log. ========================= +PLIB_Examples v1.8.0 (March 19th 2004) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Added examples for PW, PSL, ssgAux and puAux. + + PLIB_Examples v1.6.1 (Sept 4th 2002) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * Added missing files from the 'water/data' directory. Index: configure.in =================================================================== RCS file: /cvsroot/plib/plib/examples/configure.in,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- configure.in 18 Mar 2004 16:59:39 -0000 1.38 +++ configure.in 20 Mar 2004 04:22:05 -0000 1.39 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/js/js_demo.cxx) -AM_INIT_AUTOMAKE(plib_examples, 1.7.0) +AM_INIT_AUTOMAKE(plib_examples, 1.8.0) dnl Checks for programs. |
From: Steve B. <sj...@us...> - 2004-03-20 02:31:11
|
Update of /cvsroot/plib/plib/src/pw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1323/plib/src/pw Modified Files: pwX11.cxx Log Message: Fixed key-repeat problem in PW and enhanced demo program to make it obvious that it's fixed. Index: pwX11.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/pw/pwX11.cxx,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- pwX11.cxx 24 Feb 2004 02:10:40 -0000 1.5 +++ pwX11.cxx 20 Mar 2004 02:21:18 -0000 1.6 @@ -74,7 +74,8 @@ #endif -static int initialised = 0 ; +static bool initialised = false ; +static bool insideCallback = false ; static int modifiers = 0 ; static int origin [2] = { 0, 0 } ; static int size [2] = { 640, 480 } ; @@ -355,7 +356,8 @@ resizeCB = NULL ; [...176 lines suppressed...] + { + fprintf ( stderr, "PLIB/PW: FATAL - Application called pwSwapBuffers" + " from inside a callback function.\n" ) ; + exit ( 1 ) ; + } + glFlush () ; glXSwapBuffers ( currDisplay, currHandle ) ; getEvents () ; @@ -593,6 +630,10 @@ void pwCleanup () { + if ( ! initialised ) + fprintf ( stderr, "PLIB/PW: WARNING - Application called pwCleanup" + " before pwInit.\n" ) ; + glXDestroyContext ( currDisplay, currContext ) ; XDestroyWindow ( currDisplay, currHandle ) ; XFlush ( currDisplay ) ; |
From: Steve B. <sj...@us...> - 2004-03-20 02:31:11
|
Update of /cvsroot/plib/plib/doc/pw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1323/plib/doc/pw Modified Files: index.html Log Message: Fixed key-repeat problem in PW and enhanced demo program to make it obvious that it's fixed. Index: index.html =================================================================== RCS file: /cvsroot/plib/plib/doc/pw/index.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- index.html 24 Feb 2004 02:06:03 -0000 1.3 +++ index.html 20 Mar 2004 02:21:18 -0000 1.4 @@ -130,7 +130,8 @@ </pre> This function swaps the double-buffers, collects keystrokes, mouse events and resize events and calls whatever application-defined callbacks are -needed. +needed. It is NOT LEGAL to call pwSwapBuffers() from inside a PW callback +function. <p> When you wish to close the PW window, you should call: <pre> |
From: Steve B. <sj...@us...> - 2004-03-20 02:31:11
|
Update of /cvsroot/plib/plib/examples/src/pw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1323/plib/examples/src/pw Modified Files: pw_demo.cxx Log Message: Fixed key-repeat problem in PW and enhanced demo program to make it obvious that it's fixed. Index: pw_demo.cxx =================================================================== RCS file: /cvsroot/plib/plib/examples/src/pw/pw_demo.cxx,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- pw_demo.cxx 24 Feb 2004 02:06:03 -0000 1.4 +++ pw_demo.cxx 20 Mar 2004 02:21:18 -0000 1.5 @@ -38,11 +38,25 @@ } +char keyIsDown [ 512 ] = { 0 } ; + void kbFunc ( int key, int updn, int x, int y ) { - fprintf ( stderr, "Keyboard key %d dirn %d at (%4dx%4d)\n", + fprintf ( stderr, "Keyboard key %d dirn %d at (%4dx%4d) ", key, updn, x, y ) ; + keyIsDown [ key ] = (updn==PW_DOWN) ; + + for ( int i = 0 ; i < 512 ; i++ ) + if ( keyIsDown [ i ] ) + { + if ( i > ' ' && i < 0x7F ) + fprintf ( stderr, "%c ", i ) ; + else + fprintf ( stderr, "0x%2x ", i ) ; + } + + fprintf ( stderr, "\n" ) ; if ( key == 0x1B ) /* ESC */ { pwCleanup () ; |
From: Steve B. <sj...@us...> - 2004-03-20 00:31:55
|
Update of /cvsroot/plib/plib/src/js In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12523/plib/src/js Modified Files: jsBSD.cxx Log Message: Fixed up a diagnostic print. Index: jsBSD.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/js/jsBSD.cxx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- jsBSD.cxx 11 Nov 2003 22:54:48 -0000 1.2 +++ jsBSD.cxx 20 Mar 2004 00:21:53 -0000 1.3 @@ -177,7 +177,7 @@ #ifdef HAVE_USBHID_H if (ioctl(os->fd, USB_GET_REPORT_ID, &report_id) < 0) { - fprintf(stderr, "error: %s%d: %s", UHIDDEV, i, strerror(errno)); + fprintf(stderr, "error: %s: %s", os->fname, strerror(errno)); return FALSE; } |
From: Steve B. <sj...@us...> - 2004-03-18 22:18:48
|
Update of /cvsroot/plib/plib/src/psl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21428/plib/src/psl Modified Files: pslCodeGen.cxx Log Message: Fixed some type conversion warnings. Index: pslCodeGen.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/psl/pslCodeGen.cxx,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- pslCodeGen.cxx 22 Sep 2002 18:25:16 -0000 1.29 +++ pslCodeGen.cxx 18 Mar 2004 22:09:07 -0000 1.30 @@ -122,7 +122,7 @@ void pslCompiler::genGetParameter ( pslAddress var, int argpos ) { genCodeByte ( OPCODE_GET_PARAMETER ) ; - genCodeByte ( var ) ; + genCodeByte ( (unsigned char) var ) ; genCodeByte ( argpos ) ; } |
From: Steve B. <sj...@us...> - 2004-03-18 22:18:48
|
Update of /cvsroot/plib/plib/src/ssg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21428/plib/src/ssg Modified Files: ssgVertSplitter.cxx Log Message: Fixed some type conversion warnings. Index: ssgVertSplitter.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/ssg/ssgVertSplitter.cxx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ssgVertSplitter.cxx 18 Mar 2004 17:04:03 -0000 1.3 +++ ssgVertSplitter.cxx 18 Mar 2004 22:09:07 -0000 1.4 @@ -61,7 +61,7 @@ void ssgVertSplitter::setSharpAngle(float deg) { - _threshold = cos(deg*SG_DEGREES_TO_RADIANS); + _threshold = (float) cos(deg*SG_DEGREES_TO_RADIANS); } int ssgVertSplitter::findTriWithVert(int fidx, int vidx, int* tris, int ntris) |
From: Steve B. <sj...@us...> - 2004-03-18 19:24:22
|
Update of /cvsroot/plib/plib/src/sg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13664/plib/src/sg Modified Files: sg.cxx sg.h sgd.cxx Log Message: Moved some math out of puAux and into SG. Index: sg.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/sg/sg.cxx,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- sg.cxx 20 Jan 2004 22:12:15 -0000 1.41 +++ sg.cxx 18 Mar 2004 19:14:43 -0000 1.42 @@ -1284,6 +1284,7 @@ Kevin B. Thompson <kev...@ya...> Modified by Sylvan W. Clebsch <sy...@st...> Largely rewritten by "Negative0" <neg...@ea...> + More added by John Fay. */ @@ -1680,6 +1681,102 @@ } [...79 lines suppressed...] + sgAddScaledVec3 ( t2_minus_t1_t2_t1, line2.direction_vector, line.direction_vector, -t1_dot_t2 ) ; + + sgFloat u = sgScalarProductVec3 ( r1_minus_r2, t1_t2_t2_minus_t1 ) / ( 1.0f - t1_dot_t2 * t1_dot_t2 ) ; + sgFloat v = sgScalarProductVec3 ( r1_minus_r2, t2_minus_t1_t2_t1 ) / ( 1.0f - t1_dot_t2 * t1_dot_t2 ) ; + + /* Since line 2 is a line segment, we limit "v" to between 0 and the distance between the points. */ + sgFloat length = sgDistanceVec3 ( seg.a, seg.b ) ; + if ( v < 0.0 ) v = 0.0 ; + if ( v > length ) v = length ; + + sgVec3 point1, point2 ; + sgAddScaledVec3 ( point1, line.point_on_line, line.direction_vector, u ) ; + sgAddScaledVec3 ( point2, line2.point_on_line, line2.direction_vector, v ) ; + return sgDistanceSquaredVec3 ( point1, point2 ) ; +} + + void sgReflectInPlaneVec3 ( sgVec3 dst, const sgVec3 src, const sgVec4 plane ) { SGfloat src_dot_norm = sgScalarProductVec3 ( src, plane ) ; Index: sg.h =================================================================== RCS file: /cvsroot/plib/plib/src/sg/sg.h,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- sg.h 2 Feb 2004 01:35:15 -0000 1.57 +++ sg.h 18 Mar 2004 19:14:43 -0000 1.58 @@ -1175,6 +1175,7 @@ Kevin B. Thompson <kev...@ya...> Modified by Sylvan W. Clebsch <sy...@st...> Largely rewritten by "Negative0" <neg...@ea...> + Added to by John Fay */ /* @@ -1288,6 +1289,7 @@ sgEulerToQuat ( dst, tmp ) ; } + /* Multiply quaternions together (concatenate rotations) */ void sgMultQuat ( sgQuat dst, const sgQuat a, const sgQuat b ) ; @@ -2759,6 +2761,27 @@ } +/* Function to rotate a vector through a given quaternion using the formula + * R = Q r Q-1 -- this gives the components of a ROTATED vector in a STATIONARY + * coordinate system. We assume that Q is a unit quaternion. + */ + +void sgRotateVecQuat ( sgVec3 vec, sgQuat q ) ; +void sgdRotateVecQuat ( sgdVec3 vec, sgdQuat q ) ; + +/* Function to rotate a vector through a given quaternion using the formula + * R = Q-1 r Q -- this gives the components of a STATIONARY vector in a ROTATED + * coordinate system. We assume that Q is a unit quaternion. + */ + +void sgRotateCoordQuat ( sgVec3 vec, sgQuat q ) ; +void sgdRotateCoordQuat ( sgdVec3 vec, sgdQuat q ) ; + +sgFloat sgDistSquaredToLineLineSegment ( const sgLineSegment3 seg, const sgLine3 line ) ; +sgdFloat sgdDistSquaredToLineLineSegment ( const sgdLineSegment3 seg, const sgdLine3 line ) ; + + + /* Intersection testing. */ Index: sgd.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/sg/sgd.cxx,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- sgd.cxx 12 Nov 2003 12:39:16 -0000 1.12 +++ sgd.cxx 18 Mar 2004 19:14:43 -0000 1.13 @@ -1678,6 +1678,104 @@ dst[SGD_W] = scale0 * from[SGD_W] + scale1 * to[SGD_W] ; } + + + +/* Function to rotate a vector through a given quaternion using the formula + * R = Q r Q-1 -- this gives the components of a ROTATED vector in a STATIONARY + * coordinate system. We assume that Q is a unit quaternion. + */ +void sgdRotateVecQuat ( sgdVec3 vec, sgdQuat q ) [...73 lines suppressed...] + sgdAddScaledVec3 ( t2_minus_t1_t2_t1, line2.direction_vector, line.direction_vector, -t1_dot_t2 ) ; + + sgdFloat u = sgdScalarProductVec3 ( r1_minus_r2, t1_t2_t2_minus_t1 ) / ( 1.0f - t1_dot_t2 * t1_dot_t2 ) ; + sgdFloat v = sgdScalarProductVec3 ( r1_minus_r2, t2_minus_t1_t2_t1 ) / ( 1.0f - t1_dot_t2 * t1_dot_t2 ) ; + + /* Since line 2 is a line segment, we limit "v" to between 0 and the distance between the points. */ + sgdFloat length = sgdDistanceVec3 ( seg.a, seg.b ) ; + if ( v < 0.0 ) v = 0.0 ; + if ( v > length ) v = length ; + + sgdVec3 point1, point2 ; + sgdAddScaledVec3 ( point1, line.point_on_line, line.direction_vector, u ) ; + sgdAddScaledVec3 ( point2, line2.point_on_line, line2.direction_vector, v ) ; + return sgdDistanceSquaredVec3 ( point1, point2 ) ; +} + + void sgdReflectInPlaneVec3 ( sgdVec3 dst, const sgdVec3 src, const sgdVec4 plane ) { |
From: Steve B. <sj...@us...> - 2004-03-18 19:24:22
|
Update of /cvsroot/plib/plib/src/puAux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13664/plib/src/puAux Modified Files: puAuxCompass.cxx Log Message: Moved some math out of puAux and into SG. Index: puAuxCompass.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/puAux/puAuxCompass.cxx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- puAuxCompass.cxx 28 Feb 2004 22:35:03 -0000 1.2 +++ puAuxCompass.cxx 18 Mar 2004 19:14:43 -0000 1.3 @@ -33,54 +33,6 @@ UL_RTTI_DEF1(puaCompass,puObject) - -/* Function to rotate a vector through a given quaternion using the formula - * R = Q r Q-1 -- this gives the components of a ROTATED vector in a STATIONARY - * coordinate system. We assume that Q is a unit quaternion. - */ -void sgRotateVecQuat ( sgVec3 vec, sgQuat q ) -{ - sgVec3 rot ; [...77 lines suppressed...] - sgNegateVec3 ( t1_t2_t2_minus_t1 ) ; - sgAddScaledVec3 ( t2_minus_t1_t2_t1, line2.direction_vector, line.direction_vector, -t1_dot_t2 ) ; - - sgFloat u = sgScalarProductVec3 ( r1_minus_r2, t1_t2_t2_minus_t1 ) / ( 1.0f - t1_dot_t2 * t1_dot_t2 ) ; - sgFloat v = sgScalarProductVec3 ( r1_minus_r2, t2_minus_t1_t2_t1 ) / ( 1.0f - t1_dot_t2 * t1_dot_t2 ) ; - - /* Since line 2 is a line segment, we limit "v" to between 0 and the distance between the points. */ - sgFloat length = sgDistanceVec3 ( seg.a, seg.b ) ; - if ( v < 0.0 ) v = 0.0 ; - if ( v > length ) v = length ; - - sgVec3 point1, point2 ; - sgAddScaledVec3 ( point1, line.point_on_line, line.direction_vector, u ) ; - sgAddScaledVec3 ( point2, line2.point_on_line, line2.direction_vector, v ) ; - return sgDistanceSquaredVec3 ( point1, point2 ) ; -} - void puaCompass::doHit ( int button, int updown, int x, int y ) { |
From: Steve B. <sj...@us...> - 2004-03-18 17:30:32
|
Update of /cvsroot/plib/plib/src/puAux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19225/plib/src/puAux Modified Files: puAuxComboBox.cxx puAuxLargeInput.cxx puAuxSelectBox.cxx Log Message: Added some changes that John Fay requested: 1) Fixed MacOSX joystick code to resemble a fix that was applied to freeglut. 2) Provided a test to prevent some puAux widgets from being incorrectly activated on a key release. Index: puAuxComboBox.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/puAux/puAuxComboBox.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- puAuxComboBox.cxx 28 Feb 2004 00:54:03 -0000 1.1 +++ puAuxComboBox.cxx 18 Mar 2004 17:20:52 -0000 1.2 @@ -192,7 +192,8 @@ int puaComboBox::checkKey ( int key, int updown ) { - if ( ! input -> isAcceptingInput () || ! isVisible () || ! isActive () || ( window != puGetWindow () ) ) + if ( updown == PU_UP || ! input -> isAcceptingInput () || + ! isVisible () || ! isActive () || ( window != puGetWindow () ) ) return FALSE ; switch ( key ) Index: puAuxLargeInput.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/puAux/puAuxLargeInput.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- puAuxLargeInput.cxx 28 Feb 2004 00:54:03 -0000 1.1 +++ puAuxLargeInput.cxx 18 Mar 2004 17:20:52 -0000 1.2 @@ -844,9 +844,10 @@ lowlight () ; } -int puaLargeInput::checkKey ( int key, int /* updown */ ) +int puaLargeInput::checkKey ( int key, int updown ) { - if ( !isAcceptingInput () || !isActive () || !isVisible () || ( window != puGetWindow () ) ) + if ( updown == PU_UP || !isAcceptingInput () || !isActive () || + !isVisible () || ( window != puGetWindow () ) ) return FALSE ; if ( puActiveWidget() && ( this != puActiveWidget() ) ) Index: puAuxSelectBox.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/puAux/puAuxSelectBox.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- puAuxSelectBox.cxx 28 Feb 2004 00:54:03 -0000 1.1 +++ puAuxSelectBox.cxx 18 Mar 2004 17:20:52 -0000 1.2 @@ -114,7 +114,8 @@ int puaSelectBox::checkKey ( int key, int updown ) { - if ( ! input -> isAcceptingInput () || ! isVisible () || ! isActive () || ( window != puGetWindow () ) ) + if ( updown == PU_UP || ! input -> isAcceptingInput () || + ! isVisible () || ! isActive () || ( window != puGetWindow () ) ) return FALSE ; switch ( key ) |
From: Steve B. <sj...@us...> - 2004-03-18 17:30:31
|
Update of /cvsroot/plib/plib/src/js In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19225/plib/src/js Modified Files: jsMacOSX.cxx Log Message: Added some changes that John Fay requested: 1) Fixed MacOSX joystick code to resemble a fix that was applied to freeglut. 2) Provided a test to prevent some puAux widgets from being incorrectly activated on a key release. Index: jsMacOSX.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/js/jsMacOSX.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- jsMacOSX.cxx 4 Jan 2003 02:55:54 -0000 1.1 +++ jsMacOSX.cxx 18 Mar 2004 17:20:52 -0000 1.2 @@ -87,15 +87,18 @@ CFTypeRef refUsage = CFDictionaryGetValue (properties, CFSTR(kIOHIDPrimaryUsageKey)); CFNumberGetValue((CFNumberRef) refUsage, kCFNumberLongType, &usage); CFNumberGetValue((CFNumberRef) refPage, kCFNumberLongType, &page); - - // exclude keyboard / mouse devices - if ((page == kHIDPage_GenericDesktop) && - ((usage == kHIDUsage_GD_Keyboard) || (usage == kHIDUsage_GD_Mouse)) - ) - continue; - - // add it to the array - ioDevices[numDevices++] = ioDev; + + if ( (page == kHIDPage_GenericDesktop) && + ((usage == kHIDUsage_GD_Joystick) || + (usage == kHIDUsage_GD_GamePad ) || + (usage == kHIDUsage_GD_MultiAxisController) || + (usage == kHIDUsage_GD_Hatswitch) // last two necessary ? + ) + ) + { + // add it to the array + ioDevices[numDevices++] = ioDev; + } } IOObjectRelease(hidIterator); |
From: Steve B. <sj...@us...> - 2004-03-18 17:13:42
|
Update of /cvsroot/plib/plib/src/ssg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15691/plib/src/ssg Modified Files: ssgVertSplitter.cxx Log Message: Changed default crease angle from 46 degrees to 61 degrees. Index: ssgVertSplitter.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/ssg/ssgVertSplitter.cxx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ssgVertSplitter.cxx 13 Jan 2004 14:35:53 -0000 1.2 +++ ssgVertSplitter.cxx 18 Mar 2004 17:04:03 -0000 1.3 @@ -28,7 +28,7 @@ ssgVertSplitter::ssgVertSplitter(int nVerts, int nTris) { - setSharpAngle(46); + setSharpAngle(61); _nVerts = _origVerts = _vertsAlloced = nVerts; _verts = new float[3*_nVerts]; _norms = new float[3*_nVerts]; |
From: Steve B. <sj...@us...> - 2004-03-18 17:09:23
|
Update of /cvsroot/plib/plib/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14928/plib/examples Modified Files: configure.in Log Message: Fixed some missing '-lgdi32's that were breaking Windoze/Cygwin builds. Thanks Norman! Index: configure.in =================================================================== RCS file: /cvsroot/plib/plib/examples/configure.in,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- configure.in 16 Feb 2004 02:26:27 -0000 1.37 +++ configure.in 18 Mar 2004 16:59:39 -0000 1.38 @@ -101,7 +101,7 @@ LIBS="$LIBS -lwinmm" dnl OpenGL libraries - OGL_LIBS="-lglu32 -lopengl32" + OGL_LIBS="-lglu32 -lopengl32 -lgdi32" GLUT_LIBS="-lglut32" ;; *-*-mingw32*) @@ -112,7 +112,7 @@ dnl OpenGL libraries - OGL_LIBS="-lglu32 -lopengl32" + OGL_LIBS="-lglu32 -lopengl32 -lgdi32" GLUT_LIBS="-lglut32" ;; *-apple-darwin*) |
From: Steve B. <sj...@us...> - 2004-03-14 18:36:04
|
Update of /cvsroot/plib/plib/src/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21326/plib/src/util Modified Files: ul.h Log Message: Added byte-swapping routines for float, int, short. Index: ul.h =================================================================== RCS file: /cvsroot/plib/plib/src/util/ul.h,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- ul.h 14 Mar 2004 18:06:27 -0000 1.64 +++ ul.h 14 Mar 2004 18:27:05 -0000 1.65 @@ -322,18 +322,28 @@ static const int _ulEndianTest = 1; #define ulIsLittleEndian (*((char *) &_ulEndianTest ) != 0) #define ulIsBigEndian (*((char *) &_ulEndianTest ) == 0) -static inline void ulEndianSwap(unsigned int *x) { + +inline void ulEndianSwap(unsigned int *x) +{ *x = (( *x >> 24 ) & 0x000000FF ) | - (( *x >> 8 ) & 0x0000FF00 ) | - (( *x << 8 ) & 0x00FF0000 ) | - (( *x << 24 ) & 0xFF000000 ) ; + (( *x >> 8 ) & 0x0000FF00 ) | + (( *x << 8 ) & 0x00FF0000 ) | + (( *x << 24 ) & 0xFF000000 ) ; } + -static inline void ulEndianSwap(unsigned short *x) { +inline void ulEndianSwap(unsigned short *x) +{ *x = (( *x >> 8 ) & 0x00FF ) | - (( *x << 8 ) & 0xFF00 ) ; + (( *x << 8 ) & 0xFF00 ) ; } + +inline void ulEndianSwap(float *x) { ulEndianSwap((unsigned int *)x); } +inline void ulEndianSwap(int *x) { ulEndianSwap((unsigned int *)x); } +inline void ulEndianSwap(short *x) { ulEndianSwap((unsigned short *)x); } + + inline unsigned short ulEndianLittle16(unsigned short x) { if (ulIsLittleEndian) { return x; @@ -356,7 +366,7 @@ if (ulIsLittleEndian) { return x; } else { - ulEndianSwap((unsigned int*)&x); + ulEndianSwap(&x); return x; } } @@ -386,7 +396,7 @@ return; } else { for (int i = 0; i < length; i++) { - ulEndianSwap((unsigned int*)x++); + ulEndianSwap(x++); } } } @@ -416,7 +426,7 @@ return; } else { for (int i = 0; i < length; i++) { - ulEndianSwap((unsigned int*)x++); + ulEndianSwap(x++); } } } @@ -443,7 +453,7 @@ if (ulIsBigEndian) { return x; } else { - ulEndianSwap((unsigned int*)&x); + ulEndianSwap(&x); return x; } } |
From: Steve B. <sj...@us...> - 2004-03-14 18:15:30
|
Update of /cvsroot/plib/plib/src/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17049/plib/src/util Modified Files: ul.h Log Message: Exposed the underlying (and most convenient) byte swap routines so the user can play with them instead of the incredibly clunky ones we currently have. Index: ul.h =================================================================== RCS file: /cvsroot/plib/plib/src/util/ul.h,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- ul.h 25 Feb 2004 15:39:34 -0000 1.63 +++ ul.h 14 Mar 2004 18:06:27 -0000 1.64 @@ -322,14 +322,14 @@ static const int _ulEndianTest = 1; #define ulIsLittleEndian (*((char *) &_ulEndianTest ) != 0) #define ulIsBigEndian (*((char *) &_ulEndianTest ) == 0) -static inline void _ulEndianSwap(unsigned int *x) { +static inline void ulEndianSwap(unsigned int *x) { *x = (( *x >> 24 ) & 0x000000FF ) | (( *x >> 8 ) & 0x0000FF00 ) | (( *x << 8 ) & 0x00FF0000 ) | (( *x << 24 ) & 0xFF000000 ) ; } [...93 lines suppressed...] } } @@ -434,7 +434,7 @@ if (ulIsBigEndian) { return x; } else { - _ulEndianSwap(&x); + ulEndianSwap(&x); return x; } } @@ -443,7 +443,7 @@ if (ulIsBigEndian) { return x; } else { - _ulEndianSwap((unsigned int*)&x); + ulEndianSwap((unsigned int*)&x); return x; } } |
From: Wolfram K. <wol...@us...> - 2004-03-14 11:35:53
|
Update of /cvsroot/plib/plib/src/ssg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3289 Modified Files: ssgLoadSGI.cxx Log Message: Fix by Melchior FRANZ <mf...@ao...>, see hist post from 12 Mar 2004 on the fgfs devel list. A SGI file with zsize 2 is a "grayscale with alfa" file. Index: ssgLoadSGI.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadSGI.cxx,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ssgLoadSGI.cxx 4 Nov 2003 13:14:33 -0000 1.16 +++ ssgLoadSGI.cxx 14 Mar 2004 11:26:56 -0000 1.17 @@ -352,7 +352,7 @@ info -> width = sgihdr->xsize ; info -> height = sgihdr->ysize ; info -> depth = sgihdr->zsize ; - info -> alpha = ( sgihdr->zsize == 4 ) ; + info -> alpha = ( sgihdr->zsize == 2 || sgihdr->zsize == 4 ) ; } bool result = |
From: M?rten Str?m. <str...@us...> - 2004-03-02 16:37:46
|
Update of /cvsroot/plib/plib/examples/src/ssg/water In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30869 Modified Files: water.cxx Log Message: Fix to compile with OpenGL 1.4. Index: water.cxx =================================================================== RCS file: /cvsroot/plib/plib/examples/src/ssg/water/water.cxx,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- water.cxx 1 Sep 2002 12:04:52 -0000 1.24 +++ water.cxx 2 Mar 2004 16:25:49 -0000 1.25 @@ -46,6 +46,13 @@ # endif #endif +#ifndef GL_VERSION_1_3 +// ARB_multitexture +#define GL_TEXTURE0 GL_TEXTURE0_ARB +#define GL_TEXTURE1 GL_TEXTURE1_ARB +#define glActiveTexture glActiveTextureARB +#endif + #define GUI_BASE 80 #define VIEW_GUI_BASE 20 #define FONT_COLOUR 1,1,1,1 @@ -116,7 +123,7 @@ #ifdef GL_ARB_multitexture int tx ; glGetIntegerv ( GL_TEXTURE_BINDING_2D, &tx ) ; - glActiveTextureARB ( GL_TEXTURE1_ARB ) ; + glActiveTexture ( GL_TEXTURE1 ) ; #endif glTexGeni ( GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ) ; glTexGeni ( GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ) ; @@ -125,7 +132,7 @@ #ifdef GL_ARB_multitexture glEnable ( GL_TEXTURE_2D ) ; /* Enables the second texture map. */ glBindTexture ( GL_TEXTURE_2D, tx ) ; - glActiveTextureARB ( GL_TEXTURE0_ARB ) ; + glActiveTexture ( GL_TEXTURE0 ) ; #endif return TRUE ; } @@ -133,13 +140,13 @@ static int disableTexGen ( ssgEntity * ) { #ifdef GL_ARB_multitexture - glActiveTextureARB ( GL_TEXTURE1_ARB ) ; + glActiveTexture ( GL_TEXTURE1 ) ; #endif glDisable ( GL_TEXTURE_GEN_S ) ; glDisable ( GL_TEXTURE_GEN_T ) ; #ifdef GL_ARB_multitexture glDisable ( GL_TEXTURE_2D ) ; /* Disables the second texture map */ - glActiveTextureARB ( GL_TEXTURE0_ARB ) ; + glActiveTexture ( GL_TEXTURE0 ) ; #endif return TRUE ; } |
From: Steve B. <sj...@us...> - 2004-02-28 22:44:53
|
Update of /cvsroot/plib/plib/src/pw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16202/plib/src/pw Modified Files: pwMacOSX.cxx Log Message: Fixed a couple of MacOSX compilation problems. Index: pwMacOSX.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/pw/pwMacOSX.cxx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pwMacOSX.cxx 24 Feb 2004 02:06:03 -0000 1.3 +++ pwMacOSX.cxx 28 Feb 2004 22:35:03 -0000 1.4 @@ -20,7 +20,7 @@ fprintf ( stderr, "PW: ***** NOT IMPLEMENTED FOR OS-X YET!! *****\n" ) ; } -void pwInit ( int multisample, int num_samples ) ; +void pwInit ( int multisample, int num_samples ) { /* Open a full-screen window here please. */ fprintf ( stderr, "PW: ***** NOT IMPLEMENTED FOR OS-X YET!! *****\n" ) ; |
From: Steve B. <sj...@us...> - 2004-02-28 22:44:50
|
Update of /cvsroot/plib/plib/src/puAux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16202/plib/src/puAux Modified Files: puAuxCompass.cxx Log Message: Fixed a couple of MacOSX compilation problems. Index: puAuxCompass.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/puAux/puAuxCompass.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- puAuxCompass.cxx 28 Feb 2004 00:54:03 -0000 1.1 +++ puAuxCompass.cxx 28 Feb 2004 22:35:03 -0000 1.2 @@ -24,7 +24,12 @@ #include "puAux.h" -#include <GL/glu.h> + +#ifdef UL_MAC_OSX +# include <OpenGL/gl.h> +#else +# include <GL/gl.h> +#endif UL_RTTI_DEF1(puaCompass,puObject) |
From: Steve B. <sj...@us...> - 2004-02-28 22:38:59
|
Update of /cvsroot/plib/plib/src/pw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15464/plib/src/pw Modified Files: pwWindows.cxx Log Message: Fixed a missing bracket in pwWindows. Added an option to KeyFlier to allow you to change the current coordinates without killing forward motion. Index: pwWindows.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/pw/pwWindows.cxx,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- pwWindows.cxx 24 Feb 2004 02:10:40 -0000 1.5 +++ pwWindows.cxx 28 Feb 2004 22:29:11 -0000 1.6 @@ -154,7 +154,7 @@ void pwInit ( int multisample, int num_samples ) { - pwInit ( 0, 0, -1, -1, multisample, "NoName", FALSE, num_samples, + pwInit ( 0, 0, -1, -1, multisample, "NoName", FALSE, num_samples ) ; } |
From: Steve B. <sj...@us...> - 2004-02-28 22:38:59
|
Update of /cvsroot/plib/plib/src/ssg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15464/plib/src/ssg Modified Files: ssgKeyFlier.h Log Message: Fixed a missing bracket in pwWindows. Added an option to KeyFlier to allow you to change the current coordinates without killing forward motion. Index: ssgKeyFlier.h =================================================================== RCS file: /cvsroot/plib/plib/src/ssg/ssgKeyFlier.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ssgKeyFlier.h 2 Sep 2002 06:05:48 -0000 1.6 +++ ssgKeyFlier.h 28 Feb 2004 22:29:11 -0000 1.7 @@ -156,9 +156,9 @@ return & curr_pos ; } - void set_coord ( sgCoord *pos ) + void set_coord ( sgCoord *pos, int noStop = 0 ) { - stop_all () ; + if ( ! noStop ) stop_all () ; sgCopyCoord ( & last_pos, pos ) ; update () ; } |
From: Steve B. <sj...@us...> - 2004-02-28 01:13:01
|
Update of /cvsroot/plib/plib/doc/puAux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25535/plib/doc/puAux Added Files: index.html Log Message: Added a doc directory for puAux. --- NEW FILE: index.html --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <HTML> <HEAD> <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <TITLE>SSG Auxiliary Libraries.</TITLE> </HEAD> <BODY text="#B5A642" link="#8FFF8F" vlink="#18A515" alink="#20336B" bgcolor="#005000" background="../marble.png"> <TABLE> <TR> <TD> <H1>PUI Auxiliary Libraries.</H1> </TD> </TR> <TR> <TD> by Steve Baker </TD> </TR> </TABLE> <H2>Introduction</H2> <TABLE> <TR> <TD> PLIB/puAux is a suite of auxiliary libraries that build higher level classes on top of the basic PUI classes. <p> </TD> <TD> <center> <IMG SRC="snapshot.png" ALT="puAux screenshot" WIDTH=417 HEIGHT=309> <br> This image was created entirely from puAux primitives. </center> </TD> </TR> </TABLE> <p> <H2>Conventions</H2> puAux is installed and named with the same conventions as the base PLIB libraries. <br> ie: <pre> /usr/include/plib/puAux.h /usr/lib/libplibpuaux.a </pre> <p> PLIB/puAux functions, classes and constants are all named with an 'pua' or 'PUA' prefix. <br> <ADDRESS> <A HREF="http://www.sjbaker.org"> Steve J. Baker.</A> <<A HREF="mailto:sjb...@ai...">sjb...@ai...</A>> </ADDRESS> </table> </BODY> </HTML> |
From: Steve B. <sj...@us...> - 2004-02-28 01:12:50
|
Update of /cvsroot/plib/plib/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25535/plib/doc Modified Files: index.html Log Message: Added a doc directory for puAux. Index: index.html =================================================================== RCS file: /cvsroot/plib/plib/doc/index.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- index.html 16 Feb 2004 02:26:26 -0000 1.29 +++ index.html 28 Feb 2004 01:03:44 -0000 1.30 @@ -60,6 +60,7 @@ <A HREF="net/index.html"><IMG SRC="NET.png" ALT="NET" BORDER="0" width=75 height=25></A><br> <A HREF="sl/index.html"><IMG SRC="SL.png" ALT="SL" BORDER="0" width=75 height=25></A> <A HREF="pw/index.html"><IMG SRC="PW.png" ALT="PW" BORDER="0" width=75 height=25></A> +<A HREF="puAux/index.html"><IMG SRC="puAux.png" ALT="PUAUX" BORDER="0" width=75 height=25></A> <br> </TD> <TD> |