Changeset 9684 in orxonox.OLD for branches/new_class_id/src/lib/coord

Timestamp:

Aug 22, 2006, 1:34:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/new_class_id: slowly but surely reimplementing to the new groove… way to go

Location:

branches/new_class_id/src/lib/coord

Files:

• p_node.cc (modified) (6 diffs)
• p_node.h (modified) (1 diff)

branches/new_class_id/src/lib/coord/p_node.cc

@@ -19 +19 @@
 
 #include "util/loading/load_param.h"
-#include "class_list.h"
 
 #include "netdefs.h"
@@ -38 +37 @@
   : BaseObject(), Synchronizeable()
 {
-  this->setClassID(CL_PARENT_NODE, "PNode");
+  this->registerObject(this, PNode::_objectList);
 
   this->bRelCoorChanged = true;
@@ -541 +540 @@
 void PNode::addChild (const std::string& childName)
 {
-  PNode* childNode = dynamic_cast<PNode*>(ClassList::getObject(childName, CL_PARENT_NODE));
+  PNode* childNode = PNode::objectList().getObject(childName);
   //  PRINTF(0)("Adding the Child: %s to: %s\n", childName, this->getName());
   //  assert( childNode != NULL );
@@ -625 +624 @@
 void PNode::setParent (const std::string& parentName)
 {
-  PNode* parentNode = dynamic_cast<PNode*>(ClassList::getObject(parentName, CL_PARENT_NODE));
+  PNode* parentNode = PNode::objectList().getObject(parentName);
   if (parentNode != NULL)
     parentNode->addChild(this);
@@ -681 +680 @@
 void PNode::setParentSoft(const std::string& parentName, float bias)
 {
-  PNode* parentNode = dynamic_cast<PNode*>(ClassList::getObject(parentName, CL_PARENT_NODE));
+  PNode* parentNode = PNode::objectList().getObject(parentName);
   if (parentNode != NULL)
     this->setParentSoft(parentNode, bias);
@@ -731 +730 @@
   {
     PNode::nullParent = new PNode(NULL, PNODE_PARENT_MODE_DEFAULT | PNODE_REPARENT_TO_NULL);
-    PNode::nullParent->setClassID(CL_NULL_PARENT, "NullParent");
+    //PNode::nullParent->registerObject(, CL_NULL_PARENT);
     PNode::nullParent->setName("NullParent");
     PNode::nullParent->setSynchronized(true);

branches/new_class_id/src/lib/coord/p_node.h

@@ -74 +74 @@
 //! Patent Node is a Engine to calculate the position of an Object in respect to the position of its parent.
 class PNode : virtual public BaseObject, virtual public Synchronizeable {
- public:
+  NewObjectListDeclaration(PNode);
+
+  public:
   PNode (PNode* parent = PNode::getNullParent(), long nodeFlags = PNODE_PARENT_MODE_DEFAULT);
   virtual ~PNode ();