Changeset 7899 in orxonox.OLD

Timestamp:

May 27, 2006, 12:50:32 PM (18 years ago)

Author:

bensch

Message:

gui: added timer class for a more exact time

Location:

branches/gui/src/lib

Files:

• Makefile.am (modified) (2 diffs)
• gui/gl_gui/glgui_handler.cc (modified) (2 diffs)
• gui/gl_gui/glgui_widget.h (modified) (2 diffs)
• gui/gl_gui/signal_connector.h (modified) (1 diff)
• util/timer.cc (added)
• util/timer.h (added)

branches/gui/src/lib/Makefile.am

@@ -28 +28 @@
                 util/file.cc \
                 util/directory.cc \
+                util/timer.cc \
                 \
                 data/data_tank.cc
@@ -49 +50 @@
                 util/file.h \
                 util/directory.h \
+                util/timer.h \
                 \
                 util/loading/resource_manager.h \

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

@@ -61 +61 @@
   void GLGuiHandler::activateCursor()
   {
-    this->cursor = new GLGuiCursor();
+    if (this->cursor == NULL)
+      this->cursor = new GLGuiCursor();
     this->cursor->show();
   }
@@ -101 +102 @@
         if (event.bPressed)
         {
+          if (GLGuiWidget::focused()->clickable())
           GLGuiWidget::focused()->click();
         }
         else
-          GLGuiWidget::focused()->release();
+        {
+          if (GLGuiWidget::focused()->clickable())
+            GLGuiWidget::focused()->release();
+        }
       }
     }

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

@@ -13 +13 @@
 #include "glincl.h"
 #include "signal_connector.h"
+#include <vector>
 
 // FORWARD DECLARATION
@@ -97 +98 @@
 
 
+    DeclareSignal(testSignal, ());
 
   protected:

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

@@ -11 +11 @@
 namespace OrxGui
 {
+
+#define DeclareSignal(name, params) \
+  public: \
+   void signal_ ##connect ##name(const SignalConnector& connector) { \
+     name ## connected.push_back(connector); \
+   }\
+  private: \
+   void  signal_ ## name params { \
+     for (unsigned int i = 0; i < name ## connected . size(); i++) \
+       name ## connected[i] ("TEST"); \
+   }\
+   std::vector<SignalConnector> name ## connected
+
   //! A class for Conncting Signals to Objects, inside of the GUI
   class SignalConnector