Changeset 4765 in orxonox.OLD

Timestamp:

Jul 2, 2005, 2:23:41 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: addChild and setParentMode via XML-loading

Location:

orxonox/trunk/src

Files:

• lib/coord/p_node.cc (modified) (4 diffs)
• lib/coord/p_node.h (modified) (3 diffs)
• story_entities/world.cc (modified) (2 diffs)
• story_entities/world.h (modified) (1 diff)

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

@@ -128 +128 @@
   LoadParam<PNode>(root, "parent", this, &PNode::setParent)
       .describe("the Name of the Parent of this PNode");
+
+  LoadParam<PNode>(root, "parent-mode", this, &PNode::setParentMode)
+      .describe("the mode to connect this node to its parent ()");
+
+  // cycling properties
+  const TiXmlElement* element = root->FirstChildElement();
+  while (element != NULL)
+  {
+    LoadParam<PNode>(root, "parent", this, &PNode::addChild, true)
+        .describe("adds a new Child to the current Node.");
+
+    element = element->NextSiblingElement();
+  }
 }
 
@@ -289 +302 @@
 
 /**
+ * @see PNode::addChild(PNode* parent);
+ * @param childName the name of the child to add to this PNode
+ */
+void PNode::addChild (const char* childName)
+{
+  PNode* childNode = dynamic_cast<PNode*>(ClassList::getObject(childName, CL_PARENT_NODE));
+  if (childNode != NULL)
+    this->addChild(childNode);
+}
+
+
+/**
    \brief removes a child from the node
    \param pNode the child to remove from this pNode.
@@ -340 +365 @@
 {
   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);
@@ -353 +373 @@
    \param parentMode the mode of the bind-type.
 */
-void PNode::setParentMode (unsigned int parentMode)
+void PNode::setParentMode (PARENT_MODE parentMode)
 {
   this->parentMode = parentMode;
+}
+
+/**
+ * @brief sets the mode of this parent manually
+ * @param parentMode a String representing this parentingMode
+ */
+void PNode::setParentMode (const char* parentingMode)
+{
+  if (!strcmp(parentingMode, "local-rotate"))
+    this->setParentMode(PNODE_LOCAL_ROTATE);
+  else  if (!strcmp(parentingMode, "rotate-movement"))
+    this->setParentMode(PNODE_ROTATE_MOVEMENT);
+  else  if (!strcmp(parentingMode, "movement"))
+    this->setParentMode(PNODE_MOVEMENT);
+  else  if (!strcmp(parentingMode, "all"))
+    this->setParentMode(PNODE_ALL);
+  else  if (!strcmp(parentingMode, "rotate-and-move"))
+    this->setParentMode(PNODE_ROTATE_AND_MOVE);
 }
 

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

@@ -32 +32 @@
 template<class T> class tList;
 
-// linkage modes
-#define PNODE_LOCAL_ROTATE       1    //!< Rotates all the children around their centers.
-#define PNODE_ROTATE_MOVEMENT    2    //!< Moves all the children around the center of their parent, without the rotation around their own centers.
-#define PNODE_MOVEMENT           4    //!< Moves all children along with the parent.
+//! Parental linkage modes
+typedef enum
+{
+  PNODE_LOCAL_ROTATE          =   1,    //!< Rotates all the children around their centers.
+  PNODE_ROTATE_MOVEMENT       =   2,    //!< Moves all the children around the center of their parent, without the rotation around their own centers.
+
+  PNODE_MOVEMENT              =   4,    //!< Moves all children along with the parent.
 // special linkage modes
-#define PNODE_ALL                3    //!< Moves all children around the center of their parent, and also rotates their centers
-#define PNODE_ROTATE_AND_MOVE    5    //!< Rotates all children around their axis, and moves them as the Parent Moves, but does not rotate around the center of their parent.
+  PNODE_ALL                   =   3,    //!< Moves all children around the center of their parent, and also rotates their centers
+  PNODE_ROTATE_AND_MOVE       =   5    //!< Rotates all children around their axis, and moves them as the Parent Moves, but does not rotate around the center of their parent.
+
+} PARENT_MODE;
 
 //! The default mode of the translation-binding.
@@ -84 +89 @@
 
   void addChild (PNode* pNode, int parentingMode = DEFAULT_MODE);
+  void addChild (const char* childName);
   void removeChild (PNode* pNode);
   void remove();
@@ -90 +96 @@
   void setParent (const char* name);
 
-  void setParentMode (unsigned int parentingMode);
+  void setParentMode (PARENT_MODE parentMode);
+  void setParentMode (const char* parentingMode);
   /** \returns the Parenting mode of this node */
   int getParentMode() const { return this->parentMode; };

orxonox/trunk/src/story_entities/world.cc

@@ -1164 +1164 @@
 */
 void World::spawn(WorldEntity* entity, PNode* parentNode,
-                  Vector* relCoor, Quaternion* relDir,
-                  int parentingMode)
+                  Vector* relCoor, Quaternion* relDir)
 {
   this->nullParent = NullParent::getInstance();
@@ -1174 +1173 @@
       entity->setRelCoor (*relCoor);
       entity->setRelDir (*relDir);
-      entity->setParentMode(parentingMode);
 
       this->entities->add (entity);

orxonox/trunk/src/story_entities/world.h

@@ -90 +90 @@
   void spawn (WorldEntity* entity);
   void spawn (WorldEntity* entity, Vector* absCoor, Quaternion* absDir);
-  void spawn(WorldEntity* entity, PNode* parentNode, Vector* relCoor, Quaternion* relDir,
-             int parentingMode);
+  void spawn(WorldEntity* entity, PNode* parentNode, Vector* relCoor, Quaternion* relDir);
 
   const char* getPath();