Changeset 2442 for code/branches/physics_merge/src/orxonox/objects/worldentities/Planet.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/Planet.cc (modified) (4 diffs)

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

@@ -63 +63 @@
     {
         if (this->isInitialized() && this->mesh_.getEntity())
-            this->getNode()->detachObject(this->mesh_.getEntity());
+            this->detachOgreObject(this->mesh_.getEntity());
     }    
 
@@ -108 +108 @@
         billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0));
 
-        this->getNode()->attachObject(this->billboard_.getBillboardSet());    
+        this->attachOgreObject(this->billboard_.getBillboardSet());    
         this->billboard_.getBillboardSet()->setUseAccurateFacing(true);
         this->setCastShadows(true);
@@ -118 +118 @@
     {
         if (this->mesh_.getEntity())
-            this->getNode()->detachObject(this->mesh_.getEntity());
+            this->detachOgreObject(this->mesh_.getEntity());
 
         this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
@@ -124 +124 @@
         if (this->mesh_.getEntity())
         {
-            this->getNode()->attachObject(this->mesh_.getEntity());
+            this->attachOgreObject(this->mesh_.getEntity());
             this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
             this->mesh_.setVisible(this->isVisible());