[Csp-commits] APPLICATIONS/CSPSim/Include VirtualScene.h,1.6,1.7 Theater.h,1.4,1.5 StaticObject.h,1.5,1.6 Projection.h,1.1,1.2 NumericalMethod.h,1.6,1.7 DynamicalSystem.h,1.5,1.6

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

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

Modified Files:
	VirtualScene.h Theater.h StaticObject.h Projection.h 
	NumericalMethod.h DynamicalSystem.h 
Log Message:
*** see CHANGES.current ***

Index: VirtualScene.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/VirtualScene.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** VirtualScene.h	26 Jun 2003 09:25:45 -0000	1.6
--- VirtualScene.h	30 Jun 2003 22:29:15 -0000	1.7
***************
*** 82,86 ****
  	void addFeatureCell(osg::Node *feature);
  	void removeFeatureCell(osg::Node *feature);
! 	void setNearObject(simdata::Ref<DynamicObject> object, bool near);
  
  	void setLookAt(simdata::Vector3 & eyePos, simdata::Vector3 & lookPos, simdata::Vector3 & upVec);
--- 82,86 ----
  	void addFeatureCell(osg::Node *feature);
  	void removeFeatureCell(osg::Node *feature);
! 	void setNearObject(simdata::Ref<DynamicObject> object, bool isNear);
  
  	void setLookAt(simdata::Vector3 & eyePos, simdata::Vector3 & lookPos, simdata::Vector3 & upVec);

Index: Theater.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Theater.h	26 Jun 2003 09:25:45 -0000	1.4
--- Theater.h	30 Jun 2003 22:29:15 -0000	1.5
***************
*** 42,46 ****
  class TerrainObject;
  class FeatureGroup;
! class FeatureGroupList;
  
  
--- 42,47 ----
  class TerrainObject;
  class FeatureGroup;
! 
! #include "Theater/FeatureGroupList.h"
  
  

Index: StaticObject.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/StaticObject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StaticObject.h	3 May 2003 09:47:54 -0000	1.5
--- StaticObject.h	30 Jun 2003 22:29:15 -0000	1.6
***************
*** 54,58 ****
  	virtual void initialize() {}
  	virtual unsigned int onRender() { return 0; }
! 	virtual simdata::Vector3 const & getGlobalPosition() const { return simdata::Vector3::ZERO; }
  	virtual void setGlobalPosition(simdata::Vector3 const & position) {}
  	virtual void updateScene(simdata::Vector3 const &origin) {}
--- 54,58 ----
  	virtual void initialize() {}
  	virtual unsigned int onRender() { return 0; }
! 	virtual simdata::Vector3 getGlobalPosition() const { return simdata::Vector3::ZERO; }
  	virtual void setGlobalPosition(simdata::Vector3 const & position) {}
  	virtual void updateScene(simdata::Vector3 const &origin) {}

Index: Projection.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Projection.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Projection.h	26 Jun 2003 09:25:45 -0000	1.1
--- Projection.h	30 Jun 2003 22:29:15 -0000	1.2
***************
*** 38,41 ****
--- 38,42 ----
  #include <cstdio>
  
+ using simdata::Normalized;
  
  /**

Index: NumericalMethod.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/NumericalMethod.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NumericalMethod.h	19 Jun 2003 18:07:51 -0000	1.6
--- NumericalMethod.h	30 Jun 2003 22:29:15 -0000	1.7
***************
*** 34,37 ****
--- 34,38 ----
  class VectorField
  {
+ protected:
  	unsigned short const m_dimension;
  public:

Index: DynamicalSystem.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/DynamicalSystem.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DynamicalSystem.h	19 Jun 2003 18:07:51 -0000	1.5
--- DynamicalSystem.h	30 Jun 2003 22:29:15 -0000	1.6
***************
*** 32,36 ****
  
  
! class DynamicalSystem: protected VectorField {
  	NumericalMethod* _numericalMethod;
  public:
--- 32,36 ----
  
  
! class DynamicalSystem: public VectorField {
  	NumericalMethod* _numericalMethod;
  public: