csp-commits

[<de...@us...>]

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

Modified Files:
	TerrainObject.h PhysicsModel.h ObjectModel.h NumericalMethod.h 
	DynamicalSystem.h AircraftObject.h 
Log Message:
*** see CHANGES.current ***

Index: TerrainObject.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/TerrainObject.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TerrainObject.h	26 Jun 2003 09:25:45 -0000	1.8
--- TerrainObject.h	19 Jul 2003 14:08:25 -0000	1.9
***************
*** 92,100 ****
  	protected:
  		bool				_hit;
! 		float                           _ratio;
! 		simdata::Vector3		_start;
! 		simdata::Vector3		_end;
! 		simdata::Vector3                _point;
! 		simdata::Vector3                _normal;
  	};
  
--- 92,100 ----
  	protected:
  		bool				_hit;
! 		float				_ratio;
! 		simdata::Vector3	_start;
! 		simdata::Vector3	_end;
! 		simdata::Vector3    _point;
! 		simdata::Vector3    _normal;
  	};
  

Index: PhysicsModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/PhysicsModel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PhysicsModel.h	26 Jun 2003 09:25:45 -0000	1.1
--- PhysicsModel.h	19 Jul 2003 14:08:25 -0000	1.2
***************
*** 112,121 ****
  
  	/**
! 	 * Extract kinematic variables from the vector field.
  	 */
  	void YToBody(std::vector<double> const &y);
  
  	/**
! 	 * Assemble the vector field from individual kinematic variables.
  	 */
  	std::vector<double> const &bodyToY(simdata::Vector3 const &p,
--- 112,121 ----
  
  	/**
! 	 * Extract kinematic variables from the vector field variable.
  	 */
  	void YToBody(std::vector<double> const &y);
  
  	/**
! 	 * Assemble the vector field variable from individual kinematic variables.
  	 */
  	std::vector<double> const &bodyToY(simdata::Vector3 const &p,

Index: ObjectModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/ObjectModel.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ObjectModel.h	18 Jul 2003 21:05:14 -0000	1.11
--- ObjectModel.h	19 Jul 2003 14:08:25 -0000	1.12
***************
*** 41,47 ****
  #include <SimData/InterfaceRegistry.h>
  
  #include "SmokeEffects.h"
  
! class Animation;
  class AnimationCallback;
  class AnimationChannel;
--- 41,49 ----
  #include <SimData/InterfaceRegistry.h>
  
+ //FIXME: or not FIXME? see below, forward declaration
+ #include "Animation.h"
  #include "SmokeEffects.h"
  
! //class Animation;
  class AnimationCallback;
  class AnimationChannel;

Index: NumericalMethod.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/NumericalMethod.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** NumericalMethod.h	18 Jul 2003 21:16:41 -0000	1.8
--- NumericalMethod.h	19 Jul 2003 14:08:25 -0000	1.9
***************
*** 83,87 ****
  		m_failed(false) {
  	}
! 	NumericalMethod(VectorField* pf, bool deleteVF = true):
  		m_bdeleteVF(deleteVF),
  		vectorField(pf), 
--- 83,87 ----
  		m_failed(false) {
  	}
! 	NumericalMethod(VectorField* pf, bool deleteVF = false):
  		m_bdeleteVF(deleteVF),
  		vectorField(pf), 

Index: DynamicalSystem.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/DynamicalSystem.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DynamicalSystem.h	30 Jun 2003 22:29:15 -0000	1.6
--- DynamicalSystem.h	19 Jul 2003 14:08:25 -0000	1.7
***************
*** 31,40 ****
  #include "NumericalMethod.h"
  
- 
  class DynamicalSystem: public VectorField {
  	NumericalMethod* _numericalMethod;
  public:
  	DynamicalSystem(unsigned short dimension = 0);
- 	DynamicalSystem(VectorField* pf);
  	virtual ~DynamicalSystem();
  	void setNumericalMethod(NumericalMethod* pnumericalMethod);
--- 31,38 ----

Index: AircraftObject.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/AircraftObject.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AircraftObject.h	18 Jul 2003 21:00:57 -0000	1.15
--- AircraftObject.h	19 Jul 2003 14:08:25 -0000	1.16
***************
*** 33,39 ****
  //#include "PrimaryAeroDynamics.h"
  #include "FlightDynamics.h"
  
  
! class FlightModel;
  class AnimationValueChannel;
  
--- 33,40 ----
  //#include "PrimaryAeroDynamics.h"
  #include "FlightDynamics.h"
+ #include "FlightModel.h"
  
  
! //class FlightModel;
  class AnimationValueChannel;
  
***************
*** 108,111 ****
--- 109,116 ----
  	ACTION_INTERFACE(AircraftObject, DecAileron);
  	ACTION_INTERFACE(AircraftObject, noDecAileron);
+ 	ACTION_INTERFACE(AircraftObject, IncRudder);
+ 	ACTION_INTERFACE(AircraftObject, noIncRudder);
+ 	ACTION_INTERFACE(AircraftObject, DecRudder);
+ 	ACTION_INTERFACE(AircraftObject, noDecRudder);
  	ACTION_INTERFACE(AircraftObject, IncThrottle);
  	ACTION_INTERFACE(AircraftObject, noIncThrottle);