Changeset 9656 in orxonox.OLD for trunk/src/lib/gui/gl/glgui_handler.cc

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:

• trunk/src/lib/gui/gl/glgui_handler.cc (modified) (5 diffs)

trunk/src/lib/gui/gl/glgui_handler.cc

@@ -28 +28 @@
 #include "debug.h"
 
-#include <cassert>
-
 
 /// TAKE THIS OUT OF HERE.
@@ -46 +44 @@
     this->setName("GLGuiHandler");
 
+    this->_resolution = Vector2D(GraphicsEngine::getInstance()->getResolutionX(), GraphicsEngine::getInstance()->getResolutionY());
 
     EventHandler::getInstance()->withUNICODE(ES_MENU, true );
@@ -52 +51 @@
     for (unsigned int i = 0; i < EV_NUMBER; i++)
     {
-      this->subscribeEvent(ES_ALL, i);
+      this->subscribeEvent(ES_GAME, i);
+      this->subscribeEvent(ES_GAME_MENU, i);
+      this->subscribeEvent(ES_MENU, i);
     }
   }
@@ -88 +89 @@
       this->_cursor = NULL;
     }
+  }
+
+  const Vector2D& GLGuiHandler::resolution()
+  {
+    if (this->_resolution == Vector2D::nullVector())
+      this->_resolution = Vector2D(GraphicsEngine::getInstance()->getResolutionX(), GraphicsEngine::getInstance()->getResolutionY());
+    return _resolution;
   }
 
@@ -244 +252 @@
         if (this->_cursor != NULL)
           this->_cursor->setMaxBorders(Vector2D(event.resize.w, event.resize.h));
-        break;
+        this->_resolution = Vector2D(event.resize.w, event.resize.h);
+        break;
+
       case SDLK_TAB:
         if (event.bPressed)