csp-commits Mailing List for The Combat Simulator Project (Page 20)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

I dont think that this tune would make the galactic top ten but it


Cheap Vl x AG x RA http://www.masedionkadegfunjas.com

=20
=20
guards to the rear tapped me on the shoulder.


Author: mkrose
Date: 2006-10-25 00:39:07 -0700 (Wed, 25 Oct 2006)
New Revision: 2001

Modified:
   trunk/csp/csplib/util/LogConstants.h
   trunk/csp/cspsim/battlefield/SimObject.h
Log:
Fix integer overflow warnings under gcc 4.1.

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

Modified: trunk/csp/csplib/util/LogConstants.h
===================================================================

--- trunk/csp/csplib/util/LogConstants.h	2006-10-13 18:36:26 UTC (rev 2000)
+++ trunk/csp/csplib/util/LogConstants.h	2006-10-25 07:39:07 UTC (rev 2001)
@@ -80,7 +80,7 @@
 
 	// groups
 	cLogCategory_NONE         = 0x00000000,
-	cLogCategory_ALL          = 0xffffffff
+	cLogCategory_ALL          = 0x7fffffff
 };
 
 CSP_NAMESPACE_END

Modified: trunk/csp/cspsim/battlefield/SimObject.h
===================================================================
--- trunk/csp/cspsim/battlefield/SimObject.h	2006-10-13 18:36:26 UTC (rev 2000)
+++ trunk/csp/cspsim/battlefield/SimObject.h	2006-10-25 07:39:07 UTC (rev 2001)
@@ -78,11 +78,11 @@
 	std::vector<ObjectId> m_ContactList;
 	uint32 m_ContactSignature;
 
-	inline void setFlags(int flag, bool on) {
+	inline void setFlags(unsigned flag, bool on) {
 		if (on) m_Flags |= flag; else m_Flags &= ~flag;
 	}
 
-	inline int getFlags(int flags) const {
+	inline int getFlags(unsigned flags) const {
 		return m_Flags & flags;
 	}
 




Hi,

VluAGRA for LESS http://www.cadesinkadefunpalion.com

=20
twitching silence while I used the detector, borrowed from Tremearne,
slumworld. Think quickly, Jim, before things get any worse.


Author: stormbringer
Date: 2006-10-13 11:36:26 -0700 (Fri, 13 Oct 2006)
New Revision: 2000

Modified:
   trunk/csp/bin/test_objects
Log:
Correct initial position of F16 to avoid budding out of the ground. Thanks Henrik!

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

Modified: trunk/csp/bin/test_objects
===================================================================
--- trunk/csp/bin/test_objects	2006-10-04 03:58:40 UTC (rev 1999)
+++ trunk/csp/bin/test_objects	2006-10-13 18:36:26 UTC (rev 2000)
@@ -1,55 +1,55 @@
-# -*- python -*-
-
-# Combat Simulator Project
-# Copyright (C) 2002 The Combat Simulator Project
-# http://csp.sourceforge.net
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-
-# Create some test vehicles and other objects. The first vehicle created
-# will be the initial active object.  This is a temporary hack until the
-# theater code is developed to the point that objects are generated
-# automatically via a campaign engine.
-
-# shorthand
-
-vec = csp.csplib.Vector3
-vehicle = sim.createVehicle
-
-m2k = "sim:vehicles.aircraft.m2k"
-f16dj = "sim:vehicles.aircraft.f16dj"
-
-
-def createBalkan():
-	vehicle(f16dj, vec(-29495, -10530, 87.8), vec(0, 0, 0), vec(0.0, 0.0, 180.0))
-	vehicle(f16dj, vec(-29510, -10530, 87.8), vec(0, 0, 0), vec(0.0, 0.0, 180.0))
-
-def createNCA():
-	vehicle(m2k, vec(0, 0, 1200.0), vec(0, 100.0, 0), vec(5.0, 0.0, 0.0))
-	vehicle(f16dj, vec(10, 10, 1000.2), vec(0, 100.0, 0), vec(2.0, 2.0, 140.0))
-
-def unknown():
-	print "Unrecognized terrain name: %s" % sim.getTerrainName()
-
-
-dispatch = {
-	"Balkan Terrain": createBalkan,
-	"NCA Terrain": createNCA,
-}
-
-create = dispatch.get(sim.getTerrainName(), unknown)
-create()
-
+# -*- python -*-
+
+# Combat Simulator Project
+# Copyright (C) 2002 The Combat Simulator Project
+# http://csp.sourceforge.net
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+# Create some test vehicles and other objects. The first vehicle created
+# will be the initial active object.  This is a temporary hack until the
+# theater code is developed to the point that objects are generated
+# automatically via a campaign engine.
+
+# shorthand
+
+vec = csp.csplib.Vector3
+vehicle = sim.createVehicle
+
+m2k = "sim:vehicles.aircraft.m2k"
+f16dj = "sim:vehicles.aircraft.f16dj"
+
+
+def createBalkan():
+	vehicle(f16dj, vec(-29495, -10530, 91.1), vec(0, 0, 0), vec(0.0, 0.0, 180.0)) 
+	vehicle(f16dj, vec(-29510, -10530, 91.1), vec(0, 0, 0), vec(0.0, 0.0, 180.0)) 
+
+def createNCA():
+	vehicle(m2k, vec(0, 0, 1200.0), vec(0, 100.0, 0), vec(5.0, 0.0, 0.0))
+	vehicle(f16dj, vec(10, 10, 1000.2), vec(0, 100.0, 0), vec(2.0, 2.0, 140.0))
+
+def unknown():
+	print "Unrecognized terrain name: %s" % sim.getTerrainName()
+
+
+dispatch = {
+	"Balkan Terrain": createBalkan,
+	"NCA Terrain": createNCA,
+}
+
+create = dispatch.get(sim.getTerrainName(), unknown)
+create()
+




Author: mkrose
Date: 2006-10-03 20:58:40 -0700 (Tue, 03 Oct 2006)
New Revision: 1999

Modified:
   trunk/csp/cspsim/ai/AircraftTask.h
   trunk/csp/cspsim/ai/TakeoffTask.h
Log:
Add missing virtual modifiers in AircraftTask.  Fixes a bug
in TakeoffTask that could cause the sim to hang.

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

Modified: trunk/csp/cspsim/ai/AircraftTask.h
===================================================================
--- trunk/csp/cspsim/ai/AircraftTask.h	2006-10-03 06:36:12 UTC (rev 1998)
+++ trunk/csp/cspsim/ai/AircraftTask.h	2006-10-04 03:58:40 UTC (rev 1999)
@@ -29,8 +29,8 @@
 
 class AircraftTask: public Task {
 public:
-	void bind(AircraftControl *ai);
-	void setRunway(Runway const *runway);
+	virtual void bind(AircraftControl *ai);
+	virtual void setRunway(Runway const *runway);
 protected:
 	AircraftTask(const char *name);
 	virtual ~AircraftTask();
@@ -38,7 +38,7 @@
 	AircraftControl *ai() { return m_AircraftControl.get(); }
 	Runway const *runway() { return m_Runway.get(); }
 
-	bool checkDive();
+	virtual bool checkDive();
 	virtual void init();
 
 private:

Modified: trunk/csp/cspsim/ai/TakeoffTask.h
===================================================================
--- trunk/csp/cspsim/ai/TakeoffTask.h	2006-10-03 06:36:12 UTC (rev 1998)
+++ trunk/csp/cspsim/ai/TakeoffTask.h	2006-10-04 03:58:40 UTC (rev 1999)
@@ -27,7 +27,7 @@
 class TakeoffTask: public AircraftTask {
 public:
 	TakeoffTask();
-	void setRunway(Runway const *runway);
+	virtual void setRunway(Runway const *runway);
 
 private:
 	enum {




Author: mkrose
Date: 2006-10-02 23:36:12 -0700 (Mon, 02 Oct 2006)
New Revision: 1998

Modified:
   trunk/csp/cspsim/hud/DisplayTools.cpp
Log:
Fix build error under OSG 1.1 and 1.2.

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

Modified: trunk/csp/cspsim/hud/DisplayTools.cpp
===================================================================
--- trunk/csp/cspsim/hud/DisplayTools.cpp	2006-10-03 04:19:53 UTC (rev 1997)
+++ trunk/csp/cspsim/hud/DisplayTools.cpp	2006-10-03 06:36:12 UTC (rev 1998)
@@ -30,6 +30,7 @@
 #include <osg/Geometry>
 #include <osg/LineStipple>
 #include <osg/LineWidth>
+#include <osg/Version>
 
 #include <cassert>
 
@@ -181,7 +182,11 @@
 }
 
 void Element::clear() {
+#if OSG_VERSION_MAJOR == 1 && OSG_VERSION_MINOR > 0
+	geode()->removeDrawables(0, geode()->getNumDrawables());
+#else
 	geode()->removeDrawable(0, geode()->getNumDrawables());
+#endif
 }
 
 void Element::setLineWidth(double width) {




Author: mkrose
Date: 2006-10-02 21:19:53 -0700 (Mon, 02 Oct 2006)
New Revision: 1997

Modified:
   trunk/csp/csplib/util/Signal.h
   trunk/csp/cspsim/Shader.cpp
   trunk/csp/cspsim/ai/Runway.h
   trunk/csp/cspsim/ai/StateMachine.cpp
   trunk/csp/cspsim/sky/StarDome.cpp
Log:
Fix various compile errors under MSVC.  Patches contributed
by nmoooose.

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

Modified: trunk/csp/csplib/util/Signal.h
===================================================================
--- trunk/csp/csplib/util/Signal.h	2006-10-02 06:43:50 UTC (rev 1996)
+++ trunk/csp/csplib/util/Signal.h	2006-10-03 04:19:53 UTC (rev 1997)
@@ -27,74 +27,82 @@
 CSP_NAMESPACE
 
 template <class ret>
-struct signal<ret, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::signal<ret> { };
+class signal<ret, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::signal<ret> { };
 
 template <class ret, class arg1>
-struct signal<ret, arg1, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::signal<ret, arg1> { };
+class signal<ret, arg1, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::signal<ret, arg1> { };
 
 template <class ret, class arg1, class arg2>
-struct signal<ret, arg1, arg2, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::signal<ret, arg1, arg2> { };
+class signal<ret, arg1, arg2, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::signal<ret, arg1, arg2> { };
 
 template <class ret, class arg1, class arg2, class arg3>
-struct signal<ret, arg1, arg2, arg3, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::signal<ret, arg1, arg2, arg3> { };
+class signal<ret, arg1, arg2, arg3, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::signal<ret, arg1, arg2, arg3> { };
 
 template <class ret, class arg1, class arg2, class arg3, class arg4>
-struct signal<ret, arg1, arg2, arg3, arg4, sigc::nil, sigc::nil, sigc::nil>: public sigc::signal<ret, arg1, arg2, arg3, arg4> { };
+class signal<ret, arg1, arg2, arg3, arg4, sigc::nil, sigc::nil, sigc::nil>: public sigc::signal<ret, arg1, arg2, arg3, arg4> { };
 
 template <class ret, class arg1, class arg2, class arg3, class arg4, class arg5>
-struct signal<ret, arg1, arg2, arg3, arg4, arg5, sigc::nil, sigc::nil>: public sigc::signal<ret, arg1, arg2, arg3, arg4, arg5> { };
+class signal<ret, arg1, arg2, arg3, arg4, arg5, sigc::nil, sigc::nil>: public sigc::signal<ret, arg1, arg2, arg3, arg4, arg5> { };
 
 template <class ret, class arg1, class arg2, class arg3, class arg4, class arg5, class arg6>
-struct signal<ret, arg1, arg2, arg3, arg4, arg5, arg6, sigc::nil>: public sigc::signal<ret, arg1, arg2, arg3, arg4, arg5, arg6> { };
+class signal<ret, arg1, arg2, arg3, arg4, arg5, arg6, sigc::nil>: public sigc::signal<ret, arg1, arg2, arg3, arg4, arg5, arg6> { };
 
 template <class ret, class arg1, class arg2, class arg3, class arg4, class arg5, class arg6, class arg7>
-struct signal: public sigc::signal<ret, arg1, arg2, arg3, arg4, arg5, arg6, arg7> { };
+class signal: public sigc::signal<ret, arg1, arg2, arg3, arg4, arg5, arg6, arg7> { };
 
 
 template <class ret, class arg1, class arg2, class arg3, class arg4, class arg5, class arg6, class arg7>
-struct slot: public sigc::slot<ret, arg1, arg2, arg3, arg4, arg5, arg6, arg7> {
+class slot: public sigc::slot<ret, arg1, arg2, arg3, arg4, arg5, arg6, arg7> {
+public:
 	slot() {}
 	template <class functor> slot(const functor &f): sigc::slot<ret, arg1, arg2, arg3, arg4, arg5, arg6, arg7>(f) {}
 };
 
 template <class ret, class arg1, class arg2, class arg3, class arg4, class arg5, class arg6>
-struct slot<ret, arg1, arg2, arg3, arg4, arg5, arg6, sigc::nil>: public sigc::slot<ret, arg1, arg2, arg3, arg4, arg5, arg6> {
+class slot<ret, arg1, arg2, arg3, arg4, arg5, arg6, sigc::nil>: public sigc::slot<ret, arg1, arg2, arg3, arg4, arg5, arg6> {
+public:
 	slot() {}
 	template <class functor> slot(const functor &f): sigc::slot<ret, arg1, arg2, arg3, arg4, arg5, arg6>(f) {}
 };
 
 template <class ret, class arg1, class arg2, class arg3, class arg4, class arg5>
-struct slot<ret, arg1, arg2, arg3, arg4, arg5, sigc::nil, sigc::nil>: public sigc::slot<ret, arg1, arg2, arg3, arg4, arg5> {
+class slot<ret, arg1, arg2, arg3, arg4, arg5, sigc::nil, sigc::nil>: public sigc::slot<ret, arg1, arg2, arg3, arg4, arg5> {
+public:
 	slot() {}
 	template <class functor> slot(const functor &f): sigc::slot<ret, arg1, arg2, arg3, arg4, arg5>(f) {}
 };
 
 template <class ret, class arg1, class arg2, class arg3, class arg4>
-struct slot<ret, arg1, arg2, arg3, arg4, sigc::nil, sigc::nil, sigc::nil>: public sigc::slot<ret, arg1, arg2, arg3, arg4> {
+class slot<ret, arg1, arg2, arg3, arg4, sigc::nil, sigc::nil, sigc::nil>: public sigc::slot<ret, arg1, arg2, arg3, arg4> {
+public:
 	slot() {}
 	template <class functor> slot(const functor &f): sigc::slot<ret, arg1, arg2, arg3, arg4>(f) {}
 };
 
 template <class ret, class arg1, class arg2, class arg3>
-struct slot<ret, arg1, arg2, arg3, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::slot<ret, arg1, arg2, arg3> {
+class slot<ret, arg1, arg2, arg3, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::slot<ret, arg1, arg2, arg3> {
+public:
 	slot() {}
 	template <class functor> slot(const functor &f): sigc::slot<ret, arg1, arg2, arg3>(f) {}
 };
 
 template <class ret, class arg1, class arg2>
-struct slot<ret, arg1, arg2, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::slot<ret, arg1, arg2> {
+class slot<ret, arg1, arg2, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::slot<ret, arg1, arg2> {
+public:
 	slot() {}
 	template <class functor> slot(const functor &f): sigc::slot<ret, arg1, arg2>(f) {}
 };
 
 template <class ret, class arg1>
-struct slot<ret, arg1, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::slot<ret, arg1> {
+class slot<ret, arg1, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::slot<ret, arg1> {
+public:
 	slot() {}
 	template <class functor> slot(const functor &f): sigc::slot<ret, arg1>(f) {}
 };
 
 template <class ret>
-struct slot<ret, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::slot<ret> {
+class slot<ret, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil, sigc::nil>: public sigc::slot<ret> {
+public:
 	slot() {}
 	template <class functor> slot(const functor &f): sigc::slot<ret>(f) {}
 };

Modified: trunk/csp/cspsim/Shader.cpp
===================================================================
--- trunk/csp/cspsim/Shader.cpp	2006-10-02 06:43:50 UTC (rev 1996)
+++ trunk/csp/cspsim/Shader.cpp	2006-10-03 04:19:53 UTC (rev 1997)
@@ -187,7 +187,7 @@
 private:
 	void setCulling(osg::StateSet *ss) {
 		osg::StateSet::RefAttributePair const *attr = ss->getAttributePair(osg::StateAttribute::CULLFACE);
-		osg::CullFace *cullface = attr ? static_cast<const osg::CullFace*>(attr->first.get()) : 0;
+		const osg::CullFace *cullface = attr ? static_cast<const osg::CullFace*>(attr->first.get()) : 0;
 		if (cullface) {
 			bool on = ((attr->second & osg::StateAttribute::ON) != 0) && (cullface->getMode() == osg::CullFace::BACK);
 			ss->addUniform(Shader::instance()->cullface(on), attr->second);

Modified: trunk/csp/cspsim/ai/Runway.h
===================================================================
--- trunk/csp/cspsim/ai/Runway.h	2006-10-02 06:43:50 UTC (rev 1996)
+++ trunk/csp/cspsim/ai/Runway.h	2006-10-03 04:19:53 UTC (rev 1997)
@@ -28,7 +28,8 @@
 
 CSP_NAMESPACE
 
-struct Runway: public Referenced {
+class Runway: public Referenced {
+public:
 	Runway(): valid(false) {}
 	void init() {
 		direction.normalize();

Modified: trunk/csp/cspsim/ai/StateMachine.cpp
===================================================================
--- trunk/csp/cspsim/ai/StateMachine.cpp	2006-10-02 06:43:50 UTC (rev 1996)
+++ trunk/csp/cspsim/ai/StateMachine.cpp	2006-10-03 04:19:53 UTC (rev 1997)
@@ -20,6 +20,7 @@
 #include <csp/cspsim/ai/StateMachine.h>
 #include <csp/csplib/util/Signal.h>
 
+#include <cassert>
 #include <map>
 
 namespace {

Modified: trunk/csp/cspsim/sky/StarDome.cpp
===================================================================
--- trunk/csp/cspsim/sky/StarDome.cpp	2006-10-02 06:43:50 UTC (rev 1996)
+++ trunk/csp/cspsim/sky/StarDome.cpp	2006-10-03 04:19:53 UTC (rev 1997)
@@ -259,7 +259,7 @@
 
 	// prescale magnitudes to save work when updating point colors.  note that
 	// magnitude is used to control the alpha value when rendering the star.
-	star.ca = pow(10.0, - source[3]);
+	star.ca = pow(10.0f, - source[3]);
 }
 
 osg::Geode *StarDome::makeGeode() {




Author: mkrose
Date: 2006-10-01 23:43:50 -0700 (Sun, 01 Oct 2006)
New Revision: 1996

Modified:
   trunk/csp/tools/trc/trc_lex.py
Log:
Fix bug introduced in the last trc_lex edit.  Commented
out additional quote, langle, and rangle symbols.  Yacc
still complains about "6 shift/reduce conflicts" which
would be nice to fix.

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

Modified: trunk/csp/tools/trc/trc_lex.py
===================================================================
--- trunk/csp/tools/trc/trc_lex.py	2006-10-02 06:38:07 UTC (rev 1995)
+++ trunk/csp/tools/trc/trc_lex.py	2006-10-02 06:43:50 UTC (rev 1996)
@@ -88,11 +88,11 @@
 t_COLON = r':'
 t_COMMA = r','
 t_QUAL = r'::'
-t_QUOTE = r'"'
+#t_QUOTE = r'"'
 t_SHARP = r'\#'
 t_EQ = r'='
-t_LANGLE = r'<'
-t_RANGLE = r'>'
+#t_LANGLE = r'<'
+#t_RANGLE = r'>'
 t_LBRACE = r'{'
 t_RBRACE = r'}'
 t_LBRACKET = r'\['




Author: mkrose
Date: 2006-10-01 23:38:07 -0700 (Sun, 01 Oct 2006)
New Revision: 1995

Modified:
   trunk/csp/bin/test_objects
   trunk/csp/cspsim/battlefield/LocalBattlefield.cpp
Log:
Hack to force the second aircraft to be AI controlled.
The AI logic defaults to a hard-coded takeoff roll,
followed by navigation of several waypoints and landing.

Be sure to recompile the dar file (sim.py -c) before
running the sim.  The view can be switched to the AI
aircraft using the spacebar, and the AI aircraft can
be changed to an m2k by editing test_objects.

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

Modified: trunk/csp/bin/test_objects
===================================================================
--- trunk/csp/bin/test_objects	2006-10-02 06:33:08 UTC (rev 1994)
+++ trunk/csp/bin/test_objects	2006-10-02 06:38:07 UTC (rev 1995)
@@ -35,7 +35,7 @@
 
 def createBalkan():
 	vehicle(f16dj, vec(-29495, -10530, 87.8), vec(0, 0, 0), vec(0.0, 0.0, 180.0))
-	vehicle(m2k, vec(-29510, -10530, 87.8), vec(0, 0, 0), vec(0.0, 0.0, 180.0))
+	vehicle(f16dj, vec(-29510, -10530, 87.8), vec(0, 0, 0), vec(0.0, 0.0, 180.0))
 
 def createNCA():
 	vehicle(m2k, vec(0, 0, 1200.0), vec(0, 100.0, 0), vec(5.0, 0.0, 0.0))

Modified: trunk/csp/cspsim/battlefield/LocalBattlefield.cpp
===================================================================
--- trunk/csp/cspsim/battlefield/LocalBattlefield.cpp	2006-10-02 06:33:08 UTC (rev 1994)
+++ trunk/csp/cspsim/battlefield/LocalBattlefield.cpp	2006-10-02 06:38:07 UTC (rev 1995)
@@ -569,8 +569,15 @@
 	assignNewId(unit);
 	LocalUnitWrapper *wrapper = new LocalUnitWrapper(unit, 0);
 	addUnit(wrapper);
-	setHumanUnit(wrapper, true);
 
+	// XXX hack to force the first object to be player controlled.
+	// all other objects default to agent controlled.
+	static bool first = true;
+	if (first) {
+		first = false;
+		setHumanUnit(wrapper, true);
+	}
+
 	unit->registerUpdate(m_UnitUpdateMaster.get());
 	if (isConnectionActive()) {
 		Ref<RegisterUnit> msg = new RegisterUnit();




Author: mkrose
Date: 2006-10-01 23:33:08 -0700 (Sun, 01 Oct 2006)
New Revision: 1994

Added:
   trunk/csp/data/xml/vehicles/aircraft/f16/agent.xml
   trunk/csp/data/xml/vehicles/aircraft/m2k/agent.xml
Modified:
   trunk/csp/data/xml/vehicles/aircraft/f16dj.xml
   trunk/csp/data/xml/vehicles/aircraft/m2k.xml
Log:
Add agent systems for AI control of the f16 and m2k.

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

Added: trunk/csp/data/xml/vehicles/aircraft/f16/agent.xml
===================================================================
--- trunk/csp/data/xml/vehicles/aircraft/f16/agent.xml	2006-10-02 06:31:13 UTC (rev 1993)
+++ trunk/csp/data/xml/vehicles/aircraft/f16/agent.xml	2006-10-02 06:33:08 UTC (rev 1994)
@@ -0,0 +1,54 @@
+<?xml version="1.0" standalone="no"?>
+
+<Object class="SystemsModel">
+	<List name="subsystems">
+		<Object class="F16HUD" />
+		<Object class="AircraftAgent" />
+		<Object class="GroundAvoidanceAdvisory" />
+		<Path class="FlightControlSystem">fcs</Path>
+		<Object class="AircraftFlightSensors" />
+		<Object class="F16System">
+			<Object class="TimedSequence" name="fuel_door_sequence">
+				<Float name="initial_key">0.0</Float>
+				<Float name="final_key">3.0</Float>
+				<String name="sequence_channel">Aircraft.FuelDoorSequence.ReferenceTime</String>
+				<String name="normalized_channel">Aircraft.FuelDoorSequence.NormalizedTime</String>
+			</Object>
+			<Object class="TimedSequence" name="canopy_sequence">
+				<Float name="initial_key">0.0</Float>
+				<Float name="final_key">6.0</Float>
+				<String name="sequence_channel">Aircraft.CanopySequence.ReferenceTime</String>
+			</Object>
+			<Path name="resources">resources</Path>
+		</Object>
+		<Path class="f16::FuelSystem">fuel</Path>
+	</List>
+
+	<Object class="RemoteController" name="remote_controller">
+		<Path name="channel_mirror_set">channel_mirrors</Path>
+	</Object>
+
+	<Object class="AircraftPhysicsModel" name="physics_model">
+		<List name="subsystems">
+			<Object class="FlightDynamics">
+				<Path name="flight_model">fm</Path>
+				<Path name="store_drag">.objects.stores_drag</Path>
+			</Object>
+			<Object class="EngineDynamics">
+				<Path name="resources">resources</Path>
+				<List name="engine_set">
+					<Object class="F16Engine">
+						<Path name="thrust_data">thrust</Path>
+						<Vector name="thrust_direction">0.0 1.0 0.0</Vector>
+						<Vector name="engine_offset">0.0 0.0 0.0</Vector>
+						<Vector name="smoke_emitter_location">0.0 -5.5 0.522</Vector>
+					</Object>
+				</List>
+			</Object>
+			<Path class="GearDynamics">gear</Path>
+			<Object class="GroundCollisionDynamics" />
+		</List>
+	</Object>
+
+	<Path name="stores_management_system">sms</Path>
+</Object>

Modified: trunk/csp/data/xml/vehicles/aircraft/f16dj.xml
===================================================================
--- trunk/csp/data/xml/vehicles/aircraft/f16dj.xml	2006-10-02 06:31:13 UTC (rev 1993)
+++ trunk/csp/data/xml/vehicles/aircraft/f16dj.xml	2006-10-02 06:33:08 UTC (rev 1994)
@@ -24,6 +24,6 @@
 
 	<Path name="human_systems">f16.systems</Path>
 	<Path name="remote_systems">f16.remote</Path>
-	<Path name="agent_systems">f16.systems</Path>
+	<Path name="agent_systems">f16.agent</Path>
 
 </Object>

Added: trunk/csp/data/xml/vehicles/aircraft/m2k/agent.xml
===================================================================
--- trunk/csp/data/xml/vehicles/aircraft/m2k/agent.xml	2006-10-02 06:31:13 UTC (rev 1993)
+++ trunk/csp/data/xml/vehicles/aircraft/m2k/agent.xml	2006-10-02 06:33:08 UTC (rev 1994)
@@ -0,0 +1,29 @@
+<?xml version="1.0" standalone="no"?>
+
+<Object class="SystemsModel">
+	<List name="subsystems">
+		<Object class="AircraftAgent" />
+		<Object class="AircraftFlightSensors" />
+		<Path class="FlightControlSystem">fcs</Path>
+	</List>
+
+	<Object class="AircraftPhysicsModel" name="physics_model">
+		<List name="subsystems">
+			<Object class="FlightDynamics">
+				<Path name="flight_model">fm</Path>
+			</Object>
+			<Object class="EngineDynamics">
+				<List name="engine_set">
+					<Object class="Engine">
+						<Path name="thrust_data">thrust</Path>
+						<Vector name="thrust_direction">0.0 1.0 0.0</Vector>
+						<Vector name="engine_offset">0.0 0.0 0.0</Vector>
+						<Vector name="smoke_emitter_location">0.0 -5.5 0.522</Vector>
+					</Object>
+				</List>
+			</Object>
+			<Path class="GearDynamics">gear</Path>
+			<Object class="GroundCollisionDynamics" />
+		</List>
+	</Object>
+</Object>

Modified: trunk/csp/data/xml/vehicles/aircraft/m2k.xml
===================================================================
--- trunk/csp/data/xml/vehicles/aircraft/m2k.xml	2006-10-02 06:31:13 UTC (rev 1993)
+++ trunk/csp/data/xml/vehicles/aircraft/m2k.xml	2006-10-02 06:33:08 UTC (rev 1994)
@@ -21,6 +21,6 @@
 
     <Path name="human_systems">m2k.systems</Path>
     <Path name="remote_systems">m2k.remote</Path>
-    <Path name="agent_systems">m2k.systems</Path>
+    <Path name="agent_systems">m2k.agent</Path>
 
 </Object>




Author: mkrose
Date: 2006-10-01 23:31:13 -0700 (Sun, 01 Oct 2006)
New Revision: 1993

Added:
   trunk/csp/cspsim/ai/
   trunk/csp/cspsim/ai/AircraftAgent.cpp
   trunk/csp/cspsim/ai/AircraftAgent.h
   trunk/csp/cspsim/ai/AircraftControl.cpp
   trunk/csp/cspsim/ai/AircraftControl.h
   trunk/csp/cspsim/ai/AircraftMission.cpp
   trunk/csp/cspsim/ai/AircraftMission.h
   trunk/csp/cspsim/ai/AircraftTask.cpp
   trunk/csp/cspsim/ai/AircraftTask.h
   trunk/csp/cspsim/ai/DiveRecovery.cpp
   trunk/csp/cspsim/ai/DiveRecovery.h
   trunk/csp/cspsim/ai/LandingTask.cpp
   trunk/csp/cspsim/ai/LandingTask.h
   trunk/csp/cspsim/ai/PID.h
   trunk/csp/cspsim/ai/Runway.h
   trunk/csp/cspsim/ai/StateMachine.cpp
   trunk/csp/cspsim/ai/StateMachine.h
   trunk/csp/cspsim/ai/TakeoffTask.cpp
   trunk/csp/cspsim/ai/TakeoffTask.h
   trunk/csp/cspsim/ai/Task.cpp
   trunk/csp/cspsim/ai/Task.h
   trunk/csp/cspsim/ai/Task.inl
   trunk/csp/cspsim/ai/Waypoint.h
Modified:
   trunk/csp/cspsim/SConscript
Log:
Add initial aircraft AI implementation.  Provides infrastructure
for constructing hierarchical state machines to define AI logic.
Hooks into the vehicle bus to control the aircraft via stick and
throttle inputs.  Much of the control logic is hand tuned using
PID controllers, although it works reasonably well for both the
F16 flight model and the very simplified M2k flight model.  Of
course there is also a lot of room for improvement.

To demonstrate the new systems, logic for takeoff, waypoint
navigation, and landing has been implemented.  This will be
hooked up as the default behavior of the second aircraft in
the simulation in subsequent submits.

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

Diff omitted (79812 bytes).



Author: mkrose
Date: 2006-10-01 23:13:39 -0700 (Sun, 01 Oct 2006)
New Revision: 1992

Added:
   trunk/csp/csplib/util/Signal.h
   trunk/csp/csplib/util/SignalFwd.h
Modified:
   trunk/csp/csplib/SConscript
Log:
Add forward declaration workaround for sigc signals and slots.

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

Diff omitted (10787 bytes).



Author: mkrose
Date: 2006-10-01 22:54:14 -0700 (Sun, 01 Oct 2006)
New Revision: 1991

Modified:
   trunk/csp/cspsim/Channels.cpp
   trunk/csp/cspsim/GearAnimation.cpp
   trunk/csp/cspsim/GearAnimation.h
   trunk/csp/cspsim/LandingGear.cpp
   trunk/csp/cspsim/LandingGear.h
   trunk/csp/cspsim/LandingGearChannels.h
Log:
Add a generic channel for raising and lowering the landing
gear.  Fix a bug on startup where the logical extension
state and the gear animation state could be out of sync.

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

Modified: trunk/csp/cspsim/Channels.cpp
===================================================================
--- trunk/csp/cspsim/Channels.cpp	2006-10-02 05:38:08 UTC (rev 1990)
+++ trunk/csp/cspsim/Channels.cpp	2006-10-02 05:54:14 UTC (rev 1991)
@@ -99,6 +99,7 @@
 	const char *LandingGear::FullyExtended = "LandingGear.FullyExtended";
 	const char *LandingGear::FullyRetracted = "LandingGear.FullyRetracted";
 	const char *LandingGear::GearExtendSelected = "LandingGear.GearExtendSelected";
+	const char *LandingGear::GearCommand = "LandingGear.GearCommand";
 	std::string LandingGear::selectWOW(std::string const &gearname) { return "LandingGear." + gearname + ".WOW"; }
 	std::string LandingGear::selectFullyExtended(std::string const &gearname) { return "LandingGear." + gearname + ".FullyExtended"; }
 	std::string LandingGear::selectFullyRetracted(std::string const &gearname) { return "LandingGear." + gearname + ".FullyRetracted"; }

Modified: trunk/csp/cspsim/GearAnimation.cpp
===================================================================
--- trunk/csp/cspsim/GearAnimation.cpp	2006-10-02 05:38:08 UTC (rev 1990)
+++ trunk/csp/cspsim/GearAnimation.cpp	2006-10-02 05:54:14 UTC (rev 1991)
@@ -47,8 +47,14 @@
 	if (m_CompressionSequence.valid()) m_CompressionSequence->setSequenceChannel(control_channel);
 }
 
-void GearSequenceAnimation::forceExtend() {
-	if (m_RetractSequence.valid()) m_RetractSequence->jumpToEnd();
+void GearSequenceAnimation::force(bool extend) {
+	if (m_RetractSequence.valid()) {
+		if (extend) {
+			m_RetractSequence->jumpToEnd();
+		} else {
+			m_RetractSequence->jumpToStart();
+		}
+	}
 	if (m_CompressionSequence.valid()) m_CompressionSequence->enable();
 }
 

Modified: trunk/csp/cspsim/GearAnimation.h
===================================================================
--- trunk/csp/cspsim/GearAnimation.h	2006-10-02 05:38:08 UTC (rev 1990)
+++ trunk/csp/cspsim/GearAnimation.h	2006-10-02 05:54:14 UTC (rev 1991)
@@ -81,7 +81,7 @@
 	virtual bool isFullyRetracted() const = 0;
 	virtual void extend() = 0;
 	virtual void retract() = 0;
-	virtual void forceExtend() = 0;
+	virtual void force(bool extend) = 0;
 
 protected:
 	virtual std::string const &prefix() const { return m_Prefix; }
@@ -127,7 +127,7 @@
 	virtual bool isFullyRetracted() const { return !m_RetractSequence ? false : m_RetractSequence->atStart(); }
 	virtual void extend() { if (m_RetractSequence.valid()) m_RetractSequence->playForward(); }
 	virtual void retract() { if (m_RetractSequence.valid()) m_RetractSequence->playBackward(); }
-	virtual void forceExtend();
+	virtual void force(bool extend);
 
 	// Called by LandingGear to allow subclasses to register output channels for driving animations.
 	virtual void registerChannels(Bus* bus);

Modified: trunk/csp/cspsim/LandingGear.cpp
===================================================================
--- trunk/csp/cspsim/LandingGear.cpp	2006-10-02 05:38:08 UTC (rev 1990)
+++ trunk/csp/cspsim/LandingGear.cpp	2006-10-02 05:54:14 UTC (rev 1991)
@@ -103,7 +103,7 @@
 	m_TireK = 200000.0;
 	m_TireBeta = 500.0;
 	m_Damage = 0.0;
-	m_Extend = true;
+	m_Extend = false;
 	m_Compression = 0.0;
 	m_CompressionLimit = 0.0;
 	m_Touchdown = false;
@@ -406,7 +406,9 @@
 		}
 		if (m_Initialize) {
 			m_Initialize = false;
-			m_GearAnimation->forceExtend();
+			m_GearAnimation->force(m_Extend);
+			b_FullyExtended->value() = m_Extend;
+			b_FullyRetracted->value() = !m_Extend;
 		}
 	}
 }
@@ -711,6 +713,8 @@
 	b_FullyRetracted = bus->registerLocalDataChannel<bool>(bus::LandingGear::FullyRetracted, false);
 	b_FullyExtended = bus->registerLocalDataChannel<bool>(bus::LandingGear::FullyExtended, true);
 	b_GearExtendSelected = bus->registerLocalDataChannel<bool>(bus::LandingGear::GearExtendSelected, true);
+	b_GearCommand = bus->registerSharedPushChannel<bool>(bus::LandingGear::GearCommand, true);
+	b_GearCommand->connect(this, &GearDynamics::onGearCommand);
 	for (unsigned i = 0; i < m_Gear.size(); ++i) {
 		m_Gear[i]->registerChannels(bus);
 		if (sound_model) {
@@ -841,5 +845,13 @@
 	}
 }
 
+void GearDynamics::onGearCommand() {
+	if (b_GearCommand->value()) {
+		GearUp();
+	} else {
+		GearDown();
+	}
+}
+
 CSP_NAMESPACE_END
 

Modified: trunk/csp/cspsim/LandingGear.h
===================================================================
--- trunk/csp/cspsim/LandingGear.h	2006-10-02 05:38:08 UTC (rev 1990)
+++ trunk/csp/cspsim/LandingGear.h	2006-10-02 05:54:14 UTC (rev 1991)
@@ -304,6 +304,7 @@
 protected:
 	GearSet m_Gear;
 
+	DataChannel<bool>::RefT b_GearCommand;
 	DataChannel<bool>::RefT b_GearExtendSelected;  // tracks intent, not actual state.
 	DataChannel<bool>::RefT b_FullyRetracted;
 	DataChannel<bool>::RefT b_FullyExtended;
@@ -325,6 +326,7 @@
 private:
 	void doComplexPhysics(double x);
 	void doSimplePhysics(double x);
+	void onGearCommand();
 };
 
 CSP_NAMESPACE_END

Modified: trunk/csp/cspsim/LandingGearChannels.h
===================================================================
--- trunk/csp/cspsim/LandingGearChannels.h	2006-10-02 05:38:08 UTC (rev 1990)
+++ trunk/csp/cspsim/LandingGearChannels.h	2006-10-02 05:54:14 UTC (rev 1991)
@@ -38,6 +38,7 @@
 	static const char *FullyExtended;
 	static const char *FullyRetracted;
 	static const char *GearExtendSelected;
+	static const char *GearCommand;
 	static std::string selectWOW(std::string const &gearname);
 	static std::string selectFullyExtended(std::string const &gearname);
 	static std::string selectFullyRetracted(std::string const &gearname);




Author: mkrose
Date: 2006-10-01 22:38:08 -0700 (Sun, 01 Oct 2006)
New Revision: 1990

Modified:
   trunk/csp/cspsim/f16/F16HUD.cpp
Log:
Fix segfault when the f16 HUD system is used without a
DED system.

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

Modified: trunk/csp/cspsim/f16/F16HUD.cpp
===================================================================
--- trunk/csp/cspsim/f16/F16HUD.cpp	2006-10-02 05:37:08 UTC (rev 1989)
+++ trunk/csp/cspsim/f16/F16HUD.cpp	2006-10-02 05:38:08 UTC (rev 1990)
@@ -562,7 +562,7 @@
 	m_FlightPathMarker->setDirection(velocity_body);
 
 	const bool show_roll = !m_ShowData && !m_ShowVerticalVelocity;
-	m_DEDReadout->show(m_ShowData);
+	if (m_DEDReadout.valid()) m_DEDReadout->show(m_ShowData);
 	m_RollMarker->show(show_roll);
 	m_RollTape->show(show_roll);
 	m_BankAngleIndicator->show(m_ShowVerticalVelocity && !m_FlightPathMarker->isHidden());
@@ -872,7 +872,7 @@
 
 	m_AirspeedUnits->setText(m_VelocityLabel);
 
-	if (!m_DEDReadout->isHidden()) {
+	if (m_DEDReadout.valid() && !m_DEDReadout->isHidden()) {
 		m_DEDReadout->update();
 	}
 }
@@ -1100,9 +1100,13 @@
 }
 
 void F16HUD::addDEDReadout() {
-	m_DEDReadout = new DEDReadout(b_DEDReadout->value(), m_StandardFont);
-	m_DEDReadout->setPosition(-0.030, -0.0760);
-	m_HUD.addFrameElement(m_DEDReadout);
+	if (b_DEDReadout.valid()) {
+		m_DEDReadout = new DEDReadout(b_DEDReadout->value(), m_StandardFont);
+		m_DEDReadout->setPosition(-0.030, -0.0760);
+		m_HUD.addFrameElement(m_DEDReadout);
+	} else {
+		CSPLOG(ERROR, APP) << "DED channel not found";
+	}
 }
 
 void F16HUD::addPitchLadder() {




Author: mkrose
Date: 2006-10-01 22:37:08 -0700 (Sun, 01 Oct 2006)
New Revision: 1989

Modified:
   trunk/csp/cspsim/GameScreen.cpp
Log:
Allow ai-controlled vehicles to be selected as the active object.
This is a simple means to allow the ai behavior to be viewed at
close range.  User input still goes to the selected vehicle, but
most of the input functions aren't hooked up by default.  This
interface will need to be reconsidered at some point (e.g.,
should we distinguish changing the active vehicle control from
changing vehicle view?).

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

Modified: trunk/csp/cspsim/GameScreen.cpp
===================================================================
--- trunk/csp/cspsim/GameScreen.cpp	2006-10-02 04:57:13 UTC (rev 1988)
+++ trunk/csp/cspsim/GameScreen.cpp	2006-10-02 05:37:08 UTC (rev 1989)
@@ -333,7 +333,9 @@
 	LocalBattlefield *battlefield = CSPSim::theSim->getBattlefield();
 	if (battlefield) {
 		Ref<DynamicObject> object;
-		object = battlefield->getNextUnit(m_ActiveObject, 1, 1, 0);
+		// for now, allow ai-controlled vehicles to be selected as the
+		// active object to help diagose the ai logic.
+		object = battlefield->getNextUnit(m_ActiveObject, -1, 1, 0);
 		if (object.valid()) CSPSim::theSim->setActiveObject(object);
 	}
 }




Author: mkrose
Date: 2006-10-01 21:57:13 -0700 (Sun, 01 Oct 2006)
New Revision: 1988

Modified:
   trunk/csp/SConstruct
Log:
Add an explicit libjpeg dependency to the build under linux.

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

Modified: trunk/csp/SConstruct
===================================================================
--- trunk/csp/SConstruct	2006-10-02 04:55:12 UTC (rev 1987)
+++ trunk/csp/SConstruct	2006-10-02 04:57:13 UTC (rev 1988)
@@ -37,6 +37,7 @@
 build.ExternalLibrary(
 	name = 'jpeg',
 	config = [
+		build.UnixLibConfig(lib='libjpeg', symbol='jpeg_resync_to_restart'),
 		build.DevpackConfig(libs='libjpeg'),
 		build.WindowsLibConfig('user32'),
 	])




Author: mkrose
Date: 2006-10-01 21:55:12 -0700 (Sun, 01 Oct 2006)
New Revision: 1987

Modified:
   trunk/csp/tools/trc/trc_lex.py
Log:
Comment out a few unused symbols in the trc lex definition
to avoid warnings.

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

Modified: trunk/csp/tools/trc/trc_lex.py
===================================================================
--- trunk/csp/tools/trc/trc_lex.py	2006-09-24 04:48:50 UTC (rev 1986)
+++ trunk/csp/tools/trc/trc_lex.py	2006-10-02 04:55:12 UTC (rev 1987)
@@ -30,10 +30,10 @@
 	'COMMA',
 	'SHARP',
 	'QUAL',
-	'QUOTE',
+#	'QUOTE',
 	'EQ',
-	'LANGLE',
-	'RANGLE',
+#	'LANGLE',
+#	'RANGLE',
 	'LBRACE',
 	'RBRACE',
 	'LBRACKET',
@@ -74,7 +74,7 @@
 
 # literals
 literals = (
-	'ID', 'FCONST', 'SCONST', 'ICONST', 'CCONST',
+	'ID', 'FCONST', 'SCONST', 'ICONST', #'CCONST',
 )
 
 # include paths ("a.h", <a.h>)
@@ -119,7 +119,7 @@
 t_FILEPATH_A = r'\<[a-zA-Z\.\\/0-9_-]+\>'
 
 # Character constant 'c' or L'c'
-t_CCONST = r'(L)?\'([^\\\n]|(\\.))*?\''
+#t_CCONST = r'(L)?\'([^\\\n]|(\\.))*?\''
 
 # Comments (// style only)
 def t_comment(t):




Author: mkrose
Date: 2006-09-23 21:48:50 -0700 (Sat, 23 Sep 2006)
New Revision: 1986

Modified:
   trunk/csp/cspsim/views/InternalView.cpp
   trunk/csp/cspsim/views/InternalView.h
Log:
Fix jitter in padlock view at close range.  The direction to
the padlocked object was computed using the eye point from the
previous timestep, causing the angle to the target to be both
incorrect and dependent on the timestep.

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

Modified: trunk/csp/cspsim/views/InternalView.cpp
===================================================================
--- trunk/csp/cspsim/views/InternalView.cpp	2006-09-19 04:44:51 UTC (rev 1985)
+++ trunk/csp/cspsim/views/InternalView.cpp	2006-09-24 04:48:50 UTC (rev 1986)
@@ -197,6 +197,7 @@
 	Quat attitude = m_ActiveObject->getAttitude();
 
 	if (m_Padlock.valid() && m_Padlocked) {
+		ep = m_ViewpointBody + m_ActiveObject->getGlobalPosition();
 		m_PadlockPosition = m_Padlock->getGlobalPosition();
 		m_PadlockVelocity = m_Padlock->getVelocity();
 		m_PadlockLossTime = 0.0;
@@ -328,7 +329,8 @@
 	m_NeckBobbing = (1.0 - bob_f) * m_NeckBobbing + bob_f * bobbing;
 	ep = m_ActiveObject->getNominalViewPointBody() + (lean_offset + eyes + m_NeckPivotOffset) + m_NeckBobbing;
 	m_ActiveObject->setViewPointBody(ep);
-	ep = attitude.rotate(ep) + m_ActiveObject->getGlobalPosition();
+	m_ViewpointBody = attitude.rotate(ep);
+	ep = m_ViewpointBody + m_ActiveObject->getGlobalPosition();
 	lp = ep + m_DirLocal * 100.0;
 
 	double up_f = std::min(1.0, 8.0 * dt);

Modified: trunk/csp/cspsim/views/InternalView.h
===================================================================
--- trunk/csp/cspsim/views/InternalView.h	2006-09-19 04:44:51 UTC (rev 1985)
+++ trunk/csp/cspsim/views/InternalView.h	2006-09-24 04:48:50 UTC (rev 1986)
@@ -77,6 +77,7 @@
 	Vector3 m_DirLocal;
 	Vector3 m_PadlockPosition;
 	Vector3 m_PadlockVelocity;
+	Vector3 m_ViewpointBody;
 	double m_PadlockLossTime;
 
 	struct SortById;




Author: mkrose
Date: 2006-09-18 21:44:51 -0700 (Mon, 18 Sep 2006)
New Revision: 1985

Modified:
   trunk/csp/cspsim/StateStack.h
Log:
Add missing include.

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

Modified: trunk/csp/cspsim/StateStack.h
===================================================================
--- trunk/csp/cspsim/StateStack.h	2006-09-07 03:25:14 UTC (rev 1984)
+++ trunk/csp/cspsim/StateStack.h	2006-09-19 04:44:51 UTC (rev 1985)
@@ -30,6 +30,7 @@
 #include <osg/StateAttribute>
 #include <osg/StateSet>
 
+#include <cassert>
 #include <map>
 #include <vector>
 




Author: mkrose
Date: 2006-09-06 20:25:14 -0700 (Wed, 06 Sep 2006)
New Revision: 1984

Modified:
   trunk/csp/cspsim/sky/SkyDome.cpp
Log:
Set wrapping modes of fog texture.

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

Modified: trunk/csp/cspsim/sky/SkyDome.cpp
===================================================================
--- trunk/csp/cspsim/sky/SkyDome.cpp	2006-09-04 19:12:10 UTC (rev 1983)
+++ trunk/csp/cspsim/sky/SkyDome.cpp	2006-09-07 03:25:14 UTC (rev 1984)
@@ -258,7 +258,8 @@
 	m_HorizonImage->allocateImage(m_HorizonColors->size(), 4, 1, GL_RGB, GL_UNSIGNED_BYTE);
 	m_HorizonTexture = new osg::Texture2D;
 	m_HorizonTexture->setImage(m_HorizonImage.get());
-	m_HorizonTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+	m_HorizonTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::MIRROR);
+	m_HorizonTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 }
 
 void SkyDome::updateHorizon() {




Author: mkrose
Date: 2006-09-04 12:12:10 -0700 (Mon, 04 Sep 2006)
New Revision: 1983

Added:
   trunk/csp/data/xml/theater/balkan/vasi.xml
   trunk/csp/data/xml/theater/balkan/vasi/
   trunk/csp/data/xml/theater/balkan/vasi/vasi-hi.xml
   trunk/csp/data/xml/theater/balkan/vasi/vasi-lo.xml
Modified:
   trunk/csp/data/xml/theater/balkan/lightpylon/model.xml
Log:
Add VASI xml definitions.  Disable smoothing of the light pylon
model.

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

Modified: trunk/csp/data/xml/theater/balkan/lightpylon/model.xml
===================================================================
--- trunk/csp/data/xml/theater/balkan/lightpylon/model.xml	2006-09-04 02:59:05 UTC (rev 1982)
+++ trunk/csp/data/xml/theater/balkan/lightpylon/model.xml	2006-09-04 19:12:10 UTC (rev 1983)
@@ -4,6 +4,6 @@
     <External name="model_path">airbase/lightpylon/lightpylon.osg</External>
     <Vector name="axis_0">1 0 0</Vector>
     <Vector name="axis_1">0 1 0</Vector>
-    <Bool name="smooth">true</Bool>
+    <Bool name="smooth">false</Bool>
     <Bool name="filter">true</Bool>
 </Object>

Added: trunk/csp/data/xml/theater/balkan/vasi/vasi-hi.xml
===================================================================
--- trunk/csp/data/xml/theater/balkan/vasi/vasi-hi.xml	2006-09-04 02:59:05 UTC (rev 1982)
+++ trunk/csp/data/xml/theater/balkan/vasi/vasi-hi.xml	2006-09-04 19:12:10 UTC (rev 1983)
@@ -0,0 +1,8 @@
+<?xml version="1.0" standalone="no"?>
+
+<Object class="ObjectModel">
+    <External name="model_path">airbase/vasi/vasi-hi.osg</External>
+    <Vector name="axis_0">1 0 0</Vector>
+    <Vector name="axis_1">0 1 0</Vector>
+	<Bool name="smooth">false</Bool>
+</Object>

Added: trunk/csp/data/xml/theater/balkan/vasi/vasi-lo.xml
===================================================================
--- trunk/csp/data/xml/theater/balkan/vasi/vasi-lo.xml	2006-09-04 02:59:05 UTC (rev 1982)
+++ trunk/csp/data/xml/theater/balkan/vasi/vasi-lo.xml	2006-09-04 19:12:10 UTC (rev 1983)
@@ -0,0 +1,8 @@
+<?xml version="1.0" standalone="no"?>
+
+<Object class="ObjectModel">
+    <External name="model_path">airbase/vasi/vasi-lo.osg</External>
+    <Vector name="axis_0">1 0 0</Vector>
+    <Vector name="axis_1">0 1 0</Vector>
+	<Bool name="smooth">false</Bool>
+</Object>

Added: trunk/csp/data/xml/theater/balkan/vasi.xml
===================================================================
--- trunk/csp/data/xml/theater/balkan/vasi.xml	2006-09-04 02:59:05 UTC (rev 1982)
+++ trunk/csp/data/xml/theater/balkan/vasi.xml	2006-09-04 19:12:10 UTC (rev 1983)
@@ -0,0 +1,22 @@
+<?xml version="1.0" standalone="no"?>
+
+<Object class="CustomLayoutModel">
+    <List name="layout">
+        <Object class="FeatureLayout">
+            <Object class="FeatureObjectModel" name="model">
+                <Path name="model">vasi.vasi-lo</Path>
+            </Object>
+            <Float name="x">0</Float>
+            <Float name="y">0</Float>
+            <Float name="orientation">0.0</Float>
+        </Object>
+        <Object class="FeatureLayout">
+            <Object class="FeatureObjectModel" name="model">
+                <Path name="model">vasi.vasi-hi</Path>
+            </Object>
+            <Float name="x">0</Float>
+            <Float name="y">236</Float>
+            <Float name="orientation">0.0</Float>
+        </Object>
+    </List>
+</Object>




Author: mkrose
Date: 2006-09-03 19:59:05 -0700 (Sun, 03 Sep 2006)
New Revision: 1982

Added:
   trunk/csp/data/models/airbase/lightpylon/metal-small.png
Removed:
   trunk/csp/cspsim/Colorspace.cpp
   trunk/csp/cspsim/Colorspace.h
   trunk/csp/cspsim/Sky.cpp
   trunk/csp/cspsim/Sky.h
   trunk/csp/data/xml/environment/stars.xml
Modified:
   trunk/csp/bin/sim.ini
   trunk/csp/cspsim/ObjectModel.cpp
   trunk/csp/cspsim/ObjectModel.h
   trunk/csp/cspsim/SConscript
   trunk/csp/cspsim/TerrainObject.cpp
   trunk/csp/cspsim/TerrainObject.h
   trunk/csp/cspsim/VirtualScene.cpp
   trunk/csp/cspsim/VirtualScene.h
   trunk/csp/cspsim/hud/Display.cpp
   trunk/csp/cspsim/sky/StarDome.cpp
   trunk/csp/cspsim/sky/StarDome.h
   trunk/csp/cspsim/theater/FeatureQuad.cpp
   trunk/csp/data/models/airbase/lightpylon/lightpylon.osg
   trunk/csp/data/models/airbase/runway/runway.osg
   trunk/csp/data/xml/terrain/balkan.xml
   trunk/csp/data/xml/theater/balkan/airbase.xml
Log:
Hook in new sky and shader code.  This will disable per-pixel
specular highlights on graphics cards that don't support glsl,
but otherwise shouldn't cause problems.

On cards that support shaders, all objects are rendered in
shaders.  Default shaders are automatically bound based on
the model statesets when possible.  Currently, all geodes
must have a Material attribute, and may also have a 2D or
cubemap texture bound to texture unit 0.  Geodes that do
not fall into these categories are rendered in red to help
identify them.

Empty Program {} nodes can be attached to geodes to force
fixed function rendering, but note that this bypasses global
fog rendering.  This is done for light points and near-field
models like the detailed cockpit and mfd/hud displays.

The terrain drawables need special shaders to compute per-
pixel fog on the gpu. (For normal objects, fog is a uniform
computed on the cpu.)  This has been done for demeter, but
not for chunklod (yet).

Included in this change is a minor adjustment to bright-star
rendering to rescale the flare imposters so that their size
is independent of the viewing angle.

Added VASI lights and models to the airbase.

Remodelled the light towers in blender with extensive hand
editing of the exported osg files to make them more efficient.
Added blinking red lights at the top and steady white lights.

Adjusted the sim start time to pre-dawn.

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

Diff omitted (926594 bytes).



Author: mkrose
Date: 2006-09-03 01:21:25 -0700 (Sun, 03 Sep 2006)
New Revision: 1981

Modified:
   trunk/csp/SConstruct
   trunk/csp/cspsim/CSPSim.cpp
Log:
Upgrade OSG dependency to 0.9.9 for shader support.

Change vorbis pkg-config to vorbisfile, which is needed by newer
versions of openalpp.

Add a comment regarding possible deadlocks on shutdown with older
versions of openal.

Decrease the maximum simulation time between frames to reduce fcs
instability when the frame rate drops.  The minimum update rate is
now 10 Hz (instead of 5 Hz).

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

Modified: trunk/csp/SConstruct
===================================================================
--- trunk/csp/SConstruct	2006-09-03 07:14:07 UTC (rev 1980)
+++ trunk/csp/SConstruct	2006-09-03 08:21:25 UTC (rev 1981)
@@ -18,7 +18,7 @@
 
 print 'COMBAT SIMULATOR PROJECT - Build System'
 
-
+import sys
 from tools import build
 
 build.CheckSConsVersion('0.96.1')
@@ -59,7 +59,7 @@
 	name = 'sound',
 	config = [
 		build.PkgConfig(package='openalpp', version='0.2'),
-		build.PkgConfig(package='vorbis', version='1.1.0'),
+		build.PkgConfig(package='vorbisfile', version='1.1.0'),
 		build.DevpackConfig(dlls='openalpp', headers=[('openalpp', 'sounddata.h')]),
 		build.DevpackConfig(dlls=['libvorbis', 'libvorbisfile'], headers=[('vorbis', 'vorbisfile.h')]),
 		build.DevpackConfig(dlls='libogg', headers=[('ogg', 'ogg.h')]),
@@ -82,9 +82,9 @@
 build.ExternalLibrary(
 	name = 'osg',
 	config = [
-		build.PkgConfig(package='openscenegraph', version='0.9.8'),
-		build.PkgConfig(package='openthreads', version='0.9.8'),
-		build.PkgConfig(package='producer', version='0.9.8'),
+		build.PkgConfig(package='openscenegraph', version='0.9.9'),
+		build.PkgConfig(package='openthreads', version='0.9.9'),
+		build.PkgConfig(package='producer', version='0.9.9'),
 		build.PkgConfig(package='osgal', version='0.3'),
 		build.DevpackConfig(dlls='osgal', headers=[('osgAL', 'SoundNode')]),
 		build.DevpackConfig(dlls=['osg', 'osgDB', 'osgFX', 'osgGA', 'osgParticle', 'osgProducer', 'osgText', 'osgUtil', 'OpenThreadsWin32', 'Producer'], headers=[('osg', 'Depth'), ('osgText', 'Font')]),
@@ -98,7 +98,13 @@
 		build.DevpackConfig(dlls=['SDL', 'SDL_image'], headers=[('SDL', 'SDL_mouse.h'), ('SDL', 'SDL_image.h')]),
 	])
 
+build.ExternalLibrary(
+	name = 'python',
+	config = [
+		build.UnixLibConfig(lib='python%d.%d' % tuple(sys.version_info[:2]), symbol='PyEval_SaveThread', label='python library'),
+	])
 
+
 class Environment(build.Environment):
 	"""
 	COMMON TARGETS:

Modified: trunk/csp/cspsim/CSPSim.cpp
===================================================================
--- trunk/csp/cspsim/CSPSim.cpp	2006-09-03 07:14:07 UTC (rev 1980)
+++ trunk/csp/cspsim/CSPSim.cpp	2006-09-03 08:21:25 UTC (rev 1981)
@@ -432,8 +432,12 @@
 	// release cached objects.  this must be done before the sound engine is shut
 	// down to prevent errors when deleting cached sound samples.
 	m_DataManager = 0;
+	
+	// note: shutdown hangs under some conditions when using openal 0.0.7 (due to
+	// a race condition in _alLockMixerPause when calling alcMakeContextCurrent(NULL)).
+	// if you experience problems here, try upgrading openal.
+	SoundEngine::getInstance().shutdown();
 
-	SoundEngine::getInstance().shutdown();
 	SDL_Quit();
 	m_Clean = true;
 }
@@ -607,9 +611,9 @@
 	m_ElapsedTime += m_FrameTime;
 	m_FrameTime += m_TimeLag;
 	assert(m_FrameTime > 0.0);
-	if (m_FrameTime > 0.2) {
-		m_TimeLag = m_FrameTime - 0.2;
-		m_FrameTime = 0.2;
+	if (m_FrameTime > 0.1) {
+		m_TimeLag = m_FrameTime - 0.1;
+		m_FrameTime = 0.1;
 	} else {
 		m_TimeLag = 0.0;
 	}




Author: mkrose
Date: 2006-09-03 00:14:07 -0700 (Sun, 03 Sep 2006)
New Revision: 1980

Added:
   trunk/csp/data/models/airbase/vasi/
   trunk/csp/data/models/airbase/vasi/vasi-hi.osg
   trunk/csp/data/models/airbase/vasi/vasi-lo.osg
   trunk/csp/data/models/airbase/vasi/vasi.png
Log:
Add VASI model.

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

Diff omitted (25069 bytes).



Author: mkrose
Date: 2006-09-03 00:14:02 -0700 (Sun, 03 Sep 2006)
New Revision: 1979

Modified:
   trunk/csp/data/models/airbase/tower1/tower1.osg
Log:
Add rotating light beacon on top of tower.

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

Modified: trunk/csp/data/models/airbase/tower1/tower1.osg
===================================================================
--- trunk/csp/data/models/airbase/tower1/tower1.osg	2006-09-03 07:13:57 UTC (rev 1978)
+++ trunk/csp/data/models/airbase/tower1/tower1.osg	2006-09-03 07:14:02 UTC (rev 1979)
@@ -17,8 +17,68 @@
     0 0 1 0
     0 0 0 1
   }
-  num_children 47
+  num_children 48
   MatrixTransform {
+    StateSet {
+      Program {}
+    }
+    UpdateCallbacks {
+      AnimationPathCallback {
+        AnimationPath {
+          ControlPoints {
+            0 0 0 0 0 0 0 1 1 1 1
+            8 0 0 0 0 0 1 0 1 1 1
+            16 0 0 0 0 0 0 -1 1 1 1
+          }
+        }
+      }
+    }
+    Matrix {
+      1 0 0 0
+      0 1 0 0
+      0 0 1 0
+      0 0 0 1
+    }
+    osgSim::LightPointNode {
+      maxPixelSize 5
+      minPixelSize 2
+      maxDistance2 200000000
+      lightPoint {
+        isOn TRUE
+        position 0.0 0.0 30.0
+        color 1 1 1 1
+        radius 4.0
+        osgSim::AzimElevationSector {
+          azimuthRange 2.64 2.84 0.2
+          elevationRange -0.7 0.7 0.2
+        }
+        blendingMode BLENDED
+      }
+      lightPoint {
+        isOn TRUE
+        position 0.0 0.0 30.0
+        color 1 1 1 1
+        radius 4.0
+        osgSim::AzimElevationSector {
+          azimuthRange 3.44 3.64 0.2
+          elevationRange -0.7 0.7 0.2
+        }
+        blendingMode BLENDED
+      }
+      lightPoint {
+        isOn TRUE
+        position 0.0 0.0 30.0
+        color 0.4 1 0.5 1
+        radius 4.0
+        osgSim::AzimElevationSector {
+          azimuthRange -0.15 0.15 0.6
+          elevationRange -0.7 0.7 0.2
+        }
+        blendingMode BLENDED
+      }
+    }
+  }
+  MatrixTransform {
     DataVariance STATIC
     name "Bo01"
     nodeMask 0xff





2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (47)
2003	Jan (140)	Feb (98)	Mar (152)	Apr (104)	May (71)	Jun (94)	Jul (169)	Aug (83)	Sep (47)	Oct (134)	Nov (7)	Dec (20)
2004	Jan (41)	Feb (14)	Mar (42)	Apr (47)	May (68)	Jun (143)	Jul (65)	Aug (29)	Sep (40)	Oct (34)	Nov (33)	Dec (97)
2005	Jan (29)	Feb (30)	Mar (9)	Apr (37)	May (13)	Jun (31)	Jul (22)	Aug (23)	Sep	Oct (37)	Nov (34)	Dec (117)
2006	Jan (48)	Feb (6)	Mar (2)	Apr (71)	May (10)	Jun (16)	Jul (7)	Aug (1)	Sep (14)	Oct (17)	Nov (25)	Dec (26)
2007	Jan (8)	Feb (2)	Mar (7)	Apr (26)	May	Jun (12)	Jul (30)	Aug (14)	Sep (9)	Oct (4)	Nov (7)	Dec (6)
2008	Jan (10)	Feb (10)	Mar (6)	Apr (8)	May	Jun (10)	Jul (18)	Aug (15)	Sep (16)	Oct (5)	Nov (3)	Dec (10)
2009	Jan (11)	Feb (2)	Mar	Apr (15)	May (31)	Jun (18)	Jul (11)	Aug (26)	Sep (52)	Oct (17)	Nov (4)	Dec
2010	Jan	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

csp-commits Mailing List for The Combat Simulator Project (Page 20)

csp-commits — Mailing list for CVS commit messages.