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

Timestamp:

Jun 18, 2009, 10:00:15 AM (16 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/gui

Files:

• GUIManager.cc (modified) (1 diff)
• GUIManager.h (modified) (1 diff)

code/branches/pch/src/orxonox/gui/GUIManager.cc

@@ -395 +395 @@
     void GUIManager::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
     {
-        guiSystem_->injectMouseMove(rel.x, rel.y);
+        guiSystem_->injectMouseMove(static_cast<float>(rel.x), static_cast<float>(rel.y));
     }
     void GUIManager::mouseScrolled(int abs, int rel)
     {
-        guiSystem_->injectMouseWheelChange(rel);
+        guiSystem_->injectMouseWheelChange(static_cast<float>(rel));
     }
 

code/branches/pch/src/orxonox/gui/GUIManager.h

@@ -41 +41 @@
 #include <map>
 #include <string>
-#include <OgrePrerequisites.h>
 #include <CEGUIForwardRefs.h>
 
+#include "util/OgreForwardRefs.h"
 #include "core/input/InputInterfaces.h"