Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11087 for code/trunk


Ignore:
Timestamp:
Jan 23, 2016, 11:15:55 PM (8 years ago)
Author:
landauf
Message:

removed duplicate code

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/libraries/tools/BillboardSet.cc

    r11071 r11087  
    6666    void BillboardSet::setBillboardSet(Ogre::SceneManager* scenemanager, const std::string& file, const Vector3& position, int count)
    6767    {
    68         assert(scenemanager);
    69         this->destroyBillboardSet();
    70 
    71         try
    72         {
    73             if (GameMode::showsGraphics())
    74             {
    75                 this->billboardSet_ = scenemanager->createBillboardSet("Billboard" + multi_cast<std::string>(BillboardSet::billboardSetCounter_s++), count);
    76                 this->billboardSet_->createBillboard(position);
    77                 this->billboardSet_->setMaterialName(file);
    78             }
    79         }
    80         catch (...)
    81         {
    82             orxout(internal_error) << "Couldn't load billboard \"" << file << '"' << endl;
    83             this->billboardSet_ = nullptr;
    84         }
    85 
    86         this->scenemanager_ = scenemanager;
     68        this->setBillboardSet(scenemanager, file, ColourValue::White, position, count);
    8769    }
    8870
Note: See TracChangeset for help on using the changeset viewer.