csp-commits — Mailing list for CVS commit messages.

[Csp-commits] svn:csp r1503 - in trunk/CSP/CSPSim: . Include Source

[<sv...@ww...>]

Author: mkrose
Date: 2005-04-02 11:09:59 -0800 (Sat, 02 Apr 2005)
New Revision: 1503

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Include/PhysicsModel.h
   trunk/CSP/CSPSim/Source/AircraftPhysicsModel.cpp
   trunk/CSP/CSPSim/Source/PhysicsModel.cpp
Log:
Export angular velocity in body coordinates from PhysicsModel.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1503

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-04-02 17:53:21 UTC (rev 1502)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-04-02 19:09:59 UTC (rev 1503)
@@ -8,6 +8,8 @@
  * Add headers and a common source file for declaring top-level bus
    channel names.
 
+ * Export angular velocity in body coordinates from PhysicsModel.
+
 2005-03-12: delta
  * Reformated GearAnimation and related classes as Systems. Adjusted 
    xml files consequently. Cleaned up GearDynamics.

Modified: trunk/CSP/CSPSim/Include/PhysicsModel.h
===================================================================
--- trunk/CSP/CSPSim/Include/PhysicsModel.h	2005-04-02 17:53:21 UTC (rev 1502)
+++ trunk/CSP/CSPSim/Include/PhysicsModel.h	2005-04-02 19:09:59 UTC (rev 1503)
@@ -129,6 +129,7 @@
 	DataChannel<simdata::Vector3>::Ref b_Position;
 	DataChannel<simdata::Vector3>::Ref b_Velocity;
 	DataChannel<simdata::Vector3>::Ref b_AngularVelocity;
+	DataChannel<simdata::Vector3>::Ref b_AngularVelocityBody;
 	DataChannel<simdata::Vector3>::Ref b_AccelerationBody;
 	DataChannel<simdata::Quat>::Ref b_Attitude;
 

Modified: trunk/CSP/CSPSim/Source/AircraftPhysicsModel.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/AircraftPhysicsModel.cpp	2005-04-02 17:53:21 UTC (rev 1502)
+++ trunk/CSP/CSPSim/Source/AircraftPhysicsModel.cpp	2005-04-02 19:09:59 UTC (rev 1503)
@@ -129,6 +129,7 @@
 	assert(b_Position.valid());
 	assert(b_Velocity.valid());
 	assert(b_AngularVelocity.valid());
+	assert(b_AngularVelocityBody.valid());
 	assert(b_Attitude.valid());
 	assert(b_AccelerationBody.valid());
 	m_WeightLocal = - b_Mass->value() * gravity * simdata::Vector3::ZAXIS;
@@ -190,6 +191,7 @@
 	// returns vehicle data members
 	b_Velocity->value() = m_VelocityLocal;
 	b_AngularVelocity->value() = m_AngularVelocityLocal;
+	b_AngularVelocityBody->value() = localToBody(m_AngularVelocityLocal);
 	b_Attitude->value() = m_Attitude;
 	// the fixed-frame acceleration in body coordinates, *not* m_LinearAccelBody, which is the
 	// rotating-frame acceleration.  to clarify the difference, note that for an aircraft in a

Modified: trunk/CSP/CSPSim/Source/PhysicsModel.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/PhysicsModel.cpp	2005-04-02 17:53:21 UTC (rev 1502)
+++ trunk/CSP/CSPSim/Source/PhysicsModel.cpp	2005-04-02 19:09:59 UTC (rev 1503)
@@ -127,6 +127,7 @@
 	b_Position = bus->getSharedChannel(Kinetics::Position, true, true);
 	b_Velocity = bus->getSharedChannel(Kinetics::Velocity, true, true);
 	b_AngularVelocity = bus->getSharedChannel(Kinetics::AngularVelocity, true, true);
+	b_AngularVelocityBody = bus->getSharedChannel(Kinetics::AngularVelocityBody, true, true);
 	b_Attitude = bus->getSharedChannel(Kinetics::Attitude, true, true);
 	b_AccelerationBody = bus->getSharedChannel(Kinetics::AccelerationBody, true, true);
 	b_Mass = bus->getChannel(Kinetics::Mass);

[Csp-commits] svn:csp r1502 - in trunk/CSP/CSPSim: . Include Source VisualStudio/CSPSimDLL

[<sv...@ww...>]

Author: mkrose
Date: 2005-04-02 09:53:21 -0800 (Sat, 02 Apr 2005)
New Revision: 1502

Added:
   trunk/CSP/CSPSim/Include/ConditionsChannels.h
   trunk/CSP/CSPSim/Include/ControlInputsChannels.h
   trunk/CSP/CSPSim/Include/ControlSurfacesChannels.h
   trunk/CSP/CSPSim/Include/FlightDynamicsChannels.h
   trunk/CSP/CSPSim/Include/NavigationChannels.h
   trunk/CSP/CSPSim/Source/Channels.cpp
Removed:
   trunk/CSP/CSPSim/Source/KineticsChannels.cpp
Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Include/KineticsChannels.h
   trunk/CSP/CSPSim/Source/SConscript
   trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj
Log:
Add headers and a common source file for declaring top-level bus
channel names.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1502

Diff omitted (16651 bytes).

[Csp-commits] svn:csp r1501 - in trunk/CSP/CSPSim: . Include

[<sv...@ww...>]

Author: mkrose
Date: 2005-04-02 08:52:06 -0800 (Sat, 02 Apr 2005)
New Revision: 1501

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Include/Bus.h
Log:
Add a DataChannel constructor that can be used for channel data types
that don't have public copy constructors.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1501

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-04-02 16:43:03 UTC (rev 1500)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-04-02 16:52:06 UTC (rev 1501)
@@ -1,12 +1,16 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-04-02: onsight
+ * Add a DataChannel constructor that can be used for channel data types
+   that don't have public copy constructors.
+
 2005-03-12: delta
  * Reformated GearAnimation and related classes as Systems. Adjusted 
    xml files consequently. Cleaned up GearDynamics.
-   
+
  * Updated .vcproj for the next check in of OS relative to fcs.
- 
+
 ==> ALL USERS: RebuildData.py
 
 2005-03-11: onsight

Modified: trunk/CSP/CSPSim/Include/Bus.h
===================================================================
--- trunk/CSP/CSPSim/Include/Bus.h	2005-04-02 16:43:03 UTC (rev 1500)
+++ trunk/CSP/CSPSim/Include/Bus.h	2005-04-02 16:52:06 UTC (rev 1501)
@@ -424,9 +424,20 @@
 	 *  @param name The string indetifier of the channel.
 	 *  @param val The initial value of the channel data.
 	 *  @param shared Create a shared (or non-shared) channel.
+	 *  @param signal_ The signaling mechanism of the channel (push/pull/none).
 	 */
 	DataChannel(std::string const &name, T const &val, AccessType access_=ACCESS_LOCAL, SignalType signal_=NO_SIGNAL): DataChannelBase(name, access_, signal_), m_Value(val) {}
 
+	/** Construct and initialize a new channel.  The initial value is
+	 *  determined by the default constructor for the channel data type.
+	 *  This is useful for types that do not have public copy constructors.
+	 *
+	 *  @param name The string indetifier of the channel.
+	 *  @param shared_ Create a shared (or non-shared) channel.
+	 *  @param signal_ The signaling mechanism of the channel (push/pull/none).
+	 */
+	DataChannel(std::string const &name, AccessType access_=ACCESS_LOCAL, SignalType signal_=NO_SIGNAL): DataChannelBase(name, access_, signal_), m_Value() {}
+
 	static DataChannel<T> *newLocal(std::string const &name, T const &val) {
 		return new DataChannel(name, val, ACCESS_LOCAL, NO_SIGNAL);
 	}

[Csp-commits] svn:csp r1500 - trunk/CSP/SimCore/Util

[<sv...@ww...>]

Author: mkrose
Date: 2005-04-02 08:43:03 -0800 (Sat, 02 Apr 2005)
New Revision: 1500

Modified:
   trunk/CSP/SimCore/Util/StringTools.h
Log:
Add iterator typedefs to the string tokenizer.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1500

Modified: trunk/CSP/SimCore/Util/StringTools.h
===================================================================
--- trunk/CSP/SimCore/Util/StringTools.h	2005-04-02 16:42:57 UTC (rev 1499)
+++ trunk/CSP/SimCore/Util/StringTools.h	2005-04-02 16:43:03 UTC (rev 1500)
@@ -43,6 +43,8 @@
  */
 class StringTokenizer: public std::deque<std::string> {
 public:
+	typedef std::deque<std::string>::iterator iterator;
+	typedef std::deque<std::string>::const_iterator const_iterator;
 	StringTokenizer(const std::string &str, const std::string &delimiters = " ,\n");
 };
 

[Csp-commits] svn:csp r1499 - trunk/CSP/SimCore/Util

[<sv...@ww...>]

Author: mkrose
Date: 2005-04-02 08:42:57 -0800 (Sat, 02 Apr 2005)
New Revision: 1499

Modified:
   trunk/CSP/SimCore/Util/Callback.h
   trunk/CSP/SimCore/Util/CallbackDecl.h
Log:
Add callback adapter templates for methods that return a value.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1499

Modified: trunk/CSP/SimCore/Util/Callback.h
===================================================================
--- trunk/CSP/SimCore/Util/Callback.h	2005-04-02 16:38:12 UTC (rev 1498)
+++ trunk/CSP/SimCore/Util/Callback.h	2005-04-02 16:42:57 UTC (rev 1499)
@@ -19,16 +19,16 @@
 
 /**
  * @file Callback.h
- * @brief Provides an adaptor for sigc++-1.2 member function slots.
+ * @brief Provides adaptors for sigc++-1.2 member function slots.
  *
  * The adaptors do not require the target class to subclass SigC::Object,
  * but are equally safe (unlike SigC::slot_class).  Automatic disconnect
  * is handled by making the callbacks instance variables, so they are
- * destroyed (and thereby disconnect) at the same time the target object
+ * destroyed (and thereby disconnected) at the same time the target object
  * is destroyed.
  *
- * At present the signal and callback classes only support slots with no
- * return value and a limited number of arguements.
+ * At present the signal and callback classes only support slots with a
+ * limited number of argument and return value combinations.
  *
  * Sample use:
  *
@@ -67,6 +67,23 @@
 namespace simcore {
 
 
+// Signals ----------------------------------------------------------------------------
+
+class Signal0: public SigC::Signal0<void> { };
+
+template <typename M>
+class Signal1: public SigC::Signal1<void, M> { };
+
+template <typename M, typename N>
+class Signal2: public SigC::Signal2<void, M, N> { };
+
+template <typename R>
+class Signal0R: public SigC::Signal0<R> { };
+
+template <typename R, typename M>
+class Signal1R: public SigC::Signal1<R, M> { };
+
+
 // Callbacks --------------------------------------------------------------------------
 
 template <class C>
@@ -81,6 +98,7 @@
 
 class Callback0: private simdata::ScopedPointer<SigC::Object>, public SigC::Slot0<void> {
 public:
+	typedef Signal0 Signal;
 	template <class C>
 	Callback0(C *instance, void (C::*method)()) :
 		simdata::ScopedPointer<SigC::Object>(new _CallbackAdaptor0<C>(instance, method)),
@@ -100,6 +118,7 @@
 template <typename M>
 class Callback1: private simdata::ScopedPointer<SigC::Object>, public SigC::Slot1<void, M> {
 public:
+	typedef Signal1<M> Signal;
 	template <class C>
 	Callback1(C *instance, void (C::*method)(M)) :
 		simdata::ScopedPointer<SigC::Object>(new _CallbackAdaptor1<C, M>(instance, method)),
@@ -119,24 +138,34 @@
 template <typename M, typename N>
 class Callback2: private simdata::ScopedPointer<SigC::Object>, public SigC::Slot2<void, M, N> {
 public:
+	typedef Signal2<M, N> Signal;
 	template <class C>
 	Callback2(C *instance, void (C::*method)(M, N)) :
 		simdata::ScopedPointer<SigC::Object>(new _CallbackAdaptor2<C, M, N>(instance, method)),
 		SigC::Slot2<void, M, N>(SigC::slot(*dynamic_cast<_CallbackAdaptor2<C, M, N>*>(get()), &_CallbackAdaptor2<C, M, N>::bounce)) { }
 };
 
+template <class C, typename R>
+class _CallbackAdaptor0R: public SigC::Object {
+	typedef R (C::*Method)();
+	C *_instance;
+	Method _method;
+public:
+	inline R bounce() { return (_instance->*_method)(); }
+	_CallbackAdaptor0R(C *instance, Method method) : _instance(instance), _method(method) { }
+};
 
-// Signals ----------------------------------------------------------------------------
+template <typename R>
+class Callback0R: private simdata::ScopedPointer<SigC::Object>, public SigC::Slot0<R> {
+public:
+	typedef Signal0R<R> Signal;
+	template <class C>
+	Callback0R(C *instance, R (C::*method)()) :
+		simdata::ScopedPointer<SigC::Object>(new _CallbackAdaptor0R<C, R>(instance, method)),
+		SigC::Slot0<R>(SigC::slot(*dynamic_cast<_CallbackAdaptor0R<C, R>*>(get()), &_CallbackAdaptor0R<C, R>::bounce)) { }
+};
 
-class Signal0: public SigC::Signal0<void> { };
 
-template <typename M>
-class Signal1: public SigC::Signal1<void, M> { };
-
-template <typename M, typename N>
-class Signal2: public SigC::Signal2<void, M, N> { };
-
-
 // ScopedPointer Callbacks  -----------------------------------------------------------
 
 template <class C>
@@ -153,7 +182,12 @@
 ScopedCallback2<M, N>::ScopedCallback2(C *instance, void (C::*method)(M, N))
 	: simdata::ScopedPointer<Callback2<M, N> >(new Callback2<M, N>(instance, method)) { }
 
+template <typename R>
+template <class C>
+ScopedCallback0R<R>::ScopedCallback0R(C *instance, R (C::*method)())
+	: simdata::ScopedPointer<Callback0R<R> >(new Callback0R<R>(instance, method)) { }
 
+
 } // namespace simcore
 
 #endif // __SIMCORE_UTIL_CALLBACK_H__

Modified: trunk/CSP/SimCore/Util/CallbackDecl.h
===================================================================
--- trunk/CSP/SimCore/Util/CallbackDecl.h	2005-04-02 16:38:12 UTC (rev 1498)
+++ trunk/CSP/SimCore/Util/CallbackDecl.h	2005-04-02 16:42:57 UTC (rev 1499)
@@ -34,10 +34,12 @@
 class Callback0;
 template <typename M> class Callback1;
 template <typename M, typename N> class Callback2;
+template <typename R> class Callback0R;
 
 class Signal0;
 template <typename M> class Signal1;
 template <typename M, typename N> class Signal2;
+template <typename R> class Signal0R;
 
 struct ScopedCallback0: public simdata::ScopedPointer<Callback0> {
 	template <class C> ScopedCallback0(C *instance, void (C::*method)());
@@ -53,6 +55,11 @@
 	template <class C> ScopedCallback2(C *instance, void (C::*method)(M, N));
 };
 
+template <typename R>
+struct ScopedCallback0R: public simdata::ScopedPointer<Callback0R<R> > {
+	template <class C> ScopedCallback0R(C *instance, R (C::*method)());
+};
+
 } // namespace simcore
 
 #endif // __SIMCORE_UTIL_CALLBACKDECL_H__

[Csp-commits] svn:csp r1498 - in trunk/CSP/SimData: . Include/SimData

[<sv...@ww...>]

Author: mkrose
Date: 2005-04-02 08:38:12 -0800 (Sat, 02 Apr 2005)
New Revision: 1498

Modified:
   trunk/CSP/SimData/CHANGES.current
   trunk/CSP/SimData/Include/SimData/GeoPos.h
Log:
Add a few convenience methods to SimData::LLA.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1498

Modified: trunk/CSP/SimData/CHANGES.current
===================================================================
--- trunk/CSP/SimData/CHANGES.current	2005-03-12 23:12:46 UTC (rev 1497)
+++ trunk/CSP/SimData/CHANGES.current	2005-04-02 16:38:12 UTC (rev 1498)
@@ -1,6 +1,9 @@
 Version 0.4.0 (in progress)
 ===========================
 
+2005-04-02: onsight
+ * Add a few convenience methods to LLA.
+
 2005-03-11: onsight
  * Add a method to DateZulu to get the time offset relative to another
    DateZulu instance in seconds.

Modified: trunk/CSP/SimData/Include/SimData/GeoPos.h
===================================================================
--- trunk/CSP/SimData/Include/SimData/GeoPos.h	2005-03-12 23:12:46 UTC (rev 1497)
+++ trunk/CSP/SimData/Include/SimData/GeoPos.h	2005-04-02 16:38:12 UTC (rev 1498)
@@ -572,6 +572,34 @@
 	 */
 	inline double altitude() const { return _alt; }
 
+	/** Get the latitude in degrees.
+	 */
+	inline double latitudeInDegrees() const { return toDegrees(_lat); }
+
+	/** Get the longitude in degrees.
+	 */
+	inline double longitudeInDegrees() const { return toDegrees(_lon); }
+
+	/** Set the latitude in degrees.
+	 */
+	inline void setLatitudeInDegrees(double latitude) { _lat = toRadians(latitude); }
+
+	/** Set the longitude in degrees.
+	 */
+	inline void setLongitudeInDegrees(double longitude) { _lon = toDegrees(longitude); }
+
+	/** Set the latitude in radians.
+	 */
+	inline void setLatitude(double latitude) { _lat = latitude; }
+
+	/** Set the longitude in radians.
+	 */
+	inline void setLongitude(double longitude) { _lon = longitude; }
+
+	/** Set the altitude in meters.
+	 */
+	inline void setAltitude(double altitude) { _alt = altitude; }
+
 	/** String representation.
 	 */
 	virtual std::string asString() const;
@@ -583,10 +611,10 @@
 	/** Set the current position from XML character data.
 	 *
 	 *  LLA coordinate format (lat, lon, alt): @n
-	 * 	<tt> x.x x.x x.x </tt>
+	 *   <tt> x.x x.x x.x </tt>
 	 *
 	 *  LLA coordinate format 2 (lat, lon, alt): @n
-	 * 	<tt> x'x"x.x x'x"x.x x.x </tt>
+	 *   <tt> x'x"x.x x'x"x.x x.x </tt>
 	 */
 	void parseXML(const char *);
 
@@ -701,7 +729,7 @@
 	/** Set the current position from XML character data.
 	 *
 	 *  UTM coordinate format (easting, northing, zone, alt): @n
-	 *  	<tt>x.x x.x zone x.x</tt> @n
+	 *    <tt>x.x x.x zone x.x</tt> @n
 	 *  where @c zone is an integer followed by a UTM latitude designator,
 	 *  such as @c 10T
 	 */

[Csp-commits] svn:csp r1497 - in trunk/CSP/CSPSim: . Data/XML/vehicles/aircraft/F16/DJ Data/XML/vehicles/aircraft/m2k Include Source VisualStudio/CSPSimDLL

[<sv...@ww...>]

Author: delta
Date: 2005-03-12 15:12:46 -0800 (Sat, 12 Mar 2005)
New Revision: 1497

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/gear.xml
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/gear.xml
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/model.xml
   trunk/CSP/CSPSim/Include/BaseDynamics.h
   trunk/CSP/CSPSim/Include/LandingGear.h
   trunk/CSP/CSPSim/Include/System.h
   trunk/CSP/CSPSim/Source/LandingGear.cpp
   trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj
Log:
* Reformated GearAnimation and related classes as Systems. Adjusted 
   xml files consequently. Cleaned up GearDynamics.
   
 * Updated .vcproj for the next check in of OS relative to fcs.
 
==> ALL USERS: RebuildData.py

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1497

Diff omitted (27661 bytes).

[Csp-commits] svn:csp r1496 - in trunk/CSP/CSPSim: . Include Source

[<sv...@ww...>]

Author: mkrose
Date: 2005-03-11 22:42:47 -0800 (Fri, 11 Mar 2005)
New Revision: 1496

Added:
   trunk/CSP/CSPSim/Include/ControlNode.h
   trunk/CSP/CSPSim/Include/Filters.h
   trunk/CSP/CSPSim/Source/FlightControlSystem.cpp
Modified:
   trunk/CSP/CSPSim/CHANGES.current
Log:
* Add two simple digital filters.

* Add infrastructure for creating generic flight control systems.  This
check-in is the first of two (or possibly more) that will define a complex
and realistic flight control system for the F-16.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1496

Diff omitted (31344 bytes).

[Csp-commits] svn:csp r1495 - in trunk/CSP/CSPSim: . Source

[<sv...@ww...>]

Author: mkrose
Date: 2005-03-11 22:17:04 -0800 (Fri, 11 Mar 2005)
New Revision: 1495

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Source/CSPSim.cpp
Log:
Add exception handlers for csp and simdata exceptions thrown from the
main loop.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1495

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-03-12 06:13:59 UTC (rev 1494)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-03-12 06:17:04 UTC (rev 1495)
@@ -7,6 +7,9 @@
  * Add a new data channel method for setting and pushing a value in one
    call.  Also add a method for safely reading an invalid channel.
 
+ * Add exception handlers for csp and simdata exceptions thrown from the
+   main loop.
+
 2005-03-05: onsight
  * Fix a couple minor warnings under gcc.
 

Modified: trunk/CSP/CSPSim/Source/CSPSim.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/CSPSim.cpp	2005-03-12 06:13:59 UTC (rev 1494)
+++ trunk/CSP/CSPSim/Source/CSPSim.cpp	2005-03-12 06:17:04 UTC (rev 1495)
@@ -605,6 +605,12 @@
 		cleanup();
 		::exit(1);
 	}
+	catch(simdata::Exception & pEx) {
+		csp::SimDataFatalException(pEx, "mainloop");
+	}
+	catch(csp::Exception & pEx) {
+		csp::FatalException(pEx, "initialization");
+	}
 	catch(...) {
 		CSP_LOG(APP, ERROR, "MAIN: Unexpected exception, GLErrorNUM: " << glGetError());
 		cleanup();

[Csp-commits] svn:csp r1494 - in trunk/CSP/CSPSim: . Include

[<sv...@ww...>]

Author: mkrose
Date: 2005-03-11 22:13:59 -0800 (Fri, 11 Mar 2005)
New Revision: 1494

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Include/Bus.h
Log:
Add a new data channel method for setting and pushing a value in one
call.  Also add a method for safely reading an invalid channel.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1494

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-03-12 06:11:26 UTC (rev 1493)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-03-12 06:13:59 UTC (rev 1494)
@@ -4,15 +4,18 @@
 2005-03-11: onsight
  * Fix an exception in the DataRecorder.
 
+ * Add a new data channel method for setting and pushing a value in one
+   call.  Also add a method for safely reading an invalid channel.
+
 2005-03-05: onsight
  * Fix a couple minor warnings under gcc.
 
 2005-03-05: delta
  * Extended Animation class with a direct children of AnimationPathCallback.
    It should allow to export (simple) animations from max thanks to osgExp.
-   Necessary changes to handle this new class have been committed in 
-   ObjectModel. Due to the changes in the animation classes, a few xml files 
-   have been updated. F16DJ model.osg has been slightly updated too. 
+   Necessary changes to handle this new class have been committed in
+   ObjectModel. Due to the changes in the animation classes, a few xml files
+   have been updated. F16DJ model.osg has been slightly updated too.
    It's a work in progress!
 
  * Added toggles for refuelling doors and canopy (only f16dj). Hot keys added

Modified: trunk/CSP/CSPSim/Include/Bus.h
===================================================================
--- trunk/CSP/CSPSim/Include/Bus.h	2005-03-12 06:11:26 UTC (rev 1493)
+++ trunk/CSP/CSPSim/Include/Bus.h	2005-03-12 06:13:59 UTC (rev 1494)
@@ -385,6 +385,15 @@
 		}
 	}
 
+	/** Set the channel value and signal the change to listeners.
+	 *
+	 *  Should only be called for push channels (asserts false otherwise).
+	 */
+	void push(const T& value) {
+		m_Value = value;
+		push();
+	}
+
 	/**
 	 * Get the current value of this channel as a non-const reference.
 	 *
@@ -654,6 +663,19 @@
 		return channel;
 	}
 
+	/** Convenience function for accessing a data channel that may be null.
+	 *  (The channel reference must have already been already been retrieved
+	 *  from the bus.)
+	 *
+	 *  @param channel A data channel that may be null.
+	 *  @param fallback The value to return if the channel is null.
+	 *  @returns The channel value or the fallback.
+	 */
+	template <typename T>
+	static T readChannel(typename DataChannel<T>::CRef &channel, T const &fallback) {
+		return channel.isNull() ? fallback : channel->value();
+	}
+
 	/** Get the bus status value.
 	 *
 	 *  Bus degradation is not currently implemented.

[Csp-commits] svn:csp r1493 - in trunk/CSP/CSPSim: . Include

[<sv...@ww...>]

Author: mkrose
Date: 2005-03-11 22:11:26 -0800 (Fri, 11 Mar 2005)
New Revision: 1493

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Include/DataRecorder.h
Log:
Fix an exception in the DataRecorder.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1493

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-03-12 05:28:45 UTC (rev 1492)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-03-12 06:11:26 UTC (rev 1493)
@@ -1,6 +1,9 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-03-11: onsight
+ * Fix an exception in the DataRecorder.
+
 2005-03-05: onsight
  * Fix a couple minor warnings under gcc.
 

Modified: trunk/CSP/CSPSim/Include/DataRecorder.h
===================================================================
--- trunk/CSP/CSPSim/Include/DataRecorder.h	2005-03-12 05:28:45 UTC (rev 1492)
+++ trunk/CSP/CSPSim/Include/DataRecorder.h	2005-03-12 06:11:26 UTC (rev 1493)
@@ -152,13 +152,13 @@
 
 	bool addSource(simdata::Ref<const DataChannelBase> channel) {
 		if (!channel) return false;
-		DataChannel<double>::CRef dchannel = channel;
-		if (dchannel.valid()) {
+		DataChannel<double>::CRef dchannel;
+		if (dchannel.tryAssign(channel)) {
 			m_Sources.push_back(new SingleSource(dchannel));
 			return true;
 		} else {
-			DataChannel<simdata::Vector3>::CRef vchannel = channel;
-			if (vchannel.valid()) {
+			DataChannel<simdata::Vector3>::CRef vchannel;
+			if (vchannel.tryAssign(channel)) {
 				m_Sources.push_back(new VectorSource(vchannel, 0));
 				m_Sources.push_back(new VectorSource(vchannel, 1));
 				m_Sources.push_back(new VectorSource(vchannel, 2));

[Csp-commits] svn:csp r1492 - in trunk/CSP/SimData: . Include/SimData

[<sv...@ww...>]

Author: mkrose
Date: 2005-03-11 21:28:45 -0800 (Fri, 11 Mar 2005)
New Revision: 1492

Modified:
   trunk/CSP/SimData/CHANGES.current
   trunk/CSP/SimData/Include/SimData/Ref.h
Log:
Add Ref casting functions to test for campatible downcasts without
throwing an exception.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1492

Modified: trunk/CSP/SimData/CHANGES.current
===================================================================
--- trunk/CSP/SimData/CHANGES.current	2005-03-12 05:24:58 UTC (rev 1491)
+++ trunk/CSP/SimData/CHANGES.current	2005-03-12 05:28:45 UTC (rev 1492)
@@ -5,6 +5,9 @@
  * Add a method to DateZulu to get the time offset relative to another
    DateZulu instance in seconds.
 
+ * Add Ref casting functions to test for campatible downcasts without
+   throwing an exception.
+
 2005-02-16: delta
  * For some reasons, vs 2005 needs some template(!) classes to be
    exported whereas vs 2003 doesn't allow it... Back to a version

Modified: trunk/CSP/SimData/Include/SimData/Ref.h
===================================================================
--- trunk/CSP/SimData/Include/SimData/Ref.h	2005-03-12 05:24:58 UTC (rev 1491)
+++ trunk/CSP/SimData/Include/SimData/Ref.h	2005-03-12 05:28:45 UTC (rev 1492)
@@ -297,6 +297,38 @@
 		return p.isNull() || dynamic_cast<CLASS*>(p.get()) != 0;
 	}
 
+	/** Try to assignment from a potentially incompatible reference.  Returns
+	 *  true on success, or false if the pointers are incompatible.  This
+	 *  reference will be set to null if the assignment fails (or the other
+	 *  reference is null).
+	 */
+	template <class Q>
+	bool tryAssign(Ref<Q> const & p) {
+		_rebind(p.get(), false);
+		return (valid() || p.isNull());
+	}
+
+	/** Try to assignment from a potentially incompatible LinkBase.  Returns
+	 *  true on success, or false if the pointers are incompatible.  This
+	 *  reference will be set to null if the assignment fails (or the other
+	 *  reference is null).
+	 */
+	bool tryAssign(LinkBase const & p) {
+		_rebind(p._get(), false);
+		return (valid() || p.isNull());
+	}
+
+	/** Try to assignment from a potentially incompatible pointer.  Returns
+	 *  true on success, or false if the pointers are incompatible.  This
+	 *  reference will be set to null if the assignment fails (or the other
+	 *  reference is null).
+	 */
+	template <class Q>
+	bool tryAssign(Q *p) {
+		_rebind(p, false);
+		return (valid() || (p == 0));
+	}
+
 	/** Comparison with other simdata pointers.
 	 *  XXX the base class NonCopyable is used here instead of CLASS since
 	 *  swig generates bad code if CLASS is const (const const).
@@ -321,11 +353,11 @@
 	 *  @throws ConversionError if downcasting from an incompatible type.
 	 */
 	template <class Q>
-	void _rebind(Q* ptr) {
+	void _rebind(Q* ptr, bool throw_on_fail=true) {
 		if (ptr) ptr->_incref();
 		_unbind();
 		_reference = dynamic_cast<CLASS*>(ptr);
-		if (_reference == 0 && ptr != 0) {
+		if (_reference == 0 && ptr != 0 && throw_on_fail) {
 			_log_reference_conversion_error();
 			throw ConversionError();
 		}

[Csp-commits] svn:csp r1491 - in trunk/CSP/SimData: . Include/SimData

[<sv...@ww...>]

Author: mkrose
Date: 2005-03-11 21:24:58 -0800 (Fri, 11 Mar 2005)
New Revision: 1491

Modified:
   trunk/CSP/SimData/CHANGES.current
   trunk/CSP/SimData/Include/SimData/Date.h
Log:
Add a method to DateZulu to get the time offset relative to another
DateZulu instance in seconds.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1491

Modified: trunk/CSP/SimData/CHANGES.current
===================================================================
--- trunk/CSP/SimData/CHANGES.current	2005-03-05 23:31:36 UTC (rev 1490)
+++ trunk/CSP/SimData/CHANGES.current	2005-03-12 05:24:58 UTC (rev 1491)
@@ -1,6 +1,10 @@
 Version 0.4.0 (in progress)
 ===========================
 
+2005-03-11: onsight
+ * Add a method to DateZulu to get the time offset relative to another
+   DateZulu instance in seconds.
+
 2005-02-16: delta
  * For some reasons, vs 2005 needs some template(!) classes to be
    exported whereas vs 2003 doesn't allow it... Back to a version

Modified: trunk/CSP/SimData/Include/SimData/Date.h
===================================================================
--- trunk/CSP/SimData/Include/SimData/Date.h	2005-03-05 23:31:36 UTC (rev 1490)
+++ trunk/CSP/SimData/Include/SimData/Date.h	2005-03-12 05:24:58 UTC (rev 1491)
@@ -669,6 +669,18 @@
 		return days;
 	}
 
+	/** Get the time relative to a reference date and time in seconds.
+	 *
+	 *  @param reference The reference data and time.
+	 *  @returns The number of seconds relative to the reference time (positive
+	 *    if the current time is greater than the reference time).
+	 */
+	double getRelativeTime(DateZulu const &reference) const {
+		const double dj = getJulian() - reference.getJulian();
+		const double dt = getTime() - reference.getTime();
+		return dj * 86400.0 + dt;
+	}
+
 	/** Get the real-valued Julian date.
 	 *
 	 *  @returns The Julian date and time as a real value,

[Csp-commits] svn:csp r1490 - in trunk/CSP/CSPSim: . Include Source

[<sv...@ww...>]

Author: mkrose
Date: 2005-03-05 15:31:36 -0800 (Sat, 05 Mar 2005)
New Revision: 1490

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Include/Animation.h
   trunk/CSP/CSPSim/Source/Animation.cpp
Log:
Fix a couple minor warnings under gcc.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1490

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-03-05 22:35:30 UTC (rev 1489)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-03-05 23:31:36 UTC (rev 1490)
@@ -1,6 +1,9 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-03-05: onsight
+ * Fix a couple minor warnings under gcc.
+
 2005-03-05: delta
  * Extended Animation class with a direct children of AnimationPathCallback.
    It should allow to export (simple) animations from max thanks to osgExp.
@@ -8,15 +11,15 @@
    ObjectModel. Due to the changes in the animation classes, a few xml files 
    have been updated. F16DJ model.osg has been slightly updated too. 
    It's a work in progress!
-  
+
  * Added toggles for refuelling doors and canopy (only f16dj). Hot keys added
    to aircraft-core.map.
- 
+
  * Fix for animation binded on 2 channels (near future will tell us if such
    a binding will survive or not).
- 
+
  * Small cleaning in LandingGear.
- 
+
 ==> ALL USERS: RebuildData.py and rebuild aircraft.hid to get these changes.
 
 2005-02-23: delta

Modified: trunk/CSP/CSPSim/Include/Animation.h
===================================================================
--- trunk/CSP/CSPSim/Include/Animation.h	2005-03-05 22:35:30 UTC (rev 1489)
+++ trunk/CSP/CSPSim/Include/Animation.h	2005-03-05 23:31:36 UTC (rev 1490)
@@ -110,6 +110,7 @@
 	simdata::Key m_ModelID;
 	std::string m_ChannelName;
 	int m_LOD;
+	float m_Default;
 	float m_Limit0;
 	float m_Limit1;
 	float m_Gain;
@@ -168,8 +169,6 @@
 		virtual ~Callback_A(){}
 	};
 
-	float m_Default;
-
 	template <class A, class C>  AnimationCallback *newCallback_(osg::Node *node) const {
 		AnimationCallback *callback = new C(dynamic_cast<const A* const>(this));
 		init(callback);
@@ -201,12 +200,12 @@
 		SIMDATA_XML("gain", Animation::m_Gain, false)
 	END_SIMDATA_XML_INTERFACE
 
-	Animation();
+	Animation(float default_value=0.0);
 	virtual ~Animation() {}
 
 	// typically, this method will call newCallback_
 	virtual AnimationCallback *newCallback(osg::Node *node) const = 0;
-	virtual AnimationCallback *newCallback(osg::NodeCallback *nodeCallback) const {
+	virtual AnimationCallback *newCallback(osg::NodeCallback*) const {
 		 CSP_LOG(OBJECT, WARNING, typeid(*this).name() << ": nested callback not implemented" );
 		 return 0;
 	}
@@ -503,9 +502,7 @@
 	EXTEND_SIMDATA_XML_INTERFACE(DrivenSwitch, Animation)
 	END_SIMDATA_XML_INTERFACE
 
-	DrivenSwitch() {
-		m_Default = 1.0f;
-	}
+	DrivenSwitch(): Animation(1.0) { }
 	virtual ~DrivenSwitch(){}
 
 	virtual AnimationCallback *newCallback(osg::Node *node) const {

Modified: trunk/CSP/CSPSim/Source/Animation.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Animation.cpp	2005-03-05 22:35:30 UTC (rev 1489)
+++ trunk/CSP/CSPSim/Source/Animation.cpp	2005-03-05 23:31:36 UTC (rev 1490)
@@ -60,9 +60,9 @@
 	return false;
 }
 
-Animation::Animation():
+Animation::Animation(float default_value):
 	m_LOD(0),
-	m_Default(0.0f),
+	m_Default(default_value),
 	m_Limit0(0.0f),
 	m_Limit1(1.0f),
 	m_Gain(1.0f) {

[Csp-commits] svn:csp r1489 - in trunk/CSP/CSPSim: . Data/Models/F16/DJ Data/XML/vehicles/aircraft Data/XML/vehicles/aircraft/F16/DJ Data/XML/vehicles/aircraft/m2k Include Source Tools/HID/Maps

[<sv...@ww...>]

Author: delta
Date: 2005-03-05 14:35:30 -0800 (Sat, 05 Mar 2005)
New Revision: 1489

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/Models/F16/DJ/F16DJ.osg
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/gear.xml
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/model.xml
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16DJ.xml
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/gear.xml
   trunk/CSP/CSPSim/Include/AircraftObject.h
   trunk/CSP/CSPSim/Include/Animation.h
   trunk/CSP/CSPSim/Include/LandingGear.h
   trunk/CSP/CSPSim/Source/AircraftObject.cpp
   trunk/CSP/CSPSim/Source/Animation.cpp
   trunk/CSP/CSPSim/Source/LandingGear.cpp
   trunk/CSP/CSPSim/Source/ObjectModel.cpp
   trunk/CSP/CSPSim/Tools/HID/Maps/CHCS.map
   trunk/CSP/CSPSim/Tools/HID/Maps/aircraft-core.map
Log:
* Extended Animation class with a direct children of AnimationPathCallback.
   It should allow to export (simple) animations from max thanks to osgExp.
   Necessary changes to handle this new class have been committed in 
   ObjectModel. Due to the changes in the animation classes, a few xml files 
   have been updated. F16DJ model.osg has been slightly updated too. 
   It's a work in progress!
  
 * Added toggles for refuelling doors and canopy (only f16dj). Hot keys added
   to aircraft-core.map.
 
 * Fix for animation binded on 2 channels (near future will tell us if such
   a binding will survive or not).
 
 * Small cleaning in LandingGear.

==> ALL USERS: RebuildData.py and rebuild aircraft.hid to get these changes.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1489

Diff omitted (314637 bytes).

[Csp-commits] svn:csp r1488 - trunk/CSP/CSPSim/Data/Models/F16/DJ

[<sv...@ww...>]

Author: delta
Date: 2005-02-27 05:53:29 -0800 (Sun, 27 Feb 2005)
New Revision: 1488

Removed:
   trunk/CSP/CSPSim/Data/Models/F16/DJ/model.xml
Log:
* model.xml should go in XML directory.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1488

Diff omitted (20555 bytes).

[Csp-commits] svn:csp r1487 - in trunk/CSP/CSPSim: . Include

[<sv...@ww...>]

Author: delta
Date: 2005-02-23 14:14:43 -0800 (Wed, 23 Feb 2005)
New Revision: 1487

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Include/LandingGear.h
Log:
* Removed GearAnimation:getExtension() not used (use the bus mechanism).

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1487

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-02-23 07:36:05 UTC (rev 1486)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-02-23 22:14:43 UTC (rev 1487)
@@ -1,6 +1,9 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-02-23: delta
+ * Removed GearAnimation:getExtension() not used (use the bus mechanism).
+
 2005-02-21: onsight
  * Fix rudder yaw coefficients; new values work for rudder angle in radians.
 

Modified: trunk/CSP/CSPSim/Include/LandingGear.h
===================================================================
--- trunk/CSP/CSPSim/Include/LandingGear.h	2005-02-23 07:36:05 UTC (rev 1486)
+++ trunk/CSP/CSPSim/Include/LandingGear.h	2005-02-23 22:14:43 UTC (rev 1487)
@@ -299,10 +299,6 @@
 		if (m_GearSequenceAnimation.valid())
 			m_GearSequenceAnimation->rstart();
 	}
-	double getExtension() const {
-		if (m_GearSequenceAnimation.valid())
-			return m_GearSequenceAnimation->getNormalizedTime();
-	}
 
 	// Helper classes
 	class BindChannels {

[Csp-commits] svn:csp r1486 - trunk/CSP/tools

[<sv...@ww...>]

Author: mkrose
Date: 2005-02-22 23:36:05 -0800 (Tue, 22 Feb 2005)
New Revision: 1486

Modified:
   trunk/CSP/tools/build.py
Log:
Access SCons builders the right way.  Should fix an exception
under Windows.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1486

Modified: trunk/CSP/tools/build.py
===================================================================
--- trunk/CSP/tools/build.py	2005-02-23 07:25:20 UTC (rev 1485)
+++ trunk/CSP/tools/build.py	2005-02-23 07:36:05 UTC (rev 1486)
@@ -525,7 +525,7 @@
 
 
 def AddNet(env):
-	cxx_file = env['BUILDERS']['CXXFile']
+	_, cxx_file = SCons.Tool.createCFileBuilders(env)
 	cxx_file.add_emitter('.net', EmitNet)
 	cxx_file.add_action('.net', '$TRC')
 	trc = env.File('#/SimData/Tools/TaggedRecordCompiler/trc.py')

[Csp-commits] svn:csp r1485 - trunk/CSP/tools

[<sv...@ww...>]

Author: mkrose
Date: 2005-02-22 23:25:20 -0800 (Tue, 22 Feb 2005)
New Revision: 1485

Modified:
   trunk/CSP/tools/CSP_bootstrap
Log:
Hopefully fix a path problem in the CSP bootstrap loader under windows.
You only need to rerun 'setup.py --force' if you are currently having
problems with the installation.  In that case you may need to delete
the old module in Python's site-packages directory by hand (be sure to
remove both the CSP.py and CSP.pyc files).

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1485

Modified: trunk/CSP/tools/CSP_bootstrap
===================================================================
--- trunk/CSP/tools/CSP_bootstrap	2005-02-21 23:59:31 UTC (rev 1484)
+++ trunk/CSP/tools/CSP_bootstrap	2005-02-23 07:25:20 UTC (rev 1485)
@@ -47,6 +47,11 @@
 # root CSP directory is a bad thing, and we will catch it on either
 # platform.
 
+# note that we use os.sep and normal string splitting/joining instead
+# of os.path.split/join since the latter behaves a bit strangely under
+# windows.  for example, os.path.split('c:\\csp') gives ['c:\\csp']
+# rather than ['c:', 'csp'].  actually, neither one is ideal ;-)
+
 # look for the root of the current workspace (first 'CSP' directory
 # above cwd).
 cwd = os.getcwd()
@@ -64,7 +69,7 @@
 if parts[-1] != 'CSP' and parts[-1].upper() == 'CSP':
 	print
 	print 'Error: the current workspace appears to be under a directory named "csp"'
-	print '       ==> %s' % os.path.join(*parts)
+	print '       ==> %s' % os.sep.join(parts)
 	print
 	print 'The correct top-level directory should be all uppercase ("CSP").  You may'
 	print 'have made a mistake when checking out the repository (which is easy to do'
@@ -72,10 +77,10 @@
 	print 'try again.'
 	sys.exit(1)
 
-CSP_PATH = os.path.sep.join(parts[:-1])
-ROOT = os.path.join(CSP_PATH, 'CSP')
+CSP_PATH = os.sep.join(parts[:-1])
+ROOT = os.sep.join([CSP_PATH, 'CSP'])
 
-if not os.path.exists(os.path.join(ROOT, '.svn')):
+if not os.path.exists(os.sep.join([ROOT, '.svn'])):
 	print
 	print 'Warning: %s does not contain .svn and may not be a valid CSP workspace.' % ROOT
 

[Csp-commits] svn:csp r1484 - in trunk/CSP/CSPSim: . Data/XML/vehicles/aircraft/m2k

[<sv...@ww...>]

Author: mkrose
Date: 2005-02-21 15:59:31 -0800 (Mon, 21 Feb 2005)
New Revision: 1484

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml
Log:
* Fix rudder yaw coefficients; new values work for rudder angle in radians.

* Increase rudder yaw moment (cn_dr).  The new coefficient is the nominal
F-16 value, which matches the lateral force coefficient.  If this value
needs to be decrease then cy_r should be decreased as well.

* Similar fixes need to be applied to the f-16 fm (which is just a copy of
the m2k fm right now).  I'm working on more substantial changes to that
fm so I'll leave it as is for now.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1484

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-02-21 23:03:53 UTC (rev 1483)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-02-21 23:59:31 UTC (rev 1484)
@@ -1,20 +1,31 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-02-21: onsight
+ * Fix rudder yaw coefficients; new values work for rudder angle in radians.
+
+ * Increase rudder yaw moment (cn_dr).  The new coefficient is the nominal
+   F-16 value, which matches the lateral force coefficient.  If this value
+   needs to be decrease then cy_r should be decreased as well.
+
+ * Similar fixes need to be applied to the f-16 fm (which is just a copy of
+   the m2k fm right now).  I'm working on more substantial changes to that
+   fm so I'll leave it as is for now.
+
 2005-02-21: delta
  * Minor change to the m2k model to correctly retract the right gear.
- 
+
  * Minor patch to CSPSim.py to execute cspinput in case an hid file is 
    missing. cspinput is not an executable on windows and must be called
    as an argument of python(.exe). Should be checked on GNU/Linux to be 
    sure it doesn't break the stuff there.
-   
+
 2005-02-21: lologramme
  * Add Light pylons in the hangars area.
- 
+
 2005-02-20: onsight
  * Fix path for hid generation under windows.
- 
+
  * Add the correct F16DJ binding for the core aircraft.map.
 
 2005-02-18: delta

Modified: trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml	2005-02-21 23:03:53 UTC (rev 1483)
+++ trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml	2005-02-21 23:59:31 UTC (rev 1484)
@@ -106,23 +106,26 @@
     <Float name="cy_dr">-0.15</Float>
     <Table2 name="cy_m_a">
         <Breaks0 spacing="0.1">
+            <!-- mach -->
             0.0 0.5 0.7 0.8 0.9 1.0 1.2 1.4 2.0 2.5
         </Breaks0>
         <Breaks1 spacing="0.01">
+            <!-- alpha in radians -->
             -0.34906585 -0.174532925 -0.087266463 0.0   0.087266463 0.13962634 0.20943951 0.296705973 0.34906585
             0.436332313 0.523598776 0.698131701 1.047197551
         </Breaks1>
         <Values>
-        -0.0109 -0.0166 -0.0182 -0.0192 -0.0192 -0.0187 -0.0163 -0.0176 -0.0164 -0.0158 -0.0141 -0.009  -0.011
-        -0.0109 -0.0166 -0.0182 -0.0192 -0.0192 -0.0187 -0.0163 -0.0176 -0.0164 -0.0158 -0.0141 -0.009  -0.016
-        -0.0109 -0.0166 -0.0182 -0.0192 -0.0192 -0.0187 -0.0163 -0.0176 -0.0164 -0.0158 -0.0141 -0.009  -0.016
-        -0.0122 -0.021  -0.028  -0.0286 -0.0286 -0.03   -0.025  -0.0267 -0.0223 -0.0215 -0.0187 -0.0172 -0.017
-        -0.0172 -0.027  -0.033  -0.035  -0.035  -0.033  -0.0321 -0.0288 -0.0254 -0.0231 -0.0207 -0.0188 -0.0171
-        -0.01725 -0.0271    -0.03325    -0.03525    -0.03525    -0.03355    -0.03235    -0.029  -0.0257 -0.02355    -0.02085    -0.0194 -0.01715
-        -0.017275   -0.02715    -0.033375   -0.035375   -0.035375   -0.033675   -0.032475   0   -0.02585    -0.023775   -0.020925   -0.0197 -0.0172
-        -0.0173 -0.0272 -0.0335 -0.0355 -0.0355 -0.0338 -0.0326 -0.0292 -0.026  -0.024  -0.021  -0.02   -0.0172
-        -0.0173 -0.0272 -0.0335 -0.0355 -0.0355 -0.0338 -0.0326 -0.0292 -0.026  -0.024  -0.021  -0.02   -0.0161
-        -0.0162 -0.0194 -0.0194 -0.0215 -0.0215 -0.0216 -0.0214 -0.0215 -0.0205 -0.0179 -0.0153 -0.0105 1
+         <!-- coefficients assuming rudder deflection is in radians -->
+         -0.625 -0.951 -1.043 -1.100 -1.100 -1.071 -0.934 -1.008 -0.940 -0.905 -0.808 -0.516 -0.630
+         -0.625 -0.951 -1.043 -1.100 -1.100 -1.071 -0.934 -1.008 -0.940 -0.905 -0.808 -0.516 -0.917
+         -0.625 -0.951 -1.043 -1.100 -1.100 -1.071 -0.934 -1.008 -0.940 -0.905 -0.808 -0.516 -0.917
+         -0.699 -1.203 -1.604 -1.639 -1.639 -1.719 -1.432 -1.530 -1.278 -1.232 -1.071 -0.985 -0.974
+         -0.985 -1.547 -1.891 -2.005 -2.005 -1.891 -1.839 -1.650 -1.455 -1.324 -1.186 -1.077 -0.980
+         -0.988 -1.553 -1.905 -2.020 -2.020 -1.922 -1.854 -1.662 -1.473 -1.349 -1.195 -1.112 -0.983
+         -0.990 -1.556 -1.912 -2.027 -2.027 -1.929 -1.861 -0.000 -1.481 -1.362 -1.199 -1.129 -0.985
+         -0.991 -1.558 -1.919 -2.034 -2.034 -1.937 -1.868 -1.673 -1.490 -1.375 -1.203 -1.146 -0.985
+         -0.991 -1.558 -1.919 -2.034 -2.034 -1.937 -1.868 -1.673 -1.490 -1.375 -1.203 -1.146 -0.922
+         -0.928 -1.112 -1.112 -1.232 -1.232 -1.238 -1.226 -1.232 -1.175 -1.026 -0.877 -0.602 -0.573
         </Values>
     </Table2>
 
@@ -144,6 +147,7 @@
     <!--Float name="cn_r">-8.17</Float--><!-- <0 -->
     <Float name="cn_r">-16</Float><!-- <0 -->
     <Float name="cn_da">-0.0747</Float>
-    <Float name="cn_dr">0.0293</Float>
+    <!-- CHECK: this is the (nominal) F16 value, previously was set to 0.0293 -->
+    <Float name="cn_dr">0.086</Float>
 
 </Object>

[Csp-commits] svn:csp r1483 - in trunk/CSP/CSPSim: . Bin

[<sv...@ww...>]

Author: delta
Date: 2005-02-21 15:03:53 -0800 (Mon, 21 Feb 2005)
New Revision: 1483

Modified:
   trunk/CSP/CSPSim/Bin/CSPSim.py
   trunk/CSP/CSPSim/CHANGES.current
Log:
* Minor change to the m2k model to correctly retract the right gear.
 
 * Minor patch to CSPSim.py to execute cspinput in case an hid file is missing. cspinput is not an executable on windows and must be called as an argument of python(.exe). Should be checked on GNU/Linux to be sure it doesn't break the stuff there.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1483

Modified: trunk/CSP/CSPSim/Bin/CSPSim.py
===================================================================
--- trunk/CSP/CSPSim/Bin/CSPSim.py	2005-02-21 20:55:56 UTC (rev 1482)
+++ trunk/CSP/CSPSim/Bin/CSPSim.py	2005-02-21 23:03:53 UTC (rev 1483)
@@ -62,7 +62,7 @@
 		tool_path = os.path.join('..', 'Tools', 'HID')
 		csp_input = os.path.join(tool_path, 'cspinput')
 		example = os.path.join(tool_path, 'Examples', '%s.map' % hid_file)
-		os.system('%s -I%s -o%s %s' % (csp_input, tool_path, output, example))
+		os.system('python %s -I%s -o%s %s' % (csp_input, tool_path, output, example))
 		if os.path.exists(output):
 			print 'Default input map created for %s.hid; see Tools/HID/README for details.' % hid_file
 		else:

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-02-21 20:55:56 UTC (rev 1482)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-02-21 23:03:53 UTC (rev 1483)
@@ -1,10 +1,20 @@
  Version 0.4.0 (in progress)
 ===========================
+
+2005-02-21: delta
+ * Minor change to the m2k model to correctly retract the right gear.
+ 
+ * Minor patch to CSPSim.py to execute cspinput in case an hid file is 
+   missing. cspinput is not an executable on windows and must be called
+   as an argument of python(.exe). Should be checked on GNU/Linux to be 
+   sure it doesn't break the stuff there.
+   
 2005-02-21: lologramme
- * Add Light pylons in the hangars aera
+ * Add Light pylons in the hangars area.
  
 2005-02-20: onsight
  * Fix path for hid generation under windows.
+ 
  * Add the correct F16DJ binding for the core aircraft.map.
 
 2005-02-18: delta

[Csp-commits] svn:csp r1482 - trunk/CSP/CSPSim/Data/Models/Mirage2000

[<sv...@ww...>]

Author: delta
Date: 2005-02-21 12:55:56 -0800 (Mon, 21 Feb 2005)
New Revision: 1482

Modified:
   trunk/CSP/CSPSim/Data/Models/Mirage2000/model.osg
Log:
* Minor change to make the right gear retracting correctly.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1482

Modified: trunk/CSP/CSPSim/Data/Models/Mirage2000/model.osg
===================================================================
--- trunk/CSP/CSPSim/Data/Models/Mirage2000/model.osg	2005-02-21 16:50:59 UTC (rev 1481)
+++ trunk/CSP/CSPSim/Data/Models/Mirage2000/model.osg	2005-02-21 20:55:56 UTC (rev 1482)
@@ -48529,7 +48529,7 @@
       }
       MatrixTransform {
         DataVariance STATIC
-        name "Aircraft.RightMainGearAxis"
+        name "ANIM: Aircraft.RightMainGearAxis"
         nodeMask 0xff
         cullingActive TRUE
         referenceFrame RELATIVE

[Csp-commits] svn:csp r1481 - in trunk/CSP/CSPSim: . Data/Models Data/Models/Lightpylon1 Data/XML/theater/balkan Data/XML/theater/balkan/Lightpylon1

[<sv...@ww...>]

Author: lologramme
Date: 2005-02-21 08:50:59 -0800 (Mon, 21 Feb 2005)
New Revision: 1481

Added:
   trunk/CSP/CSPSim/Data/Models/Lightpylon1/
   trunk/CSP/CSPSim/Data/Models/Lightpylon1/Lightpylon1.osg
   trunk/CSP/CSPSim/Data/Models/Lightpylon1/T1.jpg
   trunk/CSP/CSPSim/Data/XML/theater/balkan/Lightpylon1.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/Lightpylon1/
   trunk/CSP/CSPSim/Data/XML/theater/balkan/Lightpylon1/model.xml
Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/XML/theater/balkan/airbase.xml
Log:
Add Light pylons

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1481

Diff omitted (446581 bytes).

[Csp-commits] svn:csp r1480 - in trunk/CSP/CSPSim: . Bin Tools/HID/Maps

[<sv...@ww...>]

Author: mkrose
Date: 2005-02-19 13:23:35 -0800 (Sat, 19 Feb 2005)
New Revision: 1480

Modified:
   trunk/CSP/CSPSim/Bin/CSPSim.py
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Tools/HID/Maps/aircraft-core.map
Log:
Fix path for hid generation under windows.
Add the correct F16DJ binding for the core aircraft.map.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1480

Modified: trunk/CSP/CSPSim/Bin/CSPSim.py
===================================================================
--- trunk/CSP/CSPSim/Bin/CSPSim.py	2005-02-19 01:01:35 UTC (rev 1479)
+++ trunk/CSP/CSPSim/Bin/CSPSim.py	2005-02-19 21:23:35 UTC (rev 1480)
@@ -55,10 +55,14 @@
 	Verify that the specified hid input definition exists.  If not, generate it from
 	from the example input maps in ../Tools/HID/Examples
 	"""
-	if not os.path.exists('../Data/Input'): return
-	output = '../Data/Input/%s.hid' % hid_file
+	input_path = os.path.join('..', 'Data', 'Input')
+	if not os.path.exists(input_path): return
+	output = os.path.join(input_path, '%s.hid' % hid_file)
 	if not os.path.exists(output):
-		os.system('../Tools/HID/cspinput -I../Tools/HID -o%s ../Tools/HID/Examples/%s.map' % (output, hid_file))
+		tool_path = os.path.join('..', 'Tools', 'HID')
+		csp_input = os.path.join(tool_path, 'cspinput')
+		example = os.path.join(tool_path, 'Examples', '%s.map' % hid_file)
+		os.system('%s -I%s -o%s %s' % (csp_input, tool_path, output, example))
 		if os.path.exists(output):
 			print 'Default input map created for %s.hid; see Tools/HID/README for details.' % hid_file
 		else:

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-02-19 01:01:35 UTC (rev 1479)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-02-19 21:23:35 UTC (rev 1480)
@@ -1,9 +1,13 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-02-20: onsight
+ * Fix path for hid generation under windows.
+ * Add the correct F16DJ binding for the core aircraft.map.
+
 2005-02-18: delta
  * Fixed a bug with ContactMarkers.
- 
+
 2005-02-17: lologramme
  * Added F16 D
 

Modified: trunk/CSP/CSPSim/Tools/HID/Maps/aircraft-core.map
===================================================================
--- trunk/CSP/CSPSim/Tools/HID/Maps/aircraft-core.map	2005-02-19 01:01:35 UTC (rev 1479)
+++ trunk/CSP/CSPSim/Tools/HID/Maps/aircraft-core.map	2005-02-19 21:23:35 UTC (rev 1480)
@@ -5,7 +5,7 @@
 device mouse 0 mouse standard_mouse
 
 bind sim:vehicles.aircraft.m2k
-bind sim:vehicles.aircraft.f16
+bind sim:vehicles.aircraft.F16DJ
 
 mode base
 

[Csp-commits] svn:csp r1479 - in trunk/CSP/CSPSim: . Source

[<sv...@ww...>]

Author: delta
Date: 2005-02-18 17:01:35 -0800 (Fri, 18 Feb 2005)
New Revision: 1479

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Source/ObjectModel.cpp
Log:
* Fixed a bug with ContactMarkers.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1479

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-02-18 16:04:22 UTC (rev 1478)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-02-19 01:01:35 UTC (rev 1479)
@@ -1,5 +1,9 @@
  Version 0.4.0 (in progress)
 ===========================
+
+2005-02-18: delta
+ * Fixed a bug with ContactMarkers.
+ 
 2005-02-17: lologramme
  * Added F16 D
 
@@ -11,7 +15,7 @@
    DrivenRotation::Callback operator.
 
 2005-02-15: lologramme
- * Addes Taxi signalisation
+ * Added Taxi signalisation
 
 2005-02-14: delta
  * Added Tools/Loader vs project.

Modified: trunk/CSP/CSPSim/Source/ObjectModel.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ObjectModel.cpp	2005-02-18 16:04:22 UTC (rev 1478)
+++ trunk/CSP/CSPSim/Source/ObjectModel.cpp	2005-02-19 01:01:35 UTC (rev 1479)
@@ -84,7 +84,7 @@
 	simdata::Ref<Animation const> m_NestedAnimation;
 public:
 	AnimationBinding(Animation const* animation): m_Animation(animation) {}
-	inline AnimationCallback *bind(osg::Node *node) const {
+	AnimationCallback *bind(osg::Node *node) const {
 		return m_Animation->newCallback(node);
 	}
 	void setNestedAnimation(Animation const* animation) {
@@ -93,7 +93,7 @@
 	bool hasNestedAnimation() const {
 		return m_NestedAnimation.valid();
 	}
-	AnimationCallback* bindNested(osg::Node* node) const {
+	AnimationCallback *bindNested(osg::Node* node) const {
 		return m_NestedAnimation->newCallback(node->getUpdateCallback());
 	}
 };
@@ -150,6 +150,9 @@
 					CSP_LOG(APP, DEBUG, "FOUND 2nd");
 					animation_binding->setNestedAnimation(i->second.get());
 				}
+			} else {
+				// si id contient le nom d une TimedAnimationPath alors
+				// associer ce noeud a la TimedAnimationPath trouvee
 			}
 		}
 		traverse(node);
@@ -460,19 +463,19 @@
 		m_ContactMarkers->addChild(diamond);
 	}
 	// set markers not visible by default
-	m_ContactMarkers->setAllChildrenOff();
+	showContactMarkers(false);
 	m_DebugMarkers->addChild(m_ContactMarkers.get());
 }
 
 void ObjectModel::showContactMarkers(bool on) {
 	if (on)
+		m_ContactMarkers->setAllChildrenOn();
+	else
 		m_ContactMarkers->setAllChildrenOff();
-	else
-		m_ContactMarkers->setAllChildrenOn();
 }
 
 bool ObjectModel::getMarkersVisible() const {
-	return (m_ContactMarkers->getNodeMask() != 0x0);
+	return (m_ContactMarkers->getValue(0) != 0);
 }
 
 osg::ref_ptr<osg::Node> ObjectModel::getModel() {