csp-commits — Mailing list for CVS commit messages.

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft m2k.xml,1.7,1.8

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

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

Modified Files:
	m2k.xml 
Log Message:


Index: m2k.xml
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** m2k.xml	18 Jul 2003 21:55:28 -0000	1.7
--- m2k.xml	20 Oct 2003 00:23:22 -0000	1.8
***************
*** 8,23 ****
  
      <Path name="model">m2k.model</Path>
-     <Bool name="complex_physics">true</Bool>
- 
-     <!-- these values come from a FS2k2 add-on -->
-     <Float name="aileron_min">-15.0</Float>
-     <Float name="aileron_max">+19.5</Float>
-     <Float name="elevator_min">-20.6</Float>
-     <Float name="elevator_max">+27.5</Float>
-     <Float name="rudder_min">-23.5</Float>
-     <Float name="rudder_max">+23.5</Float>
- 
-     <Float name="airbrake_max">60.0</Float>
-     <Float name="airbrake_rate">20.0</Float>
  
      <!-- Mass/Inertial properties -->
--- 8,11 ----
***************
*** 31,54 ****
      </Matrix>
  
!     <Object class="AircraftDynamics" name="aircraft_dynamics">
!     
!         <Path name="flight_model">m2k.fm</Path>
!         
!         <Path name="gear_dynamics">m2k.gear</Path>
!     
!         <Object class="EngineDynamics" name="engine_dynamics">
!             <List name="engine_set">
! 	    <!-- real engine power is 9700 kg -->
!             <!-- thrustdata values comes from F4SP3: f16.dat -->
!                 <Object class="Engine">
!                     <Path name="thrust_data">m2k.thrust</Path>
!                     <Float name="engine_idle_rpm">0.68</Float>
!                     <Float name="engine_ab_thrust">0.95</Float>
!                     <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.0</Vector> 
!                 </Object>
!             </List>
!         </Object>
!     </Object>
  </Object>
--- 19,24 ----
      </Matrix>
  
!     <Path name="human_systems">m2k.systems</Path>
!     <Path name="agent_systems">m2k.systems</Path>
! 
  </Object>

[Csp-commits] APPLICATIONS/CSPSim/Source/Systems AircraftFlightSensors.cpp,1.1,1.2 AircraftInputSystem.cpp,1.1,1.2 AircraftSimpleFCS.cpp,1.1,1.2

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

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

Added Files:
	AircraftFlightSensors.cpp AircraftInputSystem.cpp 
	AircraftSimpleFCS.cpp 
Log Message:

[Csp-commits] APPLICATIONS/SimData/SimData/Tests ArchiveTests.py,1.1,1.2 TODO,1.1,1.2 __init__.py,1.1,1.2

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

Update of /cvsroot/csp/APPLICATIONS/SimData/SimData/Tests
In directory sc8-pr-cvs1:/tmp/cvs-serv13870/SimData/Tests

Added Files:
	ArchiveTests.py TODO __init__.py 
Log Message:

[Csp-commits] APPLICATIONS/CSPSim CHANGES,1.7,1.8 CHANGES.current,1.69,1.70

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

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

Modified Files:
	CHANGES CHANGES.current 
Log Message:


Index: CHANGES
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CHANGES	21 Aug 2003 08:18:37 -0000	1.7
--- CHANGES	19 Oct 2003 23:30:42 -0000	1.8
***************
*** 2,5 ****
--- 2,21 ----
  to CVS.
  
+  Version 0.3.5 (2003-10-19)
+ ===========================
+ 
+ 2003-09-07: onsight
+             Added Include/System.h and Include/Bus.h, which provide
+ 	    infrastructure for constructing detailed vehicle models.
+ 	    Several existing components such as the data recorder and
+ 	    flight model need to be refactored to use this new
+ 	    interface.
+ 
+ 	    Minor warning cleanups in System.h and Bus.h.
+ 
+ 2003-08-20: onsight
+             Tagged version r0_3_4, starting version 0.3.5
+ 
+ 
   Version 0.3.4 (2003-08-20)
  ===========================

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** CHANGES.current	7 Sep 2003 22:25:49 -0000	1.69
--- CHANGES.current	19 Oct 2003 23:30:43 -0000	1.70
***************
*** 1,15 ****
!  Version 0.3.5 (in progress)
  ===========================
  
! 2003-09-07: onsight
!             Added Include/System.h and Include/Bus.h, which provide
! 	    infrastructure for constructing detailed vehicle models.
! 	    Several existing components such as the data recorder and
! 	    flight model need to be refactored to use this new
! 	    interface.
! 
! 	    Minor warning cleanups in System.h and Bus.h.
! 
! 2003-08-20: onsight
!             Tagged version r0_3_4, starting version 0.3.5
  
--- 1,8 ----
!  Version 0.3.6 (in progress)
  ===========================
  
! 2003-10-19: onsight
!             Tagged version r0_3_5, branched to b0_3 to start version 
! 	    0.3.6.  The 'systems' branch will be merged into the trunk
! 	    to create version 0.4.0.
  

[Csp-commits] APPLICATIONS/CSPSim/Include/Theater CustomLayoutModel.h,1.1.2.1,1.1.2.2 FeatureGroupList.h,1.1.2.1,1.1.2.2 FeatureObjectModel.h,1.1.2.1,1.1.2.2 FeatureQuad.h,1.1.2.1,1.1.2.2 RandomBillboardModel.h,1.1.2.1,1.1.2.2

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

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

Modified Files:
      Tag: systems
	CustomLayoutModel.h FeatureGroupList.h FeatureObjectModel.h 
	FeatureQuad.h RandomBillboardModel.h 
Log Message:


Index: CustomLayoutModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/CustomLayoutModel.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** CustomLayoutModel.h	16 Sep 2003 06:57:30 -0000	1.1.2.1
--- CustomLayoutModel.h	19 Oct 2003 20:10:32 -0000	1.1.2.2
***************
*** 46,50 ****
  
  public:
! 	SIMDATA_OBJECT(CustomLayoutModel, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(CustomLayoutModel)
--- 46,50 ----
  
  public:
! 	SIMDATA_STATIC_OBJECT(CustomLayoutModel, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(CustomLayoutModel)

Index: FeatureGroupList.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureGroupList.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** FeatureGroupList.h	16 Sep 2003 06:57:30 -0000	1.1.2.1
--- FeatureGroupList.h	19 Oct 2003 20:10:32 -0000	1.1.2.2
***************
*** 46,50 ****
  public:
  
! 	SIMDATA_OBJECT(FeatureGroupList, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(FeatureGroupList)
--- 46,50 ----
  public:
  
! 	SIMDATA_STATIC_OBJECT(FeatureGroupList, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(FeatureGroupList)

Index: FeatureObjectModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureObjectModel.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** FeatureObjectModel.h	16 Sep 2003 06:57:30 -0000	1.1.2.1
--- FeatureObjectModel.h	19 Oct 2003 20:10:32 -0000	1.1.2.2
***************
*** 84,88 ****
  	virtual void makeFeatures(std::vector<Feature> &features, int value) const;
  
! 	SIMDATA_OBJECT(FeatureObjectModel, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(FeatureObjectModel)
--- 84,88 ----
  	virtual void makeFeatures(std::vector<Feature> &features, int value) const;
  
! 	SIMDATA_STATIC_OBJECT(FeatureObjectModel, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(FeatureObjectModel)

Index: FeatureQuad.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureQuad.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** FeatureQuad.h	16 Sep 2003 06:57:30 -0000	1.1.2.1
--- FeatureQuad.h	19 Oct 2003 20:10:32 -0000	1.1.2.2
***************
*** 59,63 ****
  
  public:
! 	SIMDATA_OBJECT(FeatureQuad, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(FeatureQuad)
--- 59,63 ----
  
  public:
! 	SIMDATA_STATIC_OBJECT(FeatureQuad, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(FeatureQuad)

Index: RandomBillboardModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/RandomBillboardModel.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** RandomBillboardModel.h	16 Sep 2003 06:57:30 -0000	1.1.2.1
--- RandomBillboardModel.h	19 Oct 2003 20:10:32 -0000	1.1.2.2
***************
*** 52,56 ****
  	
  public:
! 	SIMDATA_OBJECT(RandomBillboardModel, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(RandomBillboardModel)
--- 52,56 ----
  	
  public:
! 	SIMDATA_STATIC_OBJECT(RandomBillboardModel, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(RandomBillboardModel)

[Csp-commits] APPLICATIONS/CSPSim/Include ObjectModel.h,1.13.2.1,1.13.2.2

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

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

Modified Files:
      Tag: systems
	ObjectModel.h 
Log Message:


Index: ObjectModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/ObjectModel.h,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -d -r1.13.2.1 -r1.13.2.2
*** ObjectModel.h	16 Sep 2003 06:57:30 -0000	1.13.2.1
--- ObjectModel.h	19 Oct 2003 20:11:10 -0000	1.13.2.2
***************
*** 69,73 ****
  	typedef std::vector<simdata::Vector3> ContactList;
  
! 	SIMDATA_OBJECT(ObjectModel, 6, 0);
  	
  	BEGIN_SIMDATA_XML_INTERFACE(ObjectModel)
--- 69,73 ----
  	typedef std::vector<simdata::Vector3> ContactList;
  
! 	SIMDATA_STATIC_OBJECT(ObjectModel, 6, 0);
  	
  	BEGIN_SIMDATA_XML_INTERFACE(ObjectModel)

[Csp-commits] APPLICATIONS/CSPSim/Source Sky.cpp,1.21.2.2,1.21.2.3

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

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

Modified Files:
      Tag: systems
	Sky.cpp 
Log Message:


Index: Sky.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Sky.cpp,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -C2 -d -r1.21.2.2 -r1.21.2.3
*** Sky.cpp	29 Sep 2003 06:46:11 -0000	1.21.2.2
--- Sky.cpp	19 Oct 2003 20:34:02 -0000	1.21.2.3
***************
*** 137,141 ****
  	};
  
! 	SIMDATA_OBJECT(StarCatalog, 0, 0)
  	BEGIN_SIMDATA_XML_INTERFACE(StarCatalog)
  		SIMDATA_XML("source", StarCatalog::m_Source, false)
--- 137,141 ----
  	};
  
! 	SIMDATA_STATIC_OBJECT(StarCatalog, 0, 0)
  	BEGIN_SIMDATA_XML_INTERFACE(StarCatalog)
  		SIMDATA_XML("source", StarCatalog::m_Source, false)

[Csp-commits] APPLICATIONS/CSPSim/Source LandingGear.cpp,1.13.2.2,1.13.2.3

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

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

Modified Files:
      Tag: systems
	LandingGear.cpp 
Log Message:


Index: LandingGear.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LandingGear.cpp,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -C2 -d -r1.13.2.2 -r1.13.2.3
*** LandingGear.cpp	29 Sep 2003 06:46:11 -0000	1.13.2.2
--- LandingGear.cpp	19 Oct 2003 20:12:17 -0000	1.13.2.3
***************
*** 574,578 ****
  	BIND_ACTION("GEAR_DOWN", GearDown);
  	BIND_ACTION("GEAR_TOGGLE", GearToggle);
- 	std::cout << "CREATED GEAR DYNAMICS\n";
  }
  
--- 574,577 ----

[Csp-commits] APPLICATIONS/CSPSim CHANGES.current,1.69.2.4,1.69.2.5

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

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

Modified Files:
      Tag: systems
	CHANGES.current 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.69.2.4
retrieving revision 1.69.2.5
diff -C2 -d -r1.69.2.4 -r1.69.2.5
*** CHANGES.current	19 Oct 2003 18:06:23 -0000	1.69.2.4
--- CHANGES.current	19 Oct 2003 20:15:28 -0000	1.69.2.5
***************
*** 10,13 ****
--- 10,19 ----
  	    branch is merged to make v0.4.0.
  
+ 	    SIMDATA_OBJECT(...) changed to SIMDATA_STATIC_OBJECT(...) for 
+ 	    object classes that are static.  This was previously specified
+ 	    per object in the associated xml file using the 'static' attr.
+ 	    That use is deprecated in simdata 0.4; now object classes are 
+ 	    either static or not.
+ 
  2003-10-14: onsight
              Removed very old TerrainSymbol.h

[Csp-commits] APPLICATIONS/CSPSim/Include Engine.h,1.3.2.2,1.3.2.3

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

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

Modified Files:
      Tag: systems
	Engine.h 
Log Message:


Index: Engine.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Engine.h,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -d -r1.3.2.2 -r1.3.2.3
*** Engine.h	29 Sep 2003 06:46:11 -0000	1.3.2.2
--- Engine.h	19 Oct 2003 18:03:34 -0000	1.3.2.3
***************
*** 27,31 ****
  
  #include <SimData/InterfaceRegistry.h>
! #include <SimData/Interpolate.h>
  #include <SimData/Object.h>
  #include <SimData/Vector3.h>
--- 27,31 ----
  
  #include <SimData/InterfaceRegistry.h>
! #include <SimData/LUT.h>
  #include <SimData/Object.h>
  #include <SimData/Vector3.h>
***************
*** 35,41 ****
  
  class ThrustData: public simdata::Object {
! 	simdata::Table m_idle_thrust, m_mil_thrust, m_ab_thrust;
  public:
! 	SIMDATA_OBJECT(ThrustData, 3, 0)
  	
  	BEGIN_SIMDATA_XML_INTERFACE(ThrustData)
--- 35,41 ----
  
  class ThrustData: public simdata::Object {
! 	simdata::Table2 m_idle_thrust, m_mil_thrust, m_ab_thrust;
  public:
! 	SIMDATA_STATIC_OBJECT(ThrustData, 3, 0)
  	
  	BEGIN_SIMDATA_XML_INTERFACE(ThrustData)
***************
*** 100,103 ****
--- 100,104 ----
  	EngineSet m_Engine;
  	DataChannel<double>::CRef b_ThrottleInput;
+ 	DataChannel<double>::CRef b_Mach;
  
  protected:
***************
*** 116,120 ****
  	virtual void postCreate();
  
! 	virtual void getInfo(InfoList &info);
  
  	EngineDynamics();
--- 117,121 ----
  	virtual void postCreate();
  
! 	virtual void getInfo(InfoList &info) const;
  
  	EngineDynamics();

[Csp-commits] APPLICATIONS/CSPSim CHANGES.current,1.69.2.3,1.69.2.4

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

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

Modified Files:
      Tag: systems
	CHANGES.current 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.69.2.3
retrieving revision 1.69.2.4
diff -C2 -d -r1.69.2.3 -r1.69.2.4
*** CHANGES.current	10 Oct 2003 05:41:27 -0000	1.69.2.3
--- CHANGES.current	19 Oct 2003 18:06:23 -0000	1.69.2.4
***************
*** 1,4 ****
--- 1,30 ----
  Branch 'systems' (in progress)
  ===========================
+ 2003-10-19: onsight
+             Modified class Thrust to use simdata::Table2 instead of the
+ 	    deprecated simdata::Table class.  Note that the XML thrust
+ 	    tables must be modified to use this new class, but that these
+ 	    changes will not be checked into cvs (to prevent clashes with
+ 	    the trunk).  The corrected files will be posted at 
+ 	    http://csp.sourceforge.net/downloads (soon) until the systems
+ 	    branch is merged to make v0.4.0.
+ 
+ 2003-10-14: onsight
+             Removed very old TerrainSymbol.h
+ 
+ 2003-10-11: onsight
+             Tracked down '#define min' from windows.h (no surprise), which
+ 	    was included via Producer/RenderSurface.  Added #undef's there
+ 	    as a temporary fix.
+ 
+ 	    Changed the classes related to input events and hid mapping
+ 	    to use reference counting.
+ 
+ 	    Moved CSP_OSG_094 to CSPSim.h.  You must uncomment this line
+ 	    to use OSG version 0.9.4 or older.
+ 
+ ==========> VC users add System.cpp, SystemsModel.cpp, and Systems/*.cpp
+             to the project.
+ 
  2003-10-09: onsight
              Fixed minor snprintf problem under msvc.

[Csp-commits] APPLICATIONS/CSPSim/Source Engine.cpp,1.6.2.2,1.6.2.3

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

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

Modified Files:
      Tag: systems
	Engine.cpp 
Log Message:


Index: Engine.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Engine.cpp,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -d -r1.6.2.2 -r1.6.2.3
*** Engine.cpp	29 Sep 2003 06:46:11 -0000	1.6.2.2
--- Engine.cpp	19 Oct 2003 18:03:34 -0000	1.6.2.3
***************
*** 53,65 ****
  
  float ThrustData::getMil(float altitude, float mach) const {
! 	return m_mil_thrust.getValue(mach, altitude);
  }
  
  float ThrustData::getIdle(float altitude, float mach) const {
! 	return m_idle_thrust.getValue(mach, altitude);
  }
  
  float ThrustData::getAb(float altitude, float mach) const {
! 	return m_ab_thrust.getValue(mach, altitude);
  }
  
--- 53,65 ----
  
  float ThrustData::getMil(float altitude, float mach) const {
! 	return m_mil_thrust[altitude][mach];
  }
  
  float ThrustData::getIdle(float altitude, float mach) const {
! 	return m_idle_thrust[altitude][mach];
  }
  
  float ThrustData::getAb(float altitude, float mach) const {
! 	return m_ab_thrust[altitude][mach];
  }
  
***************
*** 138,141 ****
--- 138,142 ----
  	if (!bus) return;
  	b_ThrottleInput = bus->getChannel("ControlInputs.ThrottleInput");
+ 	b_Mach = bus->getChannel("Conditions.Mach");
  }
  
***************
*** 159,165 ****
  	if (!m_Engine.empty()) {
  		float altitude = static_cast<float>(m_PositionLocal->z());
! 		float speed = static_cast<float>(m_VelocityBody->length());
! 		// XXX get this from the bus eventually
! 		float mach = static_cast<float>(CSPSim::theSim->getAtmosphere()->getMach(speed, altitude));
  		float throttle = static_cast<float>(b_ThrottleInput->value());
  		throttle = throttle * 1.05263 + std::max(0.0, throttle-0.95) * 20.0; 
--- 160,164 ----
  	if (!m_Engine.empty()) {
  		float altitude = static_cast<float>(m_PositionLocal->z());
! 		float mach = static_cast<float>(b_Mach->value());
  		float throttle = static_cast<float>(b_ThrottleInput->value());
  		throttle = throttle * 1.05263 + std::max(0.0, throttle-0.95) * 20.0; 
***************
*** 181,185 ****
  }
  
! void EngineDynamics::getInfo(InfoList &info) {
  	std::stringstream line;
  	line.setf(std::ios::fixed | std::ios::showpos);
--- 180,184 ----
  }
  
! void EngineDynamics::getInfo(InfoList &info) const {
  	std::stringstream line;
  	line.setf(std::ios::fixed | std::ios::showpos);

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.75.2.11,1.75.2.12

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

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv12883

Modified Files:
      Tag: b0_4_0
	CHANGES.current 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.75.2.11
retrieving revision 1.75.2.12
diff -C2 -d -r1.75.2.11 -r1.75.2.12
*** CHANGES.current	17 Oct 2003 21:33:54 -0000	1.75.2.11
--- CHANGES.current	19 Oct 2003 16:51:56 -0000	1.75.2.12
***************
*** 1,4 ****
--- 1,7 ----
  Version 0.4.0 (in progress)
  ===========================
+ 2003-10-19: onsight
+   * Fixed error message in data compiler for the deprecated <Table> tag.
+ 
  2003-10-13: onsight
    * Changed the 'static' property of Objects from an object property to a

[Csp-commits] APPLICATIONS/SimData/SimData Parse.py,1.12.2.1,1.12.2.2

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

Update of /cvsroot/csp/APPLICATIONS/SimData/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv12883/SimData

Modified Files:
      Tag: b0_4_0
	Parse.py 
Log Message:


Index: Parse.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Parse.py,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -C2 -d -r1.12.2.1 -r1.12.2.2
*** Parse.py	17 Oct 2003 21:33:55 -0000	1.12.2.1
--- Parse.py	19 Oct 2003 16:51:57 -0000	1.12.2.2
***************
*** 554,558 ****
  	def __init__(self, id, base, name, attrs):
  		SimpleHandler.__init__(self, id, base, name, attrs)
! 		WARN(1, "<Curve> is deprecated, use Table2 instead.")
  		self._keys = {}
  		
--- 554,558 ----
  	def __init__(self, id, base, name, attrs):
  		SimpleHandler.__init__(self, id, base, name, attrs)
! 		WARN(1, "<Table> is deprecated, use Table2 instead.")
  		self._keys = {}
  		

[Csp-commits] APPLICATIONS/SimData/Include/SimData Composite.h,1.1.2.7,1.1.2.8 GeoPos.h,1.10.2.2,1.10.2.3 InterfaceRegistry.h,1.22.2.3,1.22.2.4 LogStream.h,1.9.2.1,1.9.2.2

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

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv12171/Include/SimData

Modified Files:
      Tag: b0_4_0
	Composite.h GeoPos.h InterfaceRegistry.h LogStream.h 
Log Message:


Index: Composite.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/Composite.h,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** Composite.h	10 Oct 2003 01:54:26 -0000	1.1.2.7
--- Composite.h	17 Oct 2003 21:33:54 -0000	1.1.2.8
***************
*** 441,444 ****
--- 441,446 ----
  
  
+ /** Base class for nodes that accept visitors.
+  */
  template <class V>
  class Visitable: public virtual Referenced {

Index: GeoPos.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/GeoPos.h,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -C2 -d -r1.10.2.2 -r1.10.2.3
*** GeoPos.h	18 Sep 2003 02:09:48 -0000	1.10.2.2
--- GeoPos.h	17 Oct 2003 21:33:54 -0000	1.10.2.3
***************
*** 649,653 ****
  	 *  @param zone_ UTM zone
  	 *  @param designator_ UTM zone letter
! 	 *  @param alt_ altitude above the reference ellipse (in meters)
  	 */
  	void set(double easting_, double northing_, 
--- 649,653 ----
  	 *  @param zone_ UTM zone
  	 *  @param designator_ UTM zone letter
! 	 *  @param alt altitude above the reference ellipse (in meters)
  	 */
  	void set(double easting_, double northing_, 
***************
*** 666,670 ****
  	 *  @param northing_ UTM northing
  	 *  @param zone_ UTM zone (e.g. "10T")
! 	 *  @param alt_ altitude above the reference ellipse (in meters)
  	 */
  	void set(double easting_, double northing_, const char *zone_, double alt = 0.0);
--- 666,670 ----
  	 *  @param northing_ UTM northing
  	 *  @param zone_ UTM zone (e.g. "10T")
! 	 *  @param alt altitude above the reference ellipse (in meters)
  	 */
  	void set(double easting_, double northing_, const char *zone_, double alt = 0.0);

Index: InterfaceRegistry.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/InterfaceRegistry.h,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -C2 -d -r1.22.2.3 -r1.22.2.4
*** InterfaceRegistry.h	14 Oct 2003 18:51:23 -0000	1.22.2.3
--- InterfaceRegistry.h	17 Oct 2003 21:33:54 -0000	1.22.2.4
***************
*** 137,140 ****
--- 137,141 ----
  	 *  @param classname The name of the Object subclass corresponding
  	 *                   to the interface being added.
+ 	 *  @param classhash The hash of the Object subclass.
  	 */
  	void addInterface(ObjectInterfaceBase* objectinterface, 
***************
*** 287,291 ****
  	 *  but takes an object class hash instead of the class name.
  	 *
! 	 *  @param cname The class hash of an object class.
  	 *  @returns True if the object class is a superclass.
  	 */
--- 288,292 ----
  	 *  but takes an object class hash instead of the class name.
  	 *
! 	 *  @param chash The class hash of an object class.
  	 *  @returns True if the object class is a superclass.
  	 */
***************
*** 386,390 ****
  	/** Test if an object interface is registered.
  	 *
! 	 *  @param name The object class hash.
  	 */
  	bool hasInterface(hasht key);
--- 387,391 ----
  	/** Test if an object interface is registered.
  	 *
! 	 *  @param key The object class hash.
  	 */
  	bool hasInterface(hasht key);

Index: LogStream.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/LogStream.h,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** LogStream.h	18 Sep 2003 02:09:48 -0000	1.9.2.1
--- LogStream.h	17 Oct 2003 21:33:54 -0000	1.9.2.2
***************
*** 22,25 ****
--- 22,26 ----
  /**
   * @file LogStream.h
+  * @brief Stream based logging mechanism.
   *
   * Stream based logging mechanism.
***************
*** 57,66 ****
  //
  
! /**
!  * @brief An output-only, category-based log stream.
   *
!  * logbuf is an output-only streambuf with the ability to disable sets of
!  * messages at runtime. Only messages with priority >= logbuf::logPriority
!  * and debugClass == logbuf::logClass are output.
   */
  class SIMDATA_EXPORT logbuf : public std::streambuf
--- 58,66 ----
  //
  
! /** An output-only, category-based log stream.
   *
!  *  logbuf is an output-only streambuf with the ability to disable sets of
!  *  messages at runtime. Only messages with priority >= logbuf::logPriority
!  *  and debugClass == logbuf::logClass are output.
   */
  class SIMDATA_EXPORT logbuf : public std::streambuf
***************
*** 74,129 ****
  	~logbuf();
  
! 	/**
! 	* Is logging enabled?
! 	* @return true or false*/
  	bool enabled() { return logging_enabled; }
  
! 	/**
! 	* Set the logging level of subsequent messages.
! 	* @param c debug class
! 	* @param p priority
! 	*/
  	void set_log_state(int c, int p);
  
! 	/**
! 	* Set the global logging level.
! 	* @param c debug class
! 	* @param p priority
! 	*/
  	void set_log_level(int c, int p);
  
  
! 	/**
! 	* Set the allowed logging classes.
! 	* @param c All enabled logging classes anded together.
! 	*/
  	void set_log_classes(int c);
  
  
! 	/**
! 	* Get the logging classes currently enabled.
! 	* @return All enabled debug logging anded together.
! 	*/
  	int get_log_classes ();
  
  
! 	/**
! 	* Set the logging priority.
! 	* @param p The priority cutoff for logging messages.
! 	*/
  	void set_log_priority(int p);
  
  
! 	/**
! 	* Get the current logging priority.
! 	* @return The priority cutoff for logging messages.
! 	*/
  	int get_log_priority ();
  
  
! 	/**
! 	* Set the stream buffer
! 	* @param sb stream buffer
! 	*/
  	void set_sb( std::streambuf* sb );
  
--- 74,129 ----
  	~logbuf();
  
! 	/** Is logging enabled?
! 	 *
! 	 * @return true or false
! 	 */
  	bool enabled() { return logging_enabled; }
  
! 	/** Set the logging level of subsequent messages.
! 	 *
! 	 *  @param c debug class
! 	 *  @param p priority
! 	 */
  	void set_log_state(int c, int p);
  
! 	/** Set the global logging level.
! 	 *
! 	 *  @param c debug class
! 	 *  @param p priority
! 	 */
  	void set_log_level(int c, int p);
  
  
! 	/** Set the allowed logging classes.
! 	 *
! 	 *  @param c All enabled logging classes anded together.
! 	 */
  	void set_log_classes(int c);
  
  
! 	/** Get the logging classes currently enabled.
! 	 *  @return All enabled debug logging anded together.
! 	 */
  	int get_log_classes ();
  
  
! 	/** Set the logging priority.
! 	 *
! 	 *  @param p The priority cutoff for logging messages.
! 	 */
  	void set_log_priority(int p);
  
  
! 	/** Get the current logging priority.
! 	 * 
! 	 *  @return The priority cutoff for logging messages.
! 	 */
  	int get_log_priority ();
  
  
! 	/** Set the stream buffer
! 	 *
! 	 *  @param sb stream buffer
! 	 */
  	void set_sb( std::streambuf* sb );
  
***************
*** 165,169 ****
  }
  
! ///inline logbuf::int_type
  inline int
  logbuf::overflow( int c )
--- 165,169 ----
  }
  
! //inline logbuf::int_type
  inline int
  logbuf::overflow( int c )
***************
*** 172,177 ****
  }
  
! /**
!  * @brief LogStream manipulator for setting the log level of a message.
   */
  struct loglevel
--- 172,176 ----
  }
  
! /** LogStream manipulator for setting the log level of a message.
   */
  struct loglevel
***************
*** 184,195 ****
  };
  
! /**
!  * @brief A helper class for logstream construction.
   *
!  * A helper class that ensures a streambuf and ostream are constructed and
!  * destroyed in the correct order.  The streambuf must be created before the
!  * ostream but bases are constructed before members.  Thus, making this class
!  * a private base of logstream, declared to the left of ostream, we ensure the
!  * correct order of construction and destruction.
   */
  struct SIMDATA_EXPORT logstream_base
--- 183,193 ----
  };
  
! /** A helper class for logstream construction.
   *
!  *  A helper class that ensures a streambuf and ostream are constructed and
!  *  destroyed in the correct order.  The streambuf must be created before the
!  *  ostream but bases are constructed before members.  Thus, making this class
!  *  a private base of logstream, declared to the left of ostream, we ensure the
!  *  correct order of construction and destruction.
   */
  struct SIMDATA_EXPORT logstream_base
***************
*** 199,204 ****
  };
   
! /**
!  * @brief Class to manage the debug logging stream.
   */
  class SIMDATA_EXPORT logstream : private logstream_base, public std::ostream
--- 197,201 ----
  };
   
! /** Class to manage the debug logging stream.
   */
  class SIMDATA_EXPORT logstream : private logstream_base, public std::ostream
***************
*** 206,213 ****
  	std::ofstream *m_out;
  public:
! 	/**
! 	* The default is to send messages to cerr.
! 	* @param out output stream
! 	*/
  	logstream(std::ostream& out_)
  		: logstream_base(),
--- 203,210 ----
  	std::ofstream *m_out;
  public:
! 	/** The default is to send messages to cerr.
! 	 * 
! 	 *  @param out_ output stream
! 	 */
  	logstream(std::ostream& out_)
  		: logstream_base(),
***************
*** 230,237 ****
  	}
  
! 	/**
! 	* Set the output stream
! 	* @param out output stream
! 	*/
  	void setOutput(std::ostream& out_) { 
  		_close();
--- 227,234 ----
  	}
  
! 	/** Set the output stream
! 	 *
! 	 *  @param out_ output stream
! 	 */
  	void setOutput(std::ostream& out_) { 
  		_close();
***************
*** 239,247 ****
  	}
  
! 	/**
! 	* Set the output stream
! 	* @param fn output file path
! 	*/
! 	void setOutput( std::string const &fn ) { 
  		_close();
  		m_out = new std::ofstream(fn.c_str());
--- 236,244 ----
  	}
  
! 	/** Set the output stream
! 	 *
! 	 *  @param fn output file path
! 	 */
! 	void setOutput(std::string const &fn) { 
  		_close();
  		m_out = new std::ofstream(fn.c_str());
***************
*** 249,269 ****
  	}
  
! 	/**
! 	* Set the global log class and priority level.
! 	* @param c debug class
! 	* @param p priority
! 	*/
  	void setLogLevels(int c, int p);
  
! 	/**
! 	* Set the global log class.
! 	* @param c debug class
! 	*/
  	void setLogClasses(int c);
  
! 	/**
! 	* Output operator to capture the debug level and priority of a message.
! 	* @param l log level
! 	*/
  	inline std::ostream& operator<< ( const loglevel& l );
  };
--- 246,265 ----
  	}
  
! 	/** Set the global log class and priority level.
! 	 *
! 	 *  @param c debug class
! 	 *  @param p priority
! 	 */
  	void setLogLevels(int c, int p);
  
! 	/** Set the global log class.
! 	 *
! 	 *  @param c debug class
! 	 */
  	void setLogClasses(int c);
  
! 	/** Output operator to capture the debug level and priority of a message.
! 	 *  @param l log level
! 	 */
  	inline std::ostream& operator<< ( const loglevel& l );
  };

[Csp-commits] APPLICATIONS/SimData/Source DataArchive.cpp,1.15.2.3,1.15.2.4 Link.cpp,1.6.2.1,1.6.2.2 Object.cpp,1.6.2.1,1.6.2.2

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

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv12171/Source

Modified Files:
      Tag: b0_4_0
	DataArchive.cpp Link.cpp Object.cpp 
Log Message:


Index: DataArchive.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/DataArchive.cpp,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -C2 -d -r1.15.2.3 -r1.15.2.4
*** DataArchive.cpp	18 Sep 2003 02:09:49 -0000	1.15.2.3
--- DataArchive.cpp	17 Oct 2003 21:33:55 -0000	1.15.2.4
***************
*** 395,401 ****
  		throw CorruptArchive("Object extraction incomplete for class '" + std::string(dup->getClassName()) + "'");
  	}
! 	if (dup->isStatic()) {
  		_addStatic(dup, "", id);
- 		// XXX dup->ref(); // we own a copy
  	}
  	return LinkBase(path, dup);
--- 395,400 ----
  		throw CorruptArchive("Object extraction incomplete for class '" + std::string(dup->getClassName()) + "'");
  	}
! 	if (proxy->isStatic()) {
  		_addStatic(dup, "", id);
  	}
  	return LinkBase(path, dup);

Index: Link.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Link.cpp,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -d -r1.6.2.1 -r1.6.2.2
*** Link.cpp	22 Aug 2003 00:21:45 -0000	1.6.2.1
--- Link.cpp	17 Oct 2003 21:33:55 -0000	1.6.2.2
***************
*** 70,73 ****
--- 70,74 ----
  	} else {
  		if (isNone()) {
+ 			// XXX should throw an exception
  			assert(!isNull());
  			hasht class_hash = _get()->getClassHash();
***************
*** 115,120 ****
  		Object* p = _reference;
  		assert(p);
! 		//printf("got %p (static=%d)\n", p, p->isStatic());
! 		SIMDATA_LOG(LOG_ARCHIVE, LOG_DEBUG, "got 0x" << std::hex << int(p) << " (static=" << p->isStatic() << ")");
  	}
  }
--- 116,120 ----
  		Object* p = _reference;
  		assert(p);
! 		SIMDATA_LOG(LOG_ARCHIVE, LOG_DEBUG, "got 0x" << std::hex << int(p) << ")");
  	}
  }

Index: Object.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Object.cpp,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -d -r1.6.2.1 -r1.6.2.2
*** Object.cpp	22 Aug 2003 00:21:45 -0000	1.6.2.1
--- Object.cpp	17 Oct 2003 21:33:55 -0000	1.6.2.2
***************
*** 29,50 ****
  
  
! void Object::serialize(Archive& archive) {
! 	archive(_static);
! }
! 
! // static management (don't touch!)
! void Object::setStatic(bool s) { 
! 	_static = s;
! }
! 
! bool Object::isStatic() const { 
! 	return _static; 
  }
  
! Object::Object(): Referenced(), BaseType(), _static(false), _path(0) {
  }
  
  Object::~Object() { 
! 	//printf("~Object %p\n", this); 
  }
  
--- 29,40 ----
  
  
! void Object::serialize(Archive&) {
  }
  
! Object::Object(): Referenced(), BaseType(), _path(0) {
  }
  
  Object::~Object() { 
! 	//std::cerr << "~Object 0x" << std::hex << static_cast<unsigned int>(this) << "\n"; 
  }
  

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.75.2.10,1.75.2.11 Makefile,1.20.2.1,1.20.2.2

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

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv12171

Modified Files:
      Tag: b0_4_0
	CHANGES.current Makefile 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.75.2.10
retrieving revision 1.75.2.11
diff -C2 -d -r1.75.2.10 -r1.75.2.11
*** CHANGES.current	10 Oct 2003 05:45:33 -0000	1.75.2.10
--- CHANGES.current	17 Oct 2003 21:33:54 -0000	1.75.2.11
***************
*** 1,116 ****
  Version 0.4.0 (in progress)
  ===========================
  2003-10-09: onsight
!             Added simdata:: prefix to Ref<N> in class FindVisitor and
! 	    FindAllVisitor (Composite.h) to fix msvc namespace resolution 
! 	    problems.
  
! 	    Renamed 'interface' variables in InterfaceRegistry to
! 	    'objectinterface' to avoid a msvc reserved keyword.
  
  2003-09-27: onsight
!             Added the VisualStudio2003 directory from the main trunk,
! 	    along with Stormbringer's patches to the project file.
  
  2003-09-17: onsight
!             Changed Real::asString() to use std::stringstream instead
! 	    of snprintf.
  
!             Changed DataArchive to use std::stringstream for an error
! 	    message.
  
! 	    Fixed including std headers into simdata namespace in
! 	    Date.cpp.
  
! 	    Fixed numerous double->float conversions (mostly in LUT.cpp).
  
! 	    Fixed numerous shadowed variables/methods in Quat, Matrix,
! 	    Vector, UTM, GeoPos, and others.
  
! 	    Added additional warning flags for g++.
  
! ==========> NOTE changes to the ObjectInterface templates trigger a
!             regression in swig 1.3.19.  Use either 1.3.16 or the most
! 	    recent cvs (pre 1.3.20).
  
! ==========> NOTE that Quaternion.h/cpp are now Quat.h/cpp
  
  2003-09-07: onsight
!             Fixed signed/unsigned comparisons in Composite.h
  
  2003-09-05: onsight
!             Added Composite.h, which contains template classes for
! 	    implementing the Composite/Visitor design pattern.
  
! 	    Improved doxygen comments, small bug fixes, added 
! 	    isContainer and canBeAdded properties, adding logging
! 	    of warning messages.
  
  2003-09-04: onsight
!             Changed Referenced from a nonvirtual to a virtual base class 
! 	    of Object.
  
  2003-08-25: onsight
!             Refactored InterfaceProxy, moving most of the functionality
! 	    into the InterfaceProxyBase class.  The base class now 
! 	    maintains a list of ObjectInterface instances that is used
! 	    to access externalized member variables.  MemberAccessor
! 	    classes are now fully encapsulated within the templated
! 	    ObjectInterface classes, so that the ObjectInterfaceBase
! 	    class can be extended in Python without any of the template
! 	    metaprogramming trickery that C++ demands.  
  
! 	    ObjectInterfaceBase now also keeps track of the object
! 	    interface hierarchy (both by class name and hash).
  
! 	    Access to the ObjectInterface corresponding to a particular
! 	    member variable name is now via a std::map lookup, which
! 	    should be faster than the previous implementation involving
! 	    a linear search via base class method calls.
  
  2003-08-21: onsight
!             Convertied from pack/unpack to serialize for BaseType
! 	    serialization:
! 
!               o Removed Pack.i, Pack.h, Pack.cpp
! 	      o Added Archive.h, Archive.i
! 	      o Appropriate changes to  setup.py and Source/Makefile
  
! 	    Object classes should now only implement serialize(Archive&)
! 	    to save and load themselves from data archives.  The Archive
! 	    parameter is a functor, which handles both saving and
! 	    loading transparently.  So instead of one list of 
! 	    Packer.pack(...) methods, and another identical list of
! 	    UnPacker.unpack(..) methods, you now just make one list of
! 	    archive(..) calls:
! 	    
! 	      void MyClass::serialize(Archive& archive) {
! 	         MyBaseClass::serialize(archive);
  		 archive(member_var1);
  		 archive(member_var2);
  		 ...
! 	      }
  
! 	    See the basic data type implementations for additional examples.
! 	    Note however that the basic data types generally have more 
! 	    complicated serialization routines than most object classes will 
! 	    require.  Many basic data types test whether the archive is 
! 	    loading or saving and respond differently depending on the 
! 	    situation.  For object classes this should almost always be 
! 	    unnecessary.
! 	    
! 	    Added equality and inequality operators to several base types.
  
! 	    Modified the Python serialization interface (still subject to 
! 	    further changes).
  
! 	    Added a unit testing framework based on Python's unittest module:
! 	      o runtests.py runs all the tests (not many so far)
! 	      o SimData/Tests contains the unit test modules
! 	      o SimData/Tests/ArchiveTests tests storage and retrieval
! 	        of many basic data types (not complete yet)
  
  2003-08-20: onsight
!             Tagged r0_3_4, version 0_3_5 started.
! 	    Version 0.4.0 branch started.
  
--- 1,135 ----
  Version 0.4.0 (in progress)
  ===========================
+ 2003-10-13: onsight
+   * Changed the 'static' property of Objects from an object property to a
+     class property.  The use of the 'static' attribute in Object xml tags 
+     is now deprecated.  To specify a static Object class, use the
+     SIMDATA_STATIC_OBJECT macro instead of SIMDATA_OBJECT.
+ 
+   * Added '--force' option to Compile.py, allowing warnings to be ignored.
+ 
+   * Added a deprecation warning to 'static' attribute of the Object tag.
+ 
+   * Added a more informative message in Compile.py if there are warnings
+     that exceed the current warning level, explaining how to use the
+     '--warn=X' option.
+ 
+   * Changed the format of the CHANGES.current file.  Main points are now
+     prefixed by a '*', and subpoints by a '+'.  Indent is now 2 spaces,
+     and the max line width is 78.  A syntax highlighting file for vim to
+     support this format can be downloaded from:
+            http://csp.sourceforge.net/downloads/CHANGES.vim
+ 
+   * Added deprecation warnings for <Curve> and <Table> xml tags.
+ 
+   * Improved and added some doxygen comments.
+ 
+   * Made InterfaceRegistry::addInterface private.
+    
+   * Made Referenced copy and assignment operators private (and 
+     unimplemented).
+ 
+ ==> NOTE all data archives must be fully rebuilt to use these changes.
+ 
  2003-10-09: onsight
!   * Added simdata:: prefix to Ref<N> in class FindVisitor and FindAllVisitor
!     (Composite.h) to fix msvc namespace resolution problems.
  
!   * Renamed 'interface' variables in InterfaceRegistry to 'objectinterface'
!     to avoid a msvc reserved keyword.
  
  2003-09-27: onsight
!   * Added the VisualStudio2003 directory from the main trunk, along with
!     Stormbringer's patches to the project file.
  
  2003-09-17: onsight
!   * Changed Real::asString() to use std::stringstream instead of snprintf.
  
!   * Changed DataArchive to use std::stringstream for an error message.
  
!   * Fixed including std headers into simdata namespace in Date.cpp.
  
!   * Fixed numerous double->float conversions (mostly in LUT.cpp).
  
!   * Fixed numerous shadowed variables/methods in Quat, Matrix, Vector, UTM, 
!     GeoPos, and others.
  
!   * Added additional warning flags for g++.
  
! ==> NOTE changes to the ObjectInterface templates trigger a regression in 
!     swig 1.3.19. Use either 1.3.16 or the most recent cvs (pre-1.3.20).
  
! ==> NOTE that Quaternion.h/cpp are now Quat.h/cpp
  
  2003-09-07: onsight
!   * Fixed signed/unsigned comparisons in Composite.h
  
  2003-09-05: onsight
!   * Added Composite.h, which contains template classes for implementing 
!     the Composite/Visitor design pattern.
  
!   * Improved doxygen comments, small bug fixes, added isContainer and 
!     canBeAdded properties, adding logging of warning messages.
  
  2003-09-04: onsight
!   * Changed Referenced from a nonvirtual to a virtual base class of Object.
  
  2003-08-25: onsight
!   * Refactored InterfaceProxy, moving most of the functionality into the 
!     InterfaceProxyBase class.  The base class now maintains a list of 
!     ObjectInterface instances that is used to access externalized member 
!     variables.  MemberAccessor classes are now fully encapsulated within 
!     the templated ObjectInterface classes, so that the ObjectInterfaceBase
!     class can be extended in Python without any of the template meta-
!     programming trickery that C++ demands.  
  
!   * ObjectInterfaceBase now also keeps track of the object interface 
!     hierarchy (both by class name and hash).
  
!   * Access to the ObjectInterface corresponding to a particular member 
!     variable name is now via a std::map lookup, which should be faster than 
!     the previous implementation involving a linear search via base class 
!     method calls.
  
  2003-08-21: onsight
!   * Convertied from pack/unpack to serialize for BaseType serialization:
!     + Removed Pack.i, Pack.h, Pack.cpp
!     + Added Archive.h, Archive.i
!     + Appropriate changes to  setup.py and Source/Makefile
  
!   * Object classes should now only implement serialize(Archive&) to save 
!     and load themselves from data archives.  The Archive parameter is a 
!     functor, which handles both saving and loading transparently.  So 
!     instead of one list of Packer.pack(...) methods, and another identical 
!     list of UnPacker.unpack(..) methods, you now just make one list of
!     archive(..) calls:
!    
!      void MyClass::serialize(Archive& archive) {
!         MyBaseClass::serialize(archive);
  		 archive(member_var1);
  		 archive(member_var2);
  		 ...
!      }
  
!     See the basic data type implementations for additional examples.
!     Note however that the basic data types generally have more complicated 
!     serialization routines than most object classes will require.  Many 
!     basic data types test whether the archive is loading or saving and 
!     respond differently depending on the situation.  For object classes 
!     this should almost always be unnecessary.
!    
!   * Added equality and inequality operators to several base types.
  
!   * Modified the Python serialization interface (still subject to further 
!     changes).
  
!   * Added a unit testing framework based on Python's unittest module:
!     + runtests.py runs all the tests (not many so far)
!     + SimData/Tests contains the unit test modules
!     + SimData/Tests/ArchiveTests tests storage and retrieval
!       of many basic data types (not complete yet)
  
  2003-08-20: onsight
!   * Tagged r0_3_4, version 0_3_5 started.
!   * Version 0.4.0 branch started.
  

Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Makefile,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -C2 -d -r1.20.2.1 -r1.20.2.2
*** Makefile	18 Sep 2003 02:09:48 -0000	1.20.2.1
--- Makefile	17 Oct 2003 21:33:54 -0000	1.20.2.2
***************
*** 3,11 ****
  export PYTHON_INCLUDE := $(shell python setup.py python_include_path)
  
! export GDEBUGF = -g -W -Wall -Werror -pedantic -Wmissing-prototypes -Wconversion -Wshadow #-DSIMDATA_NOLOADCHECK
  export GCFLAGS = -fPIC -O2 # -march=athlon-tbird
  export GLDOPTS = -shared -lswigpy -ldl
  export GSWOPTS = -c -c++ -python -noexcept
! export CXX = g++-3.3
  export SWIG = swig
  
--- 3,11 ----
  export PYTHON_INCLUDE := $(shell python setup.py python_include_path)
  
! export GDEBUGF = -g -W -Wall -pedantic -Wmissing-prototypes -Wconversion -Wshadow #-DSIMDATA_NOLOADCHECK
  export GCFLAGS = -fPIC -O2 # -march=athlon-tbird
  export GLDOPTS = -shared -lswigpy -ldl
  export GSWOPTS = -c -c++ -python -noexcept
! export CXX = g++
  export SWIG = swig
  

[Csp-commits] APPLICATIONS/SimData/SimData Compile.py,1.2,1.2.2.1 Parse.py,1.12,1.12.2.1

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

Update of /cvsroot/csp/APPLICATIONS/SimData/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv12171/SimData

Modified Files:
      Tag: b0_4_0
	Compile.py Parse.py 
Log Message:


Index: Compile.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Compile.py,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** Compile.py	11 Apr 2003 18:06:37 -0000	1.2
--- Compile.py	17 Oct 2003 21:33:55 -0000	1.2.2.1
***************
*** 144,150 ****
  			print "%d warnings (severity=%d)." % (warnings, level)
  			if level > 0: 
! 				print "Please fix these warnings and recompile."
! 				print "Compiled data archive NOT written!"
! 				sys.exit(1)
  		paths = master.getPaths()
  		DEBUG(1,"Compiling all objects")
--- 144,153 ----
  			print "%d warnings (severity=%d)." % (warnings, level)
  			if level > 0: 
! 				if level > getWarningLevel():
! 					print "Run with '--warn=%d' to see all warnings." % level
! 				if not self.force:
! 					print "Please fix these warnings and recompile."
! 					print "Compiled data archive NOT written!"
! 					sys.exit(1)
  		paths = master.getPaths()
  		DEBUG(1,"Compiling all objects")
***************
*** 188,191 ****
--- 191,195 ----
  			print >>out, "              --debug=level    show debug messages (< level)"
  			print >>out, "              --rebuild        rebuild entire archive"
+ 			print >>out, "              --force          ignore warnings"
  			print >>out, "              --help           help message"
  
***************
*** 224,227 ****
--- 228,233 ----
  				elif arg == '--rebuild':
  					self.rebuild = 1
+ 				elif arg == '--force':
+ 					self.force = 1
  				elif arg in ("--help", "-h", "-help"):
  					self.usage()
***************
*** 241,244 ****
--- 247,251 ----
  		setWarningLevel(1)
  		self.rebuild = 0
+ 		self.force = 0
  		self.infile = None
  		self.outfile = None

Index: Parse.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Parse.py,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** Parse.py	20 Aug 2003 02:47:10 -0000	1.12
--- Parse.py	17 Oct 2003 21:33:55 -0000	1.12.2.1
***************
*** 504,507 ****
--- 504,508 ----
  	def __init__(self, id, base, name, attrs):
  		SimpleHandler.__init__(self, id, base, name, attrs)
+ 		WARN(1, "<Curve> is deprecated, use Table1 instead.")
  		for member in CurveHandler.members:
  			setattr(self, "_"+member, None)
***************
*** 553,556 ****
--- 554,558 ----
  	def __init__(self, id, base, name, attrs):
  		SimpleHandler.__init__(self, id, base, name, attrs)
+ 		WARN(1, "<Curve> is deprecated, use Table2 instead.")
  		self._keys = {}
  		
***************
*** 733,738 ****
  		self._req_variables = self._interface.getRequiredNames()
  
! 		static = attrs.get("static", "0").upper() in ("1", "TRUE")
! 		self._object.setStatic(static)
  		
  	def endChild(self):
--- 735,740 ----
  		self._req_variables = self._interface.getRequiredNames()
  
! 		if attrs.has_key("static"):
! 			WARN(1, "'static' attribute of <Object> is deprecated.")
  		
  	def endChild(self):

[Csp-commits] APPLICATIONS/SimData/Doc footer.html,1.2,1.2.2.1

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

Update of /cvsroot/csp/APPLICATIONS/SimData/Doc
In directory sc8-pr-cvs1:/tmp/cvs-serv12171/Doc

Modified Files:
      Tag: b0_4_0
	footer.html 
Log Message:


Index: footer.html
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Doc/footer.html,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** footer.html	16 Aug 2003 10:29:43 -0000	1.2
--- footer.html	17 Oct 2003 21:33:54 -0000	1.2.2.1
***************
*** 2,6 ****
  <table width="100%">
  <tr><td>
! For more information on SimData, visit the <a href='http://simdata-csp.sourceforge.net'>SimData Homepage</a>.<br><br>
  <i>Generated on $datetime, using Doxygen $doxygenversion.</i>
  <td>
--- 2,6 ----
  <table width="100%">
  <tr><td>
! SimData version pre-0.4.0.  For more information on SimData, visit the <a href='http://simdata-csp.sourceforge.net'>SimData Homepage</a>.<br><br>
  <i>Generated on $datetime, using Doxygen $doxygenversion.</i>
  <td>

[Csp-commits] APPLICATIONS/SimData/SimData/Tests TODO,NONE,1.1.2.1

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

Update of /cvsroot/csp/APPLICATIONS/SimData/SimData/Tests
In directory sc8-pr-cvs1:/tmp/cvs-serv12171/SimData/Tests

Added Files:
      Tag: b0_4_0
	TODO 
Log Message:


--- NEW FILE: TODO ---
Future test suites:

  * Functionality and Python interface for base types.
  * Archive test with objects and links
  * Logging facility
  * Conversions
  * Object declarations and macros (C++)
  * Object interfaces and interface registry

[Csp-commits] APPLICATIONS/CSPSim/Include TerrainSymbol.h,1.2,NONE

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

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

Removed Files:
      Tag: systems
	TerrainSymbol.h 
Log Message:


--- TerrainSymbol.h DELETED ---

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli CSPSimAppli.vcproj,1.11,1.11.2.1

[<sto...@us...>]

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

Modified Files:
      Tag: systems
	CSPSimAppli.vcproj 
Log Message:
no message

Index: CSPSimAppli.vcproj
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli/CSPSimAppli.vcproj,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** CSPSimAppli.vcproj	19 Jul 2003 14:09:03 -0000	1.11
--- CSPSimAppli.vcproj	12 Oct 2003 21:10:05 -0000	1.11.2.1
***************
*** 1,6 ****
! <?xml version="1.0" encoding = "Windows-1252"?>
  <VisualStudioProject
  	ProjectType="Visual C++"
! 	Version="7.00"
  	Name="CSPSimAppli"
  	SccProjectName=""
--- 1,6 ----
! <?xml version="1.0" encoding="Windows-1252"?>
  <VisualStudioProject
  	ProjectType="Visual C++"
! 	Version="7.10"
  	Name="CSPSimAppli"
  	SccProjectName=""
***************
*** 68,72 ****
--- 68,78 ----
  				Name="VCWebServiceProxyGeneratorTool"/>
  			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
  				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
  		<Configuration
***************
*** 132,138 ****
--- 138,152 ----
  				Name="VCWebServiceProxyGeneratorTool"/>
  			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
  				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
  	</Configurations>
+ 	<References>
+ 	</References>
  	<Files>
  		<Filter
***************
*** 149,152 ****
--- 163,169 ----
  			</File>
  			<File
+ 				RelativePath="..\..\Source\base.cpp">
+ 			</File>
+ 			<File
  				RelativePath="..\..\Source\BaseDynamics.cpp">
  			</File>
***************
*** 155,159 ****
  			</File>
  			<File
! 				RelativePath="..\..\Source\CSPSim.cpp">
  			</File>
  			<File
--- 172,188 ----
  			</File>
  			<File
! 				RelativePath="..\..\Source\cCSP_wrap.cpp">
! 				<FileConfiguration
! 					Name="Release|Win32">
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="Debug|Win32">
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"/>
! 				</FileConfiguration>
  			</File>
  			<File
***************
*** 188,195 ****
  			</File>
  			<File
! 				RelativePath="..\..\Source\DemeterTerrain.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\DynamicObject.cpp">
  			</File>
  			<File
--- 217,224 ----
  			</File>
  			<File
! 				RelativePath="..\..\Source\CSPSim.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\DemeterTerrain.cpp">
  			</File>
  			<File
***************
*** 197,200 ****
--- 226,232 ----
  			</File>
  			<File
+ 				RelativePath="..\..\Source\DynamicObject.cpp">
+ 			</File>
+ 			<File
  				RelativePath="..\..\Source\Engine.cpp">
  			</File>
***************
*** 224,227 ****
--- 256,262 ----
  			</File>
  			<File
+ 				RelativePath="..\..\Source\main.cpp">
+ 			</File>
+ 			<File
  				RelativePath="..\..\Source\MenuScreen.cpp">
  			</File>
***************
*** 278,309 ****
  			</File>
  			<File
! 				RelativePath="..\..\Source\VirtualBattlefield.cpp">
! 			</File>
! 			<File
! 				RelativePath="..\..\Source\VirtualScene.cpp">
! 			</File>
! 			<File
! 				RelativePath="..\..\Source\base.cpp">
! 			</File>
! 			<File
! 				RelativePath="..\..\Source\cCSP_wrap.cpp">
! 				<FileConfiguration
! 					Name="Release|Win32">
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="Debug|Win32">
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"/>
! 				</FileConfiguration>
  			</File>
  			<File
! 				RelativePath="..\..\Source\main.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\trees.cpp">
  			</File>
  			<Filter
--- 313,323 ----
  			</File>
  			<File
! 				RelativePath="..\..\Source\trees.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\VirtualBattlefield.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\VirtualScene.cpp">
  			</File>
  			<Filter
***************
*** 376,382 ****
  			</File>
  			<File
- 				RelativePath="..\..\Include\CSPSim.h">
- 			</File>
- 			<File
  				RelativePath="..\..\Include\Collision.h">
  			</File>
--- 390,393 ----
***************
*** 385,388 ****
--- 396,402 ----
  			</File>
  			<File
+ 				RelativePath="..\..\Include\compiler.h">
+ 			</File>
+ 			<File
  				RelativePath="..\..\Include\Config.h">
  			</File>
***************
*** 394,397 ****
--- 408,417 ----
  			</File>
  			<File
+ 				RelativePath="..\..\Include\CSPSim.h">
+ 			</File>
+ 			<File
+ 				RelativePath="..\..\Include\debug_types.h">
+ 			</File>
+ 			<File
  				RelativePath="..\..\Include\DemeterTerrain.h">
  			</File>
***************
*** 400,407 ****
  			</File>
  			<File
! 				RelativePath="..\..\Include\DynamicObject.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\DynamicalSystem.h">
  			</File>
  			<File
--- 420,427 ----
  			</File>
  			<File
! 				RelativePath="..\..\Include\DynamicalSystem.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\DynamicObject.h">
  			</File>
  			<File
***************
*** 503,512 ****
  			<File
  				RelativePath="..\..\Include\VirtualScene.h">
- 			</File>
- 			<File
- 				RelativePath="..\..\Include\compiler.h">
- 			</File>
- 			<File
- 				RelativePath="..\..\Include\debug_types.h">
  			</File>
  		</Filter>
--- 523,526 ----

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL CSPSimDLL.vcproj,1.13,1.13.2.1

[<sto...@us...>]

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

Modified Files:
      Tag: systems
	CSPSimDLL.vcproj 
Log Message:
no message

Index: CSPSimDLL.vcproj
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** CSPSimDLL.vcproj	19 Jul 2003 14:08:52 -0000	1.13
--- CSPSimDLL.vcproj	12 Oct 2003 21:09:40 -0000	1.13.2.1
***************
*** 1,7 ****
! <?xml version="1.0" encoding = "Windows-1252"?>
  <VisualStudioProject
  	ProjectType="Visual C++"
! 	Version="7.00"
  	Name="CSPSimDLL"
  	SccProjectName=""
  	SccLocalPath="">
--- 1,8 ----
! <?xml version="1.0" encoding="Windows-1252"?>
  <VisualStudioProject
  	ProjectType="Visual C++"
! 	Version="7.10"
  	Name="CSPSimDLL"
+ 	RootNamespace="CSPSimDLL"
  	SccProjectName=""
  	SccLocalPath="">
***************
*** 23,27 ****
  				AdditionalOptions="/Zm1000"
  				Optimization="0"
! 				AdditionalIncludeDirectories="C:\Python22\include;..\..\Include;..\..\..\..\THIRDPARTYLIBS\include;..\..\..\..\THIRDPARTYLIBS\demeter;..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include"
  				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS"
  				BasicRuntimeChecks="3"
--- 24,28 ----
  				AdditionalOptions="/Zm1000"
  				Optimization="0"
! 				AdditionalIncludeDirectories="&quot;E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5\sigc++\config&quot;;E:\CSP\THIRDPARTYLIBS\OpenThreads\include;E:\CSP\THIRDPARTYLIBS\Producer\include;&quot;E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5&quot;;C:\Python22\include;..\..\Include;..\..\..\..\THIRDPARTYLIBS\include;..\..\..\..\THIRDPARTYLIBS\demeter;..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include"
  				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS"
  				BasicRuntimeChecks="3"
***************
*** 72,76 ****
--- 73,83 ----
  				Name="VCWebServiceProxyGeneratorTool"/>
  			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
  				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
  		<Configuration
***************
*** 86,90 ****
  				AdditionalOptions="/Zm1000"
  				InlineFunctionExpansion="1"
! 				AdditionalIncludeDirectories="../../Include;C:/Python22/include;../../../../THIRDPARTYLIBS/include;../../../../THIRDPARTYLIBS/demeter;..\..\..\..\\THIRDPARTYLIBS\CSPChunkLod\include"
  				PreprocessorDefinitions="CSP_NDEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS"
  				StringPooling="TRUE"
--- 93,97 ----
  				AdditionalOptions="/Zm1000"
  				InlineFunctionExpansion="1"
! 				AdditionalIncludeDirectories="E:\CSP\THIRDPARTYLIBS\OpenThreads\include;&quot;E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5\sigc++\config&quot;;E:\CSP\THIRDPARTYLIBS\Producer\include;&quot;E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5&quot;;../../Include;C:/Python22/include;../../../../THIRDPARTYLIBS/include;../../../../THIRDPARTYLIBS/demeter;..\..\..\..\\THIRDPARTYLIBS\CSPChunkLod\include"
  				PreprocessorDefinitions="CSP_NDEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS"
  				StringPooling="TRUE"
***************
*** 104,108 ****
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib"
  				OutputFile="../../Bin/_cCSP.dll"
  				LinkIncremental="1"
--- 111,115 ----
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib sigc-1.2.lib OpenThreadsWin32.lib"
  				OutputFile="../../Bin/_cCSP.dll"
  				LinkIncremental="1"
***************
*** 131,137 ****
--- 138,152 ----
  				Name="VCWebServiceProxyGeneratorTool"/>
  			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
  				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
  	</Configurations>
+ 	<References>
+ 	</References>
  	<Files>
  		<Filter
***************
*** 151,154 ****
--- 166,172 ----
  			</File>
  			<File
+ 				RelativePath="..\..\Source\base.cpp">
+ 			</File>
+ 			<File
  				RelativePath="..\..\Source\BaseDynamics.cpp">
  			</File>
***************
*** 157,161 ****
  			</File>
  			<File
! 				RelativePath="..\..\Source\CSPSim.cpp">
  			</File>
  			<File
--- 175,191 ----
  			</File>
  			<File
! 				RelativePath="..\..\Source\cCSP_wrap.cpp">
! 				<FileConfiguration
! 					Name="Debug|Win32">
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="Release|Win32">
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"/>
! 				</FileConfiguration>
  			</File>
  			<File
***************
*** 190,197 ****
  			</File>
  			<File
! 				RelativePath="..\..\Source\DemeterTerrain.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\DynamicObject.cpp">
  			</File>
  			<File
--- 220,227 ----
  			</File>
  			<File
! 				RelativePath="..\..\Source\CSPSim.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\DemeterTerrain.cpp">
  			</File>
  			<File
***************
*** 199,202 ****
--- 229,235 ----
  			</File>
  			<File
+ 				RelativePath="..\..\Source\DynamicObject.cpp">
+ 			</File>
+ 			<File
  				RelativePath="..\..\Source\Engine.cpp">
  			</File>
***************
*** 226,229 ****
--- 259,265 ----
  			</File>
  			<File
+ 				RelativePath="..\..\Source\KineticsChannels.cpp">
+ 			</File>
+ 			<File
  				RelativePath="..\..\Source\LandingGear.cpp">
  			</File>
***************
*** 250,256 ****
  			</File>
  			<File
- 				RelativePath="..\..\Source\PrimaryAeroDynamics.cpp">
- 			</File>
- 			<File
  				RelativePath="..\..\Source\ScreenInfo.cpp">
  			</File>
--- 286,289 ----
***************
*** 274,314 ****
  			</File>
  			<File
! 				RelativePath="..\..\Source\TankObject.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\TerrainObject.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\Theater.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\Tools.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\VirtualBattlefield.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\VirtualScene.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\base.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\cCSP_wrap.cpp">
! 				<FileConfiguration
! 					Name="Debug|Win32">
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="Release|Win32">
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"/>
! 				</FileConfiguration>
  			</File>
  			<File
! 				RelativePath="..\..\Source\trees.cpp">
  			</File>
  			<Filter
--- 307,338 ----
  			</File>
  			<File
! 				RelativePath="..\..\Source\SynchronousUpdate.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\System.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\SystemsModel.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\TankObject.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\TerrainObject.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\Theater.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\Tools.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\trees.cpp">
  			</File>
  			<File
! 				RelativePath="..\..\Source\VirtualBattlefield.cpp">
! 			</File>
! 			<File
! 				RelativePath="..\..\Source\VirtualScene.cpp">
  			</File>
  			<Filter
***************
*** 358,361 ****
--- 382,398 ----
  				</File>
  			</Filter>
+ 			<Filter
+ 				Name="Systems"
+ 				Filter="">
+ 				<File
+ 					RelativePath="..\..\Source\Systems\AircraftFlightSensors.cpp">
+ 				</File>
+ 				<File
+ 					RelativePath="..\..\Source\Systems\AircraftInputSystem.cpp">
+ 				</File>
+ 				<File
+ 					RelativePath="..\..\Source\Systems\AircraftSimpleFCS.cpp">
+ 				</File>
+ 			</Filter>
  		</Filter>
  		<Filter
***************
*** 387,391 ****
  			</File>
  			<File
! 				RelativePath="..\..\Include\CSPSim.h">
  			</File>
  			<File
--- 424,428 ----
  			</File>
  			<File
! 				RelativePath="..\..\Include\Bus.h">
  			</File>
  			<File
***************
*** 399,402 ****
--- 436,442 ----
  			</File>
  			<File
+ 				RelativePath="..\..\Include\compiler.h">
+ 			</File>
+ 			<File
  				RelativePath="..\..\Include\Config.h">
  			</File>
***************
*** 405,415 ****
  			</File>
  			<File
  				RelativePath="..\..\Include\DataRecorder.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\DemeterTerrain.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\DynamicObject.h">
  			</File>
  			<File
--- 445,458 ----
  			</File>
  			<File
+ 				RelativePath="..\..\Include\CSPSim.h">
+ 			</File>
+ 			<File
  				RelativePath="..\..\Include\DataRecorder.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\debug_types.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\DemeterTerrain.h">
  			</File>
  			<File
***************
*** 417,420 ****
--- 460,466 ----
  			</File>
  			<File
+ 				RelativePath="..\..\Include\DynamicObject.h">
+ 			</File>
+ 			<File
  				RelativePath="..\..\Include\Engine.h">
  			</File>
***************
*** 474,480 ****
  			</File>
  			<File
- 				RelativePath="..\..\Include\PrimaryAeroDynamics.h">
- 			</File>
- 			<File
  				RelativePath="..\..\Include\Profile.h">
  			</File>
--- 520,523 ----
***************
*** 501,529 ****
  			</File>
  			<File
! 				RelativePath="..\..\Include\TankObject.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\TerrainObject.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\Theater.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\Tools.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\VehicleModel.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\VirtualBattlefield.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\compiler.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\debug_types.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\stdinc.h">
  			</File>
  			<Filter
--- 544,575 ----
  			</File>
  			<File
! 				RelativePath="..\..\Include\stdinc.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\SynchronousUpdate.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\System.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\SystemsModel.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\TankObject.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\TerrainObject.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\Theater.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\Tools.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\VehicleModel.h">
! 			</File>
! 			<File
! 				RelativePath="..\..\Include\VirtualBattlefield.h">
  			</File>
  			<Filter
***************
*** 579,582 ****
--- 625,647 ----
  				</File>
  			</Filter>
+ 			<Filter
+ 				Name="Systems"
+ 				Filter="">
+ 				<File
+ 					RelativePath="..\..\Include\Systems\AircraftDynamics.h">
+ 				</File>
+ 				<File
+ 					RelativePath="..\..\Include\Systems\AircraftFlightSensors.h">
+ 				</File>
+ 				<File
+ 					RelativePath="..\..\Include\Systems\AircraftInputSystem.h">
+ 				</File>
+ 				<File
+ 					RelativePath="..\..\Include\Systems\AircraftSimpleFCS.h">
+ 				</File>
+ 				<File
+ 					RelativePath="..\..\Include\Systems\GearDynamics.h">
+ 				</File>
+ 			</Filter>
  		</Filter>
  		<Filter
***************
*** 598,602 ****
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i
  "
  					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>
--- 663,667 ----
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.16\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i
  "
  					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio CSPSim.sln,1.1,1.1.2.1

[<bra...@us...>]

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

Modified Files:
      Tag: systems
	CSPSim.sln 
Log Message:
no message

Index: CSPSim.sln
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSim.sln,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** CSPSim.sln	22 Mar 2003 02:26:39 -0000	1.1
--- CSPSim.sln	11 Oct 2003 18:24:04 -0000	1.1.2.1
***************
*** 1,19 ****
! Microsoft Visual Studio Solution File, Format Version 7.00
! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSPSimAppli", "CSPSimAppli\CSPSimAppli.vcproj", "{7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}"
! EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSPSimDLL", "CSPSimDLL\CSPSimDLL.vcproj", "{A609C12F-9E38-4AFF-8560-B1099F051941}"
  EndProject
  Global
  	GlobalSection(SolutionConfiguration) = preSolution
! 		ConfigName.0 = Debug
! 		ConfigName.1 = Release
! 	EndGlobalSection
! 	GlobalSection(ProjectDependencies) = postSolution
  	EndGlobalSection
  	GlobalSection(ProjectConfiguration) = postSolution
- 		{7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}.Debug.ActiveCfg = Debug|Win32
- 		{7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}.Debug.Build.0 = Debug|Win32
- 		{7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}.Release.ActiveCfg = Release|Win32
- 		{7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}.Release.Build.0 = Release|Win32
  		{A609C12F-9E38-4AFF-8560-B1099F051941}.Debug.ActiveCfg = Debug|Win32
  		{A609C12F-9E38-4AFF-8560-B1099F051941}.Debug.Build.0 = Debug|Win32
--- 1,13 ----
! Microsoft Visual Studio Solution File, Format Version 8.00
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSPSimDLL", "CSPSimDLL\CSPSimDLL.vcproj", "{A609C12F-9E38-4AFF-8560-B1099F051941}"
+ 	ProjectSection(ProjectDependencies) = postProject
+ 	EndProjectSection
  EndProject
  Global
  	GlobalSection(SolutionConfiguration) = preSolution
! 		Debug = Debug
! 		Release = Release
  	EndGlobalSection
  	GlobalSection(ProjectConfiguration) = postSolution
  		{A609C12F-9E38-4AFF-8560-B1099F051941}.Debug.ActiveCfg = Debug|Win32
  		{A609C12F-9E38-4AFF-8560-B1099F051941}.Debug.Build.0 = Debug|Win32

[Csp-commits] APPLICATIONS/CSPSim/Include CSPSim.i,1.9.2.1,1.9.2.2

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

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

Modified Files:
      Tag: systems
	CSPSim.i 
Log Message:


Index: CSPSim.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/CSPSim.i,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** CSPSim.i	16 Sep 2003 06:57:30 -0000	1.9.2.1
--- CSPSim.i	11 Oct 2003 18:05:43 -0000	1.9.2.2
***************
*** 46,50 ****
  	simdata::Ref<DynamicObject> const getActiveObject() const;
  	VirtualBattlefield * const getBattlefield() const;
- 	EventMapIndex *getInterfaceMaps() { return m_InterfaceMaps; }
  	void togglePause();
  	void runConsole(PyConsole *console);
--- 46,49 ----