Merge pull request #315 from blackberry-gaming/next-sgrenier

Next sgrenier

gameplay/src/Game.inl

@@ -56,7 +56,7 @@ inline void Game::setMultiTouch(bool enabled)
     Platform::setMultiTouch(enabled);
 }
 
-inline bool isMultiTouch()
+inline bool Game::isMultiTouch() const
 {
     return Platform::isMultiTouch();
 }

gameplay/src/Scene.h

@@ -158,6 +158,21 @@ public:
      */
     void setAmbientColor(float red, float green, float blue);
 
+    /**
+     * Visits each node in the scene and calls the specified method pointer.
+     *
+     * Calling this method invokes the specified method pointer for each node
+     * in the scene hierarchy.
+     *
+     * The visitMethod parameter must be a pointer to a method that has a bool
+     * return type and accepts a single parameter of type Node*.
+     *
+     * @param instance The pointer to an instance of the object that contains visitMethod.
+     * @param visitMethod The pointer to the class method to call for each node in the scene.
+     */
+    template <class T>
+    void visit(T* instance, bool (T::*visitMethod)(Node*));
+
     /**
      * Visits each node in the scene and calls the specified method pointer.
      *
@@ -165,16 +180,16 @@ public:
      * in the scene hierarchy, passing the Node and the specified cookie value.
      * 
      * The visitMethod parameter must be a pointer to a method that has a bool
-     * return type and accepts two parameters: a Node pointer and a void* (cookie).
-     * The scene travesal continues while visitMethod return true. Returning false
-     * will cause the traversal to stop.
+     * return type and accepts two parameters: a Node pointer and a cookie of a
+     * user-specified type. The scene travesal continues while visitMethod return
+     * true. Returning false will cause the traversal to stop.
      *
      * @param instance The pointer to an instance of the object that contains visitMethod.
      * @param visitMethod The pointer to the class method to call for each node in the scene.
      * @param cookie An optional user-defined parameter that will be passed to each invocation of visitMethod.
      */
-    template <class T>
-    void visit(T* instance, bool (T::*visitMethod)(Node*,void*), void* cookie = 0);
+    template <class T, class C>
+    void visit(T* instance, bool (T::*visitMethod)(Node*,C), C cookie);
 
     /**
      * Draws debugging information (bounding volumes, etc.) for the scene.
@@ -205,7 +220,13 @@ private:
      * Visits the given node and all of its children recursively.
      */
     template <class T>
-    bool visitNode(Node* node, T* instance, bool (T::*visitMethod)(Node*,void*), void* cookie);
+    bool visitNode(Node* node, T* instance, bool (T::*visitMethod)(Node*));
+
+    /**
+     * Visits the given node and all of its children recursively.
+     */
+    template <class T, class C>
+    bool visitNode(Node* node, T* instance, bool (T::*visitMethod)(Node*,C), C cookie);
 
     std::string _id;
     Camera* _activeCamera;
@@ -218,7 +239,18 @@ private:
 };
 
 template <class T>
-void Scene::visit(T* instance, bool (T::*visitMethod)(Node*,void*), void* cookie)
+void Scene::visit(T* instance, bool (T::*visitMethod)(Node*))
+{
+    for (Node* node = getFirstNode(); node != NULL; node = node->getNextSibling())
+    {
+        if (!visitNode(node, instance, visitMethod))
+            return;
+    }
+}
+
+
+template <class T, class C>
+void Scene::visit(T* instance, bool (T::*visitMethod)(Node*,C), C cookie)
 {
     for (Node* node = getFirstNode(); node != NULL; node = node->getNextSibling())
     {
@@ -228,7 +260,24 @@ void Scene::visit(T* instance, bool (T::*visitMethod)(Node*,void*), void* cookie
 }
 
 template <class T>
-bool Scene::visitNode(Node* node, T* instance, bool (T::*visitMethod)(Node*,void*), void* cookie)
+bool Scene::visitNode(Node* node, T* instance, bool (T::*visitMethod)(Node*))
+{
+    // Invoke the visit method for this node.
+    if (!(instance->*visitMethod)(node))
+        return false;
+
+    // Recurse for all children.
+    for (Node* child = node->getFirstChild(); child != NULL; child = child->getNextSibling())
+    {
+        if (!visitNode(child, instance, visitMethod))
+            return false;
+    }
+
+    return true;
+}
+
+template <class T, class C>
+bool Scene::visitNode(Node* node, T* instance, bool (T::*visitMethod)(Node*,C), C cookie)
 {
     // Invoke the visit method for this node.
     if (!(instance->*visitMethod)(node, cookie))