[Csp-commits] APPLICATIONS/CSPSim/Include ObjectModel.h,1.8,1.9 Engine.h,1.1,1.2 Collision.h,1.1,1.2

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

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

Modified Files:
	ObjectModel.h Engine.h Collision.h 
Log Message:
see CHANGES.current

Index: ObjectModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/ObjectModel.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ObjectModel.h	19 Jun 2003 18:07:51 -0000	1.8
--- ObjectModel.h	22 Jun 2003 08:58:41 -0000	1.9
***************
*** 151,155 ****
  	SceneModel(simdata::Ref<ObjectModel> const & model);
  	
- 	
  	simdata::Ref<ObjectModel> getModel() { return m_Model; }
  	osg::Group* getRoot() { return m_Transform.get(); }
--- 151,154 ----

Index: Engine.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Engine.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Engine.h	19 Jun 2003 18:07:51 -0000	1.1
--- Engine.h	22 Jun 2003 08:58:41 -0000	1.2
***************
*** 19,23 ****
  
  /**
!  * @file Thrust.h
   *
   **/
--- 19,23 ----
  
  /**
!  * @file Engine.h
   *
   **/
***************
*** 63,67 ****
  	simdata::Link<ThrustData> m_ThrustData;
  	simdata::Vector3 m_ThrustDirection, m_EngineOffset;
! 	float m_Throttle;
  	float m_Mach;
  	float m_Altitude;
--- 63,67 ----
  	simdata::Link<ThrustData> m_ThrustData;
  	simdata::Vector3 m_ThrustDirection, m_EngineOffset;
! 	float const *m_Throttle;
  	float m_Mach;
  	float m_Altitude;
***************
*** 89,93 ****
  
  	void setThrustDirection(simdata::Vector3 const& thrustDirection);
! 	void setThrottle(float throttle);
  	void setMach(float mach);
  	void setAltitude(float altitude);
--- 89,93 ----
  
  	void setThrustDirection(simdata::Vector3 const& thrustDirection);
! 	void bindThrottle(float const &throttle);
  	void setMach(float mach);
  	void setAltitude(float altitude);
***************
*** 102,106 ****
  	typedef simdata::Link<Engine>::vector ESet;
  	ESet m_Engine;
! 	double const *m_Throttle;
  public:
  
--- 102,106 ----
  	typedef simdata::Link<Engine>::vector ESet;
  	ESet m_Engine;
! 	float m_Throttle;
  public:
  
***************
*** 113,119 ****
  	virtual void pack(simdata::Packer& p) const; 
      virtual void unpack(simdata::UnPacker &p); 
  
  	EngineDynamics();
! 	void bindThrottle(double const &throttle);
  	void update(double dt);
  	std::vector<simdata::Vector3> getSmokeEmitterLocation() const;
--- 113,120 ----
  	virtual void pack(simdata::Packer& p) const; 
      virtual void unpack(simdata::UnPacker &p); 
+ 	virtual void postCreate();
  
  	EngineDynamics();
! 	void setThrottle(double const throttle);
  	void update(double dt);
  	std::vector<simdata::Vector3> getSmokeEmitterLocation() const;

Index: Collision.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Collision.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Collision.h	19 Jun 2003 18:07:51 -0000	1.1
--- Collision.h	22 Jun 2003 08:58:41 -0000	1.2
***************
*** 94,98 ****
  public:
  	GroundCollisionDynamics(double mass, simdata::Matrix3 const &inertia, std::vector<simdata::Vector3> const &contacts);
! 	void preSimulationStep(double dt);
  	void bindWeight(simdata::Vector3 const &weightBody);
  	void update(double dt);
--- 94,98 ----
  public:
  	GroundCollisionDynamics(double mass, simdata::Matrix3 const &inertia, std::vector<simdata::Vector3> const &contacts);
! 	void reset(double dt);
  	void bindWeight(simdata::Vector3 const &weightBody);
  	void update(double dt);