Changeset 6074 in orxonox.OLD for trunk/src/lib

Timestamp:

Dec 12, 2005, 11:34:02 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: taken out NullParent.
THE TRUNK IS NOT RUNNING FOR THE TIME BEING. DO NOT BE ALARMED, THIS IS TEMPORARY

Location:

trunk/src/lib

Files:

• Makefile.am (modified) (2 diffs)
• coord/null_parent.cc (deleted)
• coord/null_parent.h (deleted)
• coord/p_node.cc (modified) (8 diffs)
• coord/p_node.h (modified) (3 diffs)
• sound/sound_engine.cc (modified) (1 diff)

trunk/src/lib/Makefile.am

@@ -34 +34 @@
 
 libORXlibs_a_SOURCES =  coord/p_node.cc \
-                        coord/null_parent.cc \
                         lang/base_object.cc \
                         lang/class_list.cc \
@@ -47 +46 @@
 
 noinst_HEADERS =        coord/p_node.h \
-                        coord/null_parent.h \
                         lang/base_object.h \
                         graphics/render2D/element_2d.h \

trunk/src/lib/coord/p_node.cc

@@ -17 +17 @@
 
 #include "p_node.h"
-#include "null_parent.h"
 
 #include "load_param.h"
@@ -34 +33 @@
  * @brief standard constructor
  */
-PNode::PNode ()
+PNode::PNode (PNode* parent)
 {
   init();
-
-  NullParent::getInstance()->addChild(this);
-}
-
-
-/**
- * @brief constructor with coodinates
- * @param absCoordinate the Absolute coordinate of the Object
- * @param parent The parent-node of this node.
- */
-PNode::PNode (const Vector& absCoor, PNode* parent )
-{
-  this->init();
-
-  if (likely(parent != NULL))
-    parent->addChild (this);
-
-  this->setAbsCoor(absCoor);
-}
-
+  if (parent != NULL)
+    parent->addChild(this);
+}
+
+/**
+ * @brief initializes a PNode
+ * @param parent the parent for this PNode
+ */
+void PNode::init()
+{
+  this->setClassID(CL_PARENT_NODE, "PNode");
+
+  this->bRelCoorChanged = true;
+  this->bRelDirChanged = true;
+  this->parent = NULL;
+  this->parentMode = PNODE_PARENT_MODE_DEFAULT;
+  this->bActive = true;
+
+  // smooth-movers
+  this->toCoordinate = NULL;
+  this->toDirection = NULL;
+  this->bias = 1.0;
+}
+
+// NullParent Reference
+PNode* PNode::nullParent = NULL;
 
 /**
@@ -86 +91 @@
           ((*deleteNode)->parentMode & PNODE_PROHIBIT_DELETE_WITH_PARENT))
       {
-        if (this == NullParent::getInstance() && (*deleteNode)->parentMode & PNODE_REPARENT_TO_NULLPARENT)
+        if (this == PNode::getNullParent() && (*deleteNode)->parentMode & PNODE_REPARENT_TO_NULLPARENT)
           delete (*deleteNode);
         else
@@ -110 +115 @@
 
 /**
- * @brief initializes a PNode
- * @param parent the parent for this PNode
- */
-void PNode::init()
-{
-  this->setClassID(CL_PARENT_NODE, "PNode");
-
-  this->bRelCoorChanged = true;
-  this->bRelDirChanged = true;
-  this->parent = NULL;
-  this->parentMode = PNODE_PARENT_MODE_DEFAULT;
-  this->bActive = true;
-
-  // smooth-movers
-  this->toCoordinate = NULL;
-  this->toDirection = NULL;
-  this->bias = 1.0;
-}
-
-/**
  * @brief loads parameters of the PNode
  * @param root the XML-element to load the properties of
@@ -160 +145 @@
     LOAD_PARAM_START_CYCLE(root, element);
     {
-      LoadParam_CYCLE(element, "parent", this, PNode, addChild)
+      LoadParam_CYCLE(element, "child", this, PNode, addChild)
           .describe("adds a new Child to the current Node.");
 
@@ -506 +491 @@
 {
   if (child != NULL)
-  {
    child->removeNode();
-//   this->children->remove(child);
-//   child->parent = NULL;
-  }
 }
 
@@ -624 +605 @@
 {
   if (this->parentMode & PNODE_REPARENT_TO_NULLPARENT)
-    this->setParent(NullParent::getInstance());
+    this->setParent(PNode::getNullParent());
   else if (this->parentMode & PNODE_REPARENT_TO_PARENTS_PARENT && this->parent != NULL)
     this->setParent(this->parent->getParent());
@@ -881 +862 @@
     {
       // drawing the Dependency graph
-     if (this != NullParent::getInstance())
+     if (this != PNode::getNullParent())
       {
        glBegin(GL_LINES);

trunk/src/lib/coord/p_node.h

@@ -72 +72 @@
 class PNode : virtual public BaseObject {
  public:
-  PNode ();
-  PNode (const Vector& absCoor, PNode* pNode);
+  PNode (PNode* parent = PNode::getNullParent());
   virtual ~PNode ();
 
@@ -155 +154 @@
   void removeNodeModeFlags(unsigned short nodeFlags);
 
+  /** @returns the NullParent, the (main) ROOT of the PNode Tree. If it does not yet exist, it will be created. */
+  static PNode* getNullParent()  { return (PNode::nullParent != NULL || (PNode::nullParent = new PNode(NULL)) != NULL)? PNode::nullParent : NULL; };
 
   void updateNode (float dt);
@@ -204 +205 @@
   bool               bActive;            //!< If the Node is Active (for cutting off the rest of the tree in update).
   unsigned short     parentMode;         //!< the mode of the binding
+
+
+  static PNode*      nullParent;         //!< The ROOT of the main PNode Tree.
 };
 

trunk/src/lib/sound/sound_engine.cc

@@ -290 +290 @@
   // INITIALIZING THE DEVICE:
 
-#ifdef AL_VERSION_1_1
+#ifndef AL_VERSION_1_1
   ALubyte deviceName[] =
 #else