Menu
▾
▴
[Csp-commits] APPLICATIONS/CSPSim CHANGES.current,1.69.2.1,1.69.2.2 TODO,1.2,1.2.2.1 acinclude.m4,1.8,1.8.2.1 configure.in,1.13.2.1,1.13.2.2
|
From: <mk...@us...> - 2003-09-29 06:46:26
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv26001
Modified Files:
Tag: systems
CHANGES.current TODO acinclude.m4 configure.in
Log Message:
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.69.2.1
retrieving revision 1.69.2.2
diff -C2 -d -r1.69.2.1 -r1.69.2.2
*** CHANGES.current 16 Sep 2003 06:57:30 -0000 1.69.2.1
--- CHANGES.current 29 Sep 2003 06:46:10 -0000 1.69.2.2
***************
*** 1,4 ****
! Version 0.3.5 (in progress)
===========================
2003-09-15: onsight
--- 1,36 ----
! Branch 'systems' (in progress)
===========================
+
+ 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
+
+ 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
Index: TODO
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/TODO,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** TODO 18 Apr 2003 12:07:34 -0000 1.2
--- TODO 29 Sep 2003 06:46:10 -0000 1.2.2.1
***************
*** 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.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** acinclude.m4 22 Jul 2003 15:49:41 -0000 1.8
--- acinclude.m4 29 Sep 2003 06:46:10 -0000 1.8.2.1
***************
*** 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.2.1
retrieving revision 1.13.2.2
diff -C2 -d -r1.13.2.1 -r1.13.2.2
*** configure.in 16 Sep 2003 06:57:30 -0000 1.13.2.1
--- configure.in 29 Sep 2003 06:46:10 -0000 1.13.2.2
***************
*** 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/])
***************
*** 73,77 ****
dnl check for libSigC++ type-safe signal libraryy
! CSP_LIB_CONFIG([SIGC], [sigc], [1.0.1], [--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++/])
--- 75,80 ----
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++/])
|
