Changeset 3188

Timestamp:

Jun 16, 2009, 2:44:36 PM (15 years ago)

Author:

rgrieder

Message:

Added attachOgreObject and detachOgreObject overloads for Ogre::Camera, Ogre::Entity, Ogre::BillboardSet and Ogre::ParticleSystem.
This saves about nine Ogre includes

Location:

code/branches/pch/src/orxonox/objects

Files:

• weaponsystem/projectiles/BillboardProjectile.cc (modified) (1 diff)
• weaponsystem/projectiles/ParticleProjectile.cc (modified) (1 diff)
• worldentities/BigExplosion.cc (modified) (1 diff)
• worldentities/Billboard.cc (modified) (1 diff)
• worldentities/CameraPosition.cc (modified) (1 diff)
• worldentities/ExplosionChunk.cc (modified) (1 diff)
• worldentities/ParticleEmitter.cc (modified) (1 diff)
• worldentities/WorldEntity.cc (modified) (2 diffs)
• worldentities/WorldEntity.h (modified) (1 diff)
• worldentities/pawns/Spectator.cc (modified) (1 diff)
• worldentities/triggers/Trigger.cc (modified) (1 diff)

code/branches/pch/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc

@@ -29 +29 @@
 #include "BillboardProjectile.h"
 
-#include <OgreBillboardSet.h>
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"

code/branches/pch/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.cc

@@ -29 +29 @@
 #include "ParticleProjectile.h"
 
-#include <OgreParticleSystem.h>
 #include <OgreParticleEmitter.h>
-
 #include "tools/ParticleInterface.h"
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/worldentities/BigExplosion.cc

@@ -30 +30 @@
 
 //#include <sstream>
-#include <OgreParticleSystem.h>
 
 #include "util/Exception.h"

code/branches/pch/src/orxonox/objects/worldentities/Billboard.cc

@@ -28 +28 @@
 
 #include "Billboard.h"
-
-#include <OgreBillboardSet.h>
 
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/worldentities/CameraPosition.cc

@@ -29 +29 @@
 #include "CameraPosition.h"
 
-#include <OgreCamera.h>
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"

code/branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.cc

@@ -28 +28 @@
 
 #include "ExplosionChunk.h"
-
-#include <OgreParticleSystem.h>
 
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/worldentities/ParticleEmitter.cc

@@ -33 +33 @@
 
 #include "ParticleEmitter.h"
-
-#include <OgreParticleSystem.h>
 
 #include "util/Exception.h"

code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -30 +30 @@
 #include "WorldEntity.h"
 
+#include <OgreBillboardSet.h>
+#include <OgreCamera.h>
+#include <OgreEntity.h>
+#include <OgreParticleSystem.h>
+#include <OgreSceneManager.h>
 #include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
 #include <BulletDynamics/Dynamics/btRigidBody.h>
 #include <boost/static_assert.hpp>
@@ -468 +472 @@
     //! Attaches an Ogre::MovableObject to this WorldEntity.
     void WorldEntity::attachOgreObject(Ogre::MovableObject* object)
-    {
-        this->node_->attachObject(object);
-    }
+        { this->node_->attachObject(object); }
+    void WorldEntity::attachOgreObject(Ogre::BillboardSet* object)
+        { this->node_->attachObject(object); }
+    void WorldEntity::attachOgreObject(Ogre::Camera* object)
+        { this->node_->attachObject(object); }
+    void WorldEntity::attachOgreObject(Ogre::Entity* object)
+        { this->node_->attachObject(object); }
+    void WorldEntity::attachOgreObject(Ogre::ParticleSystem* object)
+        { this->node_->attachObject(object); }
 
     //! Detaches an Ogre::MovableObject from this WorldEntity.
     void WorldEntity::detachOgreObject(Ogre::MovableObject* object)
-    {
-        this->node_->detachObject(object);
-    }
+        { this->node_->detachObject(object); }
+    void WorldEntity::detachOgreObject(Ogre::BillboardSet* object)
+        { this->node_->detachObject(object); }
+    void WorldEntity::detachOgreObject(Ogre::Camera* object)
+        { this->node_->detachObject(object); }
+    void WorldEntity::detachOgreObject(Ogre::Entity* object)
+        { this->node_->detachObject(object); }
+    void WorldEntity::detachOgreObject(Ogre::ParticleSystem* object)
+        { this->node_->detachObject(object); }
 
     //! Detaches an Ogre::MovableObject (by string) from this WorldEntity.

code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.h

@@ -173 +173 @@
                 { return this->children_; }
 
-            void attachOgreObject(Ogre::MovableObject* object);
-            void detachOgreObject(Ogre::MovableObject* object);
+            void attachOgreObject(Ogre::MovableObject*  object);
+            void attachOgreObject(Ogre::BillboardSet*   object);
+            void attachOgreObject(Ogre::Camera*         object);
+            void attachOgreObject(Ogre::Entity*         object);
+            void attachOgreObject(Ogre::ParticleSystem* object);
+
+            void detachOgreObject(Ogre::MovableObject*  object);
+            void detachOgreObject(Ogre::BillboardSet*   object);
+            void detachOgreObject(Ogre::Camera*         object);
+            void detachOgreObject(Ogre::Entity*         object);
+            void detachOgreObject(Ogre::ParticleSystem* object);
+
             Ogre::MovableObject* detachOgreObject(const Ogre::String& name);
 

code/branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.cc

@@ -28 +28 @@
 
 #include "Spectator.h"
-
-#include <OgreBillboardSet.h>
 
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.cc

@@ -28 +28 @@
 
 #include "Trigger.h"
-
-#include <OgreBillboardSet.h>
 
 #include "core/CoreIncludes.h"