Changeset 7905 in orxonox.OLD for branches/gui/src/lib/gui/gl_gui/glgui_cursor.cc

Timestamp:

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

Author:

bensch

Message:

borders

File:

• branches/gui/src/lib/gui/gl_gui/glgui_cursor.cc (modified) (3 diffs)

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;