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

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.cc (modified) (2 diffs)

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

@@ -28 +28 @@
 #include <sstream>
 
+#include <OgreSceneManager.h>
+
+#include "../Orxonox.h"
+#include "misc/Vector3.h"
+#include "misc/ColourValue.h"
+
 #include "BillboardSet.h"
-#include "../Orxonox.h"
 
 namespace orxonox
@@ -40 +45 @@
     }
 
-    void BillboardSet::setBillboardSet(const std::string& file, const Ogre::ColourValue& colour, int count, const Ogre::Vector3& position)
+    void BillboardSet::setBillboardSet(const String& file, const ColourValue& colour, int count, const Vector3& position)
     {
         std::ostringstream name;