csp-commits — Mailing list for CVS commit messages.

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

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

Author: delta
Date: 2005-01-26 02:26:02 -0800 (Wed, 26 Jan 2005)
New Revision: 1453

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Source/ScreenInfo.cpp
Log:
* Display altitude above ground level in feets.

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

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-01-23 16:45:00 UTC (rev 1452)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-01-26 10:26:02 UTC (rev 1453)
@@ -1,6 +1,9 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-01-25: delta
+ * Display altitude above ground level in feets.
+ 
 2005-01-23: delta
  * Display CAS in knots.
  

Modified: trunk/CSP/CSPSim/Source/ScreenInfo.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ScreenInfo.cpp	2005-01-23 16:45:00 UTC (rev 1452)
+++ trunk/CSP/CSPSim/Source/ScreenInfo.cpp	2005-01-26 10:26:02 UTC (rev 1453)
@@ -36,6 +36,7 @@
 #include <osg/StateSet>
 #include <osgText/Text>
 
+#include <SimData/Conversions.h>
 #include <SimData/Timing.h>
 
 using std::max;
@@ -176,7 +177,7 @@
 		simdata::Vector3 pos = activeObject->getGlobalPosition();
 		double altitude = activeObject->getAltitude();
 		osstr.str("");
-		osstr << "Altitude: " << setprecision(precision) << fixed << setw(8) << altitude;
+		osstr << "Altitude (agl): " << setprecision(precision) << fixed << setw(8) << simdata::convert::m_ft(altitude) << " fts";
 		m_Altitude->setText(osstr.str());
 
 		osstr.str("");

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

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

Author: delta
Date: 2005-01-23 08:45:00 -0800 (Sun, 23 Jan 2005)
New Revision: 1452

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Source/Systems/AircraftFlightSensors.cpp
Log:
* Display CAS in knots.

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

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-01-22 14:51:41 UTC (rev 1451)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-01-23 16:45:00 UTC (rev 1452)
@@ -1,6 +1,9 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-01-23: delta
+ * Display CAS in knots.
+ 
 2005-01-22: delta
  * Minor cleanup on Animation class.
 

Modified: trunk/CSP/CSPSim/Source/Systems/AircraftFlightSensors.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Systems/AircraftFlightSensors.cpp	2005-01-22 14:51:41 UTC (rev 1451)
+++ trunk/CSP/CSPSim/Source/Systems/AircraftFlightSensors.cpp	2005-01-23 16:45:00 UTC (rev 1452)
@@ -22,15 +22,18 @@
  *
  **/
 
+#include <sstream>
+#include <iomanip>
 
+#include <SimData/Conversions.h>
+
 #include <Systems/AircraftFlightSensors.h>
 #include <KineticsChannels.h>
 #include <Atmosphere.h>
 #include <CSPSim.h>
 
-#include <sstream>
-#include <iomanip>
 
+
 using bus::Kinetics;
 
 
@@ -82,7 +85,7 @@
 	line << "P: " << std::setw(3) << b_Pressure->value()
 	     << ", T: " << std::setw(3) <<  b_Temperature->value()
 	     << ", Mach: " << std::setw(3) <<  b_Mach->value()
-	     << ", CAS: " << std::setw(3) <<  b_CAS->value();
+		 << ", CAS: " << std::setw(3) <<  simdata::convert::mps_kts(b_CAS->value()) << " kts";
 	info.push_back(line.str());
 }
 

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

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

Author: delta
Date: 2005-01-22 06:51:41 -0800 (Sat, 22 Jan 2005)
New Revision: 1451

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Include/Animation.h
Log:
* Minor cleanup on Animation class.

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

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-01-19 12:41:32 UTC (rev 1450)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-01-22 14:51:41 UTC (rev 1451)
@@ -1,6 +1,9 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-01-22: delta
+ * Minor cleanup on Animation class.
+
 2005-01-17: delta
  * Minor changes in LandingGear class exposing the drag value. Also,
    gear dynamics now takes into account of the extension.

Modified: trunk/CSP/CSPSim/Include/Animation.h
===================================================================
--- trunk/CSP/CSPSim/Include/Animation.h	2005-01-19 12:41:32 UTC (rev 1450)
+++ trunk/CSP/CSPSim/Include/Animation.h	2005-01-22 14:51:41 UTC (rev 1451)
@@ -100,6 +100,15 @@
  * by multiple SceneModel instances.
  */
 class Animation: public simdata::Object {
+private:
+
+	simdata::Key m_ModelID;
+	std::string m_ChannelName;
+	int m_LOD;
+	float m_Limit0;
+	float m_Limit1;
+	float m_Gain;
+
 protected:
 	/**
 	* Small template class to reduce & simplify writing.
@@ -146,16 +155,6 @@
 		virtual ~Callback_A(){}
 	};
 
-private:
-
-	simdata::Key m_ModelID;
-	std::string m_ChannelName;
-	int m_LOD;
-	float m_Limit0;
-	float m_Limit1;
-	float m_Gain;
-
-protected:
 	float m_Default;
 
 	virtual AnimationCallback *newCallback(osg::Node *node, AnimationCallback *callback) const {
@@ -165,6 +164,11 @@
 		callback->setChannelName(m_ChannelName);
 		return callback;
 	}
+	template <class A, class C>  AnimationCallback *newCallback_(osg::Node *node) const {
+		AnimationCallback *callback = Animation::newCallback(node, new C(dynamic_cast<const A* const>(this)));
+		callback->setDefault(m_Default);
+		return callback;
+	}
 	virtual AnimationCallback *newCallback(osg::NodeCallback* node_callback, AnimationCallback *callback) const {
 		assert(node_callback);
 		assert(callback);
@@ -172,7 +176,11 @@
 		callback->setChannelName(m_ChannelName);
 		return callback;
 	}
-
+	template <class A, class C>  AnimationCallback *newCallback_(osg::NodeCallback *nodeCallback) const {
+		AnimationCallback *callback = Animation::newCallback(nodeCallback, new C(dynamic_cast<const A* const>(this)));
+		callback->setDefault(m_Default);
+		return callback;
+	}
 public:
 	BEGIN_SIMDATA_XML_VIRTUAL_INTERFACE(Animation)
 		SIMDATA_XML("model_id", Animation::m_ModelID, true)
@@ -187,21 +195,13 @@
 	Animation();
 	virtual ~Animation() {}
 
+	// typically, this method will call newCallback_
 	virtual AnimationCallback *newCallback(osg::Node *node) const = 0;
-	template <class A, class C>  AnimationCallback *newCallback_(osg::Node *node) const {
-		AnimationCallback *callback = Animation::newCallback(node, new C(dynamic_cast<const A* const>(this)));
-		callback->setDefault(m_Default);
-		return callback;
-	}
 	virtual AnimationCallback *newCallback(osg::NodeCallback *nodeCallback) const {
 		 CSP_LOG(OBJECT, WARNING, typeid(*this).name() << ": nested callback not implemented" );
 		 return 0;
 	}
-	template <class A, class C>  AnimationCallback *newCallback_(osg::NodeCallback *nodeCallback) const {
-		AnimationCallback *callback = Animation::newCallback(nodeCallback, new C(dynamic_cast<const A* const>(this)));
-		callback->setDefault(m_Default);
-		return callback;
-	}
+	
 	const std::string &getChannelName() const { return m_ChannelName; }
 	const simdata::Key &getModelID() const { return m_ModelID; }
 	float getLimit0() const { return m_Limit0; }

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

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

Author: delta
Date: 2005-01-19 04:41:32 -0800 (Wed, 19 Jan 2005)
New Revision: 1450

Modified:
   trunk/CSP/SimData/CHANGES.current
   trunk/CSP/SimData/Include/SimData/InterfaceRegistry.h
   trunk/CSP/SimData/Include/SimData/Link.h
   trunk/CSP/SimData/Include/SimData/ObjectInterface.h
   trunk/CSP/SimData/Include/SimData/TypeAdapter.h
   trunk/CSP/SimData/Source/InterfaceRegistry.cpp
Log:
Got ride of a few throw(Type) for 2 main reasons. It will ease the maintenance and it avoids a few warnings on vs2005. In fact, vs2003 already treats throw(Type) like throw(...).

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

Modified: trunk/CSP/SimData/CHANGES.current
===================================================================
--- trunk/CSP/SimData/CHANGES.current	2005-01-17 23:39:12 UTC (rev 1449)
+++ trunk/CSP/SimData/CHANGES.current	2005-01-19 12:41:32 UTC (rev 1450)
@@ -1,6 +1,11 @@
 Version 0.4.0 (in progress)
 ===========================
 
+2005-01-19: delta
+ * Got ride of a few throw(Type) for 2 main reasons. It will ease the
+   maintenance and it avoids a few warnings on vs2005. In fact, vs2003 
+   already treats throw(Type) like throw(...).
+   
 2005-01-03: onsight
  * Fix logging priority/category calls in Compile.py.
 

Modified: trunk/CSP/SimData/Include/SimData/InterfaceRegistry.h
===================================================================
--- trunk/CSP/SimData/Include/SimData/InterfaceRegistry.h	2005-01-17 23:39:12 UTC (rev 1449)
+++ trunk/CSP/SimData/Include/SimData/InterfaceRegistry.h	2005-01-19 12:41:32 UTC (rev 1450)
@@ -402,7 +402,7 @@
 	 *  Interfaces are registered automatically by the 
 	 *  SIMDATA_*_INTERFACE macros.
 	 */
-	void addInterface(const char *name, hasht id, InterfaceProxy *proxy) throw(InterfaceError);
+	void addInterface(const char *name, hasht id, InterfaceProxy *proxy);
 
 	//friend class Singleton<InterfaceRegistry>;
 	InterfaceRegistry();

Modified: trunk/CSP/SimData/Include/SimData/Link.h
===================================================================
--- trunk/CSP/SimData/Include/SimData/Link.h	2005-01-17 23:39:12 UTC (rev 1449)
+++ trunk/CSP/SimData/Include/SimData/Link.h	2005-01-19 12:41:32 UTC (rev 1450)
@@ -405,7 +405,7 @@
 	 *  Changes the object pointer without reference counting, checking
 	 *  that the new object type matches the template type.
 	 */
-	virtual void _update(Object* ptr) throw(ObjectTypeMismatch) {
+	virtual void _update(Object* ptr) {
 		LinkBase::_update(ptr);
 		T* _special = dynamic_cast<T*>(ptr);
 		if (ptr != 0 && _special == 0)

Modified: trunk/CSP/SimData/Include/SimData/ObjectInterface.h
===================================================================
--- trunk/CSP/SimData/Include/SimData/ObjectInterface.h	2005-01-17 23:39:12 UTC (rev 1449)
+++ trunk/CSP/SimData/Include/SimData/ObjectInterface.h	2005-01-19 12:41:32 UTC (rev 1450)
@@ -114,16 +114,16 @@
 	typedef typename HASH_MAPS<std::string, MemberAccessorBase *, hashstring, eqstring>::Type map;
 
 	
-	virtual void set(OBJECT *, TypeAdapter const &) throw(TypeMismatch) {
+	virtual void set(OBJECT *, TypeAdapter const &) {
 		throw TypeMismatch("Cannot set vector<> '" + name + "' directly, use push_back() instead.");
 	}
-	virtual void push_back(OBJECT *, TypeAdapter const &) throw(TypeMismatch) {
+	virtual void push_back(OBJECT *, TypeAdapter const &) {
 		throw TypeMismatch("Cannot call push_back() on non-vector<> variable '" + name + "'.");
 	}
-	virtual void clear(OBJECT *) throw(TypeMismatch) {
+	virtual void clear(OBJECT *) {
 		throw TypeMismatch("Cannot call clear() on non-vector<> variable '" + name + "'.");
 	}
-	virtual TypeAdapter const get(OBJECT *) const throw(TypeMismatch) {
+	virtual TypeAdapter const get(OBJECT *) const {
 		throw TypeMismatch("get() '" + name + "': not supported for variables of type vector<>.");
 	}
 	bool isRequired() const { return required; };
@@ -195,10 +195,10 @@
 			setType(prototype);
 		}
 	}
-	virtual TypeAdapter const get(OBJECT *object) const throw(TypeMismatch) {
+	virtual TypeAdapter const get(OBJECT *object) const {
 		return TypeAdapter(object->*member);
 	}
-	virtual void set(OBJECT *object, TypeAdapter const &v) throw(TypeMismatch) {
+	virtual void set(OBJECT *object, TypeAdapter const &v) {
 		try {
 			if (mask != 0) {
 				T value;
@@ -248,10 +248,10 @@
 			setType(prototype);
 		}
 	}
-	virtual TypeAdapter const get(OBJECT *object) const throw(TypeMismatch) {
+	virtual TypeAdapter const get(OBJECT *object) const {
 		return TypeAdapter(object->*member);
 	}
-	virtual void set(OBJECT *object, TypeAdapter const &v) throw(TypeMismatch) {
+	virtual void set(OBJECT *object, TypeAdapter const &v) {
 		try {
 			v.set(object->*member);
 		} catch (Exception &e) {
@@ -333,7 +333,7 @@
 			type = "vector::" + type;
 		}
 	}
-	virtual void push_back(OBJECT *object, TypeAdapter const &v) throw(TypeMismatch) {
+	virtual void push_back(OBJECT *object, TypeAdapter const &v) {
 		T value;
 		try {
 			v.set(value);
@@ -343,7 +343,7 @@
 		}
 		(object->*member).push_back(value);
 	}
-	virtual void clear(OBJECT *object) throw(TypeMismatch) {
+	virtual void clear(OBJECT *object) {
 		(object->*member).clear();
 	}
 	virtual void serialize(OBJECT const *object, Writer &writer) const {
@@ -523,7 +523,7 @@
 
 	typedef ObjectInterface<C> Self;
 
-	void __not_found(std::string const &name) const throw (InterfaceError) {
+	void __not_found(std::string const &name) const {
 		throw InterfaceError("Variable '"+name+"' not found in interface to class '" + C::_getClassName()+"'");
 	}
 
@@ -544,7 +544,7 @@
 	 *        macro instead.
 	 */
 	template<typename T>
-	Self& def(std::string const &name, T C::*pm, bool required) throw(InterfaceError) {
+	Self& def(std::string const &name, T C::*pm, bool required) {
 		if (variableExists(name)) throw InterfaceError("interface variable \"" + std::string(name) + "\" multiply defined in class '" + C::_getClassName() + "'.");
 #ifdef __SIMDATA_PTS_SIM
 		table[name] = new typename PTS::SELECT_ACCESSOR<C, T>::ACCESSOR(pm, name, required);
@@ -554,7 +554,7 @@
 		return *this;
 	}
 	template<typename T>
-	Self& def(std::string const &name, T C::*pm, int mask, bool required) throw(InterfaceError) {
+	Self& def(std::string const &name, T C::*pm, int mask, bool required) {
 		if (variableExists(name)) throw InterfaceError("interface variable \"" + std::string(name) + "\" multiply defined in class '" + C::_getClassName() + "'.");
 #ifdef __SIMDATA_PTS_SIM
 		table[name] = new typename PTS::SELECT_ACCESSOR<C, T>::ACCESSOR(pm, name, required);

Modified: trunk/CSP/SimData/Include/SimData/TypeAdapter.h
===================================================================
--- trunk/CSP/SimData/Include/SimData/TypeAdapter.h	2005-01-17 23:39:12 UTC (rev 1449)
+++ trunk/CSP/SimData/Include/SimData/TypeAdapter.h	2005-01-19 12:41:32 UTC (rev 1450)
@@ -244,7 +244,7 @@
 		BaseType const *o;
 	} var;
 
-	void TypeCheck(bool test, std::string msg) const throw(TypeMismatch) {
+	void TypeCheck(bool test, std::string msg) const {
 		if (!(test)) {
 			msg = __repr__() + ": " + msg;
 			throw TypeMismatch(msg);

Modified: trunk/CSP/SimData/Source/InterfaceRegistry.cpp
===================================================================
--- trunk/CSP/SimData/Source/InterfaceRegistry.cpp	2005-01-17 23:39:12 UTC (rev 1449)
+++ trunk/CSP/SimData/Source/InterfaceRegistry.cpp	2005-01-19 12:41:32 UTC (rev 1450)
@@ -166,7 +166,7 @@
 	return __list;
 }
 
-void InterfaceRegistry::addInterface(const char *name, hasht id, InterfaceProxy *proxy) throw(InterfaceError) {
+void InterfaceRegistry::addInterface(const char *name, hasht id, InterfaceProxy *proxy) {
 	if (hasInterface(name)) {
 		throw InterfaceError("interface \"" + std::string(name) + "\" multiply defined");
 	}

[Csp-commits] svn:csp r1449 - trunk/CSP/CSPSim/Source

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

Author: delta
Date: 2005-01-17 15:39:12 -0800 (Mon, 17 Jan 2005)
New Revision: 1449

Modified:
   trunk/CSP/CSPSim/Source/GameScreen.cpp
Log:
* Fixed a case sensitive typo.

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

Modified: trunk/CSP/CSPSim/Source/GameScreen.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/GameScreen.cpp	2005-01-17 22:29:11 UTC (rev 1448)
+++ trunk/CSP/CSPSim/Source/GameScreen.cpp	2005-01-17 23:39:12 UTC (rev 1449)
@@ -35,7 +35,7 @@
 #include <osgText/Text>
 #include <Producer/Camera>
 
-#include <Simdata/FileUtility.h>
+#include <SimData/FileUtility.h>
 
 #include "Animation.h"
 #include "ConsoleCommands.h"

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

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

Author: delta
Date: 2005-01-17 14:29:11 -0800 (Mon, 17 Jan 2005)
New Revision: 1448

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/gear.xml
   trunk/CSP/CSPSim/Include/LandingGear.h
   trunk/CSP/CSPSim/Source/LandingGear.cpp
Log:
* Minor changes in LandingGear class exposing the drag value. Also, gear dynamics now takes into account of the extension.

==> ALL USERS: RebuildData.py

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

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-01-16 10:19:28 UTC (rev 1447)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-01-17 22:29:11 UTC (rev 1448)
@@ -1,6 +1,12 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-01-17: delta
+ * Minor changes in LandingGear class exposing the drag value. Also,
+   gear dynamics now takes into account of the extension.
+
+==> ALL USERS: RebuildData.py
+
 2005-01-16: delta
  * A Screenshots/ directory will be created (if non existent), when a
    snapshot is taken. The default location is CSPSim/Screenshots and is

Modified: trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/gear.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/gear.xml	2005-01-16 10:19:28 UTC (rev 1447)
+++ trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/gear.xml	2005-01-17 22:29:11 UTC (rev 1448)
@@ -25,6 +25,7 @@
 			<Float name="tire_K">1200000.0</Float>
 			<Float name="tire_beta">1000000.0</Float>
 			<Real name="rolling_friction">0.02:0.001</Real>
+			<Float name="drag_factor">0.8</Float>
 		</Object>
 		<Object	class="LandingGear"> <!-- left main	-->
 			<String	name="gear_name">LeftGear</String>
@@ -44,6 +45,7 @@
 			<Float name="tire_beta">1000000.0</Float>
 			<Real name="rolling_friction">0.02:0.001</Real>
 			<Bool name="abs">true</Bool>
+			<Float name="drag_factor">0.8</Float>
 		</Object>
 		<Object	class="LandingGear"> <!-- right	main -->
 			<String	name="gear_name">RightGear</String>
@@ -63,6 +65,7 @@
 			<Float name="tire_beta">1000000.0</Float>
 			<Real name="rolling_friction">0.02:0.001</Real>
 			<Bool name="abs">true</Bool>
+			<Float name="drag_factor">0.8</Float>
 		</Object>
 	</List>
 	<List name="gear_set_animation">

Modified: trunk/CSP/CSPSim/Include/LandingGear.h
===================================================================
--- trunk/CSP/CSPSim/Include/LandingGear.h	2005-01-16 10:19:28 UTC (rev 1447)
+++ trunk/CSP/CSPSim/Include/LandingGear.h	2005-01-17 22:29:11 UTC (rev 1448)
@@ -62,6 +62,7 @@
 		SIMDATA_XML("abs", LandingGear::m_ABS, false)
 		SIMDATA_XML("rolling_friction", LandingGear::m_RollingFriction, false)
 		SIMDATA_XML("brake_steering_linkage", LandingGear::m_BrakeSteeringLinkage, false)
+		SIMDATA_XML("drag_factor", LandingGear::m_DragFactor, false)
 	END_SIMDATA_XML_INTERFACE
 
 	LandingGear();
@@ -168,6 +169,8 @@
 	bool m_SkidFlag;
 	double m_ABSActiveTimer;
 
+	double m_DragFactor;
+
 	simdata::Vector3 m_Position;
 	simdata::Vector3 m_NormalForce;
 	simdata::Vector3 m_TangentForce;

Modified: trunk/CSP/CSPSim/Source/LandingGear.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/LandingGear.cpp	2005-01-16 10:19:28 UTC (rev 1447)
+++ trunk/CSP/CSPSim/Source/LandingGear.cpp	2005-01-17 22:29:11 UTC (rev 1448)
@@ -104,6 +104,7 @@
 	m_TireRotation = 0.0;
 	m_TireRotationRate = 0.0;
 	m_TireRadius = 0.25;
+	m_DragFactor = 0.8;
 }
 
 
@@ -139,15 +140,13 @@
 
 
 void LandingGear::setBraking(double setting) {
-	if (setting < 0.0) setting = 0.0;
-	if (setting > 1.0) setting = 1.0;
+	setting = simdata::clampTo(setting,-1.0,1.0);
 	m_BrakeSetting = setting;
 }
 
 
 double LandingGear::setSteering(double setting, double link_brakes) {
-	if (setting > 1.0) setting = 1.0;
-	if (setting < -1.0) setting = -1.0;
+	setting = simdata::clampTo(setting,-1.0,1.0);
 	m_BrakeSteer = setting * link_brakes * m_BrakeSteeringLinkage;
 	m_SteerAngle = setting * m_SteeringLimit;
 	double rad = toRadians(m_SteerAngle);
@@ -158,7 +157,7 @@
 
 double LandingGear::getDragFactor() const {
 	// XXX very temporary hack (need xml, partial extension, etc)
-	if (m_Extended) return 1.0; // just a random value
+	if (m_Extended) return m_DragFactor;
 	return 0.0;
 }
 
@@ -558,8 +557,8 @@
 	for (size_t i = 0; i < n; ++i) {
 		LandingGear &gear = *(m_Gear[i]);
 		double extension = 1.0;
-		//if (b_GearExtension[i].valid()
-		//	extension = b_GearExtension[i]->value()
+		if (b_GearExtension.valid())
+			extension = b_GearExtension->value();
 		Vector3 R = extension * gear.getPosition();
 		Vector3 F = Vector3::ZERO;
 		if (b_NearGround->value()) {
@@ -570,7 +569,7 @@
 			                          m_Height,
 			                          m_GroundNormalBody);
 		}
-		F += gear.getDragFactor() * dynamic_pressure;
+		F += extension * gear.getDragFactor() * dynamic_pressure;
 		m_Force += F;
 		m_Moment += (R ^ F);
 	}

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

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

Author: delta
Date: 2005-01-16 02:19:28 -0800 (Sun, 16 Jan 2005)
New Revision: 1447

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Source/GameScreen.cpp
Log:
* A Screenshots/ directory will be created (if non existent), when a snapshot is taken. The default location is CSPSim/Screenshots and is configurable in CSPSim.ini.

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

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-01-16 10:12:07 UTC (rev 1446)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-01-16 10:19:28 UTC (rev 1447)
@@ -1,6 +1,11 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-01-16: delta
+ * A Screenshots/ directory will be created (if non existent), when a
+   snapshot is taken. The default location is CSPSim/Screenshots and is
+   configurable in CSPSim.ini.
+   
 2005-01-15: lologramme
  * Mirage 2000: Textures "color diffuse" problem resolved
 

Modified: trunk/CSP/CSPSim/Source/GameScreen.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/GameScreen.cpp	2005-01-16 10:12:07 UTC (rev 1446)
+++ trunk/CSP/CSPSim/Source/GameScreen.cpp	2005-01-16 10:19:28 UTC (rev 1447)
@@ -30,10 +30,13 @@
 
 #include <osg/Image>
 #include <osgDB/WriteFile>
+#include <osgDB/FileUtils>
 #include <osgUtil/SceneView>
 #include <osgText/Text>
 #include <Producer/Camera>
 
+#include <Simdata/FileUtility.h>
+
 #include "Animation.h"
 #include "ConsoleCommands.h"
 #include "CSPSim.h"
@@ -90,7 +93,7 @@
 
 // XXX: Preparing for the jump to OpenProducer ...
 class SnapImageDrawCallback: public Producer::Camera::Callback {
-	std::string m_Filename, m_Ext;
+	std::string m_Filename, m_Ext, m_Directory;
     bool m_SnapImageOnNextFrame;
 	std::string getDate() {
 		time_t timer;
@@ -109,7 +112,10 @@
 	SnapImageDrawCallback(const std::string& filename = "CSP",const std::string& ext = ".jpg"):
         m_Filename(filename),
 		m_Ext(ext),
+		m_Directory(g_Config.getString("Paths", "Screenshots", "../Screenshots", true)),
         m_SnapImageOnNextFrame(false){
+			if (!osgDB::makeDirectory(m_Directory))
+				std::cerr << "Warning: can't create target: " << m_Directory << "; no snapshot will be saved." << std::endl;
     }
     void setSnapImageOnNextFrame(bool flag) {
 		m_SnapImageOnNextFrame = flag;
@@ -130,7 +136,7 @@
 			image->readPixels(x,y,width,height,GL_RGB,GL_UNSIGNED_BYTE);
 
 			// save the file in the form CSPmmddyy-hhmmss.ext
-			osgDB::writeImageFile(*image,m_Filename + getDate() + m_Ext);
+			osgDB::writeImageFile(*image, simdata::ospath::join(m_Directory, m_Filename + getDate() + m_Ext));
 			m_SnapImageOnNextFrame = false;
 		}
     }

[Csp-commits] svn:csp r1446 - in trunk/CSP/SimCore: . Util VisualStudio2003

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

Author: delta
Date: 2005-01-16 02:12:07 -0800 (Sun, 16 Jan 2005)
New Revision: 1446

Removed:
   trunk/CSP/SimCore/SimCore-New/
Modified:
   trunk/CSP/SimCore/Util/Callback.h
   trunk/CSP/SimCore/VisualStudio2003/SimCore.vcproj
Log:
* Removed SimCore-New directory.
* Added Util/Callback.h to vs project.
* Small change in the syntax of ScopedCallbacks' ctors, removing the explicit template parameter(s).

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

Modified: trunk/CSP/SimCore/Util/Callback.h
===================================================================
--- trunk/CSP/SimCore/Util/Callback.h	2005-01-15 17:07:58 UTC (rev 1445)
+++ trunk/CSP/SimCore/Util/Callback.h	2005-01-16 10:12:07 UTC (rev 1446)
@@ -145,12 +145,12 @@
 
 template <typename M>
 template <class C>
-ScopedCallback1<M>::ScopedCallback1<M>(C *instance, void (C::*method)(M))
+ScopedCallback1<M>::ScopedCallback1(C *instance, void (C::*method)(M))
 	: simdata::ScopedPointer<Callback1<M> >(new Callback1<M>(instance, method)) { }
 
 template <typename M, typename N>
 template <class C>
-ScopedCallback2<M, N>::ScopedCallback2<M, N>(C *instance, void (C::*method)(M, N))
+ScopedCallback2<M, N>::ScopedCallback2(C *instance, void (C::*method)(M, N))
 	: simdata::ScopedPointer<Callback2<M, N> >(new Callback2<M, N>(instance, method)) { }
 
 

Modified: trunk/CSP/SimCore/VisualStudio2003/SimCore.vcproj
===================================================================
--- trunk/CSP/SimCore/VisualStudio2003/SimCore.vcproj	2005-01-15 17:07:58 UTC (rev 1445)
+++ trunk/CSP/SimCore/VisualStudio2003/SimCore.vcproj	2005-01-16 10:12:07 UTC (rev 1446)
@@ -160,6 +160,9 @@
 				Name="Util"
 				Filter="">
 				<File
+					RelativePath="..\Util\Callback.h">
+				</File>
+				<File
 					RelativePath="..\Util\Dispatch.h">
 				</File>
 				<File

[Csp-commits] svn:csp r1445 - in trunk/CSP/CSPSim: . Data/Models/Mirage2000

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

Author: lologramme
Date: 2005-01-15 09:07:58 -0800 (Sat, 15 Jan 2005)
New Revision: 1445

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/Models/Mirage2000/model.osg
Log:
"Color diffuse" problem on M2k resolved

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

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-01-13 08:13:41 UTC (rev 1444)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-01-15 17:07:58 UTC (rev 1445)
@@ -1,23 +1,29 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-01-15: lologramme
+ * Mirage 2000: Textures "color diffuse" problem resolved
+
 2005-01-12: delta
  * Reformated Animation's classes. Added basic time based animations.
-   Added animation's sequences in Data/XML/vehicules/aircraft/m2/gear.xml 
+   Added animation's sequences in Data/XML/vehicules/aircraft/m2/gear.xml
    and model.xml. Added an animation sequence attribute to AnimationGear class
-   in LandingGear.h. The 3d model has been updated to provide necessary node's 
+   in LandingGear.h. The 3d model has been updated to provide necessary node's
    hooks.
    This code is not tested under GNU/Linux.
- 
- * Network's hooks  haven't been updated, so animation's sequences won't work on 
+
+ * Network's hooks  haven't been updated, so animation's sequences won't work on
    a remote object.
-   
+
  ==> ALL USERS: RebuildData.py
- 
+
+2005-01-08: lologramme
+ * Add Trees
+
 2005-01-07: lologramme
  * add Taxi Signalisation
  * Add hangars
- 
+
 2005-01-03: delta
  * Snapshot is now saved as jpeg.
 

Modified: trunk/CSP/CSPSim/Data/Models/Mirage2000/model.osg
===================================================================
--- trunk/CSP/CSPSim/Data/Models/Mirage2000/model.osg	2005-01-13 08:13:41 UTC (rev 1444)
+++ trunk/CSP/CSPSim/Data/Models/Mirage2000/model.osg	2005-01-15 17:07:58 UTC (rev 1445)
@@ -52,9 +52,9 @@
             ColorMode OFF
             ambientColor 0.588 0.588 0.588 1
             diffuseColor 1 1 1 1
-            specularColor 0.0225225 0.0225225 0.0225225 1
+            specularColor 0 0 0 1
             emissionColor 0 0 0 1
-            shininess 12.8
+            shininess 0
           }
           textureUnit 0 {
             GL_TEXTURE_2D ON
@@ -14444,9 +14444,9 @@
             ColorMode OFF
             ambientColor 0.588 0.588 0.588 1
             diffuseColor 1 1 1 1
-            specularColor 0.0225225 0.0225225 0.0225225 1
+            specularColor 0 0 0 1
             emissionColor 0 0 0 1
-            shininess 12.8
+            shininess 0
           }
           textureUnit 0 {
             GL_TEXTURE_2D ON
@@ -16479,9 +16479,9 @@
             ColorMode OFF
             ambientColor 0.588 0.588 0.588 1
             diffuseColor 1 1 1 1
-            specularColor 0.00900901 0.00900901 0.00900901 1
+            specularColor 0 0 0 1
             emissionColor 0 0 0 1
-            shininess 12.8
+            shininess 0
           }
           textureUnit 0 {
             GL_TEXTURE_2D ON
@@ -19954,9 +19954,9 @@
             ColorMode OFF
             ambientColor 0.588 0.588 0.588 1
             diffuseColor 1 1 1 1
-            specularColor 0.0225225 0.0225225 0.0225225 1
+            specularColor 0 0 0 1
             emissionColor 0 0 0 1
-            shininess 12.8
+            shininess 0
           }
           textureUnit 0 {
             GL_TEXTURE_2D ON
@@ -20640,9 +20640,9 @@
             ColorMode OFF
             ambientColor 0.588 0.588 0.588 1
             diffuseColor 1 1 1 1
-            specularColor 0.0225225 0.0225225 0.0225225 1
+            specularColor 0 0 0 1
             emissionColor 0 0 0 1
-            shininess 12.8
+            shininess 0
           }
           textureUnit 0 {
             GL_TEXTURE_2D ON
@@ -41990,7 +41990,7 @@
           Material {
             DataVariance STATIC
             ColorMode OFF
-            ambientColor 0.588 0.588 0.588 1
+            ambientColor 0.0640517 0.158168 0.181698 1
             diffuseColor 1 1 1 1
             specularColor 0.0225225 0.0225225 0.0225225 1
             emissionColor 0 0 0 1
@@ -76059,7 +76059,7 @@
           Material {
             DataVariance STATIC
             ColorMode OFF
-            ambientColor 0.588 0.588 0.588 1
+            ambientColor 0.0640517 0.158168 0.181698 1
             diffuseColor 1 1 1 1
             specularColor 0.0225225 0.0225225 0.0225225 1
             emissionColor 0 0 0 1
@@ -83387,11 +83387,11 @@
           Material {
             DataVariance STATIC
             ColorMode OFF
-            ambientColor 0.205227 0.142482 0.253592 1
+            ambientColor 0.588 0.588 0.588 1
             diffuseColor 1 1 1 1
-            specularColor 0.0045045 0.0045045 0.0045045 1
+            specularColor 0 0 0 1
             emissionColor 0 0 0 1
-            shininess 32
+            shininess 0
           }
           textureUnit 0 {
             GL_TEXTURE_2D ON
@@ -105985,7 +105985,7 @@
           DataVariance STATIC
           rendering_hint DEFAULT_BIN
           renderBinMode INHERIT
-          GL_CULL_FACE OVERRIDE|OFF
+          GL_CULL_FACE ON
           GL_LIGHTING ON
           0xba1 ON
           Material {
@@ -105993,9 +105993,9 @@
             ColorMode OFF
             ambientColor 0.588 0.588 0.588 1
             diffuseColor 1 1 1 1
-            specularColor 0.0225225 0.0225225 0.0225225 1
+            specularColor 0 0 0 1
             emissionColor 0 0 0 1
-            shininess 12.8
+            shininess 0
           }
           textureUnit 0 {
             GL_TEXTURE_2D ON

[Csp-commits] svn:csp r1444 - trunk/CSP/CSPSim/Data/XML/theater/balkan

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

Author: mkrose
Date: 2005-01-13 00:13:41 -0800 (Thu, 13 Jan 2005)
New Revision: 1444

Modified:
   trunk/CSP/CSPSim/Data/XML/theater/balkan/forest1.xml
Log:
Fix error in forest model.

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

Modified: trunk/CSP/CSPSim/Data/XML/theater/balkan/forest1.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/forest1.xml	2005-01-13 08:13:35 UTC (rev 1443)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/forest1.xml	2005-01-13 08:13:41 UTC (rev 1444)
@@ -10,8 +10,6 @@
     </List>
     <List name="density">
         <Float>0.01</Float>
-        <Float>0.005</Float>
-        <Float>0.005</Float>
     </List>
     <Float name="minimum_spacing">2</Float>
     <Object class="RectangularCurve" name="isocontour">

[Csp-commits] svn:csp r1443 - trunk/CSP/CSPSim/Include

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

Author: mkrose
Date: 2005-01-13 00:13:35 -0800 (Thu, 13 Jan 2005)
New Revision: 1443

Modified:
   trunk/CSP/CSPSim/Include/Animation.h
Log:
Fix compiler error in new animation code.

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

Modified: trunk/CSP/CSPSim/Include/Animation.h
===================================================================
--- trunk/CSP/CSPSim/Include/Animation.h	2005-01-12 15:33:50 UTC (rev 1442)
+++ trunk/CSP/CSPSim/Include/Animation.h	2005-01-13 08:13:35 UTC (rev 1443)
@@ -100,6 +100,7 @@
  * by multiple SceneModel instances.
  */
 class Animation: public simdata::Object {
+protected:
 	/**
 	* Small template class to reduce & simplify writing.
 	* It's the heart of the animation in overriding
@@ -127,6 +128,7 @@
 		}
 		virtual ~Callback_A_C(){}
 	};
+
 	template <class A> class Callback_A: public Callback_A_C<A, double> {
 	protected:
 		virtual void updateValue() {
@@ -144,6 +146,8 @@
 		virtual ~Callback_A(){}
 	};
 
+private:
+
 	simdata::Key m_ModelID;
 	std::string m_ChannelName;
 	int m_LOD;

[Csp-commits] svn:csp r1442 - trunk/CSP/CSPSim/VisualStudio/CSPSimDLL

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

Author: delta
Date: 2005-01-12 07:33:50 -0800 (Wed, 12 Jan 2005)
New Revision: 1442

Modified:
   trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj
Log:
Non citical but useless modification. Back to the previous version.

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

Modified: trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj
===================================================================
--- trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj	2005-01-12 15:26:28 UTC (rev 1441)
+++ trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj	2005-01-12 15:33:50 UTC (rev 1442)
@@ -285,21 +285,6 @@
 				RelativePath="..\..\Source\MenuScreen.cpp">
 			</File>
 			<File
-				RelativePath="..\..\Source\myAnimation.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="..\..\Source\NumericalMethod.cpp">
 			</File>
 			<File

[Csp-commits] svn:csp r1441 - in trunk/CSP/CSPSim: . Data/Models/Mirage2000 Data/XML/vehicles/aircraft/m2k Include Source VisualStudio/CSPSimDLL

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

Author: delta
Date: 2005-01-12 07:26:28 -0800 (Wed, 12 Jan 2005)
New Revision: 1441

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/Models/Mirage2000/model.osg
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/gear.xml
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/model.xml
   trunk/CSP/CSPSim/Include/Animation.h
   trunk/CSP/CSPSim/Include/LandingGear.h
   trunk/CSP/CSPSim/Source/Animation.cpp
   trunk/CSP/CSPSim/Source/Controller.cpp
   trunk/CSP/CSPSim/Source/LandingGear.cpp
   trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj
Log:
* Reformated Animation's classes. Added basic time based animations. Added animation's sequences in Data/XML/vehicules/aircraft/m2/gear.xml and model.xml. Added an animation sequence attribute to AnimationGear class in LandingGear.h. The 3d model has been updated to provide necessary node's hooks. This code is not tested under GNU/Linux.
* Network's hooks  haven't been updated, so animation's sequences won't work on a remote object.
==> ALL USERS: RebuildData.py

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

Diff omitted (710142 bytes).

[Csp-commits] svn:csp r1440 - in trunk/CSP/CSPSim/Data: Images/Trees XML/theater/balkan

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

Author: lologramme
Date: 2005-01-08 09:08:42 -0800 (Sat, 08 Jan 2005)
New Revision: 1440

Added:
   trunk/CSP/CSPSim/Data/Images/Trees/tree2.png
   trunk/CSP/CSPSim/Data/XML/theater/balkan/forest1.xml
Modified:
   trunk/CSP/CSPSim/Data/XML/theater/balkan/airbase.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/forest.xml
Log:
Add Trees

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

Added: trunk/CSP/CSPSim/Data/Images/Trees/tree2.png
===================================================================
(Binary files differ)


Property changes on: trunk/CSP/CSPSim/Data/Images/Trees/tree2.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/CSP/CSPSim/Data/XML/theater/balkan/airbase.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/airbase.xml	2005-01-08 16:37:14 UTC (rev 1439)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/airbase.xml	2005-01-08 17:08:42 UTC (rev 1440)
@@ -117,5 +117,29 @@
             <Float name="y">1510</Float>
             <Float name="orientation">-1.6</Float>
         </Object>
+        <Object class="FeatureLayout">
+            <Path name="model">forest</Path>
+            <Float name="x">220</Float>
+            <Float name="y">1283</Float>
+            <Float name="orientation">0</Float>
+        </Object>
+        <Object class="FeatureLayout">
+            <Path name="model">forest</Path>
+            <Float name="x">225</Float>
+            <Float name="y">1377</Float>
+            <Float name="orientation">0</Float>
+        </Object>
+        <Object class="FeatureLayout">
+            <Path name="model">forest</Path>
+            <Float name="x">200</Float>
+            <Float name="y">1482</Float>
+            <Float name="orientation">0</Float>
+        </Object>
+        <Object class="FeatureLayout">
+            <Path name="model">forest1</Path>
+            <Float name="x">357</Float>
+            <Float name="y">1430</Float>
+            <Float name="orientation">0</Float>
+        </Object>
     </List>
 </Object>

Modified: trunk/CSP/CSPSim/Data/XML/theater/balkan/forest.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/forest.xml	2005-01-08 16:37:14 UTC (rev 1439)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/forest.xml	2005-01-08 17:08:42 UTC (rev 1440)
@@ -1,33 +1,31 @@
-<?xml version="1.0" standalone="no"?> 
+<?xml version="1.0" standalone="no"?>
 
-<Object	class="RandomBillboardModel">
-	<List name="models">
-		<Object class="FeatureQuad">
-			<External name="texture">Trees/tree0.png</External>
-			<Float name="width">6</Float>
-			<Float name="height">10</Float>
-		</Object>
-		<Object class="FeatureQuad">
-			<External name="texture">Trees/tree5.png</External>
-			<Float name="width">8</Float>
-			<Float name="height">12</Float>
-		</Object>
-		<Object class="FeatureQuad">
-			<External name="texture">Trees/tree6.png</External>
-			<Float name="width">10</Float>
-			<Float name="height">14</Float>
-		</Object>
-	</List>
-	<List name="density">
-		<Float>0.01</Float>
-		<Float>0.005</Float>
-		<Float>0.005</Float>
-	</List>
-	<Float name="minimum_spacing">2</Float>
-	<Object class="RectangularCurve" name="isocontour">
-		<Float name="width">20</Float>
-		<Float name="height">1200</Float>
-	</Object>
-</Object>
-
-
+<Object class="RandomBillboardModel">
+    <List name="models">
+        <Object class="FeatureQuad">
+            <External name="texture">Trees/tree0.png</External>
+            <Float name="width">6</Float>
+            <Float name="height">10</Float>
+        </Object>
+        <Object class="FeatureQuad">
+            <External name="texture">Trees/tree5.png</External>
+            <Float name="width">8</Float>
+            <Float name="height">12</Float>
+        </Object>
+        <Object class="FeatureQuad">
+            <External name="texture">Trees/tree6.png</External>
+            <Float name="width">10</Float>
+            <Float name="height">14</Float>
+        </Object>
+    </List>
+    <List name="density">
+        <Float>0.01</Float>
+        <Float>0.005</Float>
+        <Float>0.005</Float>
+    </List>
+    <Float name="minimum_spacing">2</Float>
+    <Object class="RectangularCurve" name="isocontour">
+        <Float name="width">20</Float>
+        <Float name="height">20</Float>
+    </Object>
+</Object>

Added: trunk/CSP/CSPSim/Data/XML/theater/balkan/forest1.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/forest1.xml	2005-01-08 16:37:14 UTC (rev 1439)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/forest1.xml	2005-01-08 17:08:42 UTC (rev 1440)
@@ -0,0 +1,21 @@
+<?xml version="1.0" standalone="no"?>
+
+<Object class="RandomBillboardModel">
+    <List name="models">
+        <Object class="FeatureQuad">
+            <External name="texture">Trees/tree2.png</External>
+            <Float name="width">10</Float>
+            <Float name="height">15</Float>
+        </Object>
+    </List>
+    <List name="density">
+        <Float>0.01</Float>
+        <Float>0.005</Float>
+        <Float>0.005</Float>
+    </List>
+    <Float name="minimum_spacing">2</Float>
+    <Object class="RectangularCurve" name="isocontour">
+        <Float name="width">20</Float>
+        <Float name="height">10</Float>
+    </Object>
+</Object>

[Csp-commits] svn:csp r1439 - in trunk/CSP/CSPSim: . Data/Models/Hangar Data/XML/theater/balkan Data/XML/theater/balkan/hangar

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

Author: lologramme
Date: 2005-01-08 08:37:14 -0800 (Sat, 08 Jan 2005)
New Revision: 1439

Added:
   trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar/
   trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar/model.xml
Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/Models/Hangar/hangar01.3ds
   trunk/CSP/CSPSim/Data/XML/theater/balkan/airbase.xml
Log:
Add Hangars

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

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-01-07 10:04:51 UTC (rev 1438)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-01-08 16:37:14 UTC (rev 1439)
@@ -2,6 +2,7 @@
 ===========================
 2005-01-07: lologramme
  * add Taxi Signalisation
+ * Add hangars
  
 2005-01-03: delta
  * Snapshot is now saved as jpeg.

Modified: trunk/CSP/CSPSim/Data/Models/Hangar/hangar01.3ds
===================================================================
(Binary files differ)

Modified: trunk/CSP/CSPSim/Data/XML/theater/balkan/airbase.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/airbase.xml	2005-01-07 10:04:51 UTC (rev 1438)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/airbase.xml	2005-01-08 16:37:14 UTC (rev 1439)
@@ -93,5 +93,29 @@
             <Float name="y">340</Float>
             <Float name="orientation">2.07</Float>
         </Object>
+        <Object class="FeatureLayout">
+            <Path name="model">hangar</Path>
+            <Float name="x">231</Float>
+            <Float name="y">1253</Float>
+            <Float name="orientation">-0.75</Float>
+        </Object>
+        <Object class="FeatureLayout">
+            <Path name="model">hangar</Path>
+            <Float name="x">208</Float>
+            <Float name="y">1326</Float>
+            <Float name="orientation">-0.20</Float>
+        </Object>
+        <Object class="FeatureLayout">
+            <Path name="model">hangar</Path>
+            <Float name="x">192</Float>
+            <Float name="y">1433</Float>
+            <Float name="orientation">-2.10</Float>
+        </Object>
+        <Object class="FeatureLayout">
+            <Path name="model">hangar</Path>
+            <Float name="x">208</Float>
+            <Float name="y">1510</Float>
+            <Float name="orientation">-1.6</Float>
+        </Object>
     </List>
 </Object>

Added: trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar/model.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar/model.xml	2005-01-07 10:04:51 UTC (rev 1438)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar/model.xml	2005-01-08 16:37:14 UTC (rev 1439)
@@ -0,0 +1,13 @@
+<?xml version="1.0" standalone="no"?>
+
+<Object class="ObjectModel">
+    <External name="model_path">Hangar/hangar01.3ds</External>
+    <Vector name="axis_0">1 0 0</Vector>
+    <Vector name="axis_1">0 1.0 0.0</Vector>
+    <Vector name="offset">0 0 0</Vector>
+    <Float name="polygon_offset">-1</Float>
+    <Int name="cull_face">0</Int>
+    <Float name="scale">1.0</Float>
+    <Bool name="smooth">true</Bool>
+    <Bool name="filter">true</Bool>
+</Object>

Added: trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar.xml	2005-01-07 10:04:51 UTC (rev 1438)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar.xml	2005-01-08 16:37:14 UTC (rev 1439)
@@ -0,0 +1,6 @@
+<?xml version="1.0" standalone="no"?>
+
+<Object class="FeatureObjectModel">
+    <Path name="model">hangar.model</Path>
+    <Int name="hit_points">30</Int>
+</Object>

[Csp-commits] svn:csp r1438 - in trunk/CSP/CSPSim: . Data/Models/caissons Data/Models/caissons/caisson06 Data/Models/caissons/caisson07 Data/Models/caissons/caisson08 Data/Models/caissons/caisson09 Data/XML/theater/balkan Data/XML/theater/balkan/caissons Data/XML/theater/balkan/caissons/caisson06 Data/XML/theater/balkan/caissons/caisson07 Data/XML/theater/balkan/caissons/caisson08 Data/XML/theater/balkan/caissons/caisson09

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

Author: lologramme
Date: 2005-01-07 02:04:51 -0800 (Fri, 07 Jan 2005)
New Revision: 1438

Added:
   trunk/CSP/CSPSim/Data/Models/caissons/caisson06/
   trunk/CSP/CSPSim/Data/Models/caissons/caisson06/F-G2.jpg
   trunk/CSP/CSPSim/Data/Models/caissons/caisson06/caisson.jpg
   trunk/CSP/CSPSim/Data/Models/caissons/caisson06/caisson06.3ds
   trunk/CSP/CSPSim/Data/Models/caissons/caisson07/
   trunk/CSP/CSPSim/Data/Models/caissons/caisson07/c07.jpg
   trunk/CSP/CSPSim/Data/Models/caissons/caisson07/caisson.jpg
   trunk/CSP/CSPSim/Data/Models/caissons/caisson07/caisson07.3ds
   trunk/CSP/CSPSim/Data/Models/caissons/caisson08/
   trunk/CSP/CSPSim/Data/Models/caissons/caisson08/c08.jpg
   trunk/CSP/CSPSim/Data/Models/caissons/caisson08/caisson.jpg
   trunk/CSP/CSPSim/Data/Models/caissons/caisson08/caisson08.3ds
   trunk/CSP/CSPSim/Data/Models/caissons/caisson09/
   trunk/CSP/CSPSim/Data/Models/caissons/caisson09/c09.jpg
   trunk/CSP/CSPSim/Data/Models/caissons/caisson09/caisson.jpg
   trunk/CSP/CSPSim/Data/Models/caissons/caisson09/caisson09.3ds
   trunk/CSP/CSPSim/Data/XML/theater/balkan/caisson06.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/caisson07.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/caisson08.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/caisson09.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/caissons/caisson06/
   trunk/CSP/CSPSim/Data/XML/theater/balkan/caissons/caisson06/model.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/caissons/caisson07/
   trunk/CSP/CSPSim/Data/XML/theater/balkan/caissons/caisson07/model.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/caissons/caisson08/
   trunk/CSP/CSPSim/Data/XML/theater/balkan/caissons/caisson08/model.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/caissons/caisson09/
   trunk/CSP/CSPSim/Data/XML/theater/balkan/caissons/caisson09/model.xml
Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/XML/theater/balkan/airbase.xml
Log:
Add taxi signalisation

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

Diff omitted (11937 bytes).

[Csp-commits] svn:csp r1437 - trunk/CSP/SimCore/Battlefield

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

Author: mkrose
Date: 2005-01-04 22:56:30 -0800 (Tue, 04 Jan 2005)
New Revision: 1437

Modified:
   trunk/CSP/SimCore/Battlefield/GlobalBattlefield.h
   trunk/CSP/SimCore/Battlefield/LocalBattlefield.cpp
Log:
Fix a possible segfault when new objects enter the battlefield.

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

Modified: trunk/CSP/SimCore/Battlefield/GlobalBattlefield.h
===================================================================
--- trunk/CSP/SimCore/Battlefield/GlobalBattlefield.h	2005-01-03 21:55:13 UTC (rev 1436)
+++ trunk/CSP/SimCore/Battlefield/GlobalBattlefield.h	2005-01-05 06:56:30 UTC (rev 1437)
@@ -262,6 +262,8 @@
 				response.send(queue);
 				return;
 			}
+		} else {
+			CSP_LOG(BATTLEFIELD, WARNING, "join request missing local time");
 		}
 
 		PeerId id = msg->getSource();

Modified: trunk/CSP/SimCore/Battlefield/LocalBattlefield.cpp
===================================================================
--- trunk/CSP/SimCore/Battlefield/LocalBattlefield.cpp	2005-01-03 21:55:13 UTC (rev 1436)
+++ trunk/CSP/SimCore/Battlefield/LocalBattlefield.cpp	2005-01-05 06:56:30 UTC (rev 1437)
@@ -356,7 +356,7 @@
 	msg->set_user_name(name);
 	msg->set_internal_ip_addr(m_NetworkClient->getLocalNode().getIp());
 	msg->set_external_ip_addr(m_NetworkClient->getExternalNode().getIp());
-	msg->set_local_time(simdata::getSecondsSinceUnixEpoch());
+	msg->set_local_time(static_cast<simdata::uint32>(simdata::getSecondsSinceUnixEpoch()));
 	sendServerCommand(msg);
 	m_ConnectionState = CONNECTION_JOIN;
 }
@@ -590,7 +590,9 @@
 }
 
 bool LocalBattlefield::updateUnitVisibility(UnitWrapper *wrapper, GridPoint const &old_position, GridPoint const &new_position) {
+	assert(wrapper->unit().valid());
 	if (!m_SceneManager.valid()) return false;
+	if (!wrapper->unit().valid()) return false;
 	const double vis_bubble = m_SceneManager->getVisibleRange();
 	const double vis_r2 = vis_bubble * vis_bubble;
 	const bool in_old_bubble = (globalDistance2(m_CameraGridPosition, old_position) <= vis_r2) && !isNullPoint(old_position);
@@ -659,13 +661,27 @@
 	CSP_LOG(BATTLEFIELD, DEBUG, "updateVisibility(): hiding " << hide.size() << " objects");
 	for (unsigned i = 0; i < hide.size(); ++i) {
 		Object object = static_cast<ObjectWrapper*>(hide[i])->object();
-		m_SceneManager->scheduleHide(object);
+		// object will be null if we have not received any peer updates yet.  in this case
+		// the object isn't really visible, and there is nothing to do. this situation can
+		// arise transiently when new objects are added to the global battlefield, but in
+		// general we should have received peer updates before an object enters or leaves
+		// visible range.
+		if (object.valid()) {
+			m_SceneManager->scheduleHide(object);
+		}
 	}
 
 	CSP_LOG(BATTLEFIELD, DEBUG, "updateVisibility(): showing " << show.size() << " objects");
 	for (unsigned i = 0; i < show.size(); ++i) {
 		Object object = static_cast<ObjectWrapper*>(show[i])->object();
-		m_SceneManager->scheduleShow(object);
+		// object will be null if we have not received any peer updates yet.  in this case
+		// we can't show the object, but the visibility will be reevaluated when the first
+		// update arives and the object is created.  this situation can arise transiently
+		// when new objects are added to the global battlefield, but in general we should
+		// receive peer updates before an object enters visible range.
+		if (object.valid()) {
+			m_SceneManager->scheduleShow(object);
+		}
 	}
 }
 

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

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

Author: mkrose
Date: 2005-01-03 13:55:13 -0800 (Mon, 03 Jan 2005)
New Revision: 1436

Modified:
   trunk/CSP/SimData/CHANGES.current
   trunk/CSP/SimData/SimData/Compile.py
Log:
Fix logging priority/category calls in Compile.py.

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

Modified: trunk/CSP/SimData/CHANGES.current
===================================================================
--- trunk/CSP/SimData/CHANGES.current	2005-01-03 10:38:31 UTC (rev 1435)
+++ trunk/CSP/SimData/CHANGES.current	2005-01-03 21:55:13 UTC (rev 1436)
@@ -1,6 +1,9 @@
 Version 0.4.0 (in progress)
 ===========================
 
+2005-01-03: onsight
+ * Fix logging priority/category calls in Compile.py.
+
 2004-12-23: delta
  * Latest version of pthreads for win changed the type of pthread_t.
    A small wrapper for Task:ThreadId is provided to garanty compatibility 
@@ -11,7 +14,7 @@
 2004-12-12: delta
  * Fixed a few warnings in Random.h under msvc. Hopefully gcc 
    won't complain.
-   
+
   * Updated Config project file.
 
 2004-12-11: onsight

Modified: trunk/CSP/SimData/SimData/Compile.py
===================================================================
--- trunk/CSP/SimData/SimData/Compile.py	2005-01-03 10:38:31 UTC (rev 1435)
+++ trunk/CSP/SimData/SimData/Compile.py	2005-01-03 21:55:13 UTC (rev 1436)
@@ -37,7 +37,8 @@
 		print "more information or ask for help on the forums at"
 		print "http://csp.sourcforge.net/forum"
 		sys.exit(1)
-	SimData.log().setLogLevels(SimData.LOG_ALL, SimData.LOG_ALERT)
+	SimData.log().setLogPriority(SimData.LOG_ALERT)
+	SimData.log().setLogCategory(SimData.LOG_ALL)
 	original_path = sys.path[:]
 	new_path = ""
 	try:
@@ -214,7 +215,8 @@
 						self.usage("invalid option '%s'" % arg)
 					setWarningLevel(level)
 					if level > 0:
-						SimData.log().setLogLevels(SimData.LOG_ALL, SimData.LOG_WARNING)
+						SimData.log().setLogPriority(SimData.LOG_WARNING)
+						SimData.log().setLogCategory(SimData.LOG_ALL)
 				elif arg.startswith('--debug='):
 					try:
 						level = int(arg[8:])
@@ -222,9 +224,11 @@
 						self.usage("invalid option '%s'" % arg)
 					setDebugLevel(level)
 					if level > 1:
-						SimData.log().setLogLevels(SimData.LOG_ALL, SimData.LOG_TRACE)
+						SimData.log().setLogPriority(SimData.LOG_TRACE)
+						SimData.log().setLogCategory(SimData.LOG_ALL)
 					elif level > 0:
-						SimData.log().setLogLevels(SimData.LOG_ALL, SimData.LOG_DEBUG)
+						SimData.log().setLogPriority(SimData.LOG_DEBUG)
+						SimData.log().setLogCategory(SimData.LOG_ALL)
 				elif arg == '--rebuild':
 					self.rebuild = 1
 				elif arg == '--force':

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

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

Author: delta
Date: 2005-01-03 02:38:31 -0800 (Mon, 03 Jan 2005)
New Revision: 1435

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Source/GameScreen.cpp
Log:
* Snapshot is now saved as jpeg.

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

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-01-02 09:17:56 UTC (rev 1434)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-01-03 10:38:31 UTC (rev 1435)
@@ -1,5 +1,9 @@
  Version 0.4.0 (in progress)
 ===========================
+
+2005-01-03: delta
+ * Snapshot is now saved as jpeg.
+ 
 2005-01-01: onsight
  * Fixed a sign error on the server time offset that made it impossible
    to correct significant clock skew between peers.  Also simplified the

Modified: trunk/CSP/CSPSim/Source/GameScreen.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/GameScreen.cpp	2005-01-02 09:17:56 UTC (rev 1434)
+++ trunk/CSP/CSPSim/Source/GameScreen.cpp	2005-01-03 10:38:31 UTC (rev 1435)
@@ -106,10 +106,9 @@
 		return day + '-' + hour;
 	}
 public:
-	// XXX: next release of osg should allow saving to jpg instead of bmp
-	SnapImageDrawCallback(const std::string& filename = "CSP",const std::string& ext = ".bmp"):
+	SnapImageDrawCallback(const std::string& filename = "CSP",const std::string& ext = ".jpg"):
         m_Filename(filename),
-		m_Ext(".bmp"),
+		m_Ext(ext),
         m_SnapImageOnNextFrame(false){
     }
     void setSnapImageOnNextFrame(bool flag) {
@@ -130,7 +129,7 @@
 			osg::ref_ptr<osg::Image> image = new osg::Image;
 			image->readPixels(x,y,width,height,GL_RGB,GL_UNSIGNED_BYTE);
 
-			// save the file in the form CSPScreenmmddyy-hhmmss.ext
+			// save the file in the form CSPmmddyy-hhmmss.ext
 			osgDB::writeImageFile(*image,m_Filename + getDate() + m_Ext);
 			m_SnapImageOnNextFrame = false;
 		}
@@ -187,6 +186,10 @@
 	m_OnPlayerJoin(this, &GameScreen::onPlayerJoin),
 	m_OnPlayerQuit(this, &GameScreen::onPlayerQuit)
 {
+	//typedef void (GameScreen::*OPJ)(int, const std::string&);
+	//OPJ opj;
+	//m_OnPlayerJoin = simcore::ScopedCallback2<int, const std::string&>(this, opj);
+	//m_OnPlayerQuit = simcore::ScopedCallback2(this, &GameScreen::onPlayerQuit);
 	initInterface();
 }
 

[Csp-commits] svn:csp r1434 - trunk/CSP/CSPSim/Include/Systems

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

Author: mkrose
Date: 2005-01-02 01:17:56 -0800 (Sun, 02 Jan 2005)
New Revision: 1434

Modified:
   trunk/CSP/CSPSim/Include/Systems/AircraftSimpleFCS.h
Log:
Fix a minor warning (non virtual dtor).

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

Modified: trunk/CSP/CSPSim/Include/Systems/AircraftSimpleFCS.h
===================================================================
--- trunk/CSP/CSPSim/Include/Systems/AircraftSimpleFCS.h	2005-01-02 08:46:28 UTC (rev 1433)
+++ trunk/CSP/CSPSim/Include/Systems/AircraftSimpleFCS.h	2005-01-02 09:17:56 UTC (rev 1434)
@@ -44,6 +44,7 @@
 		double m_Limit0, m_Limit1, m_Limit;
 	public:
 		Deflection(): m_Rate(0.5), m_Limit0(-0.3), m_Limit1(-m_Limit0), m_Limit(m_Limit1) {}
+		virtual ~Deflection() {}
 		void setParameters(double rate, double limit) {
 			limit = std::abs(limit);
 			setParameters(rate,-limit,limit);

[Csp-commits] svn:csp r1433 - trunk/CSP/SimNet

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

Author: mkrose
Date: 2005-01-02 00:46:28 -0800 (Sun, 02 Jan 2005)
New Revision: 1433

Modified:
   trunk/CSP/SimNet/PeerInfo.cpp
   trunk/CSP/SimNet/PeerInfo.h
Log:
More tweaks to clock skew measurement.  Undo part of the last change
to increase the ping rate initially; slower pings are actually better.
This is because all the high cost operations when the sim first starts
interfere with timing measurements.  By receiving fewer pings during
startup, we have fewer bad measurements and quicker convergence to the
true time offset.  Also wait for a couple extra pings before increasing
the filtering time constant.  (This is all just a bandaid for now.)

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

Modified: trunk/CSP/SimNet/PeerInfo.cpp
===================================================================
--- trunk/CSP/SimNet/PeerInfo.cpp	2005-01-01 11:56:14 UTC (rev 1432)
+++ trunk/CSP/SimNet/PeerInfo.cpp	2005-01-02 08:46:28 UTC (rev 1433)
@@ -308,9 +308,10 @@
 	correction = m_time_skew_history.add(correction);
 	m_time_skew = m_time_skew * m_time_filter + correction * (1.0 - m_time_filter);
 	m_last_ping_latency = ping_latency;
+	//std::cout << "PING TIME SKEW: " << correction << ", " << m_time_skew << ", " << m_time_skew_history.count() << ", " << m_time_filter << "\n";
 
 	// wait for a few values to arrive before increasing the filter time constant
-	if (m_time_skew_history.count() >= 7) {
+	if (m_time_skew_history.count() >= 9) {
 		if (m_time_filter < 0.9999) {
 			m_time_filter += (1.0 - m_time_filter) * 0.1;
 		}

Modified: trunk/CSP/SimNet/PeerInfo.h
===================================================================
--- trunk/CSP/SimNet/PeerInfo.h	2005-01-01 11:56:14 UTC (rev 1432)
+++ trunk/CSP/SimNet/PeerInfo.h	2005-01-02 08:46:28 UTC (rev 1433)
@@ -192,7 +192,7 @@
 	inline bool needsPing() {
 		// ping quickly at first to help establish a stable time offset; and at
 		// least occasionally after that.
-		const double ping_limit = (m_connect_time < 20.0 ? 0.5 : 10.0);
+		const double ping_limit = (m_connect_time < 30.0 ? 1.0 : 10.0);
 		const double quiet_limit = (hasPendingConfirmations() ? 0.0 : 0.5);
 		bool ping = (m_quiet_time > quiet_limit || m_ping_time > ping_limit);
 		if (ping) m_ping_time = 0.0;

[Csp-commits] svn:csp r1432 - trunk/CSP/SimNet

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

Author: mkrose
Date: 2005-01-01 03:56:14 -0800 (Sat, 01 Jan 2005)
New Revision: 1432

Modified:
   trunk/CSP/SimNet/PeerInfo.cpp
   trunk/CSP/SimNet/PeerInfo.h
Log:
More timing changes.  Wait to accumulate more time skew samples before
increasing the filter time constant.  Together with faster pings after
the initial connection, this should yield better convergence on the
true time offset.

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

Modified: trunk/CSP/SimNet/PeerInfo.cpp
===================================================================
--- trunk/CSP/SimNet/PeerInfo.cpp	2005-01-01 10:52:11 UTC (rev 1431)
+++ trunk/CSP/SimNet/PeerInfo.cpp	2005-01-01 11:56:14 UTC (rev 1432)
@@ -308,12 +308,16 @@
 	correction = m_time_skew_history.add(correction);
 	m_time_skew = m_time_skew * m_time_filter + correction * (1.0 - m_time_filter);
 	m_last_ping_latency = ping_latency;
-	if (m_time_filter < 0.9999) {
-		m_time_filter += (1.0 - m_time_filter) * 0.1;
+
+	// wait for a few values to arrive before increasing the filter time constant
+	if (m_time_skew_history.count() >= 7) {
+		if (m_time_filter < 0.9999) {
+			m_time_filter += (1.0 - m_time_filter) * 0.1;
+		}
+		if (m_time_filter > 0.9999) {
+			m_time_filter = 0.9999;
+		}
 	}
-	if (m_time_filter > 0.9999) {
-		m_time_filter = 0.9999;
-	}
 	//std::cout << "clock skew = " << m_time_skew << "\n";
 	//std::cout << "round trip = " << m_roundtrip_latency << "\n";
 }

Modified: trunk/CSP/SimNet/PeerInfo.h
===================================================================
--- trunk/CSP/SimNet/PeerInfo.h	2005-01-01 10:52:11 UTC (rev 1431)
+++ trunk/CSP/SimNet/PeerInfo.h	2005-01-01 11:56:14 UTC (rev 1432)
@@ -192,7 +192,7 @@
 	inline bool needsPing() {
 		// ping quickly at first to help establish a stable time offset; and at
 		// least occasionally after that.
-		const double ping_limit = (m_connect_time < 20.0 ? 1.0 : 10.0);
+		const double ping_limit = (m_connect_time < 20.0 ? 0.5 : 10.0);
 		const double quiet_limit = (hasPendingConfirmations() ? 0.0 : 0.5);
 		bool ping = (m_quiet_time > quiet_limit || m_ping_time > ping_limit);
 		if (ping) m_ping_time = 0.0;

[Csp-commits] svn:csp r1431 - in trunk/CSP: CSPSim CSPSim/Include CSPSim/Source SimCore/Battlefield SimNet

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

Author: mkrose
Date: 2005-01-01 02:52:11 -0800 (Sat, 01 Jan 2005)
New Revision: 1431

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Include/Controller.h
   trunk/CSP/CSPSim/Source/CSPSim.cpp
   trunk/CSP/CSPSim/Source/Controller.cpp
   trunk/CSP/SimCore/Battlefield/BattlefieldMessages.net
   trunk/CSP/SimCore/Battlefield/GlobalBattlefield.h
   trunk/CSP/SimCore/Battlefield/LocalBattlefield.cpp
   trunk/CSP/SimNet/ClientServer.cpp
   trunk/CSP/SimNet/ClientServer.h
   trunk/CSP/SimNet/RecordCodec.cpp
Log:
Fixed a sign error on the server time offset that made it impossible
to correct significant clock skew between peers.  Also simplified the
(broken) timestamp logic for object updates, under the assumption that
the clock skew correction will do the right thing.  Shouldn't be any
worse that before at least.  Also added a timestamp to join requests
so that the index server can deny clients that are too far out of
sync.  Note that all clients and servers need to be rebuilt to
communicate correctly!

Added update throttling based on acceleration.  Still experimental,
and in need of tuning.

Added a config variable to set the logfile for network messages, as
opposed to stderr.

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

Diff omitted (13414 bytes).

[Csp-commits] svn:csp r1430 - trunk/CSP/CSPSim/Source

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

Author: delta
Date: 2005-01-01 02:36:58 -0800 (Sat, 01 Jan 2005)
New Revision: 1430

Modified:
   trunk/CSP/CSPSim/Source/ScreenInfo.cpp
Log:
* Make quiet a gcc warning.

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

Modified: trunk/CSP/CSPSim/Source/ScreenInfo.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ScreenInfo.cpp	2004-12-31 23:58:11 UTC (rev 1429)
+++ trunk/CSP/CSPSim/Source/ScreenInfo.cpp	2005-01-01 10:36:58 UTC (rev 1430)
@@ -79,8 +79,8 @@
 	m_FontSize(20),
 	//m_CharacterSize(14),
 	m_CharacterSize(11),
-	m_Text(makeText(pos_x,pos_y - m_CharacterSize, text)),
-	m_InfoGeode(new osg::Geode) {
+	m_InfoGeode(new osg::Geode),
+	m_Text(makeText(pos_x,pos_y - m_CharacterSize, text)) {
 		m_InfoGeode->addDrawable(m_Text.get());
 		setName(name);
 		// HACK to prevent text from disappearing when chunklod multitexture details

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

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

Author: delta
Date: 2004-12-31 15:58:11 -0800 (Fri, 31 Dec 2004)
New Revision: 1429

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml
   trunk/CSP/CSPSim/Source/AircraftPhysicsModel.cpp
   trunk/CSP/CSPSim/Source/Console.cpp
   trunk/CSP/CSPSim/Source/ConsoleCommands.cpp
   trunk/CSP/CSPSim/Source/ObjectModel.cpp
   trunk/CSP/CSPSim/Source/ScreenInfo.cpp
   trunk/CSP/CSPSim/Source/ScreenInfoManager.cpp
   trunk/CSP/CSPSim/Source/SmokeEffects.cpp
   trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj
Log:
* Linked the release vesrion against pthreadVC1.lib.
* Removed 0SG096 tag in the source files.

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

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2004-12-31 23:53:37 UTC (rev 1428)
+++ trunk/CSP/CSPSim/CHANGES.current	2004-12-31 23:58:11 UTC (rev 1429)
@@ -1,6 +1,11 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2004-12-26: delta
+ * Linked the release vesrion against pthreadVC1.lib.
+ 
+ * Removed 0SG096 tag in the source files.
+
 2004-12-22: onsight
  * Rename new .3DS models to .3ds to match the XML path.
 

Modified: trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml	2004-12-31 23:53:37 UTC (rev 1428)
+++ trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml	2004-12-31 23:58:11 UTC (rev 1429)
@@ -84,7 +84,7 @@
 	<!--Float name="cl_dh">0.62</Float-->
 
 	<!-- Pitch Moment Parameters -->
-	<Float name="cm0">0.0001</Float>
+	<Float name="cm0">-0.001</Float>
 	<Float name="cm_a">-1.33</Float>
 	<Float name="cm_adot">-3.61</Float>
 	<Float name="cm_q">-53</Float><!-- <0 -->

Modified: trunk/CSP/CSPSim/Source/AircraftPhysicsModel.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/AircraftPhysicsModel.cpp	2004-12-31 23:53:37 UTC (rev 1428)
+++ trunk/CSP/CSPSim/Source/AircraftPhysicsModel.cpp	2004-12-31 23:58:11 UTC (rev 1429)
@@ -112,8 +112,8 @@
 void AircraftPhysicsModel::doSimStep(double dt) {
 
 	if (dt == 0.0) dt = 0.017;
-	//unsigned short n = std::min<unsigned short>(6,static_cast<unsigned short>(180 * dt)) + 1;
-	unsigned short n = 15*std::min<unsigned short>(1,static_cast<unsigned short>(210*dt)) + 1;
+	unsigned short n = std::min<unsigned short>(6,static_cast<unsigned short>(180 * dt)) + 1;
+	//unsigned short n = 15*std::min<unsigned short>(1,static_cast<unsigned short>(210*dt)) + 1;
 	double dtlocal = dt/n;
 	std::for_each(m_Dynamics.begin(),m_Dynamics.end(),InitializeSimulationStep(dtlocal));
 

Modified: trunk/CSP/CSPSim/Source/Console.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Console.cpp	2004-12-31 23:53:37 UTC (rev 1428)
+++ trunk/CSP/CSPSim/Source/Console.cpp	2004-12-31 23:58:11 UTC (rev 1429)
@@ -109,11 +109,7 @@
 
 void Console::_setFont(osg::ref_ptr<osgText::Text> &text, std::string const &font, int size) {
 	text->setFont(font);
-#ifdef OSG096
-	text->setFontSize(size, size);
-#else
 	text->setFontResolution(size, size);
-#endif // OSG096
 	text->setCharacterSize(size, 1.0);
 	text->setColor(osg::Vec4(1, 1, 1, 1));
 	text->setAlignment(osgText::Text::LEFT_TOP);

Modified: trunk/CSP/CSPSim/Source/ConsoleCommands.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ConsoleCommands.cpp	2004-12-31 23:53:37 UTC (rev 1428)
+++ trunk/CSP/CSPSim/Source/ConsoleCommands.cpp	2004-12-31 23:58:11 UTC (rev 1429)
@@ -56,11 +56,7 @@
 
 	setMatrix(osg::Matrix::ortho2D(0, ScreenWidth, 0, ScreenHeight));
 	m_ModelViewAbs = new osg::MatrixTransform;
-#ifdef OSG096
-	m_ModelViewAbs->setReferenceFrame(osg::Transform::RELATIVE_TO_ABSOLUTE);
-#else
 	m_ModelViewAbs->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
-#endif // OSG096
 	m_ModelViewAbs->setMatrix(osg::Matrix::identity());
 	addChild(m_ModelViewAbs.get());
 

Modified: trunk/CSP/CSPSim/Source/ObjectModel.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ObjectModel.cpp	2004-12-31 23:53:37 UTC (rev 1428)
+++ trunk/CSP/CSPSim/Source/ObjectModel.cpp	2004-12-31 23:58:11 UTC (rev 1429)
@@ -35,11 +35,7 @@
 #include <osgDB/ReadFile>
 #include <osgFX/SpecularHighlights>
 #include <osgUtil/SmoothingVisitor>
-#ifdef OSG096
-#include <osgUtil/DisplayListVisitor>
-#else
 #include <osgUtil/GLObjectsVisitor>
-#endif
 #include <osgUtil/Optimizer>
 #include <osg/CullFace>
 #include <osg/NodeVisitor>
@@ -197,12 +193,8 @@
 		osg::StateSet::TextureAttributeList& attr = set->getTextureAttributeList();
 		osg::StateSet::TextureAttributeList::iterator i;
 		for (i = attr.begin(); i != attr.end(); i++) {
-#ifdef OSG096
-			osg::StateSet::AttributeList::iterator tex = i->find(osg::StateAttribute::TEXTURE);
-#else
 			// TODO don't we need to consider other members within the TEXTURE group?
 			osg::StateSet::AttributeList::iterator tex = i->find(osg::StateAttribute::TypeMemberPair(osg::StateAttribute::TEXTURE, 0));
-#endif // OSG096
 			if (tex != i->end()) {
 				osg::Texture* texture = dynamic_cast<osg::Texture*>(tex->second.first.get());
 				if (texture) {
@@ -424,19 +416,11 @@
 
 	osg::ref_ptr<osg::State> state = new osg::State;
 
-#ifdef OSG096
-	osgUtil::DisplayListVisitor dlv(osgUtil::DisplayListVisitor::COMPILE_DISPLAY_LISTS);
-	dlv.setState(state.get());
-	dlv.setNodeMaskOverride(0xffffffff);
-	m_Model->accept(dlv);
-	m_DebugMarkers->accept(dlv);
-#else
 	osgUtil::GLObjectsVisitor ov;
 	ov.setState(state.get());
 	ov.setNodeMaskOverride(0xffffffff);
 	m_Model->accept(ov);
 	m_DebugMarkers->accept(ov);
-#endif // OSG096
 
 	// XXX: there is a really weird bug on vs with the optimizer:
 	// 1) it rarely appears in the release built (never when called from this exact line)
@@ -449,10 +433,10 @@
 	// 4) The bug only occurs when CSP is run from command line or clicking CSPSim.py;
 	//    it never occurs when running csp in debug mode from the ide.
 	// 5) I'm unable to trace it :)
-	CSP_LOG(APP, DEBUG, "LoadModel: Optimizer run");
-	osgUtil::Optimizer opt;
-	opt.optimize(m_Model.get());
-	CSP_LOG(APP, DEBUG, "LoadModel: Optimizer done");
+	//CSP_LOG(APP, DEBUG, "LoadModel: Optimizer run");
+	//osgUtil::Optimizer opt;
+	//opt.optimize(m_Model.get());
+	//CSP_LOG(APP, DEBUG, "LoadModel: Optimizer done");
 }
 
 void ObjectModel::addContactMarkers() {
@@ -559,11 +543,7 @@
 
 	m_Label = new osgText::Text();
 	m_Label->setFont("screeninfo.ttf");
-#ifdef OSG096
-	m_Label->setFontSize(16, 16);
-#else
 	m_Label->setFontResolution(16, 16);
-#endif // OSG096
 	m_Label->setColor(osg::Vec4(0.3f, 0.4f, 1.0f, 1.0f));
 	m_Label->setCharacterSize(100.0, 1.0);
 	m_Label->setPosition(osg::Vec3(6, 0, 0));
@@ -576,11 +556,7 @@
 	label->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
 	//setMatrix(osg::Matrix::ortho2D(0,ScreenWidth,0,ScreenHeight));
 	osg::MatrixTransform *m_modelview_abs = new osg::MatrixTransform;
-#ifdef OSG096
-	m_modelview_abs->setReferenceFrame(osg::Transform::RELATIVE_TO_ABSOLUTE);
-#else
 	m_modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
-#endif // OSG096
 	m_modelview_abs->setMatrix(osg::Matrix::identity());
 	m_modelview_abs->addChild(label);
 

Modified: trunk/CSP/CSPSim/Source/ScreenInfo.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ScreenInfo.cpp	2004-12-31 23:53:37 UTC (rev 1428)
+++ trunk/CSP/CSPSim/Source/ScreenInfo.cpp	2004-12-31 23:58:11 UTC (rev 1429)
@@ -95,11 +95,7 @@
 osgText::Text *ScreenInfo::makeText(float pos_x, float pos_y, std::string const &string_text) {
 	osgText::Text *text = new osgText::Text;
 	text->setFont(m_TTFPath);
-#ifdef OSG096
-	text->setFontSize(m_FontSize, m_FontSize);
-#else
 	text->setFontResolution(m_FontSize, m_FontSize);
-#endif // OSG096
 	text->setColor(osg::Vec4(1.0f, 1.0f, 1.0f, 1.0f));
 	text->setCharacterSize(m_CharacterSize, 1.0);
 	text->setPosition(osg::Vec3(pos_x, pos_y, 0));

Modified: trunk/CSP/CSPSim/Source/ScreenInfoManager.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ScreenInfoManager.cpp	2004-12-31 23:53:37 UTC (rev 1428)
+++ trunk/CSP/CSPSim/Source/ScreenInfoManager.cpp	2004-12-31 23:58:11 UTC (rev 1429)
@@ -54,11 +54,7 @@
 	setMatrix(osg::Matrix::ortho2D(0,ScreenWidth,0,ScreenHeight));
 
 	m_modelview_abs = new osg::MatrixTransform;
-#ifdef OSG096
-	m_modelview_abs->setReferenceFrame(osg::Transform::RELATIVE_TO_ABSOLUTE);
-#else
 	m_modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
-#endif // OSG096
 	m_modelview_abs->setMatrix(osg::Matrix::identity());
 
 	set2dScene(m_modelview_abs,ScreenWidth,ScreenHeight);

Modified: trunk/CSP/CSPSim/Source/SmokeEffects.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SmokeEffects.cpp	2004-12-31 23:53:37 UTC (rev 1428)
+++ trunk/CSP/CSPSim/Source/SmokeEffects.cpp	2004-12-31 23:58:11 UTC (rev 1429)
@@ -140,11 +140,7 @@
 				P->setVelocity(simdata::toOSG(wind) + push.get_random());
 				place += d_place;
 				wind += d_wind;
-#ifdef OSG096
-				if (getReferenceFrame() == RELATIVE_TO_PARENTS) {
-#else
 				if (getReferenceFrame() == RELATIVE_RF) {
-#endif // OSG096
 					P->transformPositionVelocity(getLocalToWorldMatrix());
 					//P->transformPositionVelocity(getWorldToLocalMatrix());
 				}

Modified: trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj
===================================================================
--- trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj	2004-12-31 23:53:37 UTC (rev 1428)
+++ trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj	2004-12-31 23:58:11 UTC (rev 1429)
@@ -123,7 +123,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="pthreadVC.lib SimNet.lib ws2_32.lib ccgnu2.lib osgFX.lib osgChunkLod.lib producer.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib sigc-1.2.lib OpenThreadsWin32.lib ccext2.lib SpatialIndex.lib SimCore.lib"
+				AdditionalDependencies="pthreadVC1.lib SimNet.lib ws2_32.lib ccgnu2.lib osgFX.lib osgChunkLod.lib producer.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib sigc-1.2.lib OpenThreadsWin32.lib ccext2.lib SpatialIndex.lib SimCore.lib"
 				OutputFile="../../Bin/_cCSP.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"