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

Timestamp:

Jun 12, 2006, 12:40:57 AM (18 years ago)

Author:

bensch

Message:

trunk: Texture-Sequence is initialized smoothly now in the GLGuiCursor

File:

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

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

@@ -42 +42 @@
     EventHandler::getInstance()->withUNICODE(ES_ALL, true );
 
-    this->cursor = NULL;
+    this->_cursor = NULL;
     for (unsigned int i = 0; i < EV_NUMBER; i++)
     {
@@ -64 +64 @@
   void GLGuiHandler::activateCursor()
   {
-    if (this->cursor == NULL)
-      this->cursor = new GLGuiCursor();
-    this->cursor->show();
-    this->cursor->setMaxBorders(Vector2D(GraphicsEngine::getInstance()->getResolutionX(), GraphicsEngine::getInstance()->getResolutionY()));
+    if (this->_cursor == NULL)
+      this->_cursor = new GLGuiCursor();
+    this->_cursor->show();
+    this->_cursor->setMaxBorders(Vector2D(GraphicsEngine::getInstance()->getResolutionX(), GraphicsEngine::getInstance()->getResolutionY()));
   }
 
   void GLGuiHandler::deactivateCursor(bool deleteCursor)
   {
-    if (this->cursor)
+    if (this->_cursor)
     {
       if (deleteCursor)
-        delete this->cursor;
-      this->cursor = NULL;
+        delete this->_cursor;
+      this->_cursor = NULL;
     }
   }
@@ -108 +108 @@
             if (GLGuiWidget::focused()->clickable())
             {
-              Vector2D cursorPos = (this->cursor != NULL) ? this->cursor->getAbsCoor2D() : Vector2D(event.x, event.y);
+              Vector2D cursorPos = (this->_cursor != NULL) ? this->_cursor->getAbsCoor2D() : Vector2D(event.x, event.y);
               GLGuiWidget::focused()->click(cursorPos - GLGuiWidget::focused()->getAbsCoor2D());
             }
@@ -116 +116 @@
             if (GLGuiWidget::focused()->clickable())
             {
-              Vector2D cursorPos = (this->cursor != NULL) ? this->cursor->getAbsCoor2D() : Vector2D(event.x, event.y);
+              Vector2D cursorPos = (this->_cursor != NULL) ? this->_cursor->getAbsCoor2D() : Vector2D(event.x, event.y);
               GLGuiWidget::focused()->release(cursorPos - GLGuiWidget::focused()->getAbsCoor2D());
             }
@@ -128 +128 @@
 
       case EV_VIDEO_RESIZE:
-        if (this->cursor != NULL)
-          this->cursor->setMaxBorders(Vector2D(event.resize.w, event.resize.h));
+        if (this->_cursor != NULL)
+          this->_cursor->setMaxBorders(Vector2D(event.resize.w, event.resize.h));
         break;
     }
@@ -147 +147 @@
   Vector2D GLGuiHandler::cursorPositionOverFocusedWidget() const
   {
-    return (this->cursor != NULL) ? this->cursor->getAbsCoor2D() : Vector2D(0,0);
+    return (this->_cursor != NULL) ? this->_cursor->getAbsCoor2D() : Vector2D(0,0);
   }
 
   const Vector2D& GLGuiHandler::cursorPositionAbs() const
   {
-    if (this->cursor)
-      return this->cursor->getAbsCoor2D();
+    if (this->_cursor)
+      return this->_cursor->getAbsCoor2D();
     else
       return Vector2D::nullVector();
@@ -160 +160 @@
   {
     assert (widget != NULL);
-    if (this->cursor)
-      return  this->cursor->getAbsCoor2D() - widget->getAbsCoor2D();
+    if (this->_cursor)
+      return  this->_cursor->getAbsCoor2D() - widget->getAbsCoor2D();
     else
       return Vector2D::nullVector();
@@ -179 +179 @@
     const std::list<BaseObject*>* objects = ClassList::getList(CL_GLGUI_WIDGET);
 
-    if (objects != NULL && this->cursor != NULL)
+    if (objects != NULL && this->_cursor != NULL)
     {
       for (std::list<BaseObject*>::const_iterator it = objects->begin(); it != objects->end(); it++)
@@ -187 +187 @@
         if (widget->isVisible() &&
             widget->focusable() &&
-            widget->focusOverWidget(this->cursor))
+            widget->focusOverWidget(this->_cursor))
         {
           // receiving Focus