[Plib-cvs] plib/src/js js.cxx,1.4,1.5 js.h,1.31,1.32 jsBSD.cxx,1.4,1.5 jsLinux.cxx,1.4,1.5 jsLinuxOl
Brought to you by:
sjbaker
Menu
▾
▴
[Plib-cvs] plib/src/js js.cxx,1.4,1.5 js.h,1.31,1.32 jsBSD.cxx,1.4,1.5 jsLinux.cxx,1.4,1.5 jsLinuxOld.cxx,1.2,1.3 jsMacOS.cxx,1.3,1.4 jsMacOSX.cxx,1.3,1.4 jsNone.cxx,1.3,1.4 jsWindows.cxx,1.4,1.5
|
From: Eric L. <smo...@us...> - 2004-09-21 11:46:06
|
Update of /cvsroot/plib/plib/src/js In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2333 Modified Files: js.cxx js.h jsBSD.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx jsMacOSX.cxx jsNone.cxx jsWindows.cxx Log Message: Many changes courtesy of John Fay. Index: js.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/js/js.cxx,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- js.cxx 15 Aug 2004 00:12:32 -0000 1.4 +++ js.cxx 21 Sep 2004 11:45:55 -0000 1.5 @@ -22,9 +22,6 @@ #include "js.h" - -/// void jsInit () {} - float jsJoystick::fudge_axis ( float value, int axis ) const { if ( value < center[axis] ) @@ -86,3 +83,4 @@ } + Index: js.h =================================================================== RCS file: /cvsroot/plib/plib/src/js/js.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- js.h 15 Aug 2004 00:12:32 -0000 1.31 +++ js.h 21 Sep 2004 11:45:55 -0000 1.32 @@ -93,3 +93,4 @@ #endif + Index: jsBSD.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/js/jsBSD.cxx,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- jsBSD.cxx 15 Aug 2004 00:12:32 -0000 1.4 +++ jsBSD.cxx 21 Sep 2004 11:45:55 -0000 1.5 @@ -38,7 +38,7 @@ #include "js.h" -#if defined(UL_BSD) +#if defined (UL_BSD) #if defined(__NetBSD__) || defined(__FreeBSD__) #define HAVE_USB_JS 1 Index: jsLinux.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/js/jsLinux.cxx,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- jsLinux.cxx 15 Aug 2004 00:12:32 -0000 1.4 +++ jsLinux.cxx 21 Sep 2004 11:45:55 -0000 1.5 @@ -23,8 +23,9 @@ #include "js.h" -#if defined(UL_LINUX) && defined(JS_NEW) +#if defined (UL_LINUX) && defined (JS_NEW) +#include <linux/joystick.h> #include <sys/param.h> #include <fcntl.h> #include <sys/ioctl.h> @@ -39,9 +40,6 @@ void jsInit () {} - -/* check the joystick driver version */ - void jsJoystick::open () { name [0] = '\0' ; @@ -182,4 +180,3 @@ } #endif - Index: jsLinuxOld.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/js/jsLinuxOld.cxx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- jsLinuxOld.cxx 15 Aug 2004 00:12:32 -0000 1.2 +++ jsLinuxOld.cxx 21 Sep 2004 11:45:55 -0000 1.3 @@ -23,7 +23,7 @@ #include "js.h" -#if defined(UL_LINUX) && !defined(JS_NEW) +#if defined (UL_LINUX) && !defined (JS_NEW) #include <fcntl.h> #include <sys/ioctl.h> Index: jsMacOS.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/js/jsMacOS.cxx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- jsMacOS.cxx 15 Aug 2004 00:12:32 -0000 1.3 +++ jsMacOS.cxx 21 Sep 2004 11:45:55 -0000 1.4 @@ -23,11 +23,11 @@ #include "js.h" -#ifdef UL_MACINTOSH +#if defined (UL_MACINTOSH) #include <InputSprocket.h> -//#define _JS_MAX_AXES_MAC 9 // not used +//#define _JS_MAX_AXES_MAC 9 #define isp_num_axis 9 #define isp_num_needs 41 @@ -208,4 +208,3 @@ void jsInit() {} #endif - Index: jsNone.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/js/jsNone.cxx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- jsNone.cxx 15 Aug 2004 00:12:32 -0000 1.3 +++ jsNone.cxx 21 Sep 2004 11:45:55 -0000 1.4 @@ -22,12 +22,9 @@ #include "js.h" -#if defined(UL_IRIX) || defined(UL_SOLARIS) || defined(UL_HPUX) +#if defined(UL_IRIX) || defined(UL_SOLARIS) || defined (UL_HPUX) -/* -struct os_specific_s { -} -*/ +struct os_specific_s ; void jsJoystick::open () @@ -39,7 +36,7 @@ void jsJoystick::close () { - // if (os) delete os; + error = TRUE ; } @@ -56,5 +53,7 @@ if ( buttons != NULL ) *buttons = 0 ; } +void jsInit () {} + #endif Index: jsWindows.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/js/jsWindows.cxx,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- jsWindows.cxx 15 Aug 2004 15:08:24 -0000 1.4 +++ jsWindows.cxx 21 Sep 2004 11:45:55 -0000 1.5 @@ -23,10 +23,8 @@ #include "js.h" -#ifdef UL_WIN32 +#if defined (UL_WIN32) -// Since we use joyGetPosEx to request the joystick values, -// we have never more than 8 axes to worry about: #define _JS_MAX_AXES_WIN 8 /* X,Y,Z,R,U,V,POV_X,POV_Y */ struct os_specific_s { @@ -128,7 +126,7 @@ // X,Y,Z,R,U,V,POV - not necessarily the first n of these. if ( os->jsCaps.wCaps & JOYCAPS_HASPOV ) { - num_axes = _JS_MAX_AXES_WIN ; + num_axes = _JS_MAX_AXES ; min [ 7 ] = -1.0 ; max [ 7 ] = 1.0 ; // POV Y min [ 6 ] = -1.0 ; max [ 6 ] = 1.0 ; // POV X } @@ -258,4 +256,3 @@ void jsInit() {} #endif - |
