Changeset 2459 for code/branches/presentation/src/orxonox/tools

Timestamp:

Dec 15, 2008, 12:53:05 AM (16 years ago)

Author:

rgrieder

Message:

Merged physics_merge back to presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/orxonox/tools/BillboardSet.cc (modified) (1 diff)
• src/orxonox/tools/BillboardSet.h (modified) (1 diff)
• src/orxonox/tools/BulletConversions.h (copied) (copied from code/branches/physics_merge/src/orxonox/tools/BulletConversions.h)
• src/orxonox/tools/Mesh.cc (modified) (1 diff)
• src/orxonox/tools/Mesh.h (modified) (1 diff)
• src/orxonox/tools/ParticleInterface.cc (modified) (2 diffs)
• src/orxonox/tools/ParticleInterface.h (modified) (3 diffs)

code/branches/presentation/src/orxonox/tools/BillboardSet.cc

@@ -34 +34 @@
 
 #include <OgreSceneManager.h>
+#include <OgreBillboardSet.h>
 #include <OgreBillboard.h>
 

code/branches/presentation/src/orxonox/tools/BillboardSet.h

@@ -33 +33 @@
 
 #include <string>
-#include <OgreBillboardSet.h>
+#include <OgrePrerequisites.h>
 
 #include "util/Math.h"

code/branches/presentation/src/orxonox/tools/Mesh.cc

@@ -31 +31 @@
 
 #include <sstream>
+#include <OgreEntity.h>
 #include <OgreSceneManager.h>
 #include <cassert>

code/branches/presentation/src/orxonox/tools/Mesh.h

@@ -33 +33 @@
 
 #include <string>
-#include <OgreEntity.h>
+#include <OgrePrerequisites.h>
 
 namespace orxonox

code/branches/presentation/src/orxonox/tools/ParticleInterface.cc

@@ -57 +57 @@
 
         this->scenemanager_ = scenemanager;
-        this->sceneNode_ = 0;
         this->particleSystem_ = 0;
 
@@ -87 +86 @@
         {
             this->particleSystem_->removeAllEmitters();
-            this->detachFromSceneNode();
             this->scenemanager_->destroyParticleSystem(this->particleSystem_);
-        }
-    }
-
-    void ParticleInterface::addToSceneNode(Ogre::SceneNode* sceneNode)
-    {
-        if (this->sceneNode_)
-            this->detachFromSceneNode();
-
-        if (this->particleSystem_)
-        {
-            this->sceneNode_ = sceneNode;
-            this->sceneNode_->attachObject(this->particleSystem_);
-        }
-    }
-
-    void ParticleInterface::detachFromSceneNode()
-    {
-        if (this->sceneNode_)
-        {
-            if (this->particleSystem_)
-                this->sceneNode_->detachObject(this->particleSystem_);
-            this->sceneNode_ = 0;
         }
     }

code/branches/presentation/src/orxonox/tools/ParticleInterface.h

@@ -33 +33 @@
 
 #include <string>
-#include <OgreParticleEmitter.h>
+#include <OgrePrerequisites.h>
 
 #include "core/OrxonoxClass.h"
@@ -53 +53 @@
             inline Ogre::ParticleSystem* getParticleSystem() const
                 { return this->particleSystem_; }
-
-            void addToSceneNode(Ogre::SceneNode* sceneNode);
-            void detachFromSceneNode();
 
             Ogre::ParticleEmitter* createNewEmitter();
@@ -96 +93 @@
             static unsigned int       counter_s;
 
-            Ogre::SceneNode*          sceneNode_;
             Ogre::ParticleSystem*     particleSystem_;
             bool                      bVisible_;