Changeset 7971 in orxonox.OLD

Timestamp:

May 30, 2006, 10:13:29 AM (18 years ago)

Author:

bensch

Message:

preparing for Signal-Slot algo

Location:

branches/gui/src

Files:

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

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

@@ -122 +122 @@
     DeclareSignal(testSignal, ());
 
+    static void connect(GLGuiWidget* sender, Signal& signal, BaseObject* receiver, Slot executor);
+    void connect(Signal& signal, BaseObject* receiver, Slot executor);
 
+    void disconnect(GLGuiWidget* sender, Signal& signal, BaseObject* receiver);
 
   protected:

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

@@ -11 +11 @@
 namespace OrxGui
 {
+  /**
+   * @brief declares a new Signal.
+   * @param SignalName the Name of the Signal.
+   * @param params the Parameters to be taken
+   */
+#define DeclareSignal(SignalName, params) \
+  public: \
+   void signal_ ## connect ## SignalName(const SignalConnector& connector) { \
+     SignalName ## connected.push_back(connector); \
+   }\
+   Signal& getSignalVector_##SignalName () { return this->SignalName ## connected; }; \
+  private: \
+   void  SignalName params { \
+     for (unsigned int i = 0; i < SignalName ## connected .size(); i++) \
+       SignalName ## connected[i] ("TEST"); \
+   }\
+   Signal SignalName ## connected
 
-#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
+   /**
+    * @brief selects a Signal.
+    * @param SignalName the Signal to be retrieved.
+    */
+#define SIGNAL(SignalName) \
+    getSignalVector_##SignalName()
+
+#define SLOT(Class, function) \
+    createExecutor<Class>(&Class::function)
 
   //! A class for Conncting Signals to Objects, inside of the GUI
@@ -45 +60 @@
     const Executor*      exec;           //!< The Executor, that will be called, on object.
   };
+
+  typedef std::vector<SignalConnector> Signal;
+  typedef Executor*                    Slot;
+
 }
 #endif /* _SIGNAL_CONNECTOR_H */

branches/gui/src/lib/math/vector.h

@@ -96 +96 @@
   inline void slerpTo(const Vector& toVec, float t) { *this + (toVec - *this) * t; };
 
+  /** @returns a Null Vector */
+  inline static const Vector& nullVector() { static Vector nullVector; return nullVector; }
   void debug() const;
 

branches/gui/src/story_entities/simple_game_menu.cc

@@ -93 +93 @@
   rdnpb->show();
   rdnpb->setAbsCoor2D(200, 180);
-  rdnpb->connectSignal(OrxGui::Signal_release, this, createExecutor<SimpleGameMenu>(&SimpleGameMenu::quitMenu));
+  rdnpb->connectSignal(OrxGui::Signal_release, this, SLOT(SimpleGameMenu, quitMenu));
 
   OrxGui::GLGuiInputLine* input = new OrxGui::GLGuiInputLine();