[Csp-commits] APPLICATIONS/CSPSim/Include ObjectModel.h,1.10,1.11

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

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

Modified Files:
	ObjectModel.h 
Log Message:


Index: ObjectModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/ObjectModel.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ObjectModel.h	26 Jun 2003 09:25:45 -0000	1.10
--- ObjectModel.h	18 Jul 2003 21:05:14 -0000	1.11
***************
*** 43,46 ****
--- 43,54 ----
  #include "SmokeEffects.h"
  
+ class Animation;
+ class AnimationCallback;
+ class AnimationChannel;
+ 
+ namespace osgText {
+ 	class Text;
+ }
+ 
  
  /**
***************
*** 74,77 ****
--- 82,86 ----
  		SIMDATA_XML("cull_face", ObjectModel::m_CullFace, false)
  		SIMDATA_XML("landing_gear", ObjectModel::m_LandingGear, false)
+ 		SIMDATA_XML("animations", ObjectModel::m_Animations, false)
  	END_SIMDATA_XML_INTERFACE
  
***************
*** 79,84 ****
  	virtual ~ObjectModel();
  
! 	osg::ref_ptr<osg::Node> getModel() { return m_Transform.get(); }
! 	osg::ref_ptr<osg::Node> getRawModel() { return m_Node.get(); }
  	std::string getModelPath() const { return m_ModelPath.getSource(); }
  
--- 88,93 ----
  	virtual ~ObjectModel();
  
! 	osg::ref_ptr<osg::Node> getModel() { return m_Model.get(); }
! 	osg::ref_ptr<osg::Node> getDebugMarkers() { return m_DebugMarkers.get(); }
  	std::string getModelPath() const { return m_ModelPath.getSource(); }
  
***************
*** 112,115 ****
--- 121,125 ----
  	ContactList m_Contacts;
  	std::vector<simdata::Vector3> m_LandingGear;
+ 	simdata::Link<Animation>::vector m_Animations;
  	
  	virtual void pack(simdata::Packer& p) const;
***************
*** 131,136 ****
  private:
  	osg::ref_ptr<osg::Group> m_GearSprites;
- 	osg::ref_ptr<osg::Node> m_Node;
  	osg::ref_ptr<osg::MatrixTransform> m_Transform;
  	osg::ref_ptr<osg::Switch> m_DebugMarkers;
  	osg::ref_ptr<osg::Group> m_ContactMarkers;
--- 141,146 ----
  private:
  	osg::ref_ptr<osg::Group> m_GearSprites;
  	osg::ref_ptr<osg::MatrixTransform> m_Transform;
+ 	osg::ref_ptr<osg::Node> m_Model;
  	osg::ref_ptr<osg::Switch> m_DebugMarkers;
  	osg::ref_ptr<osg::Group> m_ContactMarkers;
***************
*** 150,157 ****
--- 160,169 ----
  	osg::ref_ptr<osg::PositionAttitudeTransform> m_Transform;
  	osg::ref_ptr<osg::Switch> m_Switch;
+ 	osg::ref_ptr<osgText::Text> m_Label;
  	simdata::Ref<ObjectModel> m_Model;
  	bool m_Smoke;
  	osg::ref_ptr<fx::SmokeTrailSystem> m_SmokeTrails;
  	std::vector<simdata::Vector3> m_SmokeEmitterLocation;
+ 	std::vector< osg::ref_ptr<AnimationCallback> > m_AnimationCallbacks;
  protected:
  	virtual ~SceneModel();
***************
*** 177,180 ****
--- 189,194 ----
  	}
  
+ 	AnimationChannel *bindAnimationChannel(std::string const &control, AnimationChannel *channel);
+ 
  	void setSmokeEmitterLocation(std::vector<simdata::Vector3> const &sel);
  	bool addSmoke();
***************
*** 183,186 ****
--- 197,201 ----
  	void enableSmoke();
  	void updateSmoke(double dt, simdata::Vector3 const & global_position, simdata::Quaternion const &attitude);
+ 	void setLabel(std::string const &);
  };