Changeset 7221 in orxonox.OLD for trunk/src/lib/coord

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

Location:

trunk/src/lib/coord

Files:

• p_node.cc (modified) (8 diffs)
• p_node.h (modified) (4 diffs)

trunk/src/lib/coord/p_node.cc

@@ -540 +540 @@
  * @param childName the name of the child to add to this PNode
  */
-void PNode::addChild (const char* childName)
+void PNode::addChild (const std::string& childName)
 {
   PNode* childNode = dynamic_cast<PNode*>(ClassList::getObject(childName, CL_PARENT_NODE));
@@ -624 +624 @@
  * @param parentName the name of the Parent to set to this PNode
  */
-void PNode::setParent (const char* parentName)
+void PNode::setParent (const std::string& parentName)
 {
   PNode* parentNode = dynamic_cast<PNode*>(ClassList::getObject(parentName, CL_PARENT_NODE));
@@ -631 +631 @@
   else
     PRINTF(2)("Not Found PNode's (%s::%s) new Parent by Name: %s\n",
-              this->getClassName(), this->getName(), parentName);
+        this->getClassName(), this->getName(), parentName.c_str());
 }
 
@@ -680 +680 @@
  * @param bias the speed to iterate to this new Positions
  */
-void PNode::setParentSoft(const char* parentName, float bias)
+void PNode::setParentSoft(const std::string& parentName, float bias)
 {
   PNode* parentNode = dynamic_cast<PNode*>(ClassList::getObject(parentName, CL_PARENT_NODE));
@@ -699 +699 @@
  * @param parentMode a String representing this parentingMode
  */
-void PNode::setParentMode (const char* parentingMode)
-{
-  this->setParentMode(PNode::charToParentingMode(parentingMode));
+void PNode::setParentMode (const std::string& parentingMode)
+{
+  this->setParentMode(PNode::stringToParentingMode(parentingMode));
 }
 
@@ -927 +927 @@
            this->getAbsDirV().y,
            this->getAbsDirV().z,
-           this->parentingModeToChar(parentMode),
+           this->parentingModeToString(parentMode),
            childNodeCount);
   if (depth >= 2 || depth == 0)
@@ -1049 +1049 @@
  * @return the converted string
  */
-const char* PNode::parentingModeToChar(int parentingMode)
+const char* PNode::parentingModeToString(int parentingMode)
 {
   if (parentingMode == PNODE_LOCAL_ROTATE)
@@ -1068 +1068 @@
  * @return the int corresponding to the named parentingMode
  */
-PARENT_MODE PNode::charToParentingMode(const char* parentingMode)
-{
-  if (!strcmp(parentingMode, "local-rotate"))
+PARENT_MODE PNode::stringToParentingMode(const std::string& parentingMode)
+{
+  if (parentingMode == "local-rotate")
     return (PNODE_LOCAL_ROTATE);
-  else  if (!strcmp(parentingMode, "rotate-movement"))
+  else  if (parentingMode == "rotate-movement")
     return (PNODE_ROTATE_MOVEMENT);
-  else  if (!strcmp(parentingMode, "movement"))
+  else  if (parentingMode == "movement")
     return (PNODE_MOVEMENT);
-  else  if (!strcmp(parentingMode, "all"))
+  else  if (parentingMode == "all")
     return (PNODE_ALL);
-  else  if (!strcmp(parentingMode, "rotate-and-move"))
+  else  if (parentingMode == "rotate-and-move")
     return (PNODE_ROTATE_AND_MOVE);
 }

trunk/src/lib/coord/p_node.h

@@ -143 +143 @@
   // PARENTING //
   void addChild (PNode* child);
-  void addChild (const char* childName);
+  void addChild (const std::string& childName);
   void removeChild (PNode* child);
   void removeNode();
@@ -151 +151 @@
   /** @param parent the new parent of this node */
   inline void setParent (PNode* parent) { parent->addChild(this); };
-  void setParent (const char* parentName);
+  void setParent (const std::string& parentName);
   /** @returns the parent of this PNode */
   inline PNode* getParent () const { return this->parent; };
@@ -158 +158 @@
 
   void setParentSoft(PNode* parentNode, float bias = 1.0);
-  void setParentSoft(const char* parentName, float bias = 1.0);
+  void setParentSoft(const std::string& parentName, float bias = 1.0);
 
   // PARENTING_MODE AND OTHER FLAGS //
   void setParentMode (PARENT_MODE parentMode);
-  void setParentMode (const char* parentingMode);
+  void setParentMode (const std::string& parentingMode);
   /** @returns the Parenting mode of this node */
   int getParentMode() const { return 0x000f & this->parentMode; };
@@ -183 +183 @@
 
   // HELPER_FUNCTIONS //
-  static const char* parentingModeToChar(int parentingMode);
-  static PARENT_MODE charToParentingMode(const char* parentingMode);
+  static const char* parentingModeToString(int parentingMode);
+  static PARENT_MODE stringToParentingMode(const std::string& parentingMode);
   float distance(const PNode* node) const { return (this->getAbsCoor() - node->getAbsCoor()).len(); };