plib-cvs Mailing List for PLIB (Page 59)
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: Sebastian U. <ud...@us...> - 2002-04-03 01:26:20
|
Update of /cvsroot/plib/plib/doc/pui In directory usw-pr-cvs1:/tmp/cvs-serv22144 Modified Files: index.html Log Message: Fixed puInterface documentation Index: index.html =================================================================== RCS file: /cvsroot/plib/plib/doc/pui/index.html,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- index.html 24 Mar 2002 01:30:13 -0000 1.41 +++ index.html 3 Apr 2002 01:26:17 -0000 1.42 @@ -1544,8 +1544,7 @@ <p> The PUI system itself maintains a private global puInterface which is used to group together all of the <a href="#puObject">puObjects</a> that -the application generates that are not grouped into other -<a href="#puGroup">puGroups</a> or puInterfaces. +the application generates. <p> <a NAME="puPopup"></a> <h3> |
From: Sebastian U. <ud...@us...> - 2002-04-03 00:53:58
|
Update of /cvsroot/plib/plib/src/pui In directory usw-pr-cvs1:/tmp/cvs-serv13821 Modified Files: puInterface.cxx Log Message: Dave McClurg: Fixed potential array overflow in puPushLiveInterface () Index: puInterface.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/pui/puInterface.cxx,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- puInterface.cxx 19 Dec 2001 18:44:44 -0000 1.13 +++ puInterface.cxx 3 Apr 2002 00:53:54 -0000 1.14 @@ -31,7 +31,7 @@ void puPushLiveInterface ( puInterface *in ) { - if ( currLiveInterface < PUSTACK_MAX ) + if ( currLiveInterface < PUSTACK_MAX - 1 ) liveInterfaceStack [ ++currLiveInterface ] = in ; else ulSetError ( UL_WARNING, "PUI: Too many live puInterfaces open at once!\n" ) ; |
From: M?rten Str?m. <str...@us...> - 2002-03-27 15:36:04
|
Update of /cvsroot/plib/plib/src/ssg In directory usw-pr-cvs1:/tmp/cvs-serv31966 Modified Files: ssgLoad.cxx ssgLoadTexture.cxx Log Message: Replace known loaders by extension. Index: ssgLoad.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/ssg/ssgLoad.cxx,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ssgLoad.cxx 23 Mar 2002 15:06:45 -0000 1.22 +++ ssgLoad.cxx 27 Mar 2002 15:36:01 -0000 1.23 @@ -177,6 +177,17 @@ void ssgAddModelFormat ( const char* extension, ssgLoadFunc *loadfunc , ssgSaveFunc *savefunc ) { + for ( int i = 0 ; i < num_formats ; i++ ) + { + if ( ulStrEqual ( formats [ i ] . extension, extension ) ) + { + formats [ i ] . extension = extension ; + formats [ i ] . loadfunc = loadfunc ; + formats [ i ] . savefunc = savefunc ; + return ; + } + } + if ( num_formats < MAX_FORMATS ) { formats [ num_formats ] . extension = extension ; Index: ssgLoadTexture.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadTexture.cxx,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ssgLoadTexture.cxx 23 Mar 2002 15:06:45 -0000 1.13 +++ ssgLoadTexture.cxx 27 Mar 2002 15:36:01 -0000 1.14 @@ -192,6 +192,16 @@ void ssgAddTextureFormat ( const char* extension, bool (*loadfunc) (const char*, ssgTextureInfo* info) ) { + for ( int i = 0 ; i < num_formats ; i++ ) + { + if ( ulStrEqual ( formats [ i ] . extension, extension ) ) + { + formats [ i ] . extension = extension ; + formats [ i ] . loadfunc = loadfunc ; + return ; + } + } + if ( num_formats < MAX_FORMATS ) { formats [ num_formats ] . extension = extension ; |
From: M?rten Str?m. <str...@us...> - 2002-03-27 13:51:23
|
Update of /cvsroot/plib/plib/src/ssg In directory usw-pr-cvs1:/tmp/cvs-serv24269 Modified Files: ssgVtxTable.cxx Log Message: Changed ssgVtxTable to use vertex arrays. Index: ssgVtxTable.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/ssg/ssgVtxTable.cxx,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- ssgVtxTable.cxx 25 Jan 2002 16:28:00 -0000 1.27 +++ ssgVtxTable.cxx 27 Mar 2002 13:51:20 -0000 1.28 @@ -489,32 +489,41 @@ void ssgVtxTable::draw_geometry () { + int num_vertices = getNumVertices () ; int num_colours = getNumColours () ; int num_normals = getNumNormals () ; - int num_vertices = getNumVertices () ; int num_texcoords = getNumTexCoords () ; - sgVec3 *vx = (sgVec3 *) vertices -> get(0) ; - sgVec3 *nm = (sgVec3 *) normals -> get(0) ; - sgVec2 *tx = (sgVec2 *) texcoords -> get(0) ; - sgVec4 *cl = (sgVec4 *) colours -> get(0) ; - - glBegin ( gltype ) ; - if ( num_colours == 0 ) glColor4f ( 1.0f, 1.0f, 1.0f, 1.0f ) ; - if ( num_colours == 1 ) glColor4fv ( cl [ 0 ] ) ; - if ( num_normals == 1 ) glNormal3fv ( nm [ 0 ] ) ; + if ( num_colours == 1 ) glColor4fv ( colours -> get(0) ) ; + if ( num_normals == 1 ) glNormal3fv ( normals -> get(0) ) ; - for ( int i = 0 ; i < num_vertices ; i++ ) + glPushClientAttrib ( GL_CLIENT_VERTEX_ARRAY_BIT ) ; + + if ( num_colours > 1 ) { - if ( num_colours > 1 ) glColor4fv ( cl [ i ] ) ; - if ( num_normals > 1 ) glNormal3fv ( nm [ i ] ) ; - if ( num_texcoords > 1 ) glTexCoord2fv ( tx [ i ] ) ; + glEnableClientState ( GL_COLOR_ARRAY ) ; + glColorPointer ( 4, GL_FLOAT, 0, colours->get(0) ) ; + } - glVertex3fv ( vx [ i ] ) ; + if ( num_normals > 1 ) + { + glEnableClientState ( GL_NORMAL_ARRAY ) ; + glNormalPointer ( GL_FLOAT, 0, normals->get(0) ) ; } - glEnd () ; + if ( num_texcoords > 1 ) + { + glEnableClientState ( GL_TEXTURE_COORD_ARRAY ) ; + glTexCoordPointer ( 2, GL_FLOAT, 0, texcoords->get(0) ) ; + } + + glEnableClientState ( GL_VERTEX_ARRAY ) ; + glVertexPointer ( 3, GL_FLOAT, 0, vertices->get(0) ) ; + + glDrawArrays ( gltype, 0, num_vertices ) ; + + glPopClientAttrib () ; } |
From: M?rten Str?m. <str...@us...> - 2002-03-27 13:49:36
|
Update of /cvsroot/plib/plib/src/pui In directory usw-pr-cvs1:/tmp/cvs-serv23587 Modified Files: pu.cxx Log Message: Removed GLU dependency. Index: pu.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/pui/pu.cxx,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- pu.cxx 23 Mar 2002 15:06:44 -0000 1.45 +++ pu.cxx 27 Mar 2002 13:49:33 -0000 1.46 @@ -288,7 +288,7 @@ glMatrixMode ( GL_PROJECTION ) ; glPushMatrix () ; glLoadIdentity () ; - gluOrtho2D ( 0, w, 0, h ) ; + glOrtho ( 0, w, 0, h, -1, 1 ) ; glMatrixMode ( GL_MODELVIEW ) ; glPushMatrix () ; glLoadIdentity () ; |
From: Sebastian U. <ud...@us...> - 2002-03-25 17:38:04
|
Update of /cvsroot/plib/plib In directory usw-pr-cvs1:/tmp/cvs-serv29753 Modified Files: AUTHORS Log Message: Added a couple of names Index: AUTHORS =================================================================== RCS file: /cvsroot/plib/plib/AUTHORS,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- AUTHORS 20 Jun 2001 19:51:24 -0000 1.9 +++ AUTHORS 25 Mar 2002 17:32:33 -0000 1.10 @@ -9,13 +9,17 @@ Dave McClurg Gerard Decatrel Gil Carter + Giancarlo Niccolai John Fay Mark Vallevand Marten Stromberg + Nathan Matias Norman Vine Per Liedman - Steve Baker <--- Hmmm - must sort this list by SECOND name! Sam Stickland + Sebastian Ude + Steve Baker <--- Hmmm - must sort this list by SECOND name! + Will Lachance Wolfram Kuss Apologies to anyone I've left out - please let me know |
From: Sebastian U. <ud...@us...> - 2002-03-25 17:14:45
|
Update of /cvsroot/plib/plib/doc/util In directory usw-pr-cvs1:/tmp/cvs-serv24934 Modified Files: index.html Log Message: Corrected by-line on Steve's request; Updated ulLinkedList documentation Index: index.html =================================================================== RCS file: /cvsroot/plib/plib/doc/util/index.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- index.html 24 Mar 2002 00:35:44 -0000 1.8 +++ index.html 25 Mar 2002 17:14:41 -0000 1.9 @@ -10,7 +10,7 @@ bgcolor="#005000" background="../marble.png"> <H1>The PLIB general Utility Library.</H1> -By Steve Baker +By Sebastian Ude <H2>Introduction</H2> The 'UL' utility library is primarily targeted towards hiding common operating system functions behind a thin layer that makes them portable. @@ -394,22 +394,27 @@ <p> To remove a node from the list, call one of: <pre><i> - void ulLinkedList::removeNode ( void *data ) ; + bool ulLinkedList::removeNode ( void *data ) ; void * ulLinkedList::removeNode ( int pos ) ; </i></pre> -Where in case there is more than one node whose data value is 'data', the -first function will remove the <b>first</b> one. With the second one, 'pos' -has to be a number between '0' and the number of nodes minus one. The return -value of the second function is a copy of the removed node's data value. +Where the first function returns 'true' if the node was sucessfully removed or +'false' if it could not find a node whose value is 'data'. In case there is +more than one node whose data value is 'data', it will remove the <b>first</b> +one. With the second function, 'pos' has to be a number between '0' and the +number of nodes minus one. It's return value is the removed node's data +value. <p> To iterate over the list (starting from the head) and to have a custom function being called for each node's data pointer, call: <pre><i> - typedef bool (*ulIterateFunc)( const void *data ) ; - void ulLinkedList::forEach ( ulIterateFunc fn ) const ; + typedef bool (*ulIterateFunc)( void *data, void *user_data ) ; + void * ulLinkedList::forEach ( ulIterateFunc fn, void *user_data = NULL ) const ; </i></pre> -The iteration process will stop if your ulIterateFunc returns "false" or -if the tail of the list is reached. +The iteration process will stop if your ulIterateFunc returns 'false', in +which case "forEach" returns the data value of the node at which the iteration +stopped, or if the tail of the list has been reached, in which case "forEach" +returns NULL. The user_data pointer will be passed to your ulIterateFunc as +the second argument. <p> ulLinkedList allows you to maintain a sorted list as an option. To set up a sorted list, simply be sure to insert all nodes using the sorted insertion @@ -443,17 +448,20 @@ <pre><i> bool ulLinkedList::isSorted ( void ) const ; </i></pre> +Note that with a linked list, you <b>must not</b> modify the criteria of a +node's data that is used for sorting without removing the node from the list +and re-inserting it. <p> Finally, you can empty a list (remove all nodes) by calling: <pre><i> typedef bool (*ulIterateFunc)( const void *data ) ; - void ulList::empty ( ulIterateFunc destroyfn = NULL ) ; + void ulList::empty ( ulIterateFunc destroyfn = NULL, void *user_data = NULL ) ; </i></pre> Where "destroyfn" is an optionally specified function that will be called -with a copy each destroyed node's data pointer as the argument. This is -for example useful if the list entries are pointers to dynamically allocated -objects that have to be freed on destruction of the list. The return value -of the specified function is ignored. +with each destroyed node's data pointer as the first and with user_data as +the second argument. This is for example useful if the list entries are +pointers to dynamically allocated objects that have to be freed on destruction +of the list. The return value of the specified function is ignored. <p> <h3><a name="ulHashTable">ulHashTable</a></h3> @@ -610,9 +618,7 @@ <a href="http://validator.w3.org/check/referer"><img border="0" src="../valid-html40.png" alt="Valid HTML 4.0!" height="31" width="88"></a> <td> <ADDRESS> -<A HREF="http://www.sjbaker.org"> -Steve J. Baker.</A> -<<A HREF="mailto:sjb...@ai...">sjb...@ai...</A>> +Sebastian Ude <<A HREF="mailto:ud...@ha...">ud...@ha...</A>> </ADDRESS> </table> </BODY> |
From: Sebastian U. <ud...@us...> - 2002-03-25 12:56:15
|
Update of /cvsroot/plib/plib/src/ssg In directory usw-pr-cvs1:/tmp/cvs-serv22478 Modified Files: ssgOptimiser.cxx Log Message: Franz Melchior: Fixed "new" / "delete []" mismatch in OptVertexList::~OptVertexList Index: ssgOptimiser.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/ssg/ssgOptimiser.cxx,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- ssgOptimiser.cxx 25 Mar 2002 12:55:15 -0000 1.23 +++ ssgOptimiser.cxx 25 Mar 2002 12:56:12 -0000 1.24 @@ -115,7 +115,7 @@ ~OptVertexList () { for ( int i = 0 ; i < vnum ; i++ ) - delete [] vlist [ i ] ; + delete vlist [ i ] ; delete [] vlist ; delete [] tlist ; |
From: Sebastian U. <ud...@us...> - 2002-03-25 12:55:18
|
Update of /cvsroot/plib/plib/src/ssg In directory usw-pr-cvs1:/tmp/cvs-serv21876 Modified Files: ssgOptimiser.cxx Log Message: Argh ... Index: ssgOptimiser.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/ssg/ssgOptimiser.cxx,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ssgOptimiser.cxx 25 Mar 2002 12:54:04 -0000 1.22 +++ ssgOptimiser.cxx 25 Mar 2002 12:55:15 -0000 1.23 @@ -115,7 +115,7 @@ ~OptVertexList () { for ( int i = 0 ; i < vnum ; i++ ) - delete vlist [ i ] ; + delete [] vlist [ i ] ; delete [] vlist ; delete [] tlist ; |
From: Sebastian U. <ud...@us...> - 2002-03-25 12:54:08
|
Update of /cvsroot/plib/plib/src/ssg In directory usw-pr-cvs1:/tmp/cvs-serv20924 Modified Files: ssgOptimiser.cxx Log Message: diff Index: ssgOptimiser.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/ssg/ssgOptimiser.cxx,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ssgOptimiser.cxx 23 Mar 2002 15:06:45 -0000 1.21 +++ ssgOptimiser.cxx 25 Mar 2002 12:54:04 -0000 1.22 @@ -115,7 +115,7 @@ ~OptVertexList () { for ( int i = 0 ; i < vnum ; i++ ) - delete [] vlist [ i ] ; + delete vlist [ i ] ; delete [] vlist ; delete [] tlist ; |
From: Sebastian U. <ud...@us...> - 2002-03-24 21:14:40
|
Update of /cvsroot/plib/plib/src/util In directory usw-pr-cvs1:/tmp/cvs-serv23164 Modified Files: Makefile.am ul.dsp ulLinkedList.cxx Added Files: ulLocal.h Log Message: Introduced ulLocal.h and moved ulListNode definition there --- NEW FILE: ulLocal.h --- /* PLIB - A Suite of Portable Game Libraries Copyright (C) 2002 Steve Baker This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA For further information visit http://plib.sourceforge.net $Id: ulLocal.h,v 1.1 2002/03/24 21:14:37 ude Exp $ */ #ifndef _UL_LOCAL_H_ #define _UL_LOCAL_H_ 1 #include "ul.h" class ulListNode { protected: ulListNode *next ; void *data ; public: ulListNode ( void *dt, ulListNode *next_node ) { data = dt ; next = next_node ; } void * getData ( void ) const { return data ; } void setData ( void *d ) { data = d ; } ulListNode * getNext ( void ) const { return next ; } void setNext ( ulListNode *n ) { next = n ; } } ; #endif Index: Makefile.am =================================================================== RCS file: /cvsroot/plib/plib/src/util/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.am 20 Mar 2002 15:48:23 -0000 1.7 +++ Makefile.am 24 Mar 2002 21:14:36 -0000 1.8 @@ -3,7 +3,7 @@ include_HEADERS = ul.h libplibul_a_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \ - ulList.cxx + ulList.cxx ulLocal.h EXTRA_DIST = ul.dsp Index: ul.dsp =================================================================== RCS file: /cvsroot/plib/plib/src/util/ul.dsp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ul.dsp 20 Mar 2002 15:48:23 -0000 1.13 +++ ul.dsp 24 Mar 2002 21:14:37 -0000 1.14 @@ -116,5 +116,9 @@ SOURCE=.\ulList.cxx # End Source File +# Begin Source File + +SOURCE=.\ulLocal.h +# End Source File # End Target # End Project Index: ulLinkedList.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/util/ulLinkedList.cxx,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ulLinkedList.cxx 24 Mar 2002 20:49:55 -0000 1.5 +++ ulLinkedList.cxx 24 Mar 2002 21:14:37 -0000 1.6 @@ -22,30 +22,7 @@ */ -#include "ul.h" - -class ulListNode -{ -protected: - - ulListNode *next ; - void *data ; - -public: - - ulListNode ( void *dt, ulListNode *next_node ) - { - data = dt ; - next = next_node ; - } - - void * getData ( void ) const { return data ; } - void setData ( void *d ) { data = d ; } - - ulListNode * getNext ( void ) const { return next ; } - void setNext ( ulListNode *n ) { next = n ; } -} ; - +#include "ulLocal.h" void ulLinkedList::unlinkNode ( ulListNode *prev, ulListNode *node ) { |
From: Sebastian U. <ud...@us...> - 2002-03-24 21:09:36
|
Update of /cvsroot/plib/plib/src/fnt In directory usw-pr-cvs1:/tmp/cvs-serv21825 Modified Files: Makefile.am Log Message: Do not install fntLocal.h on the user's system Index: Makefile.am =================================================================== RCS file: /cvsroot/plib/plib/src/fnt/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.am 3 Oct 2001 10:21:10 -0000 1.5 +++ Makefile.am 24 Mar 2002 21:09:33 -0000 1.6 @@ -1,6 +1,6 @@ lib_LIBRARIES = libplibfnt.a -include_HEADERS = fnt.h fntLocal.h +include_HEADERS = fnt.h libplibfnt_a_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h |
From: Sebastian U. <ud...@us...> - 2002-03-24 20:50:04
|
Update of /cvsroot/plib/plib/src/util In directory usw-pr-cvs1:/tmp/cvs-serv16791 Modified Files: ul.h ulLinkedList.cxx Log Message: Added "user_data" argument to ulIterateFunc Index: ul.h =================================================================== RCS file: /cvsroot/plib/plib/src/util/ul.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- ul.h 24 Mar 2002 19:42:54 -0000 1.39 +++ ul.h 24 Mar 2002 20:49:55 -0000 1.40 @@ -666,7 +666,7 @@ } ; -typedef bool (*ulIterateFunc)( const void *data ) ; +typedef bool (*ulIterateFunc)( const void *data, void *user_data ) ; typedef int (*ulCompareFunc)( const void *data1, const void *data2 ) ; /* @@ -724,9 +724,9 @@ void * getNodeData ( int pos ) const ; - void * forEach ( ulIterateFunc fn ) const ; + void * forEach ( ulIterateFunc fn, void *user_data = NULL ) const ; - void empty ( ulIterateFunc destroyfn = NULL ) ; + void empty ( ulIterateFunc destroyfn = NULL, void *user_data = NULL ) ; } ; Index: ulLinkedList.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/util/ulLinkedList.cxx,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ulLinkedList.cxx 24 Mar 2002 19:42:54 -0000 1.4 +++ ulLinkedList.cxx 24 Mar 2002 20:49:55 -0000 1.5 @@ -125,46 +125,50 @@ int ulLinkedList::insertSorted ( void *data, ulCompareFunc comparefn ) { - if ( !sorted ) + if ( comparefn != NULL ) { - ulSetError ( UL_WARNING, - "ulLinkedList::insertSorted: This is not a sorted list !" ) ; - return -1 ; - } + if ( sorted ) [...109 lines suppressed...] + (*destroyfn) ( curr -> getData (), user_data ) ; - delete curr ; + delete curr ; + curr = next ; + } + } + else + { + while ( curr != NULL ) + { + ulListNode *next = curr -> getNext () ; - curr = next ; + delete curr ; + curr = next ; + } } head = tail = NULL ; |
From: Sebastian U. <ud...@us...> - 2002-03-24 19:42:57
|
Update of /cvsroot/plib/plib/src/util In directory usw-pr-cvs1:/tmp/cvs-serv2089 Modified Files: ul.h ulLinkedList.cxx Log Message: Changed ulLinkedList::forEach () to return the data of the node where the iteration stopped Index: ul.h =================================================================== RCS file: /cvsroot/plib/plib/src/util/ul.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- ul.h 21 Mar 2002 15:41:47 -0000 1.38 +++ ul.h 24 Mar 2002 19:42:54 -0000 1.39 @@ -724,7 +724,7 @@ void * getNodeData ( int pos ) const ; - void forEach ( ulIterateFunc fn ) const ; + void * forEach ( ulIterateFunc fn ) const ; void empty ( ulIterateFunc destroyfn = NULL ) ; } ; Index: ulLinkedList.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/util/ulLinkedList.cxx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ulLinkedList.cxx 21 Mar 2002 19:26:01 -0000 1.3 +++ ulLinkedList.cxx 24 Mar 2002 19:42:54 -0000 1.4 @@ -240,15 +240,17 @@ } -void ulLinkedList::forEach ( ulIterateFunc fn ) const +void * ulLinkedList::forEach ( ulIterateFunc fn ) const { ulListNode *curr ; for ( curr = head ; curr != NULL ; curr = curr -> getNext () ) { if ( (*fn)( curr -> getData () ) == false ) - break ; + return curr -> getData () ; } + + return NULL ; } |
From: Sebastian U. <ud...@us...> - 2002-03-24 19:17:17
|
Update of /cvsroot/plib/plib/src/pui In directory usw-pr-cvs1:/tmp/cvs-serv29614 Modified Files: pu.h Log Message: Replaced "delete" with "delete []" in puValue::~puValue Index: pu.h =================================================================== RCS file: /cvsroot/plib/plib/src/pui/pu.h,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- pu.h 23 Mar 2002 15:06:44 -0000 1.98 +++ pu.h 24 Mar 2002 19:17:13 -0000 1.99 @@ -443,7 +443,7 @@ clrValue () ; } - virtual ~puValue () { delete string ; } + virtual ~puValue () { delete [] string ; } int getType ( void ) const { return type ; } const char *getTypeString ( void ) const ; |
From: Per L. <li...@us...> - 2002-03-24 15:11:40
|
Update of /cvsroot/plib/plib/src/ssg In directory usw-pr-cvs1:/tmp/cvs-serv350 Modified Files: ssgLoad3ds.cxx Log Message: Uses ssgVtxArray instead of ssgVtxTable. ssgVtxTable support can be restored by undefining USE_VTXARRAY in the code. Patch submitted by Paolo Leoncini. Index: ssgLoad3ds.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/ssg/ssgLoad3ds.cxx,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- ssgLoad3ds.cxx 23 Mar 2002 15:06:45 -0000 1.32 +++ ssgLoad3ds.cxx 24 Mar 2002 15:11:36 -0000 1.33 @@ -48,6 +48,8 @@ it seems that no one really knows what to do with them. */ + +#define USE_VTXARRAYS #include "ssgLocal.h" #include "ssg3ds.h" @@ -63,7 +65,7 @@ /* Define DEBUG if you want debug output (this might be a nice way of looking at the structure of a 3DS file). */ -/*#define DEBUG 1*/ +//#define DEBUG 1 #ifdef DEBUG @@ -796,7 +798,7 @@ /* now apply correct smoothing. If smooth list has been found, use it, otherwise use threshold value. */ - smooth_normals( smooth_found ); + smooth_normals( 0 /*smooth_found*/ ); if (!facemat_found) { DEBUGPRINT("%sNo CHUNK_FACEMAT found. Adding default faces of material " \ @@ -871,6 +873,9 @@ ssgVertexArray *vertices = new ssgVertexArray(); ssgNormalArray *normals = new ssgNormalArray(); ssgTexCoordArray *texcrds = NULL; +#ifdef USE_VTXARRAYS + ssgIndexArray* indices = new ssgIndexArray(); +#endif if (has_texture) { if (texcrd_list == NULL) { @@ -886,12 +891,20 @@ } } + int tri_idx = 0; + for (int i = 0; i < listed_faces; i++) { unsigned short faceindex = face_indices[i]; int v1 = faceindex * 3, v2 = faceindex * 3 + 1, v3 = faceindex * 3 + 2; +#ifdef USE_VTXARRAYS + indices->add( tri_idx++ ); + indices->add( tri_idx++ ); + indices->add( tri_idx++ ); +#endif + vertices->add( vertex_list[ vertex_index[v1] ] ); vertices->add( vertex_list[ vertex_index[v2] ] ); vertices->add( vertex_list[ vertex_index[v3] ] ); @@ -941,12 +954,21 @@ sgNegateVec3( n[j] ); normals->add( n[j] ); } + +#ifdef USE_VTXARRAYS + indices->add( tri_idx++ ); + indices->add( tri_idx++ ); + indices->add( tri_idx++ ); +#endif } } - ssgVtxTable* vtab = new ssgVtxTable ( GL_TRIANGLES, - vertices, normals, texcrds, NULL ) ; +#ifdef USE_VTXARRAYS + ssgVtxArray* vtab = new ssgVtxArray ( GL_TRIANGLES, vertices, normals, texcrds, NULL, indices ); +#else + ssgVtxTable* vtab = new ssgVtxTable ( GL_TRIANGLES, vertices, normals, texcrds, NULL ) ; +#endif vtab -> setState ( get_state( material ) ) ; vtab -> setCullFace ( TRUE ) ; |
From: Sebastian U. <ud...@us...> - 2002-03-24 02:04:37
|
Update of /cvsroot/plib/plib/doc/net In directory usw-pr-cvs1:/tmp/cvs-serv7202 Modified Files: index.html Log Message: Added keywords, description and "Valid HTML 4.0" image Index: index.html =================================================================== RCS file: /cvsroot/plib/plib/doc/net/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- index.html 1 Oct 2001 16:57:31 -0000 1.5 +++ index.html 24 Mar 2002 02:04:35 -0000 1.6 @@ -2,6 +2,8 @@ <HTML> <HEAD> <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <META name="keywords" content="NET, PLIB, Pegasus, network, library, portable, games, medusa, client, server, socket, TCP, IP, netAddress, netBuffer, netMessage, netGuid, netSocket, netChannel, netBufferChannel, netChat, netMessageChannel, netMonitorServer"> + <META name="description" content="The Pegasus Network Library is C++ library for making networked games. Pegasus is based on Medusa and it is a part of PLIB. Pegasus, like Medusa, multiplexes I/O with its various client and server connections within a single process/thread. Pegasus is supported on many platforms, including Win32, Linux, and a majority of Unix implementations."> <TITLE>Pegasus Network Library</TITLE> </HEAD> <BODY text="#B5A642" link="#8FFF8F" vlink="#18A515" alink="#20336B" @@ -264,11 +266,17 @@ } ; </pre> <hr> +<table> +<tr> +<td> +<a href="http://validator.w3.org/check/referer"><img border="0" src="../valid-html40.png" alt="Valid HTML 4.0!" height="31" width="88"></a> +<td> <ADDRESS> <A HREF="http://mcdave.cjb.net"> Dave McClurg</A> <<A HREF="mailto:dp...@ef...">dp...@ef...</A>> </ADDRESS> +</table> </BODY> </HTML> |
From: Sebastian U. <ud...@us...> - 2002-03-24 01:57:15
|
Update of /cvsroot/plib/plib/doc/sg In directory usw-pr-cvs1:/tmp/cvs-serv5787 Modified Files: index.html Log Message: Fixed typo; Added keywords, description and "Valid HTML 4.0" image Index: index.html =================================================================== RCS file: /cvsroot/plib/plib/doc/sg/index.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- index.html 25 Jan 2002 16:28:00 -0000 1.9 +++ index.html 24 Mar 2002 01:57:13 -0000 1.10 @@ -2,6 +2,8 @@ <HTML> <HEAD> <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <META name="keywords" content="SG, PLIB, OpenGL, simple, geometry, library, portable, matrix, quaternion, vector, math, Baker, Steve"> + <META name="description" content="The PLIB Simple Geometry (SG) Library is simple set of matrix, quaternion and vector math functions that are useful for all sorts of OpenGL applications."> <TITLE>A Simple Geometry library for OpenGL.</TITLE> </HEAD> <BODY text="#B5A642" link="#8FFF8F" vlink="#18A515" alink="#20336B" @@ -23,7 +25,7 @@ Simple Geometry (SG) is simple set of matrix, quaternion and vector math functions that were originally written to support the SSG (Simple Scene Graph) API - but which are rather useful -for all sorts of OpenGL applications, +for all sorts of OpenGL applications. <p> SG is now a part of <A HREF="../index.html">PLIB</A>. <p> @@ -801,11 +803,17 @@ Thanks to <A HREF="mailto:kev...@ya...">Kevin Thompson</A> who kindly donated the original Quaternion code. <hr> +<table> +<tr> +<td> +<a href="http://validator.w3.org/check/referer"><img border="0" src="../valid-html40.png" alt="Valid HTML 4.0!" height="31" width="88"></a> +<td> <ADDRESS> <A HREF="http://www.sjbaker.org"> Steve J. Baker.</A> <<A HREF="mailto:sjb...@ai...">sjb...@ai...</A>> </ADDRESS> +</table> </BODY> </HTML> |
From: Sebastian U. <ud...@us...> - 2002-03-24 01:49:11
|
Update of /cvsroot/plib/plib/doc/pui In directory usw-pr-cvs1:/tmp/cvs-serv4466 Modified Files: BasicPUI.html Log Message: Added keywords and description Index: BasicPUI.html =================================================================== RCS file: /cvsroot/plib/plib/doc/pui/BasicPUI.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- BasicPUI.html 2 Oct 2001 09:21:17 -0000 1.3 +++ BasicPUI.html 24 Mar 2002 01:49:08 -0000 1.4 @@ -4,6 +4,8 @@ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="Author" content="John F. Fay"> <meta name="GENERATOR" content="Mozilla/4.75 [en] (Win98; U) [Netscape]"> + <meta name="keywords" content="PUI, PLIB, OpenGL, UI, user, interface, library, portable, picoscopic, widget, GUI, fast, GLUT, introduction, callback, puButton, puButtonBox, puFrame, puInput, puMenuBar, puOneShot, puText, puInit"> + <meta name="description" content="The PLIB Picoscopic User Interface (PUI) Library is designed to be a simple, easy-to-use graphical user interface. It is based on the OpenGL graphics language and requires a windowing system, either the OpenGL Utility Toolkit (GLUT) or another similar one. This document's purpose is to provide an introduction to the basics of PUI."> <title>BasicPUI</title> </head> <body> |
From: Sebastian U. <ud...@us...> - 2002-03-24 01:38:51
|
Update of /cvsroot/plib/plib/doc/pui In directory usw-pr-cvs1:/tmp/cvs-serv2618 Modified Files: FAQ.html Log Message: Added keywords, description, contact information and "Valid HTML 4.0" image Index: FAQ.html =================================================================== RCS file: /cvsroot/plib/plib/doc/pui/FAQ.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- FAQ.html 29 Oct 2001 18:46:43 -0000 1.4 +++ FAQ.html 24 Mar 2002 01:38:46 -0000 1.5 @@ -2,6 +2,8 @@ <HTML> <HEAD> <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <META name="keywords" content="PUI, PLIB, OpenGL, UI, user, interface, library, portable, picoscopic, MUI, widget, GUI, fast, FAQ, Baker, Steve"> + <META name="description" content="Here are some questions that have been asked about the PLIB Picoscopic User Interface library."> <TITLE>The Picoscopic User Interface: FAQ list.</TITLE> </HEAD> <BODY text="#B5A642" link="#8FFF8F" vlink="#18A515" alink="#20336B" @@ -155,6 +157,15 @@ Yes - there will never be a {insert favorite non-C++ language here} version of PUI. - +<hr> +<table> +<tr> +<td> +<a href="http://validator.w3.org/check/referer"><img border="0" src="../valid-html40.png" alt="Valid HTML 4.0!" height="31" width="88"></a> +<td> +<ADDRESS> +<A HREF="http://www.sjbaker.org">Steve J. Baker.</A> <<A HREF="mailto:sjb...@ai...">sjb...@ai...</A>> +</ADDRESS> +</table> </BODY> </HTML> |
From: Sebastian U. <ud...@us...> - 2002-03-24 01:30:16
|
Update of /cvsroot/plib/plib/doc/pui In directory usw-pr-cvs1:/tmp/cvs-serv1366 Modified Files: index.html Log Message: Added keywords and description Index: index.html =================================================================== RCS file: /cvsroot/plib/plib/doc/pui/index.html,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- index.html 24 Mar 2002 00:02:42 -0000 1.40 +++ index.html 24 Mar 2002 01:30:13 -0000 1.41 @@ -2,6 +2,8 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <META name="keywords" content="PUI, PLIB, OpenGL, UI, user, interface, library, portable, picoscopic, MUI, widget, GUI, fast, Baker, Steve, puFont, puObject, puButton, puArrowButton, puOneShot, puDial, puSlider, puBiSlider, puTriSlider, puFrame, puText, puInput, puLargeInput, puGroup, puInterface, puPopup, puDialogBox, puPopupMenu, puMenuBar, puVerticalMenu, puListBox, puButtonBox, puComboBox, puSelectBox, puFileSelector"> + <META name="description" content="The PLIB The Picoscopic User Interface (PUI) Library is a simple set of C++ classes that allow OpenGL programs to create buttons, sliders, menus etc. By using OpenGL calls, PUI is well suited for games or other interactive programs where the GUI is required to overlay some 3D rendering."> <title>The Picoscopic User Interface: Programmers Guide.</title> </head> <body text="#B5A642" bgcolor="#005000" link="#8FFF8F" vlink="#18A515" alink="#20336B" background="../marble.png"> |
From: Sebastian U. <ud...@us...> - 2002-03-24 01:21:44
|
Update of /cvsroot/plib/plib/doc/js In directory usw-pr-cvs1:/tmp/cvs-serv32468 Modified Files: index.html Log Message: Fixed typo Index: index.html =================================================================== RCS file: /cvsroot/plib/plib/doc/js/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- index.html 24 Mar 2002 01:20:46 -0000 1.5 +++ index.html 24 Mar 2002 01:21:39 -0000 1.6 @@ -3,7 +3,7 @@ <HEAD> <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <META name="keywords" content="JS, PLIB, OpenGL, joystick, library, portable, interface, games, Baker, Steve, jsJoystick"> - <META name="description" content="The PLIB Joystick Library (JS) is a portable interface that has no inherent restrictions over the number and type of joysticks it supports. It is a wrapper to make the various underlying OS mechanisms look the same to application code"> + <META name="description" content="The PLIB Joystick Library (JS) is a portable interface that has no inherent restrictions over the number and type of joysticks it supports. It is a wrapper to make the various underlying OS mechanisms look the same to application code."> <TITLE>A Joystick Library.</TITLE> </HEAD> <BODY text="#B5A642" link="#8FFF8F" vlink="#18A515" alink="#20336B" |
From: Sebastian U. <ud...@us...> - 2002-03-24 01:20:49
|
Update of /cvsroot/plib/plib/doc/js In directory usw-pr-cvs1:/tmp/cvs-serv32332 Modified Files: index.html Log Message: Added keywords, description and "Valid HTML 4.0" image Index: index.html =================================================================== RCS file: /cvsroot/plib/plib/doc/js/index.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- index.html 27 Oct 2001 05:34:47 -0000 1.4 +++ index.html 24 Mar 2002 01:20:46 -0000 1.5 @@ -2,6 +2,8 @@ <HTML> <HEAD> <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <META name="keywords" content="JS, PLIB, OpenGL, joystick, library, portable, interface, games, Baker, Steve, jsJoystick"> + <META name="description" content="The PLIB Joystick Library (JS) is a portable interface that has no inherent restrictions over the number and type of joysticks it supports. It is a wrapper to make the various underlying OS mechanisms look the same to application code"> <TITLE>A Joystick Library.</TITLE> </HEAD> <BODY text="#B5A642" link="#8FFF8F" vlink="#18A515" alink="#20336B" @@ -157,11 +159,17 @@ and provide a hot-key to pause the game and recalibrate the stick on demand. <hr> +<table> +<tr> +<td> +<a href="http://validator.w3.org/check/referer"><img border="0" src="../valid-html40.png" alt="Valid HTML 4.0!" height="31" width="88"></a> +<td> <ADDRESS> <A HREF="http://www.sjbaker.org"> Steve J. Baker.</A> <<A HREF="mailto:sjb...@ai...">sjb...@ai...</A>> </ADDRESS> +</table> </BODY> </HTML> |
From: Sebastian U. <ud...@us...> - 2002-03-24 01:13:22
|
Update of /cvsroot/plib/plib/doc/fnt In directory usw-pr-cvs1:/tmp/cvs-serv31210 Modified Files: index.html Log Message: Added keywords, description and "Valid HTML 4.0" image Index: index.html =================================================================== RCS file: /cvsroot/plib/plib/doc/fnt/index.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- index.html 27 Oct 2001 05:34:47 -0000 1.7 +++ index.html 24 Mar 2002 01:13:19 -0000 1.8 @@ -2,6 +2,8 @@ <HTML> <HEAD> <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <META name="keywords" content="FNT, PLIB, OpenGL, font, library, portable, rendering, text, texture, map, glyph, TXF"> + <META name="description" content="The PLIB FNT Library allows you to produce text using texture maps instead of bitmaps because the latter are typically very slow on consumer-grade 3D hardware."> <TITLE>A Font Library for OpenGL.</TITLE> </HEAD> <BODY text="#B5A642" link="#8FFF8F" vlink="#18A515" alink="#20336B" @@ -361,11 +363,17 @@ There are over a dozen sample TXF fonts stored in <code>examples/src/fnt/data</code>. <hr> +<table> +<tr> +<td> +<a href="http://validator.w3.org/check/referer"><img border="0" src="../valid-html40.png" alt="Valid HTML 4.0!" height="31" width="88"></a> +<td> <ADDRESS> <A HREF="http://www.sjbaker.org"> Steve J. Baker.</A> <<A HREF="mailto:sjb...@ai...">sjb...@ai...</A>> </ADDRESS> +</table> </BODY> </HTML> |
From: Sebastian U. <ud...@us...> - 2002-03-24 01:07:44
|
Update of /cvsroot/plib/plib/doc/sl In directory usw-pr-cvs1:/tmp/cvs-serv30450 Modified Files: sl.html Log Message: Added keywords, description and "Valid HTML 4.0" image Index: sl.html =================================================================== RCS file: /cvsroot/plib/plib/doc/sl/sl.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- sl.html 29 Oct 2001 18:37:52 -0000 1.6 +++ sl.html 24 Mar 2002 01:07:39 -0000 1.7 @@ -2,6 +2,8 @@ <HTML> <HEAD> <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <META name="keywords" content="SL, PLIB, OpenGL, sound, library, portable, games, replay, mixing, realtime, interactive, Baker, Steve, slDSP, slSample, slScheduler, slEnvelope, MOD, music"> + <META name="description" content="The PLIB SL Library is targetted towards producing sound effects for games and other realtime applications. It allows one to play, mix and modify sound samples with emphasis on low CPU impact and low latency rather than high quality and fancy MIDI/MOD facilities."> <TITLE>The SL Sound Library.</TITLE> </HEAD> <BODY text="#B5A642" link="#8FFF8F" vlink="#18A515" alink="#20336B" @@ -1030,11 +1032,17 @@ </pre> <hr> +<table> +<tr> +<td> +<a href="http://validator.w3.org/check/referer"><img border="0" src="../valid-html40.png" alt="Valid HTML 4.0!" height="31" width="88"></a> +<td> <ADDRESS> <A HREF="http://www.sjbaker.org"> Steve J. Baker.</A> <<A HREF="mailto:sjb...@ai...">sjb...@ai...</A>> </ADDRESS> +</table> </BODY> </HTML> |