[Usata-commits] Changes to usata2/src/objects/top-nodes.hpp

[David Lau]

Index: usata2/src/objects/top-nodes.hpp
diff -u usata2/src/objects/top-nodes.hpp:1.1 
usata2/src/objects/top-nodes.hpp:1.2
--- usata2/src/objects/top-nodes.hpp:1.1        Sun Jan  2 06:47:04 2005
+++ usata2/src/objects/top-nodes.hpp    Mon Jan  3 07:43:50 2005
@@ -10,28 +10,52 @@
 // included in the software distribution, or visit
 // http://www.fsf.org/licenses/gpl.html.
 //
-// $Id: top-nodes.hpp,v 1.1 2005/01/02 06:47:04 skunix Exp $
+// $Id: top-nodes.hpp,v 1.2 2005/01/03 07:43:50 skunix Exp $
 
 
 #include "../object.hpp"
+#include <vector>
+#include <list>
 
 namespace usata
 {
 
-       class GuiNode : public Object, NodeInterface
+       class GenericNode : public NodeInterface
        {
+               protected:
+                       typedef std::pair<std::string, Object_sp> Child;
+                       typedef std::list<Child> ChildV;
+                       ChildV  children;
 
+                       ChildV::iterator find(const std::string&);      
+       
                public:
-                       GuiNode(Object*x);
-                       virtual void draw();
-                       virtual void update();
-                       
+                       GenericNode();
+
+                       virtual void add_child(const Object_sp&);
                        virtual void add_child(const Object_sp&, std::string& 
path);
                        virtual Object_sp get_child(const std::string&);
-                       virtual std::string name();
+               
+                       bool    has_child(const std::string&);
+
+                       virtual ~GenericNode();
+
+       };
+
 
+       class GuiNode : public Object, public GenericNode
+       {
+       
+                       GuiNode(NodeInterface*x);
+               public:
+                       static void create(NodeInterface*x);
+                       virtual void draw();
+                       virtual void update();
                        virtual ~GuiNode();
+       };
 
+       class WorldNode : public Object, NodeInterface
+       {
        };