Changeset 3188 for code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc

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

File:

• code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc (modified) (2 diffs)

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.