Changeset 10443 for code/branches/cpp11/src/libraries

Timestamp:

May 17, 2015, 9:45:02 PM (10 years ago)

Author:

landauf

Message:

fixed includes to make it compile without build units

Location:

code/branches/cpp11/src/libraries

Files:

• tools/BulletDebugDrawer.h (modified) (1 diff)
• tools/OgreBulletUtils.h (modified) (2 diffs)
• util/SmallObjectAllocator.h (modified) (1 diff)

code/branches/cpp11/src/libraries/tools/BulletDebugDrawer.h

@@ -13 +13 @@
 #include <btBulletCollisionCommon.h>
 #include <OgreFrameListener.h>
+#include <OgreVector3.h>
+#include <OgreColourValue.h>
 
 namespace orxonox

code/branches/cpp11/src/libraries/tools/OgreBulletUtils.h

@@ -10 +10 @@
 
 #include "tools/ToolsPrereqs.h"
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreColourValue.h>
+#include <OgreMatrix3.h>
+#include <OgreMatrix4.h>
 
 namespace orxonox
@@ -42 +47 @@
     inline Ogre::Matrix3 matrix3(const btMatrix3x3& matrix)
     {
-        return Matrix3(
+        return Ogre::Matrix3(
                 matrix[0][0], matrix[0][1], matrix[0][2],
                 matrix[1][0], matrix[1][1], matrix[1][2],

code/branches/cpp11/src/libraries/util/SmallObjectAllocator.h

@@ -77 +77 @@
 #include "UtilPrereqs.h"
 #include <vector>
+#include <cstdio>
 
 namespace orxonox