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

Timestamp:

Dec 28, 2007, 10:30:29 PM (17 years ago)

Author:

rgrieder

Message:

• added Vector2, Vector3, Matrix3, ColourValue, Quaternion and String to the misc folder as header files (each of them contains #include <string> … typedef std::string String , etc.)
• please use String from now on by including <misc/String.h"
• removed #include <OgreVector3.h", etc. from "CoreIncludes.h" (adjusted all source files)
• adjusted all the source files (except network, that keeps <string> for the moment) (what a mess..)
• moved usleep hack to misc/Sleep.h
• relative include paths for files from other root directories (like misc, network, etc.) (but it stills writes "../Orxonox.h" when in folder orxonox/objects)
• "OgreSceneManager.h" —> <OgreSceneManager.h>
• included OrxonoxPrereqs in every file in folder orxonox
• moved HUD and ParticleInterface to namespace orxonox
• removed some using namespace Ogre/std when appropriate
• I hope I haven't forgotten important points..

Location:

code/branches/FICN/src/orxonox/particle

Files:

• ParticleInterface.cc (modified) (2 diffs)
• ParticleInterface.h (modified) (1 diff)

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

@@ -1 +1 @@
 /*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *      ...
- *   Co-authors:
- *      ...
- *
- */
+*   ORXONOX - the hottest 3D action shooter ever to exist
+*
+*
+*   License notice:
+*
+*   This program is free software; you can redistribute it and/or
+*   modify it under the terms of the GNU General Public License
+*   as published by the Free Software Foundation; either version 2
+*   of the License, or (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program; if not, write to the Free Software
+*   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*
+*   Author:
+*      ...
+*   Co-authors:
+*      ...
+*
+*/
 
 /**
- * @file ParticleInterface.cc
- * @brief class to control praticle effects
- */
+* @file ParticleInterface.cc
+* @brief class to control praticle effects
+*/
 
 #include "ParticleInterface.h"
 // #include <OgreParticleSystem.h>
 // #include <Ogre.h>
-//#include <OIS/OIS.h>
+// #include <OIS/OIS.h>
 // #include <CEGUI/CEGUI.h>
 // #include <CEGUIRenderer.h>
 
 
-using namespace Ogre;
 
-namespace particle {
+namespace orxonox {
+  using namespace Ogre;
 
   ParticleInterface::ParticleInterface( SceneManager *sceneManager, String name, String templateName )
@@ -122 +122 @@
   }
 
- // TODO check if this really works
+  // TODO check if this really works
   Vector3 ParticleInterface::getPositionOfEmitter ( int emitterNr )
   {

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

@@ -11 +11 @@
 #include <OgreSceneManager.h>
 
+#include "../OrxonoxPrereqs.h"
 
-namespace particle
+#include "misc/Vector3.h"
+#include "misc/String.h"
+#include "misc/ColourValue.h"
+
+
+namespace orxonox
 {
 
-class ParticleInterface
-{
- public:
+  class ParticleInterface
+  {
+  public:
 
-  ParticleInterface( Ogre::SceneManager *sceneManager, Ogre::String name, Ogre::String templateName );
-  ~ParticleInterface( void );
+    ParticleInterface( Ogre::SceneManager *sceneManager, String name, String templateName );
+    ~ParticleInterface( void );
 
-  void inline addToSceneNode( Ogre::SceneNode* sceneNode ) { sceneNode_ = sceneNode; sceneNode_->attachObject(particleSystem_);};
-  void inline detachFromSceneNode( void ) { sceneNode_->detachObject(particleSystem_); sceneNode_ = NULL;};
+    void inline addToSceneNode( Ogre::SceneNode* sceneNode ) { sceneNode_ = sceneNode; sceneNode_->attachObject(particleSystem_);};
+    void inline detachFromSceneNode( void ) { sceneNode_->detachObject(particleSystem_); sceneNode_ = NULL;};
 
-  Ogre::ParticleEmitter* getEmitter ( int emitterNr );
-  void newEmitter ( void );
+    Ogre::ParticleEmitter* getEmitter ( int emitterNr );
+    void newEmitter ( void );
 
-  Ogre::Vector3 getPositionOfEmitter ( int emitterNr );
-  inline void setPositionOfEmitter ( int emitterNr, Ogre::Vector3 position ) { particleSystem_->getEmitter(emitterNr)->setPosition(position); };
+    Vector3 getPositionOfEmitter ( int emitterNr );
+    inline void setPositionOfEmitter ( int emitterNr, Vector3 position ) { particleSystem_->getEmitter(emitterNr)->setPosition(position); };
 
-  inline Ogre::Vector3 getDirection ( void ) { return particleSystem_->getEmitter(0)->getDirection(); };
-  void setDirection ( Ogre::Vector3 direction );
+    inline Vector3 getDirection ( void ) { return particleSystem_->getEmitter(0)->getDirection(); };
+    void setDirection ( Vector3 direction );
 
-  inline Ogre::Real getVelocity() {return velocity_; };
-  void setVelocity( Ogre::Real v );
+    inline Real getVelocity() {return velocity_; };
+    void setVelocity( Real v );
 
-  inline int getRate() { return rate_; };
-  void setRate( int r );
+    inline int getRate() { return rate_; };
+    void setRate( int r );
 
-  inline Ogre::Real getDistance() { return distance_; };
-  void setDistance( Ogre::Real d );
+    inline Real getDistance() { return distance_; };
+    void setDistance( Real d );
 
-  inline Ogre::ColourValue getColour( void ) {return colour_;};
-  void setColour( Ogre::ColourValue colour );
+    inline ColourValue getColour( void ) {return colour_;};
+    void setColour( ColourValue colour );
 
-  void switchEnable();
+    void switchEnable();
 
-  inline Ogre::ParticleSystem* getParticleSystem() { return this->particleSystem_; };
+    inline Ogre::ParticleSystem* getParticleSystem() { return this->particleSystem_; };
 
- private:
-  Ogre::SceneNode *sceneNode_;
-  Ogre::SceneManager *sceneManager_;
-  Ogre::ParticleSystem *particleSystem_;
-  Ogre::Real distance_;
-  Ogre::Real velocity_;
-  int rate_;
-  Ogre::ColourValue colour_;
-  int numberOfEmitters_;
+  private:
+    Ogre::SceneNode *sceneNode_;
+    Ogre::SceneManager *sceneManager_;
+    Ogre::ParticleSystem *particleSystem_;
+    Real distance_;
+    Real velocity_;
+    int rate_;
+    ColourValue colour_;
+    int numberOfEmitters_;
 
-  void standardizeEmitters();
-};
+    void standardizeEmitters();
+  };
 
 }
+
 #endif /* _ParticleInterface_H__ */