Changeset 7905 in orxonox.OLD

Timestamp:

May 27, 2006, 2:48:11 PM (18 years ago)

Author:

bensch

Message:

borders

Location:

branches/gui/src/lib

Files:

• event/event_def.h (modified) (1 diff)
• event/event_handler.cc (modified) (1 diff)
• gui/gl_gui/glgui_cursor.cc (modified) (3 diffs)
• gui/gl_gui/glgui_cursor.h (modified) (2 diffs)
• gui/gl_gui/glgui_handler.cc (modified) (2 diffs)

branches/gui/src/lib/event/event_def.h

@@ -28 +28 @@
   EV_JOY_BUTTON,
 
+  EV_WINDOW_FOCUS,
   EV_VIDEO_RESIZE,
 

branches/gui/src/lib/event/event_handler.cc

@@ -388 +388 @@
         ev.type = EV_JOY_BUTTON;
         break;
+      case SDL_ACTIVEEVENT:
+        ev.type = EV_WINDOW_FOCUS;
+        ev.bPressed = (event.active.gain != 0);
+        break;
       case SDL_VIDEORESIZE:
         ev.resize = event.resize;

branches/gui/src/lib/gui/gl_gui/glgui_cursor.cc

@@ -33 +33 @@
 
     this->subscribeEvent(ES_MENU,  EV_MOUSE_MOTION);
+    this->subscribeEvent(ES_MENU, EV_WINDOW_FOCUS);
 
 
@@ -73 +74 @@
     this->backMaterial().setDiffuse(color.x, color.y, color.z);
 
-    //if (this->movement != Vector2D())
+    if (this->movement != Vector2D())
     {
-/*      if (this->getAbsCoor2D().x < 0.0 )
+      if (this->getAbsCoor2D().x < 0.0 )
         movement.x = -this->getAbsCoor2D().x;
-      if (this->getAbsCoor2D().x > 200.0)
-        movement.x = (200.0-this->getAbsCoor2D().x);
+      if (this->getAbsCoor2D().x > this->_maxBorders.x)
+        movement.x = (this->_maxBorders.x-this->getAbsCoor2D().x);
       if (this->getAbsCoor2D().y < 0.0 )
-        movement.x = -this->getAbsCoor2D().y;
-      if (this->getAbsCoor2D().y > 200.0)
-        movement.x = (200.0-this->getAbsCoor2D().y);*/
+        movement.y = -this->getAbsCoor2D().y;
+      if (this->getAbsCoor2D().y > this->_maxBorders.y)
+        movement.y = (this->_maxBorders.y-this->getAbsCoor2D().y);
 
+      newPos += movement;
 
-
-      //this->shiftCoor2D(movement);
       this->setAbsCoor2D(newPos);
       movement = Vector2D();
@@ -106 +106 @@
     switch (event.type)
     {
+      case EV_WINDOW_FOCUS:
+        if (event.bPressed)
+        {
+          int mouseX, mouseY;
+          SDL_GetMouseState(&mouseX, &mouseY);
+          newPos = Vector2D(mouseX, mouseY);
+        }
+        break;
       case EV_MOUSE_MOTION:
-        newPos = Vector2D(event.x, event.y);
-        movement += Vector2D(event.xRel * _mouseSensitivity, event.yRel * _mouseSensitivity);
+        // newPos = Vector2D(event.x, event.y);
+        movement += Vector2D((float)event.xRel * _mouseSensitivity, (float)event.yRel * _mouseSensitivity);
+        movement.debug();
         break;
 

branches/gui/src/lib/gui/gl_gui/glgui_cursor.h

@@ -30 +30 @@
     static float mouseSensitivity() { return GLGuiCursor::_mouseSensitivity; };
 
+    void setMaxBorders(const Vector2D& maxBorders) { this->_maxBorders = maxBorders; };
+
     void init();
     const Vector2D& position() const { return Element2D::getAbsCoor2D(); }
@@ -38 +40 @@
     virtual void process(const Event& event);
   private:
+
+    Vector2D      _maxBorders;
 
     Vector2D      newPos;

branches/gui/src/lib/gui/gl_gui/glgui_handler.cc

@@ -24 +24 @@
 #include "class_list.h"
 
+
+/// TAKE THIS OUT OF HERE.
+#include "graphics_engine.h"
 
 namespace OrxGui
@@ -64 +67 @@
       this->cursor = new GLGuiCursor();
     this->cursor->show();
+    this->cursor->setMaxBorders(Vector2D(GraphicsEngine::getInstance()->getResolutionX(), GraphicsEngine::getInstance()->getResolutionY()));
   }