Changeset 4435 in orxonox.OLD for orxonox

Timestamp:

Jun 1, 2005, 11:40:19 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: objectName is now a property of BaseObject, because pNode has nothing to do with a name

Location:

orxonox/trunk/src

Files:

• lib/coord/p_node.cc (modified) (4 diffs)
• lib/coord/p_node.h (modified) (1 diff)
• lib/lang/base_object.cc (modified) (3 diffs)
• lib/lang/base_object.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

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

@@ -85 +85 @@
   delete this->children;
   this->parent = NULL;
-  delete []this->objectName;
-
 }
 
@@ -98 +96 @@
   this->bAbsDirChanged = false;
   this->parent = parent; 
-  this->objectName = NULL;
 }
 
@@ -406 +403 @@
   this->lastAbsCoordinate = this->absCoordinate;
 
-  PRINTF(4)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
+  PRINTF(4)("PNode::update - %s - (%f, %f, %f)\n", this->getName(), this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
 
 
@@ -518 +515 @@
 }
 
-
-/**
-  \brief set the name of the node
-
-  for debug purposes realy usefull, not used to work properly
-*/
-void PNode::setName (const char* newName)
-{
-  this->objectName = new char[strlen(newName)+1];
-  strcpy(this->objectName,newName);
-}
-
-
-/**
-  \brief gets the name of the node
-*/
-const char* PNode::getName ()
-{
-  return this->objectName;
-}
-

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

@@ -99 +99 @@
   void processTick (float dt);
 
-  void setName (const char* newName);
-  const char* getName ();
-
   void debug ();
 
  protected:
   float timeStamp;         //!< this the timeStamp of when the abs{Coordinat, Direction} has been calculated
-  char* objectName;        //!< The name of the Object
   bool bAbsCoorChanged;    //!< If Absolute Coordinate has changed since last time we checked
   bool bRelCoorChanged;    //!< If Relative Coordinate has changed since last time we checked

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

@@ -32 +32 @@
   this->id = -1;
   this->finalized = false;
+
+  this->objectName = NULL;
 }
 
@@ -41 +43 @@
 {
   //  delete []this->className;
+  if (this->objectName)
+    delete []this->objectName;
 }
 
@@ -96 +100 @@
   this->finalized = true;
 }
+
+
+/**
+  \brief set the name of the node
+
+  for debug purposes realy usefull, not used to work properly
+*/
+void BaseObject::setName (const char* newName)
+{
+  if (this->objectName)
+    delete []this->objectName;
+  if (newName)
+    {
+      this->objectName = new char[strlen(newName)+1];
+      strcpy(this->objectName, newName);
+    }
+  else 
+    this->objectName = NULL;
+}

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

@@ -31 +31 @@
   void finalize();
 
+  void setName (const char* newName);
+  const char* getName (void)const { return this->objectName; };
+
  private:
-  const char*    className;                       //!< the name of the class 
-  int            id;                              //!< this is the id from the class_list.h enumeration
-  bool           finalized;                       //!< is true if the object is ready to be garbage collected
+  const char*    className;        //!< the name of the class 
+  int            id;               //!< this is the id from the class_list.h enumeration
+  bool           finalized;        //!< is true if the object is ready to be garbage collected
+
+  char*    objectName;                   //!< The name of this object               
 };
 

orxonox/trunk/src/world_entities/world_entity.cc

@@ -42 +42 @@
 {
   // name setup
-  LoadParam<WorldEntity>(root, "name", this, &WorldEntity::setName)
-    .describe("the name of the Object at hand");
+  //  LoadParam<WorldEntity>(root, "name", this, &BaseObject::setName)
+  //    .describe("the name of the Object at hand");
 
   // Model Loading