Changeset 2442 for code/branches/physics_merge/src/orxonox/objects/worldentities/Billboard.cc

Timestamp:

Dec 14, 2008, 4:16:52 PM (16 years ago)

Author:

rgrieder

Message:

Finally merged physics stuff. Target is physics_merge because I'll have to do some testing first.

Location:

code/branches/physics_merge

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/Billboard.cc (modified) (5 diffs)

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

@@ -30 +30 @@
 #include "Billboard.h"
 
+#include <OgreBillboardSet.h>
+
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -38 +40 @@
     CreateFactory(Billboard);
 
-    Billboard::Billboard(BaseObject* creator) : PositionableEntity(creator)
+    Billboard::Billboard(BaseObject* creator) : StaticEntity(creator)
     {
         RegisterObject(Billboard);
@@ -50 +52 @@
         {
             if (this->isInitialized() && this->billboard_.getBillboardSet())
-                this->getNode()->detachObject(this->billboard_.getName());
+                this->detachOgreObject(this->billboard_.getName());
         }
     }
@@ -76 +78 @@
                 this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->material_, this->colour_, 1);
                 if (this->billboard_.getBillboardSet())
-                    this->getNode()->attachObject(this->billboard_.getBillboardSet());
+                     this->attachOgreObject(this->billboard_.getBillboardSet());
                 this->billboard_.setVisible(this->isVisible());
             }
@@ -92 +94 @@
                 this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->material_, this->colour_, 1);
                 if (this->billboard_.getBillboardSet())
-                    this->getNode()->attachObject(this->billboard_.getBillboardSet());
+                    this->attachOgreObject(this->billboard_.getBillboardSet());
                 this->billboard_.setVisible(this->isVisible());
             }