[Orxonox-commit 6430] r11087 - code/trunk/src/libraries/tools

[landauf at orxonox.net]

Author: landauf
Date: 2016-01-23 23:15:55 +0100 (Sat, 23 Jan 2016)
New Revision: 11087

Modified:
   code/trunk/src/libraries/tools/BillboardSet.cc
Log:
removed duplicate code

Modified: code/trunk/src/libraries/tools/BillboardSet.cc
===================================================================
--- code/trunk/src/libraries/tools/BillboardSet.cc	2016-01-23 21:07:53 UTC (rev 11086)
+++ code/trunk/src/libraries/tools/BillboardSet.cc	2016-01-23 22:15:55 UTC (rev 11087)
@@ -65,25 +65,7 @@
 
     void BillboardSet::setBillboardSet(Ogre::SceneManager* scenemanager, const std::string& file, const Vector3& position, int count)
     {
-        assert(scenemanager);
-        this->destroyBillboardSet();
-
-        try
-        {
-            if (GameMode::showsGraphics())
-            {
-                this->billboardSet_ = scenemanager->createBillboardSet("Billboard" + multi_cast<std::string>(BillboardSet::billboardSetCounter_s++), count);
-                this->billboardSet_->createBillboard(position);
-                this->billboardSet_->setMaterialName(file);
-            }
-        }
-        catch (...)
-        {
-            orxout(internal_error) << "Couldn't load billboard \"" << file << '"' << endl;
-            this->billboardSet_ = nullptr;
-        }
-
-        this->scenemanager_ = scenemanager;
+        this->setBillboardSet(scenemanager, file, ColourValue::White, position, count);
     }
 
     void BillboardSet::setBillboardSet(Ogre::SceneManager* scenemanager, const std::string& file, const ColourValue& colour, const Vector3& position, int count)