Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2367


Ignore:
Timestamp:
Dec 9, 2008, 6:08:20 PM (16 years ago)
Author:
landauf
Message:

used SceneManager provided by our Scene

Location:
code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc

    r2272 r2367  
    3333
    3434#include "core/CoreIncludes.h"
     35#include "objects/Scene.h"
    3536
    3637namespace orxonox
     
    4243        RegisterObject(BillboardProjectile);
    4344
    44         this->billboard_.setBillboardSet(this->scenemanager_, "Examples/Flare", ColourValue(1.0, 1.0, 0.5), 1);
     45        assert(this->getScene()->getSceneManager()); // getScene() was already checked by WorldEntity
     46
     47        this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(1.0, 1.0, 0.5), 1);
    4548        //this->attachObject(this->billboard_.getBillboardSet());
    4649        this->scale(0.5);
  • code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.h

    r2272 r2367  
    4747            virtual void changedVisibility();
    4848
    49             inline Ogre::SceneManager* getSceneManager()
    50             { return this->scenemanager_; }
    51 
    5249        private:
    5350            BillboardSet billboard_;
    54             Ogre::SceneManager* scenemanager_;
    5551    };
    5652}
Note: See TracChangeset for help on using the changeset viewer.