Changeset 708 for code/branches/FICN/src/orxonox/objects/BillboardSet.h

Timestamp:

Dec 28, 2007, 10:30:29 PM (18 years ago)

Author:

rgrieder

Message:

• added Vector2, Vector3, Matrix3, ColourValue, Quaternion and String to the misc folder as header files (each of them contains #include <string> … typedef std::string String , etc.)
• please use String from now on by including <misc/String.h"
• removed #include <OgreVector3.h", etc. from "CoreIncludes.h" (adjusted all source files)
• adjusted all the source files (except network, that keeps <string> for the moment) (what a mess..)
• moved usleep hack to misc/Sleep.h
• relative include paths for files from other root directories (like misc, network, etc.) (but it stills writes "../Orxonox.h" when in folder orxonox/objects)
• "OgreSceneManager.h" —> <OgreSceneManager.h>
• included OrxonoxPrereqs in every file in folder orxonox
• moved HUD and ParticleInterface to namespace orxonox
• removed some using namespace Ogre/std when appropriate
• I hope I haven't forgotten important points..

File:

• code/branches/FICN/src/orxonox/objects/BillboardSet.h (modified) (2 diffs)

code/branches/FICN/src/orxonox/objects/BillboardSet.h

@@ -2 +2 @@
 #define _BillboardSet_H__
 
-#include <string>
+#include <OgreBillboardSet.h>
 
-#include "OgreBillboardSet.h"
+#include "../OrxonoxPrereqs.h"
+
+#include "misc/String.h"
+#include "../core/CoreIncludes.h"
+#include "misc/ColourValue.h"
+#include "misc/Vector3.h"
 
 namespace orxonox
@@ -13 +18 @@
             BillboardSet();
             ~BillboardSet();
-            void setBillboardSet(const std::string& file, const Ogre::ColourValue& colour = Ogre::ColourValue(1.0, 1.0, 1.0), int count = 1, const Ogre::Vector3& position = Ogre::Vector3::ZERO);
+            void setBillboardSet(const String& file, const ColourValue& colour = ColourValue(1.0, 1.0, 1.0), int count = 1, const Vector3& position = Vector3::ZERO);
 
             inline Ogre::BillboardSet* getBillboardSet()
                 { return this->billboardSet_; }
 
-            inline const std::string& getName() const
+            inline const String& getName() const
                 { return this->billboardSet_->getName(); }