Changeset 3192 for code/branches/pch/src/orxonox/tools

Timestamp:

Jun 18, 2009, 10:00:15 AM (15 years ago)

Author:

rgrieder

Message:

Replaced <OgrePrerequisites.h> with "util/OgreForwardRefs.h": I haven't yet realised that OgrePrerequisites.h includes about every single std header by including the OgreMemoryManager.h file.
And while at it, I took care of some type conversions (partially revealed by the missing OgrePrerequisites.h that disabled warnings)

Location:

code/branches/pch/src/orxonox/tools

Files:

• BillboardSet.h (modified) (1 diff)
• Mesh.h (modified) (1 diff)
• ParticleInterface.h (modified) (1 diff)
• Shader.cc (modified) (1 diff)
• Shader.h (modified) (1 diff)

code/branches/pch/src/orxonox/tools/BillboardSet.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
-#include <OgrePrerequisites.h>
-#include "util/UtilPrereqs.h"
+#include "util/OgreForwardRefs.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/tools/Mesh.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
-#include <OgrePrerequisites.h>
+#include "util/OgreForwardRefs.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/tools/ParticleInterface.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include <OgrePrerequisites.h>
+#include "util/OgreForwardRefs.h"
 #include "interfaces/TimeFactorListener.h"
 

code/branches/pch/src/orxonox/tools/Shader.cc

@@ -216 +216 @@
                 return (*((float*)pointer->second));
             else
-                return (*((int*)pointer->second));
+                return static_cast<float>(*((int*)pointer->second));
         }
         else

code/branches/pch/src/orxonox/tools/Shader.h

@@ -35 +35 @@
 #include <string>
 #include <vector>
-#include <OgrePrerequisites.h>
 
+#include "util/OgreForwardRefs.h"
 #include "interfaces/Tickable.h"