Changeset 7884 in orxonox.OLD

Timestamp:

May 27, 2006, 2:24:51 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: first Event gets dispached… but i see, that the interface is crappy… there has to be a much better solution for:

1. Generating Signals (more variable)
2. Bringing Variables onto the Signals
3. Interface has to be way simpler:

at the moment the Interface looks like this:
===
OrxGui::GLGuiPushButton* rdnpb = new OrxGui::GLGuiPushButton("REALLY DO NOT PUSH ME");
rdnpb→connectSignal(OrxGui::Signal_release, this, createExecutor<SimpleGameMenu>(&SimpleGameMenu::quitMenu));
===
But it should be like the following:
OrxGui::GLGuiPushButton* pb = new OrxGui::GLGuiPushButton("Push this button, it is way better");
pb→connect(this, OrxGui::SIGNAL(released()), this, OrxGui::SLOT(quitMenu()));

man, this would be almost too much

Location:

branches/gui/src

Files:

• lib/gui/gl_gui/glgui_handler.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_widget.cc (modified) (2 diffs)
• lib/gui/gl_gui/glgui_widget.h (modified) (2 diffs)
• story_entities/simple_game_menu.cc (modified) (2 diffs)
• story_entities/simple_game_menu.h (modified) (1 diff)

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

@@ -95 +95 @@
       {
         if (event.bPressed)
+        {
           GLGuiWidget::focused()->click();
+        }
         else
           GLGuiWidget::focused()->release();

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

@@ -69 +69 @@
 
 
+  /** @brief gives focus to this widget */
+  void GLGuiWidget::giveFocus()
+  {
+    GLGuiWidget::_focused = this;
+    this->receivedFocus();
+  };
+
+  void GLGuiWidget::breakFocus()
+  {
+    GLGuiWidget::_focused = NULL;
+    this->removedFocus();
+  };
+
+
   bool GLGuiWidget::focusOverWidget(const Vector2D& position) const
   {
@@ -79 +93 @@
     return this->focusOverWidget(cursor->getAbsCoor2D());
   }
+
+  void GLGuiWidget::click()
+  {
+    this->widgetSignals[Signal_click]("none");
+
+    this->clicked();
+  }
+
+  void GLGuiWidget::release()
+  {
+    this->widgetSignals[Signal_release]("none");
+
+    this->released();
+  }
+
 
 

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

@@ -61 +61 @@
     /// FOCUS
     /** @brief gives focus to this widget */
-    void giveFocus() { GLGuiWidget::_focused = this; this->receivedFocus(); };
-    void breakFocus() { GLGuiWidget::_focused = NULL; this->removedFocus(); };
+    void giveFocus();
+    void breakFocus();
     /** @returns true if the widget is focusable */
     bool focusable() const { return this->_focusable; };
@@ -77 +77 @@
 
     /// CLICK
+    void click();
+    void release();
     bool clickable() const { return this->_clickable; };
     void setClickable(bool clickable = true) { this->_clickable = clickable; };
-    void click() { this->clicked(); };
-    void release() { this->released(); };
 
     virtual void update() {};

branches/gui/src/story_entities/simple_game_menu.cc

@@ -74 +74 @@
   rdnpb->show();
   rdnpb->setAbsCoor2D(200, 180);
+  rdnpb->connectSignal(OrxGui::Signal_release, this, createExecutor<SimpleGameMenu>(&SimpleGameMenu::quitMenu));
 
 
@@ -350 +351 @@
 }
 
+void SimpleGameMenu::quitMenu()
+{
+  this->setNextStoryID(WORLD_ID_GAMEEND);
+  this->stop();
+}
+
 
 /**

branches/gui/src/story_entities/simple_game_menu.h

@@ -61 +61 @@
 
 
+    void startLevel(int level);
+    void quitMenu();
+
+    void TEST() { printf("TEST\n"); }
+
   protected:
     virtual void tick();