Changeset 2232 for code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc

Timestamp:

Nov 19, 2008, 7:07:36 PM (17 years ago)

Author:

polakma

Message:

added new features to munition.h and weapon.h. tried to fix projectiles (still doesn't compile)

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc (modified) (2 diffs)

code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc

@@ -42 +42 @@
         RegisterObject(BillboardProjectile);
 
-        this->billboard_.setBillboardSet("Examples/Flare", ColourValue(1.0, 1.0, 0.5), 1);
-        this->attachObject(this->billboard_.getBillboardSet());
+        this->billboard_.setBillboardSet(this->scenemanager_, "Examples/Flare", ColourValue(1.0, 1.0, 0.5), 1);
+        //this->attachObject(this->billboard_.getBillboardSet());
         this->scale(0.5);
     }
@@ -49 +49 @@
     BillboardProjectile::~BillboardProjectile()
     {
-        if (this->isInitialized() && this->owner_)
-            this->detachObject(this->billboard_.getBillboardSet());
+        //if (this->isInitialized() && this->owner_)
+            //this->detachObject(this->billboard_.getBillboardSet());
     }