Changeset 3192 for code/branches/pch/src/orxonox/tools/Shader.cc

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)

File:

• code/branches/pch/src/orxonox/tools/Shader.cc (modified) (1 diff)

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