Changeset 609 for code/branches/FICN/src/orxonox/particle

Timestamp:

Dec 18, 2007, 12:32:09 PM (17 years ago)

Author:

rgrieder

Message:

• removed all the "using namespace Ogre" in the header files
• cleaned up the orxonox.cc header a little bit (every Ogre class referenced is now included via header file)

File:

• code/branches/FICN/src/orxonox/particle/ParticleInterface.h (modified) (2 diffs)

code/branches/FICN/src/orxonox/particle/ParticleInterface.h

@@ -8 +8 @@
 // #include <CEGUIRenderer.h>
 
-using namespace Ogre;
 
 namespace particle
@@ -16 +15 @@
 {
  public:
-        ParticleSystem *particleSystem_;
+        Ogre::ParticleSystem *particleSystem_;
 
-        ParticleInterface( SceneManager *sceneManager, String name, String templateName );
+        ParticleInterface( Ogre::SceneManager *sceneManager, Ogre::String name, Ogre::String templateName );
         ~ParticleInterface( void );
-        void addToSceneNode( SceneNode* sceneNode );
+        void addToSceneNode( Ogre::SceneNode* sceneNode );
         void dettachFromSceneNode( void );
-        ParticleEmitter* getEmitter ( int emitterNr );
+        Ogre::ParticleEmitter* getEmitter ( int emitterNr );
         void newEmitter ( void );
-        void setPositionOfEmitter ( int emitterNr, Vector3 position );
-        Vector3 getPositionOfEmitter ( int emitterNr );
-        void setDirection ( Vector3 direction );
-        Vector3 getDirection ( void );
-        Real getVelocity();
-        void setVelocity( Real v );
+        void setPositionOfEmitter ( int emitterNr, Ogre::Vector3 position );
+        Ogre::Vector3 getPositionOfEmitter ( int emitterNr );
+        void setDirection ( Ogre::Vector3 direction );
+        Ogre::Vector3 getDirection ( void );
+        Ogre::Real getVelocity();
+        void setVelocity( Ogre::Real v );
         int getRate();
         void setRate( int r );
-        Real getDistance();
-        void setDistance( Real d );
-        ColourValue getColour( void );
-        void setColour( ColourValue colour );
+        Ogre::Real getDistance();
+        void setDistance( Ogre::Real d );
+        Ogre::ColourValue getColour( void );
+        void setColour( Ogre::ColourValue colour );
         void switchEnable( void );
 
  private:
-        SceneNode *sceneNode_;
-        SceneManager *sceneManager_;
-        Real distance_;
-        Real velocity_;
+        Ogre::SceneNode *sceneNode_;
+        Ogre::SceneManager *sceneManager_;
+        Ogre::Real distance_;
+        Ogre::Real velocity_;
         int rate_;
-        ColourValue colour_;
+        Ogre::ColourValue colour_;
         int numberOfEmitters_;