csp-commits

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv17617

Modified Files:
	CHANGES CHANGES.current TODO acinclude.m4 configure.in 
Log Message:


Index: CHANGES
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CHANGES	19 Oct 2003 23:30:42 -0000	1.8
--- CHANGES	20 Oct 2003 00:23:22 -0000	1.9
***************
*** 55,59 ****
  
  
- 
  Version 0.3.3 (2003-08-04)
  ===========================
--- 55,58 ----

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** CHANGES.current	19 Oct 2003 23:30:43 -0000	1.70
--- CHANGES.current	20 Oct 2003 00:23:22 -0000	1.71
***************
*** 1,8 ****
!  Version 0.3.6 (in progress)
  ===========================
  
  2003-10-19: onsight
              Tagged version r0_3_5, branched to b0_3 to start version 
  	    0.3.6.  The 'systems' branch will be merged into the trunk
  	    to create version 0.4.0.
  
--- 1,134 ----
!  Version 0.4.0 (in progress)
  ===========================
+ 2003-10-19: onsight
+             Tagged r0_3_5 and started branch b0_3.  Merged 'systems'
+ 	    branch into the trunk to start version 0.4.0.
+ 
+ 2003-10-19: onsight
+             Modified class Thrust to use simdata::Table2 instead of the
+ 	    deprecated simdata::Table class.  Note that the XML thrust
+ 	    tables must be modified to use this new class, but that these
+ 	    changes will not be checked into cvs (to prevent clashes with
+ 	    the trunk).  The corrected files will be posted at 
+ 	    http://csp.sourceforge.net/downloads (soon) until the systems
+ 	    branch is merged to make v0.4.0.
+ 
+ 	    SIMDATA_OBJECT(...) changed to SIMDATA_STATIC_OBJECT(...) for 
+ 	    object classes that are static.  This was previously specified
+ 	    per object in the associated xml file using the 'static' attr.
+ 	    That use is deprecated in simdata 0.4; now object classes are 
+ 	    either static or not.
+ 
+ 2003-10-14: onsight
+             Removed very old TerrainSymbol.h
+ 
+ 2003-10-11: onsight
+             Tracked down '#define min' from windows.h (no surprise), which
+ 	    was included via Producer/RenderSurface.  Added #undef's there
+ 	    as a temporary fix.
+ 
+ 	    Changed the classes related to input events and hid mapping
+ 	    to use reference counting.
+ 
+ 	    Moved CSP_OSG_094 to CSPSim.h.  You must uncomment this line
+ 	    to use OSG version 0.9.4 or older.
+ 
+ ==========> VC users add System.cpp, SystemsModel.cpp, and Systems/*.cpp
+             to the project.
+ 
+ 2003-10-09: onsight
+             Fixed minor snprintf problem under msvc.
+ 
+             Split the SystemsModel class out of System.h/cpp into 
+ 	    SystemsModel.h/cpp.  This seems to be a better arrangement,
+ 	    and hopefully circumventns a problem with forward 
+ 	    declarations + simdata::Link<> under msvc.
+ 
+ 2003-10-05: onsight
+             Changed HID to inherit from simdata::Referenced.  Minor
+ 	    changes to BaseScreen, GameScreen, and CSPSim to support
+ 	    this change.
+ 
+ 2003-09-25: onsight
+             Integrated VI's patches for OSG 096 support.  Changes
+ 	    camera handling in near/far SceneView intances in
+ 	    VirtualScene.cpp.
+ 
+             Various OSG 096 fixes:
+ 	      * SceneView aspect ratio
+ 	      * NearView projection matrix
+ 	      * False horizon coloring
+ 	      * Skydome (non-TEXDOME) coloring
+ 
+ 	    To use OSG 094, uncomment the #define CSP_OSG_094 line
+ 	    in VirtualScene.cpp
  
+ 2003-09-17: onsight
+             Major refactoring of the aircraft components in terms of
+ 	    the System/SystemsModel architecture.  PhysicsModel is now
+ 	    a System under the main SystemsModel for the vehicle.  The
+ 	    BaseDynamics classes are also Systems, although they only
+ 	    function as dynamics when placed directly underneath the
+ 	    PhysicsModel node.  Almost all of the original inter-
+ 	    component communications are now implemented through the
+ 	    bus architecture.  A few hacks remain, such as the landing
+ 	    gear sprites (which needs to be overhauled in terms of
+ 	    standard animations once a suitable 3d model is available).
+ 
+ 	    Significant changes to the DataRecorder interface.
+ 
+ 	    Changed the stats display interface to allow each System
+ 	    to add its own info lines to the display by extending
+ 	    getInfo().
+ 
+ 	    Changes to the XML data for the m2k to support the new
+ 	    vehicle interfaces.
+ 
+ 2003-09-15: onsight
+             Added SynchronousUpdate.h and SynchronousUpdate.cpp as the
+ 	    basis for a new update callback infrastructure.
+ 
+ 2003-09-13: onsight
+             Renamed Model to SystemsModel
+ 
+             Removed F16Model from the build.
+ 
+ 	    Added m_SystemsModel to DynamicObject to reference the
+ 	    current systems model.  The setHuman() and setLocal()
+ 	    methods now handle updates of the model, using two new
+ 	    simdata::Path member variables: m_AgentModel and m_HumanModel.
+ 
+ 	    SystemModel updates are now hooked into DynamicObject updates.
+ 
+ 	    Input events are chained to the systems model if the dynamic
+ 	    object doesn't handle them.
+ 
+ 	    Changed the mapped input event interface.  The onCommand, 
+ 	    onAxis, and onMotion methods of InputInterface are now
+ 	    private, and all mapped events are passed via the onMapEvent
+ 	    method.  Overriding these methods was generally used to pass 
+ 	    events to subobjects, so it is easier now that only one method 
+ 	    needs to be extended.  The raw event handlers were excluded 
+ 	    from this interface, since raw events are more often handled 
+ 	    by top-level objects.  MapEvent is a wrapper type that 
+ 	    encompasses the three original types of events. 
+ 
+ 2003-09-07: onsight
+             Added Include/System.h and Include/Bus.h, which provide
+ 	    infrastructure for constructing detailed vehicle models.
+ 	    Several existing components such as the data recorder and
+ 	    flight model need to be refactored to use this new
+ 	    interface.
+ 
+ <<<<<<< CHANGES.current
  2003-10-19: onsight
              Tagged version r0_3_5, branched to b0_3 to start version 
  	    0.3.6.  The 'systems' branch will be merged into the trunk
  	    to create version 0.4.0.
+ =======
+ 	    Minor warning cleanups in System.h and Bus.h.
+ 
+ 2003-08-20: onsight
+             Tagged version r0_3_4, starting version 0.3.5
+ >>>>>>> 1.69.2.5
  

Index: TODO
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/TODO,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TODO	18 Apr 2003 12:07:34 -0000	1.2
--- TODO	20 Oct 2003 00:23:22 -0000	1.3
***************
*** 23,24 ****
--- 23,72 ----
  so it can be unpacked in the main CSPSim directory (right
  now you have to unpack it in CSPSim/Data)
+ 
+ 
+ ////////////////////////////////////////////////////////
+ // SYSTEM CONVERSION
+ 
+ Bind PhysicsModel and Controller to the bus. --DONE
+ 
+ Revise AircraftPhysicsModel. --DONE
+ 
+ Update the XML for AircraftPhysicsModel.  --DONE
+ 
+ Deal with creating FlightDynamics from FlightModel---
+ FlightDynamics should link to FlightModel, not the
+ other way around.  --DONE
+ 
+ Fix aircraft stats --DONE
+ 
+ Fix landing gear access from AircraftObject --PARTIAL
+    (needs animation overhaul)
+ 
+ Fix smoke code in AircraftObject
+ 
+ Use standard channel name defs --PARTIAL
+ 
+ Improve code in onRender (save old position there, do
+ smoke updates, etc).
+ 
+ Add gear command handling to gear dynamics --DONE
+ 
+ share Contact points channel --DONE (sharing ObjectModel)
+ 
+ registerChannel(Bus::Ref) -> exportChannels  --DEFER
+ bind(Bus::Ref) -> importChannels  --DONE
+ 
+ change assertions on missing channels to use library
+ functions, with logging, screen messages, and error
+ modes.
+ 
+ log missing animation channels --DONE
+ 
+ rename SystemsModel to ComponentModel or CoreModel?
+ 
+ rename PhysicsModel::m_qOrientation to m_Attitude --DONE
+ 
+ dump diagnostics if a dynamics system overflows, then
+ exit.
+ 
+ 

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/acinclude.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** acinclude.m4	22 Jul 2003 15:49:41 -0000	1.8
--- acinclude.m4	20 Oct 2003 00:23:22 -0000	1.9
***************
*** 37,42 ****
  dnl Generic version check for libraries using 'xxx-config' scripts
  AC_DEFUN(CSP_LIB_CONFIG, [
!   lib_min_version=$3
!   lib_flags_opt=$4
    lib=yes
    AC_PATH_PROG($1[]_CONFIG, $2-config, no)
--- 37,42 ----
  dnl Generic version check for libraries using 'xxx-config' scripts
  AC_DEFUN(CSP_LIB_CONFIG, [
!   lib_min_version="$3"
!   lib_flags_opt="$4"
    lib=yes
    AC_PATH_PROG($1[]_CONFIG, $2-config, no)
***************
*** 76,79 ****
--- 76,157 ----
     LIBS="$$1[]_LIBS $LIBS"
  ])
+ 
+ AC_DEFUN(_CSP_CHECK_PKG_CONFIG, [
+ 	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ ])
+ 		
+ dnl Generic version check for libraries using 'pkg-config' scripts
+ AC_DEFUN(_CSP_PKG_CONFIG, [
+   if test "$PKG_CONFIG" != "no"; then
+   	CSP_LIB_VERSION=`$PKG_CONFIG --silence-errors --modversion $1`
+   	CSP_LIB_LIBS=`$PKG_CONFIG --silence-errors --libs $1`
+   	CSP_LIB_CFLAGS=`$PKG_CONFIG --silence-errors --cflags $1`
+   fi
+ ])
+ 
+ AC_DEFUN(_CSP_LIB_CONFIG, [
+   AC_PATH_PROG(LIB_CONFIG, $1-config, no)
+   if test "$LIB_CONFIG" != "no"; then
+     CSP_LIB_VERSION=`$LIB_CONFIG --version` 
+     CSP_LIB_LIBS=`$LIB_CONFIG --libs` 
+     CSP_LIB_CFLAGS=`$LIB_CONFIG $2` 
+   fi
+ ])
+ 
+ 
+ AC_DEFUN(CSP_CONFIG, [
+   lib_name="$1"
+   lib_id="$2"
+   lib_pkg_id="$3"
+   lib_min_version="$4"
+   lib_flags_opt="$5"
+   lib_fullname="$6"
+   lib_site="$7"
+   lib=yes
+   CSP_LIB_VERSION="0.0.0"
+   CSP_LIB_LIBS=""
+   CSP_LIB_CFLAGS=""
+   _CSP_LIB_CONFIG($lib_id, $lib_flags_opt)
+   if test "$CSP_LIB_VERSION" = "0.0.0"; then
+   	_CSP_PKG_CONFIG($lib_pkg_id)
+   fi
+   AC_MSG_CHECKING(for $lib_pkg_id >= $lib_min_version)
+   no_lib=""
+   lib_version="$CSP_LIB_VERSION"
+   if test "$lib_version" = "0.0.0"; then
+     no_lib=yes
+     AC_MSG_RESULT(no)
+   else
+     lib_major=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` 
+     lib_minor=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+     lib_micro=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+     lib_major_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` 
+     lib_minor_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+     lib_micro_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+     lib_version_proper=`expr \
+       $lib_major \> $lib_major_min \| \
+       $lib_major \= $lib_major_min \& \
+       $lib_minor \> $lib_minor_min \| \
+       $lib_major \= $lib_major_min \& \
+       $lib_minor \= $lib_minor_min \& \
+       $lib_micro \>= $lib_micro_min `
+     if test "$lib_version_proper" = "1" ; then
+       AC_MSG_RESULT(yes)
+     else
+       AC_MSG_RESULT(no)
+       no_lib=yes
+     fi
+    fi
+    if test "$no_lib" = "yes"; then
+ 	CSP_LIB_ERROR($lib_fullname,$lib_min_version,$lib_site,$1[]_CONFIG)
+    fi
+    $1[]_FLAGS="$CSP_LIB_CFLAGS"
+    $1[]_LIBS="$CSP_LIB_LIBS"
+    AC_SUBST($1[]_FLAGS)
+    AC_SUBST($1[]_LIBS)
+    LIBS="$$1[]_LIBS $LIBS"
+ ])
+   	
+ 
  
  

Index: configure.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** configure.in	22 Jul 2003 15:53:11 -0000	1.13
--- configure.in	20 Oct 2003 00:23:22 -0000	1.14
***************
*** 32,35 ****
--- 32,37 ----
  AC_ST_BLKSIZE
  
+ _CSP_CHECK_PKG_CONFIG([])
+ 
  dnl check for Simple Direct Media Library
  CSP_LIB_CONFIG([SDL], [sdl], [1.2.5], [--cflags], [Simple Direct Media Library], [http://www.libsdl.org/])
***************
*** 71,74 ****
--- 73,80 ----
  CSP_OSG_CONFIG(osgText, 0.9.4, [OpenSceneGraph Text library])
  CSP_OSG_CONFIG(osgParticle, 0.9.4, [OpenSceneGraph Particle library])
+ 
+ dnl check for libSigC++ type-safe signal libraryy
+ dnl CSP_LIB_CONFIG([SIGC], [sigc], [1.0.1], [--cflags], [LibSigC++ Signal Library], [http://libsigc.sourceforge.net/])
+ CSP_CONFIG([SIGC], [sigc], [sigc++-1.2], [1.2.0], [--cflags], [LibSigC++ Signal Library], [http://libsigc.sourceforge.net/])
  
  #CSP_LIB_CONFIG([CCGNU2], [ccgnu2], [1.0.6], [--flags], [GNU Common C++ Library], [http://www.gnu.org/software/commonc++/])