plib-cvs Mailing List for PLIB (Page 58)
Brought to you by:
sjbaker
Menu
▾
▴
plib-cvs — A read-only list that automatically announces CVS activity
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: <ud...@us...> - 2002-04-19 21:08:02
|
Update of /cvsroot/plib/plib/src/util
In directory usw-pr-cvs1:/tmp/cvs-serv22832/src/util
Modified Files:
Makefile.am ul.h
Added Files:
ulContext.cxx
Log Message:
Moved "glIsValidContext" over to UL
--- NEW FILE: ulContext.cxx ---
/*
PLIB - A Suite of Portable Game Libraries
Copyright (C) 2001 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: ulContext.cxx,v 1.1 2002/04/19 21:02:17 ude Exp $
*/
#include "ul.h"
#ifndef WIN32
# ifndef macintosh
# include <GL/glx.h>
# else
# include <agl.h>
# endif
#endif
bool ulIsValidContext ( void )
{
#if defined(CONSOLE)
return true ;
#elif defined(WIN32)
return ( wglGetCurrentContext () != NULL ) ;
#elif defined(macintosh)
return ( aglGetCurrentContext () != NULL ) ;
#else
return ( glXGetCurrentContext () != NULL ) ;
#endif
}
Index: Makefile.am
===================================================================
RCS file: /cvsroot/plib/plib/src/util/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am 24 Mar 2002 21:14:36 -0000 1.8
+++ Makefile.am 19 Apr 2002 21:02:17 -0000 1.9
@@ -2,8 +2,8 @@
include_HEADERS = ul.h
-libplibul_a_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
- ulList.cxx ulLocal.h
+libplibul_a_SOURCES = ul.cxx ulClock.cxx ulContext.cxx ulError.cxx \
+ ulLinkedList.cxx ulList.cxx ulLocal.h
EXTRA_DIST = ul.dsp
Index: ul.h
===================================================================
RCS file: /cvsroot/plib/plib/src/util/ul.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ul.h 24 Mar 2002 20:49:55 -0000 1.40
+++ ul.h 19 Apr 2002 21:02:17 -0000 1.41
@@ -31,6 +31,7 @@
// - high performance clocks
// - ulList
// - ulLinkedList
+// - ulIsValidContext
// - more to come (endian support, version ID)
//
@@ -732,6 +733,9 @@
extern int ulStrNEqual ( const char *s1, const char *s2, int len );
extern int ulStrEqual ( const char *s1, const char *s2 );
+
+
+bool ulIsValidContext ( void ) ;
//lint -restore
|
|
From: <ud...@us...> - 2002-04-19 21:08:02
|
Update of /cvsroot/plib/plib/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv22832/src/pui
Modified Files:
pu.cxx
Log Message:
Moved "glIsValidContext" over to UL
Index: pu.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.cxx,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- pu.cxx 19 Apr 2002 20:35:40 -0000 1.47
+++ pu.cxx 19 Apr 2002 21:02:16 -0000 1.48
@@ -23,14 +23,6 @@
#include "puLocal.h"
-#ifndef WIN32
-# ifndef macintosh
-# include <GL/glx.h>
-# else
-# include <agl.h>
-# endif
-#endif
-
int puRefresh = TRUE ;
static int puWindowWidth = 400 ;
@@ -110,19 +102,6 @@
} ;
-static int glIsValidContext ( void )
-{
-#if defined(CONSOLE)
- return true ;
-#elif defined(WIN32)
- return ( wglGetCurrentContext () != NULL ) ;
-#elif defined(macintosh)
- return ( aglGetCurrentContext() != NULL ) ;
-#else
- return ( glXGetCurrentContext() != NULL ) ;
-#endif
-}
-
static int _puCursor_enable = FALSE ;
static int _puCursor_x = 0 ;
static int _puCursor_y = 0 ;
@@ -234,7 +213,7 @@
if ( firsttime )
{
- if ( glIsValidContext () == 0 )
+ if ( ! ulIsValidContext () )
{
ulSetError ( UL_FATAL,
"puInit called without a valid OpenGL context.");
|
|
From: <ud...@us...> - 2002-04-19 20:35:43
|
Update of /cvsroot/plib/plib/src/pui In directory usw-pr-cvs1:/tmp/cvs-serv6675 Modified Files: pu.cxx Log Message: Do not include "iostream.h" Index: pu.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/pui/pu.cxx,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- pu.cxx 27 Mar 2002 13:49:33 -0000 1.46 +++ pu.cxx 19 Apr 2002 20:35:40 -0000 1.47 @@ -31,10 +31,6 @@ # endif #endif -#ifdef PU_NOT_USING_GLUT -#include <iostream.h> -#endif - int puRefresh = TRUE ; static int puWindowWidth = 400 ; |
|
From: <ud...@us...> - 2002-04-19 20:20:04
|
Update of /cvsroot/plib/plib In directory usw-pr-cvs1:/tmp/cvs-serv30859 Removed Files: aclocal.m4 acsite.m4 Log Message: Removed 'install.sh', 'missing', 'mkinstalldirs' files and 'm4' macros from CVS --- aclocal.m4 DELETED --- --- acsite.m4 DELETED --- |
|
From: <ud...@us...> - 2002-04-19 20:15:46
|
Update of /cvsroot/plib/plib/tools In directory usw-pr-cvs1:/tmp/cvs-serv27773/tools Removed Files: aclocal.m4 acsite.m4 install-sh missing mkinstalldirs Log Message: Removed 'install.sh', 'missing', 'mkinstalldirs' files and 'm4' macros from CVS --- aclocal.m4 DELETED --- --- acsite.m4 DELETED --- --- install-sh DELETED --- --- missing DELETED --- --- mkinstalldirs DELETED --- |
|
From: <ud...@us...> - 2002-04-19 20:15:46
|
Update of /cvsroot/plib/plib/examples In directory usw-pr-cvs1:/tmp/cvs-serv27773/examples Removed Files: aclocal.m4 acsite.m4 install-sh missing mkinstalldirs Log Message: Removed 'install.sh', 'missing', 'mkinstalldirs' files and 'm4' macros from CVS --- aclocal.m4 DELETED --- --- acsite.m4 DELETED --- --- install-sh DELETED --- --- missing DELETED --- --- mkinstalldirs DELETED --- |
|
From: <ud...@us...> - 2002-04-19 20:15:46
|
Update of /cvsroot/plib/plib/demos/ttt3d In directory usw-pr-cvs1:/tmp/cvs-serv27773/demos/ttt3d Removed Files: acsite.m4 install-sh mkinstalldirs Log Message: Removed 'install.sh', 'missing', 'mkinstalldirs' files and 'm4' macros from CVS --- acsite.m4 DELETED --- --- install-sh DELETED --- --- mkinstalldirs DELETED --- |
|
From: <ud...@us...> - 2002-04-19 20:15:46
|
Update of /cvsroot/plib/plib/demos/exposer In directory usw-pr-cvs1:/tmp/cvs-serv27773/demos/exposer Removed Files: acsite.m4 install-sh mkinstalldirs Log Message: Removed 'install.sh', 'missing', 'mkinstalldirs' files and 'm4' macros from CVS --- acsite.m4 DELETED --- --- install-sh DELETED --- --- mkinstalldirs DELETED --- |
|
From: <ud...@us...> - 2002-04-19 20:08:09
|
Update of /cvsroot/plib/plib/tools
In directory usw-pr-cvs1:/tmp/cvs-serv22231
Added Files:
INSTALL
Log Message:
Added INSTALL file to the tools area
--- NEW FILE: INSTALL ---
Basic Installation
==================
These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, a file
`config.cache' that saves the results of its tests to speed up
reconfiguring, and a file `config.log' containing compiler output
(useful mainly for debugging `configure').
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If at some point `config.cache'
[...143 lines suppressed...]
`--help'
Print a summary of the options to `configure', and exit.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`--version'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`configure' also accepts some other, not widely useful, options.
|
|
From: <ud...@us...> - 2002-04-18 19:54:40
|
Update of /cvsroot/plib/plib/src/js
In directory usw-pr-cvs1:/tmp/cvs-serv14315
Modified Files:
js.h
Log Message:
Frederic Bouvier: Get joystick name in Windows
Index: js.h
===================================================================
RCS file: /cvsroot/plib/plib/src/js/js.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- js.h 17 Apr 2002 22:29:51 -0000 1.16
+++ js.h 18 Apr 2002 19:54:34 -0000 1.17
@@ -269,10 +269,6 @@
#elif defined( WIN32 )
- /*
- FIXME: get joystick name in Windows
- */
-
JOYCAPS jsCaps ;
js . dwFlags = JOY_RETURNALL ;
@@ -289,6 +285,8 @@
}
else
{
+ strncpy ( name, jsCaps.szPname, sizeof(name) ) ;
+
// Windows joystick drivers may provide any combination of
// X,Y,Z,R,U,V,POV - not necessarily the first n of these.
if ( jsCaps.wCaps & JOYCAPS_HASPOV ) {
@@ -382,7 +380,7 @@
# ifdef JS_NEW
ioctl ( fd, JSIOCGAXES , & num_axes ) ;
ioctl ( fd, JSIOCGBUTTONS, & num_buttons ) ;
- ioctl ( fd, JSIOCGNAME ( 128 ), name ) ;
+ ioctl ( fd, JSIOCGNAME ( sizeof(name) ), name ) ;
fcntl ( fd, F_SETFL, O_NONBLOCK ) ;
if ( num_axes > _JS_MAX_AXES )
|
|
From: <ud...@us...> - 2002-04-17 22:29:56
|
Update of /cvsroot/plib/plib/doc/js
In directory usw-pr-cvs1:/tmp/cvs-serv2591/doc/js
Modified Files:
index.html
Log Message:
David Megginson: Added jsJoystick::getName ()
Index: index.html
===================================================================
RCS file: /cvsroot/plib/plib/doc/js/index.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- index.html 17 Apr 2002 22:02:48 -0000 1.7
+++ index.html 17 Apr 2002 22:29:51 -0000 1.8
@@ -45,9 +45,10 @@
jsJoystick ( int id = 0 ) ;
~jsJoystick () ;
- int getNumAxes () const ;
- int notWorking () const ;
- void setError () ;
+ const char* getName () const ;
+ int getNumAxes () const ;
+ int notWorking () const ;
+ void setError () ;
float getDeadBand ( int axis ) const ;
void setDeadBand ( int axis, float db ) ;
@@ -78,6 +79,11 @@
check for the existance of a particular stick, you can
call <code>notWorking()</code> which returns JS_TRUE if
there is some problem with that stick, JS_FALSE otherwise.
+<p>
+<code>getName()</code> tells you the device name of the
+joystick, if available through API calls in your OS. A
+typical value is "CH PRODUCTS CH PRO PEDALS USB ". If no
+name is available, this method will return the empty string.
<p>
<code>getNumAxes()</code> tells you how many axes the stick
has. Note that it is NOT safe to assume that all sticks have
|
|
From: <ud...@us...> - 2002-04-17 22:29:56
|
Update of /cvsroot/plib/plib/examples/src/js In directory usw-pr-cvs1:/tmp/cvs-serv2591/examples/src/js Modified Files: js_demo.cxx Log Message: David Megginson: Added jsJoystick::getName () Index: js_demo.cxx =================================================================== RCS file: /cvsroot/plib/plib/examples/src/js/js_demo.cxx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- js_demo.cxx 13 Jul 2000 05:57:54 -0000 1.2 +++ js_demo.cxx 17 Apr 2002 22:29:51 -0000 1.3 @@ -12,8 +12,16 @@ printf ( "Joystick test program.\n" ) ; printf ( "~~~~~~~~~~~~~~~~~~~~~~\n" ) ; - if ( js[0]->notWorking () ) printf ( "Joystick 0 not detected\n" ) ; - if ( js[1]->notWorking () ) printf ( "Joystick 1 not detected\n" ) ; + if ( js[0]->notWorking () ) + printf ( "Joystick 0 not detected\n" ) ; + else + printf ( "Joystick 0 is \"%s\"\n", js[0]->getName() ) ; + + if ( js[1]->notWorking () ) + printf ( "Joystick 1 not detected\n" ) ; + else + printf ( "Joystick 1 is \"%s\"\n", js[1]->getName() ) ; + if ( js[0]->notWorking () && js[1]->notWorking () ) exit ( 1 ) ; ax[0] = new float [ js[0]->getNumAxes () ] ; |
|
From: <ud...@us...> - 2002-04-17 22:29:56
|
Update of /cvsroot/plib/plib/src/js
In directory usw-pr-cvs1:/tmp/cvs-serv2591/src/js
Modified Files:
js.h
Log Message:
David Megginson: Added jsJoystick::getName ()
Index: js.h
===================================================================
RCS file: /cvsroot/plib/plib/src/js/js.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- js.h 17 Apr 2002 21:34:42 -0000 1.15
+++ js.h 17 Apr 2002 22:29:51 -0000 1.16
@@ -1,25 +1,26 @@
/*
PLIB - A Suite of Portable Game Libraries
Copyright (C) 2001 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.
-
+
[...261 lines suppressed...]
+
for (i = 0; i < num_axes; i++) {
-
+
err = ISpElement_GetSimpleState (isp_elem[ i ], &state);
ISP_CHECK_ERR (err);
-
+
axes [i] = (float) state;
}
}
@@ -700,7 +714,7 @@
# else
int status = ::read ( fd, &js, JS_RETURN ) ;
-
+
if ( status != JS_RETURN )
{
perror ( fname ) ;
|
|
From: <ud...@us...> - 2002-04-17 22:02:50
|
Update of /cvsroot/plib/plib/doc/js
In directory usw-pr-cvs1:/tmp/cvs-serv25974
Modified Files:
index.html
Log Message:
Updated JS documentation
Index: index.html
===================================================================
RCS file: /cvsroot/plib/plib/doc/js/index.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- index.html 24 Mar 2002 01:21:39 -0000 1.6
+++ index.html 17 Apr 2002 22:02:48 -0000 1.7
@@ -45,23 +45,23 @@
jsJoystick ( int id = 0 ) ;
~jsJoystick () ;
- int getNumAxes () ;
- int notWorking () ;
+ int getNumAxes () const ;
+ int notWorking () const ;
void setError () ;
- float getDeadBand ( int axis ) ;
+ float getDeadBand ( int axis ) const ;
void setDeadBand ( int axis, float db ) ;
- float getSaturation ( int axis ) ;
+ float getSaturation ( int axis ) const ;
void setSaturation ( int axis, float st ) ;
void setMinRange ( float *axes ) ;
void setMaxRange ( float *axes ) ;
void setCenter ( float *axes ) ;
- void getMinRange ( float *axes ) ;
- void getMaxRange ( float *axes ) ;
- void getCenter ( float *axes ) ;
+ void getMinRange ( float *axes ) const ;
+ void getMaxRange ( float *axes ) const ;
+ void getCenter ( float *axes ) const ;
void read ( int *buttons, float *axes ) ;
void rawRead ( int *buttons, float *axes ) ;
|
|
From: <ud...@us...> - 2002-04-17 21:34:45
|
Update of /cvsroot/plib/plib/src/js
In directory usw-pr-cvs1:/tmp/cvs-serv16377
Modified Files:
js.h
Log Message:
Made JS const-correct
Index: js.h
===================================================================
RCS file: /cvsroot/plib/plib/src/js/js.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- js.h 9 Mar 2002 16:33:50 -0000 1.14
+++ js.h 17 Apr 2002 21:34:42 -0000 1.15
@@ -432,7 +432,7 @@
#endif
}
- float fudge_axis ( float value, int axis )
+ float fudge_axis ( float value, int axis ) const
{
if ( value < center[axis] )
{
@@ -497,23 +497,23 @@
close () ;
}
- int getNumAxes () { return num_axes ; }
- int notWorking () { return error ; }
+ int getNumAxes () const { return num_axes ; }
+ int notWorking () const { return error ; }
void setError () { error = JS_TRUE ; }
- float getDeadBand ( int axis ) { return dead_band [ axis ] ; }
+ float getDeadBand ( int axis ) const { return dead_band [ axis ] ; }
void setDeadBand ( int axis, float db ) { dead_band [ axis ] = db ; }
- float getSaturation ( int axis ) { return saturate [ axis ] ; }
+ float getSaturation ( int axis ) const { return saturate [ axis ] ; }
void setSaturation ( int axis, float st ) { saturate [ axis ] = st ; }
void setMinRange ( float *axes ) { memcpy ( min , axes, num_axes * sizeof(float) ) ; }
void setMaxRange ( float *axes ) { memcpy ( max , axes, num_axes * sizeof(float) ) ; }
void setCenter ( float *axes ) { memcpy ( center, axes, num_axes * sizeof(float) ) ; }
- void getMinRange ( float *axes ) { memcpy ( axes, min , num_axes * sizeof(float) ) ; }
- void getMaxRange ( float *axes ) { memcpy ( axes, max , num_axes * sizeof(float) ) ; }
- void getCenter ( float *axes ) { memcpy ( axes, center, num_axes * sizeof(float) ) ; }
+ void getMinRange ( float *axes ) const { memcpy ( axes, min , num_axes * sizeof(float) ) ; }
+ void getMaxRange ( float *axes ) const { memcpy ( axes, max , num_axes * sizeof(float) ) ; }
+ void getCenter ( float *axes ) const { memcpy ( axes, center, num_axes * sizeof(float) ) ; }
void read ( int *buttons, float *axes )
{
@@ -727,5 +727,4 @@
//lint -restore
#endif
-
|
|
From: <ud...@us...> - 2002-04-17 13:37:43
|
Update of /cvsroot/plib/CVSROOT In directory usw-pr-cvs1:/tmp/cvs-serv6142 Modified Files: cvswrappers Log Message: Told CVS to treat a few more extensions as binary files Index: cvswrappers =================================================================== RCS file: /cvsroot/plib/CVSROOT/cvswrappers,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cvswrappers 24 May 2001 01:27:23 -0000 1.2 +++ cvswrappers 17 Apr 2002 13:37:38 -0000 1.3 @@ -24,3 +24,9 @@ *.png -k 'b' *.rgb -k 'b' *.bmp -k 'b' +*.txf -k 'b' +*.mod -k 'b' +*.wav -k 'b' +*.au -k 'b' +*.ub -k 'b' +*.3ds -k 'b' |
|
From: <ud...@us...> - 2002-04-17 12:59:19
|
Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv24193
Modified Files:
ssgLoadTexture.cxx ssg.cxx
Log Message:
Darrell Walisser: Fixed "int *" / "GLint *" pointer bug
Index: ssgLoadTexture.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadTexture.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ssgLoadTexture.cxx 27 Mar 2002 15:36:01 -0000 1.14
+++ ssgLoadTexture.cxx 17 Apr 2002 12:59:15 -0000 1.15
@@ -109,7 +109,7 @@
int map_level = 0 ;
#ifndef PROXY_TEXTURES_ARE_BROKEN
- int ww ;
+ GLint ww ;
do
{
Index: ssg.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssg.cxx,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- ssg.cxx 17 Jan 2002 16:14:22 -0000 1.45
+++ ssg.cxx 17 Apr 2002 12:59:15 -0000 1.46
@@ -201,7 +201,7 @@
ssgForceBasicState () ;
- int vp [ 4 ] ;
+ GLint vp [ 4 ] ;
sgVec4 viewport ;
sgMat4 mat ;
|
|
From: <ud...@us...> - 2002-04-16 14:29:24
|
Update of /cvsroot/plib/plib In directory usw-pr-cvs1:/tmp/cvs-serv8144 Modified Files: NEWS Log Message: We do again - back to normal Index: NEWS =================================================================== RCS file: /cvsroot/plib/plib/NEWS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NEWS 16 Apr 2002 12:50:34 -0000 1.2 +++ NEWS 16 Apr 2002 14:29:16 -0000 1.3 @@ -1 +0,0 @@ -Do we ? |
|
From: Sebastian U. <ud...@us...> - 2002-04-15 22:19:17
|
Update of /cvsroot/plib/CVSROOT
In directory usw-pr-cvs1:/tmp/cvs-serv13015
Modified Files:
syncmail
Log Message:
Updated to rev. 3.20 from GNU mailman CVS repository
Index: syncmail
===================================================================
RCS file: /cvsroot/plib/CVSROOT/syncmail,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- syncmail 29 Jan 2002 20:55:25 -0000 1.5
+++ syncmail 15 Apr 2002 22:19:13 -0000 1.6
@@ -1,5 +1,7 @@
#! /usr/bin/python
-# -*- Python -*-
+
+# NOTE: Until SourceForge installs a modern version of Python on the cvs
+# servers, this script MUST be compatible with Python 1.5.2.
"""Complicated notification for CVS checkins.
@@ -35,8 +37,7 @@
Use <path> as the environment variable CVSROOT. Otherwise this
variable must exist in the environment.
[...202 lines suppressed...]
for s in specs[2:]:
prev = L[-1]
- if string.count(prev, ",") < 2:
+ if string.count(prev, ',') < 2:
L[-1] = "%s %s" % (prev, s)
else:
L.append(s)
specs = L
- print 'Generating notification message...'
- blast_mail(mailcmd, specs[1:], contextlines)
- print 'Generating notification message... done.'
+
+ if verbose:
+ print 'Generating notification message...'
+ blast_mail(subject, people, specs[1:], contextlines)
+ if verbose:
+ print 'Generating notification message... done.'
|
|
From: Sebastian U. <ud...@us...> - 2002-04-15 21:45:01
|
Update of /cvsroot/plib/plib/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv2661
Modified Files:
puFilePicker.cxx puFileSelector.cxx
Log Message:
Mark Follett, John F. Fay: Fixed bug in invalid directory handling
Index: puFilePicker.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puFilePicker.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- puFilePicker.cxx 23 Mar 2002 15:06:44 -0000 1.24
+++ puFilePicker.cxx 15 Apr 2002 21:44:58 -0000 1.25
@@ -504,6 +504,7 @@
perror ("puFilePicker") ;
ulSetError ( UL_WARNING, "PUI:puFilePicker - can't open directory '%s'", dir ) ;
num_files = 0 ;
+ return ;
}
while ( ( dp = ulReadDir(dirp) ) != NULL )
@@ -518,7 +519,7 @@
ulSetError ( UL_WARNING,
"PUI:puFilePicker - no entries in directory '%s'?!", dir ) ;
num_files = 0 ;
- return;
+ return ;
}
files = new char* [ num_files+1 ] ;
Index: puFileSelector.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puFileSelector.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- puFileSelector.cxx 23 Mar 2002 15:06:44 -0000 1.18
+++ puFileSelector.cxx 15 Apr 2002 21:44:58 -0000 1.19
@@ -582,6 +582,7 @@
perror ("puFileSelector") ;
ulSetError ( UL_WARNING, "PUI:puFileSelector - can't open directory '%s'", dir ) ;
num_files = 0 ;
+ return ;
}
/* Count the number of files - skipping "." */
@@ -602,7 +603,7 @@
{
ulSetError ( UL_WARNING,
"PUI:puFileSelector - no entries in directory '%s'?!", dir ) ;
- return;
+ return ;
}
files = new char* [ num_files+1 ] ;
|
|
From: Sebastian U. <ud...@us...> - 2002-04-15 21:08:10
|
Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv22071
Modified Files:
ssgLoadSGI.cxx
Log Message:
Franz Melchior: In ssgSGIHeader constructor, set "loadSSG_bool" on failure
Index: ssgLoadSGI.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadSGI.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ssgLoadSGI.cxx 23 Mar 2002 15:06:45 -0000 1.13
+++ ssgLoadSGI.cxx 15 Apr 2002 21:06:14 -0000 1.14
@@ -265,9 +265,13 @@
leng = NULL ;
bool success=openFile(fname);
-
- if(!success) return;
-
+
+ if ( !success )
+ {
+ loadSGI_bool = false ;
+ return ;
+ }
+
GLubyte *image = new GLubyte [ sgihdr->xsize *
sgihdr->ysize *
sgihdr->zsize ] ;
|
|
From: Sebastian U. <ud...@us...> - 2002-04-15 20:40:17
|
Update of /cvsroot/plib/plib/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv12575
Modified Files:
puObject.cxx
Log Message:
John F. Fay: Fixed calculation of y-position of multi-line labels above a widget
Index: puObject.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puObject.cxx,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- puObject.cxx 2 Mar 2002 18:20:09 -0000 1.41
+++ puObject.cxx 15 Apr 2002 20:40:11 -0000 1.42
@@ -400,7 +400,7 @@
case PUPLACE_TOP_CENTERED :
case PUPLACE_TOP_RIGHT :
case PUPLACE_ABOVE_RIGHT :
- yy = bbox.max[1] - bbox.min[1] - labelFont.getStringHeight ( label ) -
+ yy = bbox.max[1] - bbox.min[1] - labelFont.getStringHeight () -
labelFont.getStringDescender () ;
break ;
@@ -430,7 +430,6 @@
yy = labelFont.getStringDescender () ;
break ;
}
-
labelFont.drawString ( label, dx + bbox.min[0] + xx,
dy + bbox.min[1] + yy ) ;
|
|
From: Norman V. <nh...@us...> - 2002-04-12 14:49:31
|
Update of /cvsroot/plib/plib/src/sg
In directory usw-pr-cvs1:/tmp/cvs-serv7722
Modified Files:
sg.cxx
Log Message:
Minor optimization for sgSetCoord to multiply by the inverse instead of division
Index: sg.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/sg/sg.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- sg.cxx 25 Jan 2002 16:28:00 -0000 1.28
+++ sg.cxx 12 Apr 2002 14:49:26 -0000 1.29
@@ -900,10 +900,11 @@
}
else
{
- SGfloat sr = _sgClampToUnity ( -mat[0][2] / cp ) ;
- SGfloat cr = _sgClampToUnity ( mat[2][2] / cp ) ;
- SGfloat sh = _sgClampToUnity ( -mat[1][0] / cp ) ;
- SGfloat ch = _sgClampToUnity ( mat[1][1] / cp ) ;
+ cp = SG_ONE / cp ;
+ SGfloat sr = _sgClampToUnity ( -mat[0][2] * cp ) ;
+ SGfloat cr = _sgClampToUnity ( mat[2][2] * cp ) ;
+ SGfloat sh = _sgClampToUnity ( -mat[1][0] * cp ) ;
+ SGfloat ch = _sgClampToUnity ( mat[1][1] * cp ) ;
if ( (sh == SG_ZERO && ch == SG_ZERO) || (sr == SG_ZERO && cr == SG_ZERO) )
{
|
|
From: M?rten Str?m. <str...@us...> - 2002-04-03 13:55:22
|
Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv30073
Modified Files:
ssgOptimiser.cxx
Log Message:
Fixed bug in OptVertex::equal().
Index: ssgOptimiser.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgOptimiser.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ssgOptimiser.cxx 25 Mar 2002 12:56:12 -0000 1.24
+++ ssgOptimiser.cxx 3 Apr 2002 13:55:16 -0000 1.25
@@ -68,15 +68,15 @@
int equal ( sgVec3 v, sgVec2 t, sgVec4 c, int tex_frac )
{
- if ( ! sgCompareVec3 ( vertex , v, DISTANCE_SLOP ) == 0 ||
- ! sgCompareVec4 ( colour , c, COLOUR_SLOP ) == 0 )
+ if ( ! sgCompareVec3 ( vertex , v, DISTANCE_SLOP ) ||
+ ! sgCompareVec4 ( colour , c, COLOUR_SLOP ) )
return FALSE ;
if ( ! tex_frac )
- return sgCompareVec2 ( texcoord, t, TEXCOORD_SLOP ) == 0 ;
+ return sgCompareVec2 ( texcoord, t, TEXCOORD_SLOP ) ;
- return fabs ( frac ( texcoord[0] ) - frac ( t[0] ) ) <= TEXCOORD_SLOP &&
- fabs ( frac ( texcoord[1] ) - frac ( t[1] ) ) <= TEXCOORD_SLOP ;
+ return ( fabs ( frac ( texcoord[0] ) - frac ( t[0] ) ) <= TEXCOORD_SLOP &&
+ fabs ( frac ( texcoord[1] ) - frac ( t[1] ) ) <= TEXCOORD_SLOP ) ;
}
void bump () { counter++ ; }
|
|
From: M?rten Str?m. <str...@us...> - 2002-04-03 11:31:11
|
Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv15309
Modified Files:
ssgLoadAC.cxx
Log Message:
Fix to enable GL_BLEND for alpha textures.
Index: ssgLoadAC.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadAC.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ssgLoadAC.cxx 23 Mar 2002 15:06:45 -0000 1.24
+++ ssgLoadAC.cxx 3 Apr 2002 11:31:07 -0000 1.25
@@ -213,7 +213,21 @@
st -> enable ( GL_LIGHTING ) ;
st -> setShadeModel ( GL_SMOOTH ) ;
- if ( mat -> rgb[3] < 0.99 )
+ bool has_alpha = false ;
+
+ if ( current_tfname != NULL )
+ {
+ ssgTexture *tex = current_options -> createTexture ( current_tfname ) ;
+ has_alpha = tex -> hasAlpha () ;
+ st -> setTexture( tex ) ;
+ st -> enable( GL_TEXTURE_2D ) ;
+ }
+ else
+ {
+ st -> disable( GL_TEXTURE_2D ) ;
+ }
+
+ if ( mat -> rgb[3] < 0.99 || has_alpha )
{
st -> disable ( GL_ALPHA_TEST ) ;
st -> enable ( GL_BLEND ) ;
@@ -221,15 +235,9 @@
}
else
{
+ st -> disable ( GL_ALPHA_TEST ) ;
st -> disable ( GL_BLEND ) ;
st -> setOpaque () ;
- }
-
- if (current_tfname != NULL) {
- st -> setTexture( current_options -> createTexture(current_tfname) ) ;
- st -> enable( GL_TEXTURE_2D ) ;
- } else {
- st -> disable( GL_TEXTURE_2D ) ;
}
return st ;
|
