plib-cvs Mailing List for PLIB (Page 51)
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: Sebastian U. <ud...@us...> - 2002-07-01 00:31:38
|
Update of /cvsroot/plib/plib
In directory usw-pr-cvs1:/tmp/cvs-serv32596
Modified Files:
configure.in
Log Message:
Fixed CPPFLAGS vs. CXXFLAGS / LDFLAGS vs. LIBS issue
Index: configure.in
===================================================================
RCS file: /cvsroot/plib/plib/configure.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- configure.in 30 Jun 2002 17:59:35 -0000 1.33
+++ configure.in 1 Jul 2002 00:31:35 -0000 1.34
@@ -32,18 +32,14 @@
dnl for Loring Holden's Solaris system
AC_ARG_WITH(GL,
-[ --with-GL=DIR set the prefix directory where GL resides],
+AC_HELP_STRING([--with-GL=DIR], [set the prefix directory where GL resides]),
GL_PREFIX=$withval, GL_PREFIX=auto)
if test "x$GL_PREFIX" != "xauto"; then
- LIBS="$LIBS -L$GL_PREFIX/lib"
- CXXFLAGS="$CXXFLAGS -I$GL_PREFIX/include"
+ LDFLAGS="$LDFLAGS -L$GL_PREFIX/lib"
+ CPPFLAGS="$CPPFLAGS -I$GL_PREFIX/include"
fi
-dnl AC_CHECK_HEADER uses CPPFLAGS
-
-export CPPFLAGS="$CXXFLAGS"
-
dnl Checks for header files.
AC_HEADER_STDC
@@ -86,7 +82,9 @@
AC_PATH_XTRA
- x_suffix="$X_LIBS $X_PRE_LIBS -lX11 -lXi -lXext -lXmu $X_EXTRA_LIBS -lm"
+ LDFLAGS="$LDFLAGS $X_LIBS"
+
+ x_suffix="$X_PRE_LIBS -lX11 -lXi -lXext -lXmu $X_EXTRA_LIBS -lm"
dnl =========================================================
dnl if test "x$x_includes" != "x"; then
@@ -117,19 +115,26 @@
if test "x$ac_cv_lib_freeglut_glutGetModifiers" = "xno" ; then
dnl if no freeglut, check for Real GLUT
AC_CHECK_LIB(glut, glutGetModifiers,,,$opengl_LIBS)
+
+ if test "x$ac_cv_lib_glut_glutGetModifiers" = "xno" ; then
+ AC_MSG_ERROR([could not find working GLUT library])
+ fi
fi
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
+
WFLAG="-Wall"
case "$host" in
mips-sgi-irix*)
if test "x$CXX" = "xCC"; then
WFLAG="-fullwarn";
fi
- ;;
+ ;;
esac
- CFLAGS="$CFLAGS $WFLAG -I/usr/local/include -L/usr/local/lib"
- CXXFLAGS="$CXXFLAGS $WFLAG -I/usr/local/include -L/usr/local/lib"
+ CFLAGS="$CFLAGS $WFLAG"
+ CXXFLAGS="$CXXFLAGS $WFLAG"
LIBS="$LIBS $x_suffix"
;;
@@ -137,8 +142,8 @@
fi
dnl Check SGI audio library
-
AC_CHECK_LIB(audio, ALopenport)
+
if test "x$ac_cv_lib_audio_ALopenport" = "xyes" ; then
dnl this is an SGI machine...
LIBS="$LIBS -laudio"
@@ -159,9 +164,9 @@
#include <sys/socket.h>
int accept (int, struct sockaddr *, size_t *);
],[],[
-AC_MSG_RESULT(size_t)
+AC_MSG_RESULT(size_t)
AC_DEFINE(socklen_t,size_t)], [
-AC_MSG_RESULT(int)
+AC_MSG_RESULT(int)
AC_DEFINE(socklen_t,int)])])
AC_OUTPUT( \
|
|
From: Sebastian U. <ud...@us...> - 2002-07-01 00:20:16
|
Update of /cvsroot/plib/plib/tools/src/af2rgb
In directory usw-pr-cvs1:/tmp/cvs-serv29067
Modified Files:
af2rgb.cxx
Log Message:
Synced with recent SSG changes
Index: af2rgb.cxx
===================================================================
RCS file: /cvsroot/plib/plib/tools/src/af2rgb/af2rgb.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- af2rgb.cxx 22 Jun 2001 21:26:51 -0000 1.5
+++ af2rgb.cxx 1 Jul 2002 00:20:14 -0000 1.6
@@ -134,10 +134,10 @@
unsigned char b;
if ( fread(&b, 1, 1, tfile) != 1)
return false;
- texelsR[c] = fsTexPalette[b*4 ];
- texelsG[c] = fsTexPalette[b*4 + 1];
- texelsB[c] = fsTexPalette[b*4 + 2];
- texelsA[c] = fsTexPalette[b*4 + 3];
+ texelsR[c] = ssgFsTexPalette[b*4 ];
+ texelsG[c] = ssgFsTexPalette[b*4 + 1];
+ texelsB[c] = ssgFsTexPalette[b*4 + 2];
+ texelsA[c] = ssgFsTexPalette[b*4 + 3];
c++;
}
}
|
|
From: Sebastian U. <ud...@us...> - 2002-07-01 00:19:57
|
Update of /cvsroot/plib/plib/tools/src/af2rgb In directory usw-pr-cvs1:/tmp/cvs-serv28927 Modified Files: Makefile.am Log Message: Link against SSG and SG Index: Makefile.am =================================================================== RCS file: /cvsroot/plib/plib/tools/src/af2rgb/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.am 11 Jan 2001 16:21:05 -0000 1.1 +++ Makefile.am 1 Jul 2002 00:19:53 -0000 1.2 @@ -2,7 +2,7 @@ af2rgb_SOURCES = af2rgb.cxx -af2rgb_LDADD = -lplibul +af2rgb_LDADD = -lplibssg -lplibsg -lplibul EXTRA_DIST = af2rgb.dsp |
|
From: Sebastian U. <ud...@us...> - 2002-07-01 00:19:11
|
Update of /cvsroot/plib/plib/src/ssg In directory usw-pr-cvs1:/tmp/cvs-serv28713 Modified Files: Makefile.am Log Message: Install ssgMSFSPalette.h to the system (needed by af2rgb tool) Index: Makefile.am =================================================================== RCS file: /cvsroot/plib/plib/src/ssg/Makefile.am,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- Makefile.am 9 Jun 2002 11:25:47 -0000 1.32 +++ Makefile.am 1 Jul 2002 00:19:07 -0000 1.33 @@ -1,6 +1,6 @@ lib_LIBRARIES = libplibssg.a -include_HEADERS = ssg.h ssgconf.h ssgKeyFlier.h +include_HEADERS = ssg.h ssgconf.h ssgMSFSPalette.h ssgKeyFlier.h libplibssg_a_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \ ssgBaseTransform.cxx ssgBranch.cxx ssgContext.cxx ssgCutout.cxx \ |
|
From: Sebastian U. <ud...@us...> - 2002-07-01 00:17:02
|
Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv27931
Modified Files:
ssgLoadMDL_BGLTexture.cxx ssgMSFSPalette.h
Log Message:
Moved definition of fsTexPalette from ssgMSFSPalette.h to ssgLoadMDL_BGLTexture.cxx
Index: ssgLoadMDL_BGLTexture.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadMDL_BGLTexture.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ssgLoadMDL_BGLTexture.cxx 9 Jun 2002 11:29:54 -0000 1.3
+++ ssgLoadMDL_BGLTexture.cxx 1 Jul 2002 00:16:58 -0000 1.4
@@ -45,6 +45,270 @@
#include "ssgLocal.h"
#include "ssgMSFSPalette.h"
+//===========================================================================
+// Texture palette values (from fs5.pal)
+// Alpha channel added for more efficient
+// rendering on 3dfx hardware.
+
+unsigned const char ssgFsTexPalette[1024] = {
+ 0x00, 0x00, 0x00, 0xff,
+ 0x08, 0x08, 0x08, 0xff,
[...252 lines suppressed...]
+ 0x21, 0x63, 0x7b, 0xff,
+ 0x4a, 0x73, 0x84, 0xff
+};
+
#ifdef SSG_LOAD_MDL_BGL_TEXTURE_SUPPORTED
// This really simple (raw paletted) format is used by older MSFS for textures
bool ssgLoadMDLTexture ( const char *fname, ssgTextureInfo* info )
@@ -86,9 +350,9 @@
for (int x = 0; x < 256; x++) {
unsigned char b;
fread(&b, 1, 1, tfile);
- texels[c++] = fsTexPalette[b*4 ];
- texels[c++] = fsTexPalette[b*4 + 1];
- texels[c++] = fsTexPalette[b*4 + 2];
+ texels[c++] = ssgFsTexPalette[b*4 ];
+ texels[c++] = ssgFsTexPalette[b*4 + 1];
+ texels[c++] = ssgFsTexPalette[b*4 + 2];
texels[c++] = (b<index)?0:255;
}
}
Index: ssgMSFSPalette.h
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgMSFSPalette.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ssgMSFSPalette.h 7 Nov 2001 23:51:10 -0000 1.3
+++ ssgMSFSPalette.h 1 Jul 2002 00:16:58 -0000 1.4
@@ -24,268 +24,6 @@
#ifndef __SSGMSFSPALETTE
#define __SSGMSFSPALETTE
-//===========================================================================
-// Texture palette values (from fs5.pal)
-// Alpha channel added for more efficient
-// rendering on 3dfx hardware.
-
-static unsigned char fsTexPalette[1024] = {
- 0x00, 0x00, 0x00, 0xff,
- 0x08, 0x08, 0x08, 0xff,
[...238 lines suppressed...]
- 0x8c, 0xad, 0x63, 0xff,
- 0x84, 0x9c, 0x63, 0xff,
- 0x31, 0x42, 0x29, 0xff,
- 0x63, 0xa5, 0x5a, 0xff,
- 0x4a, 0xd6, 0x4a, 0xff,
- 0x39, 0x8c, 0x39, 0xff,
- 0x4a, 0xb5, 0x4a, 0xff,
- 0x5a, 0xc6, 0x5a, 0xff,
- 0x39, 0x7b, 0x39, 0xff,
- 0x31, 0x63, 0x31, 0xff,
- 0x5a, 0xa5, 0x5a, 0xff,
- 0x52, 0x94, 0x52, 0xff,
- 0x4a, 0x63, 0x4a, 0xff,
- 0x39, 0x73, 0x84, 0xff,
- 0x21, 0x63, 0x7b, 0xff,
- 0x4a, 0x73, 0x84, 0xff
-};
+extern unsigned const char ssgFsTexPalette[] ;
#endif // __SSGMSFSPALETTE
|
|
From: Sebastian U. <ud...@us...> - 2002-06-30 17:59:39
|
Update of /cvsroot/plib/plib In directory usw-pr-cvs1:/tmp/cvs-serv30796 Modified Files: configure.in Log Message: Cleanups Index: configure.in =================================================================== RCS file: /cvsroot/plib/plib/configure.in,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- configure.in 30 Jun 2002 16:51:56 -0000 1.32 +++ configure.in 30 Jun 2002 17:59:35 -0000 1.33 @@ -50,8 +50,6 @@ AC_CHECK_HEADERS(GL/gl.h GL/glu.h,, AC_MSG_ERROR([OpenGL header files not found])) AC_CHECK_HEADER(windows.h, AC_DEFINE(WIN32)) -AC_CHECK_HEADER(joystick.h, AC_DEFINE(JOYSTICK_IS_PRESENT)) -AC_CHECK_HEADER(linux/joystick.h, AC_DEFINE(LINUX_JOYSTICK_IS_PRESENT)) AC_CHECK_HEADER(GL/glut.h, AC_DEFINE(GLUT_IS_PRESENT)) AC_CHECK_HEADER(GL/freeglut.h, AC_DEFINE(FREEGLUT_IS_PRESENT)) |
|
From: Sebastian U. <ud...@us...> - 2002-06-30 16:56:17
|
Update of /cvsroot/plib/plib
In directory usw-pr-cvs1:/tmp/cvs-serv8167
Modified Files:
configure.in
Log Message:
Cleanups; Some improvements
Index: configure.in
===================================================================
RCS file: /cvsroot/plib/plib/configure.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- configure.in 30 Jun 2002 15:03:18 -0000 1.31
+++ configure.in 30 Jun 2002 16:51:56 -0000 1.32
@@ -40,6 +40,25 @@
CXXFLAGS="$CXXFLAGS -I$GL_PREFIX/include"
fi
+dnl AC_CHECK_HEADER uses CPPFLAGS
+
+export CPPFLAGS="$CXXFLAGS"
+
+dnl Checks for header files.
+
+AC_HEADER_STDC
+
+AC_CHECK_HEADERS(GL/gl.h GL/glu.h,, AC_MSG_ERROR([OpenGL header files not found]))
+AC_CHECK_HEADER(windows.h, AC_DEFINE(WIN32))
+AC_CHECK_HEADER(joystick.h, AC_DEFINE(JOYSTICK_IS_PRESENT))
+AC_CHECK_HEADER(linux/joystick.h, AC_DEFINE(LINUX_JOYSTICK_IS_PRESENT))
+AC_CHECK_HEADER(GL/glut.h, AC_DEFINE(GLUT_IS_PRESENT))
+AC_CHECK_HEADER(GL/freeglut.h, AC_DEFINE(FREEGLUT_IS_PRESENT))
+
+if test "x$ac_cv_header_GL_glut_h" = "xno" && test "x$ac_cv_header_GL_freeglut_h" = "xno"; then
+ AC_MSG_ERROR([found neither GLUT nor freeglut header file])
+fi
+
dnl Checks for library functions.
dnl check for OpenGL related libraries
@@ -87,16 +106,6 @@
AC_CHECK_LIB(MesaGL, glNewList,,,$x_suffix)
fi
- dnl if using mesa, check for xmesa.h
- if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then
- AC_CHECK_HEADER(GL/xmesa.h)
- AM_CONDITIONAL(ENABLE_XMESA_FX, \
- test "x$ac_cv_header_GL_xmesa_h" = "xyes")
- else
- dnl force a failed check
- AM_CONDITIONAL(ENABLE_XMESA_FX, test "no" = "yes")
- fi
-
AC_CHECK_LIB(GLU, gluLookAt,,,$x_suffix)
if test "x$ac_cv_lib_GLU_gluLookAt" = "xno" ; then
dnl if no GLU, check for MesaGLU
@@ -129,10 +138,6 @@
esac
fi
-dnl AC_CHECK_HEADER uses CPPFLAGS
-
-export CPPFLAGS="$CXXFLAGS"
-
dnl Check SGI audio library
AC_CHECK_LIB(audio, ALopenport)
@@ -140,19 +145,6 @@
dnl this is an SGI machine...
LIBS="$LIBS -laudio"
fi
-
-dnl Checks for header files.
-
-AC_HEADER_STDC
-
-AC_CHECK_HEADERS(GL/gl.h GL/glu.h)
-AC_CHECK_HEADER(windows.h, AC_DEFINE(WIN32))
-AC_CHECK_HEADER(joystick.h, AC_DEFINE(JOYSTICK_IS_PRESENT))
-AC_CHECK_HEADER(linux/joystick.h, AC_DEFINE(LINUX_JOYSTICK_IS_PRESENT))
-AC_CHECK_HEADER(GL/glut.h, AC_DEFINE(GLUT_IS_PRESENT))
-AC_CHECK_HEADER(GL/freeglut.h, AC_DEFINE(FREEGLUT_IS_PRESENT))
-
-unset CPPFLAGS
dnl Checks for typedefs, structures, and compiler characteristics.
|
|
From: Sebastian U. <ud...@us...> - 2002-06-30 15:13:22
|
Update of /cvsroot/plib/plib/tools In directory usw-pr-cvs1:/tmp/cvs-serv4309/tools Modified Files: AUTHORS Log Message: Copied up-to-date 'AUTHORS' file over to the tools / examples areas Index: AUTHORS =================================================================== RCS file: /cvsroot/plib/plib/tools/AUTHORS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- AUTHORS 29 Jun 2002 18:40:19 -0000 1.2 +++ AUTHORS 30 Jun 2002 15:13:19 -0000 1.3 @@ -4,6 +4,7 @@ Most important of all - the 'official' PLIB developers: + Alex Perry Curtis Olson Ben Woodhead Dave McClurg @@ -27,11 +28,11 @@ Apologies to anyone I've left out - please let me know who you are and I'll add you in. - Alex Perry Christopher St.John Christian Mayer Darrell Walisser Dave Heil + Erik Hofman Kevin Thompson Karl Kremer Negative0 <---- Who? Some kind of 1's complement arithmetic fanatic? |
|
From: Sebastian U. <ud...@us...> - 2002-06-30 15:13:22
|
Update of /cvsroot/plib/plib/examples In directory usw-pr-cvs1:/tmp/cvs-serv4309/examples Modified Files: AUTHORS Log Message: Copied up-to-date 'AUTHORS' file over to the tools / examples areas Index: AUTHORS =================================================================== RCS file: /cvsroot/plib/plib/examples/AUTHORS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- AUTHORS 29 Jun 2002 18:40:19 -0000 1.2 +++ AUTHORS 30 Jun 2002 15:13:19 -0000 1.3 @@ -4,6 +4,7 @@ Most important of all - the 'official' PLIB developers: + Alex Perry Curtis Olson Ben Woodhead Dave McClurg @@ -27,11 +28,11 @@ Apologies to anyone I've left out - please let me know who you are and I'll add you in. - Alex Perry Christopher St.John Christian Mayer Darrell Walisser Dave Heil + Erik Hofman Kevin Thompson Karl Kremer Negative0 <---- Who? Some kind of 1's complement arithmetic fanatic? |
|
From: Sebastian U. <ud...@us...> - 2002-06-30 15:11:40
|
Update of /cvsroot/plib/plib In directory usw-pr-cvs1:/tmp/cvs-serv3599 Modified Files: AUTHORS Log Message: A. Perry is an official developer; Added Eric Hofman for his PLIB/IRIX efforts Index: AUTHORS =================================================================== RCS file: /cvsroot/plib/plib/AUTHORS,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- AUTHORS 28 Jun 2002 23:49:12 -0000 1.11 +++ AUTHORS 30 Jun 2002 15:11:37 -0000 1.12 @@ -4,6 +4,7 @@ Most important of all - the 'official' PLIB developers: + Alex Perry Curtis Olson Ben Woodhead Dave McClurg @@ -27,11 +28,11 @@ Apologies to anyone I've left out - please let me know who you are and I'll add you in. - Alex Perry Christopher St.John Christian Mayer Darrell Walisser Dave Heil + Erik Hofman Kevin Thompson Karl Kremer Negative0 <---- Who? Some kind of 1's complement arithmetic fanatic? |
|
From: Sebastian U. <ud...@us...> - 2002-06-30 15:03:28
|
Update of /cvsroot/plib/plib
In directory usw-pr-cvs1:/tmp/cvs-serv348
Modified Files:
configure.in
Log Message:
Erik Hofman: Modifications for IRIX compatibility
Index: configure.in
===================================================================
RCS file: /cvsroot/plib/plib/configure.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- configure.in 19 Apr 2002 23:15:55 -0000 1.30
+++ configure.in 30 Jun 2002 15:03:18 -0000 1.31
@@ -112,8 +112,17 @@
AC_CHECK_LIB(glut, glutGetModifiers,,,$opengl_LIBS)
fi
- CFLAGS="$CFLAGS -Wall -I/usr/local/include -L/usr/local/lib"
- CXXFLAGS="$CXXFLAGS -Wall -I/usr/local/include -L/usr/local/lib"
+ WFLAG="-Wall"
+ case "$host" in
+ mips-sgi-irix*)
+ if test "x$CXX" = "xCC"; then
+ WFLAG="-fullwarn";
+ fi
+ ;;
+ esac
+
+ CFLAGS="$CFLAGS $WFLAG -I/usr/local/include -L/usr/local/lib"
+ CXXFLAGS="$CXXFLAGS $WFLAG -I/usr/local/include -L/usr/local/lib"
LIBS="$LIBS $x_suffix"
;;
@@ -126,8 +135,8 @@
dnl Check SGI audio library
-AC_CHECK_LIB(audio, alOpenPort)
-if test "x$ac_cv_lib_audio_alOpenPort" = "xyes" ; then
+AC_CHECK_LIB(audio, ALopenport)
+if test "x$ac_cv_lib_audio_ALopenport" = "xyes" ; then
dnl this is an SGI machine...
LIBS="$LIBS -laudio"
fi
|
|
From: Sebastian U. <ud...@us...> - 2002-06-30 14:53:51
|
Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv29393
Modified Files:
ssgLoad3ds.cxx
Log Message:
Erik Hofman: Removed DOS line endings from sourcefile
Index: ssgLoad3ds.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoad3ds.cxx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- ssgLoad3ds.cxx 20 Jun 2002 20:07:53 -0000 1.35
+++ ssgLoad3ds.cxx 30 Jun 2002 14:53:48 -0000 1.36
@@ -48,7 +48,7 @@
it seems that no one really knows what to do with them.
*/
-
+
#define USE_VTXARRAYS
#include "ssgLocal.h"
|
|
From: Sebastian U. <ud...@us...> - 2002-06-29 18:40:22
|
Update of /cvsroot/plib/plib/examples In directory usw-pr-cvs1:/tmp/cvs-serv30085/examples Modified Files: AUTHORS Log Message: Copied up-to-date 'AUTHORS' file over to the tools / examples areas Index: AUTHORS =================================================================== RCS file: /cvsroot/plib/plib/examples/AUTHORS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AUTHORS 13 Jul 2000 04:07:09 -0000 1.1 +++ AUTHORS 29 Jun 2002 18:40:19 -0000 1.2 @@ -1,28 +1,61 @@ -PLIB was written by Steve Baker, with help from -numerous others. Special mention must go to: +PLIB was originally written by Steve Baker as a solo project - but +has subsequently been greatly enhanced and expanded by a 'cast of +thousands'. - Daryll Strauss (GLIDE port to Linux) - David Bucciarelli (Mesa -> GLIDE interface) - Brian Paul (Mesa) - Curtis Olson (FlightGear guru and all-round "Mr Nice Guy") - Vasily Lewis (Tireless maintainer and sysadmin at Woodsoup) - Everyone at OPENGL-GAMEDEV-L and 3Dfx.glide.linux +Most important of all - the 'official' PLIB developers: -Specific contributions came from: + Curtis Olson + Ben Woodhead + Dave McClurg + Gerard Decatrel + Gil Carter + Giancarlo Niccolai + James Jones + John Fay + Juergen Marquardt + Mark Vallevand + Marten Stromberg + Nathan Matias + Norman Vine + Per Liedman + Sam Stickland + Sebastian Ude + Steve Baker <--- Hmmm - must sort this list by SECOND name! + Will Lachance + Wolfram Kuss - Ton Knienieder - -- Ported SL to a bunch of non-Linux OS's +Apologies to anyone I've left out - please let me know +who you are and I'll add you in. - Simon Britnell <ug...@ya...> - -- Added SSG methods for searching for - objects by name, etc. - -- Added an SSG loader for the Me3D file format. + Alex Perry + Christopher St.John + Christian Mayer + Darrell Walisser + Dave Heil + Kevin Thompson + Karl Kremer + Negative0 <---- Who? Some kind of 1's complement arithmetic fanatic? + Mark Danks + Michael Kurth + Sean Palmer + Simon Britnell + Themie Gouthas + Tony Knienieder + Trent Gamblin - Toru Egashira <to...@jm...> - -- Who wrote a program called 'NSPmod' which was - the original basis of the SL 'MOD' player - - although the original code has been almost - entirely rewritten in the process of merging - it with SL. +Special mention must go to: + Daryll Strauss (GLIDE port to Linux) + David Bucciarelli (Mesa -> GLIDE interface) + Brian Paul (Mesa) + Curtis Olson (FlightGear guru and all-round "Mr Nice Guy", + who nagged me into writing most of this stuff!) + Vasily Lewis (Tireless maintainer and sysadmin at Woodsoup + where PLIB was first hosted) + Toru Egashira (Who wrote a program called 'NSPmod' which was + the original basis of the SL 'MOD' player - + although the original code has been almost + entirely rewritten in the process of merging + it with SL. + Everyone at OPENGL-GAMEDEV-L and 3Dfx.glide.linux |
|
From: Sebastian U. <ud...@us...> - 2002-06-29 18:40:22
|
Update of /cvsroot/plib/plib/tools In directory usw-pr-cvs1:/tmp/cvs-serv30085/tools Modified Files: AUTHORS Log Message: Copied up-to-date 'AUTHORS' file over to the tools / examples areas Index: AUTHORS =================================================================== RCS file: /cvsroot/plib/plib/tools/AUTHORS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AUTHORS 30 Jul 2000 08:20:07 -0000 1.1 +++ AUTHORS 29 Jun 2002 18:40:19 -0000 1.2 @@ -1,28 +1,61 @@ -PLIB was written by Steve Baker, with help from -numerous others. Special mention must go to: +PLIB was originally written by Steve Baker as a solo project - but +has subsequently been greatly enhanced and expanded by a 'cast of +thousands'. - Daryll Strauss (GLIDE port to Linux) - David Bucciarelli (Mesa -> GLIDE interface) - Brian Paul (Mesa) - Curtis Olson (FlightGear guru and all-round "Mr Nice Guy") - Vasily Lewis (Tireless maintainer and sysadmin at Woodsoup) - Everyone at OPENGL-GAMEDEV-L and 3Dfx.glide.linux +Most important of all - the 'official' PLIB developers: -Specific contributions came from: + Curtis Olson + Ben Woodhead + Dave McClurg + Gerard Decatrel + Gil Carter + Giancarlo Niccolai + James Jones + John Fay + Juergen Marquardt + Mark Vallevand + Marten Stromberg + Nathan Matias + Norman Vine + Per Liedman + Sam Stickland + Sebastian Ude + Steve Baker <--- Hmmm - must sort this list by SECOND name! + Will Lachance + Wolfram Kuss - Ton Knienieder - -- Ported SL to a bunch of non-Linux OS's +Apologies to anyone I've left out - please let me know +who you are and I'll add you in. - Simon Britnell <ug...@ya...> - -- Added SSG methods for searching for - objects by name, etc. - -- Added an SSG loader for the Me3D file format. + Alex Perry + Christopher St.John + Christian Mayer + Darrell Walisser + Dave Heil + Kevin Thompson + Karl Kremer + Negative0 <---- Who? Some kind of 1's complement arithmetic fanatic? + Mark Danks + Michael Kurth + Sean Palmer + Simon Britnell + Themie Gouthas + Tony Knienieder + Trent Gamblin - Toru Egashira <to...@jm...> - -- Who wrote a program called 'NSPmod' which was - the original basis of the SL 'MOD' player - - although the original code has been almost - entirely rewritten in the process of merging - it with SL. +Special mention must go to: + Daryll Strauss (GLIDE port to Linux) + David Bucciarelli (Mesa -> GLIDE interface) + Brian Paul (Mesa) + Curtis Olson (FlightGear guru and all-round "Mr Nice Guy", + who nagged me into writing most of this stuff!) + Vasily Lewis (Tireless maintainer and sysadmin at Woodsoup + where PLIB was first hosted) + Toru Egashira (Who wrote a program called 'NSPmod' which was + the original basis of the SL 'MOD' player - + although the original code has been almost + entirely rewritten in the process of merging + it with SL. + Everyone at OPENGL-GAMEDEV-L and 3Dfx.glide.linux |
|
From: Sebastian U. <ud...@us...> - 2002-06-28 23:49:15
|
Update of /cvsroot/plib/plib In directory usw-pr-cvs1:/tmp/cvs-serv20056 Modified Files: AUTHORS Log Message: Added James Jones and Juergen Marquardt Index: AUTHORS =================================================================== RCS file: /cvsroot/plib/plib/AUTHORS,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- AUTHORS 25 Mar 2002 17:32:33 -0000 1.10 +++ AUTHORS 28 Jun 2002 23:49:12 -0000 1.11 @@ -10,7 +10,9 @@ Gerard Decatrel Gil Carter Giancarlo Niccolai + James Jones John Fay + Juergen Marquardt Mark Vallevand Marten Stromberg Nathan Matias |
|
From: Sebastian U. <ud...@us...> - 2002-06-28 23:38:48
|
Update of /cvsroot/plib/plib/tools In directory usw-pr-cvs1:/tmp/cvs-serv14331a Removed Files: NOTICE Log Message: Removed copy of LGPL from the tools area --- NOTICE DELETED --- |
|
From: Sebastian U. <ud...@us...> - 2002-06-28 15:07:11
|
Update of /cvsroot/plib/plib/tools/src/afm2txf
In directory usw-pr-cvs1:/tmp/cvs-serv1116/afm2txf
Added Files:
README afm2txf.pl
Log Message:
Added afm2txf script by Andy Ross to the repository
--- NEW FILE: README ---
It's definitely a tool of the "duct tape and fishing line" variety. :)
It expects to find a ghostscript interpreter and ImageMagick's "mogrify"
program on the command line, takes a .afm font metrics file as its sole
argument, and expects that the font therein is accessible to ghostscript.
Basically, it should work out of the box on most linux distributions,
and nowhere else without a lot of work.
If you have a TrueType font that you want to generate:
export GS_FONTPATH=<wherever the font is>
ttf2afm yourfont.ttf > whatever.afm
font.pl whatever.afm
Wait for a while (at 16x downsampling, this takes 1-2 minutes on my
Athlon 1800+), and the .txf file will appear in the current directory.
It will have the Postscript language name of the font.
Andy
--- NEW FILE: afm2txf.pl ---
#!/usr/bin/perl -w
# afm2txf.pl 0.2
#
# Generates .txf font textures from Type 1 fonts
# Requirements: Ghostscript, ImageMagick
#
# Usage:
# afm2txf.pl whatever.afm
#
# Changelog:
# 0.2 (06/28/2002): Generate fonts with proper padding
# 0.1 (06/28/2002): Initial version
#
# Copyright (C) 2002 Andy Ross
use strict;
my $METRICS = shift or die; # AFM file
[...239 lines suppressed...]
return undef if $y < 0;
}
# Record where in the texture the box ended up
$positions{$c} = [$x, $y];
my $vx = $x + $m->[1]*$LINEHGT;
my $vy = $y + $m->[2]*$LINEHGT;
push @PS, "$vx $vy moveto";
push @PS, "<$id> show";
# Next box...
$x += $w + 2*$PADDING/$TEXSIZ;
}
push @PS, "showpage";
return \@PS;
}
|
|
From: Sebastian U. <ud...@us...> - 2002-06-28 15:05:14
|
Update of /cvsroot/plib/plib/tools/src/afm2txf In directory usw-pr-cvs1:/tmp/cvs-serv454/afm2txf Log Message: Directory /cvsroot/plib/plib/tools/src/afm2txf added to the repository |
|
From: Sebastian U. <ud...@us...> - 2002-06-22 02:46:57
|
Update of /cvsroot/plib/plib/src/js
In directory usw-pr-cvs1:/tmp/cvs-serv20289
Modified Files:
js.h
Log Message:
Aargh - this time for real
Index: js.h
===================================================================
RCS file: /cvsroot/plib/plib/src/js/js.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- js.h 22 Jun 2002 02:45:18 -0000 1.19
+++ js.h 22 Jun 2002 02:46:54 -0000 1.20
@@ -66,18 +66,18 @@
# include <machine/joystick.h>
# define JS_DATA_TYPE joystick
# define JS_RETURN (sizeof(struct JS_DATA_TYPE))
-/*# elif defined(__linux__)
+# elif defined(__linux__)
# include <sys/ioctl.h>
# include <linux/joystick.h>
# include <errno.h>
-*/
+
/* check the joystick driver version */
-/*
+
# ifdef JS_VERSION
# if JS_VERSION >= 0x010000
# define JS_NEW
# endif
-# endif*/
+# endif
# else
# ifndef JS_DATA_TYPE
@@ -497,10 +497,12 @@
# if defined(__FreeBSD__) || defined(__NetBSD__)
//id = ident;
sprintf ( fname, "/dev/joy%d", ident ) ;
-# else
+# elif defined(__linux__)
sprintf ( fname, "/dev/input/js%d", ident ) ;
if ( access ( fname, F_OK ) != 0 )
sprintf ( fname, "/dev/js%d", ident ) ;
+# else
+ sprintf ( fname, "/dev/js%d", ident ) ; /* FIXME */
# endif
open () ;
#endif
|
|
From: Sebastian U. <ud...@us...> - 2002-06-22 02:45:21
|
Update of /cvsroot/plib/plib/src/js
In directory usw-pr-cvs1:/tmp/cvs-serv20048
Modified Files:
js.h
Log Message:
Update to previous change
Index: js.h
===================================================================
RCS file: /cvsroot/plib/plib/src/js/js.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- js.h 22 Jun 2002 02:38:17 -0000 1.18
+++ js.h 22 Jun 2002 02:45:18 -0000 1.19
@@ -66,18 +66,18 @@
# include <machine/joystick.h>
# define JS_DATA_TYPE joystick
# define JS_RETURN (sizeof(struct JS_DATA_TYPE))
-# elif defined(__linux__)
+/*# elif defined(__linux__)
# include <sys/ioctl.h>
# include <linux/joystick.h>
# include <errno.h>
-
+*/
/* check the joystick driver version */
-
+/*
# ifdef JS_VERSION
# if JS_VERSION >= 0x010000
# define JS_NEW
# endif
-# endif
+# endif*/
# else
# ifndef JS_DATA_TYPE
|
|
From: Sebastian U. <ud...@us...> - 2002-06-22 02:38:21
|
Update of /cvsroot/plib/plib/src/js
In directory usw-pr-cvs1:/tmp/cvs-serv18843
Modified Files:
js.h
Log Message:
With Linux, also check for joystick devices using the devfs naming scheme
Index: js.h
===================================================================
RCS file: /cvsroot/plib/plib/src/js/js.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- js.h 18 Apr 2002 19:54:34 -0000 1.17
+++ js.h 22 Jun 2002 02:38:17 -0000 1.18
@@ -132,9 +132,9 @@
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+/*#if defined(__FreeBSD__) || defined(__NetBSD__)
int id ;
-#endif
+#endif*/
#ifdef WIN32
JOYINFOEX js ;
UINT js_id ;
@@ -495,10 +495,12 @@
#else
# if defined(__FreeBSD__) || defined(__NetBSD__)
- id = ident;
+ //id = ident;
sprintf ( fname, "/dev/joy%d", ident ) ;
# else
- sprintf ( fname, "/dev/js%d", ident ) ;
+ sprintf ( fname, "/dev/input/js%d", ident ) ;
+ if ( access ( fname, F_OK ) != 0 )
+ sprintf ( fname, "/dev/js%d", ident ) ;
# endif
open () ;
#endif
|
|
From: Sebastian U. <ud...@us...> - 2002-06-20 20:14:04
|
Update of /cvsroot/plib/plib/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv28192
Modified Files:
pu.h pu.cxx
Log Message:
Undo of accidential merge
Index: pu.h
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.h,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- pu.h 20 Jun 2002 20:07:54 -0000 1.107
+++ pu.h 20 Jun 2002 20:14:01 -0000 1.108
@@ -50,7 +50,6 @@
#ifdef PU_NOT_USING_GLUT
-#define PU_NOBUTTON -1
#define PU_LEFT_BUTTON 0
#define PU_MIDDLE_BUTTON 1
#define PU_RIGHT_BUTTON 2
@@ -59,7 +58,6 @@
#else
-#define PU_NOBUTTON -1
#define PU_LEFT_BUTTON GLUT_LEFT_BUTTON
#define PU_MIDDLE_BUTTON GLUT_MIDDLE_BUTTON
#define PU_RIGHT_BUTTON GLUT_RIGHT_BUTTON
Index: pu.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.cxx,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- pu.cxx 20 Jun 2002 20:07:54 -0000 1.51
+++ pu.cxx 20 Jun 2002 20:14:01 -0000 1.52
@@ -360,8 +360,6 @@
else
last_buttons &= ~( 1 << button ) ;
-printf ( "last_buttons: %d\n", last_buttons ) ;
-
pu_mouse_x = x ;
pu_mouse_y = h - y ;
int return_value = puGetBaseLiveInterface () -> checkHit ( button,
@@ -400,9 +398,7 @@
int button =
(last_buttons & (1<<PU_LEFT_BUTTON )) ? PU_LEFT_BUTTON :
(last_buttons & (1<<PU_MIDDLE_BUTTON)) ? PU_MIDDLE_BUTTON :
- (last_buttons & (1<<PU_RIGHT_BUTTON )) ? PU_RIGHT_BUTTON : PU_NOBUTTON ;
-
-printf ( "%d\n", button ) ;
+ (last_buttons & (1<<PU_RIGHT_BUTTON )) ? PU_RIGHT_BUTTON : 0 ;
int h = puGetWindowHeight () ;
|
|
From: Sebastian U. <ud...@us...> - 2002-06-20 20:11:05
|
Update of /cvsroot/plib/plib/examples/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv27017
Modified Files:
simple.cxx
Log Message:
Undo of accidential merge
Index: simple.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/pui/simple.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- simple.cxx 20 Jun 2002 20:07:55 -0000 1.7
+++ simple.cxx 20 Jun 2002 20:11:02 -0000 1.8
@@ -13,19 +13,19 @@
//#define VOODOO 1
-static void motionfn ( int x, int y )
+void motionfn ( int x, int y )
{
puMouse ( x, y ) ;
glutPostRedisplay () ;
}
-static void mousefn ( int button, int updown, int x, int y )
+void mousefn ( int button, int updown, int x, int y )
{
puMouse ( button, updown, x, y ) ;
glutPostRedisplay () ;
}
-static void displayfn ( void )
+void displayfn ( void )
{
glClearColor ( 0.1f, 0.4f, 0.1f, 1.0f ) ;
glClear ( GL_COLOR_BUFFER_BIT ) ;
@@ -41,13 +41,13 @@
than creating user interface widgets, you normally do want to
redraw your scenery as often as possible for smooth animation. */
- //glutPostRedisplay () ;
+ glutPostRedisplay () ;
}
-/*static void button_cb ( puObject * )
+void button_cb ( puObject * )
{
fprintf ( stderr, "Hello World.\n" ) ;
-}*/
+}
int main ( int argc, char **argv )
@@ -67,23 +67,27 @@
can write their applications upon this example code without running
into problems. */
- glutInitDisplayMode ( GLUT_RGB | GLUT_DOUBLE /*| GLUT_DEPTH*/ ) ;
+ glutInitDisplayMode ( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH ) ;
glutCreateWindow ( "PUI Application" ) ;
glutDisplayFunc ( displayfn ) ;
glutMouseFunc ( mousefn ) ;
glutMotionFunc ( motionfn ) ;
- glutPassiveMotionFunc ( motionfn ) ;
-/*#ifdef VOODOO
+#ifdef VOODOO
glutPassiveMotionFunc ( motionfn ) ;
-#endif*/
+#endif
puInit () ;
#ifdef VOODOO
puShowCursor () ;
#endif
+
+ puOneShot *b = new puOneShot ( 50, 50, 200, 80 ) ;
+
+ b -> setLegend ( "Say Hello" ) ;
+ b -> setCallback ( button_cb ) ;
glutMainLoop () ;
|
|
From: Sebastian U. <ud...@us...> - 2002-06-20 20:08:26
|
Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv25822/src/ssg
Modified Files:
ssgLoadMDL.cxx ssgLoadBGL.cxx ssgLoadAC.cxx ssgLoad3ds.cxx
ssgIO.cxx
Log Message:
Minor optimizations
Index: ssgLoadMDL.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadMDL.cxx,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ssgLoadMDL.cxx 10 Jun 2002 14:15:14 -0000 1.40
+++ ssgLoadMDL.cxx 20 Jun 2002 20:07:52 -0000 1.41
@@ -1384,7 +1384,7 @@
char c;
int i = 0;
- while((c = fgetc(fp)) != 0)
+ while((c = getc(fp)) != 0)
{
if(!isspace(c))
tex_filename[i++] = tolower(c);
@@ -1393,7 +1393,7 @@
// Padding byte
if((strlen(tex_filename) + 1) % 2)
- c = fgetc(fp);
+ c = getc(fp);
DEBUGPRINT( "TEXTURE2: Set texture: name = " << tex_filename <<
std::endl);
Index: ssgLoadBGL.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadBGL.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ssgLoadBGL.cxx 20 Jun 2002 16:42:10 -0000 1.7
+++ ssgLoadBGL.cxx 20 Jun 2002 20:07:52 -0000 1.8
@@ -2020,7 +2020,7 @@
char c;
int i = 0;
- while((c = fgetc(fp)) != 0)
+ while((c = getc(fp)) != 0)
{
if(!isspace(c))
tex_filename[i++] = tolower(c);
@@ -2029,7 +2029,7 @@
// Padding byte
if((strlen(tex_filename) + 1) % 2)
- c = fgetc(fp);
+ c = getc(fp);
JMPRINT( ios::hex, "Set texture2: name = " << tex_filename << ", length = 0x" << length
<< ", idx = 0x" << idx << ", flags = 0x" << (short)flags << ", color = 0x" << color);
Index: ssgLoadAC.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadAC.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ssgLoadAC.cxx 10 Jun 2002 16:34:29 -0000 1.27
+++ ssgLoadAC.cxx 20 Jun 2002 20:07:52 -0000 1.28
@@ -352,11 +352,11 @@
current_data = new char [ len + 1 ] ;
for ( int i = 0 ; i < len ; i++ )
- current_data [ i ] = fgetc ( loader_fd ) ;
+ current_data [ i ] = getc ( loader_fd ) ;
current_data [ len ] = '\0' ;
- fgetc ( loader_fd ) ; /* Final RETURN */
+ getc ( loader_fd ) ; /* Final RETURN */
ssgBranch *br = current_options -> createBranch ( current_data ) ;
Index: ssgLoad3ds.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoad3ds.cxx,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ssgLoad3ds.cxx 10 Jun 2002 16:34:29 -0000 1.34
+++ ssgLoad3ds.cxx 20 Jun 2002 20:07:53 -0000 1.35
@@ -343,7 +343,7 @@
char *s = new char[256], read;
int c = 0;
- while ( (read = fgetc(model)) != 0 ) {
+ while ( (read = getc(model)) != 0 ) {
if (c < 255)
s[c++] = read;
}
Index: ssgIO.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgIO.cxx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- ssgIO.cxx 18 Dec 2001 16:35:58 -0000 1.35
+++ ssgIO.cxx 20 Jun 2002 20:07:53 -0000 1.36
@@ -203,7 +203,7 @@
for ( i = 0 ; i < MAX_ENTITY_NAME_LENGTH ; i++ )
{
- int c = fgetc ( fd ) ;
+ int c = getc ( fd ) ;
s [ i ] = c ;
if ( c == '\0' )
|
|
From: Sebastian U. <ud...@us...> - 2002-06-20 20:07:58
|
Update of /cvsroot/plib/plib/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv25822/src/pui
Modified Files:
puLargeInput.cxx puFileSelector.cxx puFilePicker.cxx pu.cxx
pu.h
Log Message:
Minor optimizations
Index: puLargeInput.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puLargeInput.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- puLargeInput.cxx 23 Mar 2002 16:26:40 -0000 1.31
+++ puLargeInput.cxx 20 Jun 2002 20:07:53 -0000 1.32
@@ -390,7 +390,7 @@
text = new char [ length ] ;
strcpy ( text, l ) ;
- if ( ( strlen(l) == 0 ) || ( *(l+strlen(l)-1) != '\n' ) )
+ if ( ( l [ 0 ] == '\0' ) || ( *(l+strlen(l)-1) != '\n' ) )
strcat ( text, "\n" ) ;
// Find the greatest width of a line
Index: puFileSelector.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puFileSelector.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- puFileSelector.cxx 10 Jun 2002 23:32:46 -0000 1.23
+++ puFileSelector.cxx 20 Jun 2002 20:07:53 -0000 1.24
@@ -610,7 +610,9 @@
return ;
}
- for ( ifile = 0 ; (dp = ulReadDir(dirp)) != NULL && ifile < num_files ; )
+ for ( ifile = 0 ;
+ (dp = ulReadDir(dirp)) != NULL && ifile < num_files ;
+ ifile++ )
{
/* Skip over the "." entry... */
@@ -631,8 +633,6 @@
files[ ifile ] = new char[ strlen(dp->d_name)+1 ] ;
strcpy ( files [ ifile ], dp->d_name ) ;
}
-
- ifile++ ;
}
files [ ifile ] = NULL ;
Index: puFilePicker.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puFilePicker.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- puFilePicker.cxx 10 Jun 2002 23:32:46 -0000 1.26
+++ puFilePicker.cxx 20 Jun 2002 20:07:53 -0000 1.27
@@ -103,7 +103,7 @@
chop_file ( fname ) ;
- if ( strlen ( fname ) == 0 )
+ if ( fname [ 0 ] == '\0' )
{
/* Empty string! The only way to go up is to append a "../" */
@@ -273,7 +273,6 @@
dflag = NULL ;
num_files = 0 ;
- strcpy ( getStringValue(), "" ) ;
strcpy ( startDir, dir ) ;
if ( arrows > 2 ) arrows = 2 ;
Index: pu.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.cxx,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- pu.cxx 23 Apr 2002 23:51:55 -0000 1.50
+++ pu.cxx 20 Jun 2002 20:07:54 -0000 1.51
@@ -360,6 +360,8 @@
else
last_buttons &= ~( 1 << button ) ;
+printf ( "last_buttons: %d\n", last_buttons ) ;
+
pu_mouse_x = x ;
pu_mouse_y = h - y ;
int return_value = puGetBaseLiveInterface () -> checkHit ( button,
@@ -398,7 +400,9 @@
int button =
(last_buttons & (1<<PU_LEFT_BUTTON )) ? PU_LEFT_BUTTON :
(last_buttons & (1<<PU_MIDDLE_BUTTON)) ? PU_MIDDLE_BUTTON :
- (last_buttons & (1<<PU_RIGHT_BUTTON )) ? PU_RIGHT_BUTTON : 0 ;
+ (last_buttons & (1<<PU_RIGHT_BUTTON )) ? PU_RIGHT_BUTTON : PU_NOBUTTON ;
+
+printf ( "%d\n", button ) ;
int h = puGetWindowHeight () ;
Index: pu.h
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.h,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- pu.h 10 Jun 2002 23:32:46 -0000 1.106
+++ pu.h 20 Jun 2002 20:07:54 -0000 1.107
@@ -50,6 +50,7 @@
#ifdef PU_NOT_USING_GLUT
+#define PU_NOBUTTON -1
#define PU_LEFT_BUTTON 0
#define PU_MIDDLE_BUTTON 1
#define PU_RIGHT_BUTTON 2
@@ -58,6 +59,7 @@
#else
+#define PU_NOBUTTON -1
#define PU_LEFT_BUTTON GLUT_LEFT_BUTTON
#define PU_MIDDLE_BUTTON GLUT_MIDDLE_BUTTON
#define PU_RIGHT_BUTTON GLUT_RIGHT_BUTTON
|
