Changeset 4761 in orxonox.OLD

Timestamp:

Jul 2, 2005, 1:28:28 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Global identifiers and PNode-parenting via LoadParam works

Location:

orxonox/trunk/src/lib

Files:

• coord/p_node.cc (modified) (3 diffs)
• coord/p_node.h (modified) (1 diff)
• lang/class_list.cc (modified) (2 diffs)
• lang/class_list.h (modified) (1 diff)
• sound/sound_engine.h (modified) (1 diff)

orxonox/trunk/src/lib/coord/p_node.cc

@@ -21 +21 @@
 
 #include "p_node.h"
+#include "null_parent.h"
+
+#include "load_param.h"
+#include "class_list.h"
+
 #include "stdincl.h"
 #include "compiler.h"
-
 #include "error.h"
 #include "debug.h"
 #include "list.h"
 #include "vector.h"
-#include "null_parent.h"
-#include "load_param.h"
 
 //#include "vector.h"
@@ -123 +125 @@
   LoadParam<PNode>(root, "rel-coor", this, &PNode::setRelCoor)
       .describe("Sets The relative position of the Node to its parent.");
+
+  LoadParam<PNode>(root, "parent", this, &PNode::setParent)
+      .describe("the Name of the Parent of this PNode");
 }
 
@@ -328 +333 @@
 }
 
+/**
+ * @see PNode::setParent(PNode* parent);
+ * @param parentName the name of the Parent to set to this PNode
+ */
+void PNode::setParent (const char* parentName)
+{
+  PNode* parentNode = dynamic_cast<PNode*>(ClassList::getObject(parentName, CL_PARENT_NODE));
+
+
+  printf("%p\n", parentNode);
+  printf("%s\n", parentNode->getName());
+
+  if (parentNode != NULL)
+    parentNode->addChild(this);
+}
 
 /**

orxonox/trunk/src/lib/coord/p_node.h

@@ -88 +88 @@
 
   void setParent (PNode* parent);
+  void setParent (const char* name);
+
   void setParentMode (unsigned int parentingMode);
   /** \returns the Parenting mode of this node */

orxonox/trunk/src/lib/lang/class_list.cc

@@ -109 +109 @@
 /**
  * checks if the BaseObject* object exists.
+ * @param name the name of the BaseObject to look for
+ * @param classID if not CL_NULL it will only search through a specific type of Objects. Otherwise it will be searched everywhere.
+ * @return true, if the Object Exists in the specified ClassID, false otherwise
+ * @todo: speed this up!!
+ */
+BaseObject* ClassList::getObject(const char* name, long classID)
+{
+  if(unlikely(ClassList::first == NULL) || name == NULL)
+    return NULL;
+  else
+  {
+    ClassList* tmp = ClassList::first;
+    while (likely(tmp != NULL))
+    {
+      if (tmp->classID == classID || (classID == CL_NULL && tmp->classID == CL_BASE_OBJECT))
+      {
+        tIterator<BaseObject>* iterator = tmp->objectList->getIterator();
+        BaseObject* enumBO = iterator->nextElement();
+        const char* tmpName;
+        while (enumBO != NULL)
+        {
+          tmpName = enumBO->getName();
+          if (tmpName && !strcmp(tmpName, name))
+          {
+            delete iterator;
+            return enumBO;
+          }
+          enumBO = iterator->nextElement();
+        }
+        delete iterator;
+        break;
+      }
+      tmp = tmp->next;
+    }
+  }
+  return NULL;
+}
+
+
+/**
+ * checks if the BaseObject* object exists.
  * @param object the Pointer to a BaseObject to check if it exists
  * @param classID if not CL_NULL it will only search through a specific type of Objects. Otherwise it will be searched everywhere.
@@ -127 +168 @@
         tIterator<BaseObject>* iterator = tmp->objectList->getIterator();
         BaseObject* enumBO = iterator->nextElement();
-        while (enumBO)
+        while (enumBO != NULL)
         {
           if (enumBO == object)
+          {
+            delete iterator;
             return true;
+          }
           enumBO = iterator->nextElement();
         }

orxonox/trunk/src/lib/lang/class_list.h

@@ -28 +28 @@
 
     // STATIC FUNCTIONS
-    static void addToClassList(BaseObject* objectPointer, const long& classID, const char* className);
-    static void removeFromClassList(BaseObject* objectPointer);
+    static void         addToClassList(BaseObject* objectPointer, const long& classID, const char* className);
+    static void         removeFromClassList(BaseObject* objectPointer);
 
-    static bool exists(BaseObject* object, long classID = CL_NULL);
+    static BaseObject*  getObject(const char* name, long classID = CL_NULL);
+    static bool         exists(BaseObject* object, long classID = CL_NULL);
 
     static void debug(unsigned int debugLevel = 0);

orxonox/trunk/src/lib/sound/sound_engine.h

@@ -37 +37 @@
 
 //! A class that represents a SoundSource
-class SoundSource : virtual public BaseObject
+class SoundSource : public BaseObject
 {
  public: