Changeset 6073 in orxonox.OLD

Timestamp:

Dec 12, 2005, 7:42:48 PM (18 years ago)

Author:

bensch

Message:

trunk: sync

Location:

trunk/src/lib

Files:

• coord/null_parent.cc (modified) (1 diff)
• coord/p_node.cc (modified) (8 diffs)
• coord/p_node.h (modified) (2 diffs)
• graphics/importer/model.cc (modified) (1 diff)
• sound/sound_engine.cc (modified) (1 diff)

trunk/src/lib/coord/null_parent.cc

@@ -33 +33 @@
   this->setName("NullParent");
 
-  while (!this->getNodesChildren().empty())
-    delete this->getNodesChildren().front();
-
   this->setParentMode(PNODE_ALL);
   NullParent::singletonRef = this;

trunk/src/lib/coord/p_node.cc

@@ -36 +36 @@
 PNode::PNode ()
 {
-  init(NULL);
+  init();
 
   NullParent::getInstance()->addChild(this);
 }
 
-/**
- * @param root the load-Element for the PNode
- */
-PNode::PNode(const TiXmlElement* root)
-{
-  this->init(NULL);
-  this->loadParams(root);
-
-  if (this->parent == NULL)
-    NullParent::getInstance()->addChild(this);
-}
 
 /**
@@ -60 +49 @@
 PNode::PNode (const Vector& absCoor, PNode* parent )
 {
-  this->init(parent);
+  this->init();
 
   if (likely(parent != NULL))
@@ -67 +56 @@
   this->setAbsCoor(absCoor);
 }
+
 
 /**
@@ -77 +67 @@
  *    (danger if you still need the children's instance somewhere else!!)
  *
- * 2. instance->remove2D(); delete instance;
+ * 2. instance->removeNode(); delete instance;
  *   -> result:
  *    moves its children to the NullParent
@@ -84 +74 @@
 PNode::~PNode ()
 {
+  // remove the Node, delete it's children (if required).
+  std::list<PNode*>::iterator tmp = this->children.begin();
+  std::list<PNode*>::iterator deleteNode;
+  while(!this->children.empty())
+    while (tmp != this->children.end())
+    {
+      deleteNode = tmp;
+      ++tmp;
+      printf("TEST::%s(%s) %s\n", (*deleteNode)->getName(), (*deleteNode)->getClassName(), this->getName());
+      if ((this->parentMode & PNODE_PROHIBIT_CHILD_DELETE) ||
+          ((*deleteNode)->parentMode & PNODE_PROHIBIT_DELETE_WITH_PARENT))
+      {
+        if (this == NullParent::getInstance() && (*deleteNode)->parentMode & PNODE_REPARENT_TO_NULLPARENT)
+          delete (*deleteNode);
+        else
+          (*deleteNode)->reparent();
+      }
+      else
+        delete (*deleteNode);
+    }
+
   if (this->parent != NULL)
    {
@@ -90 +101 @@
    }
 
-  // remove the Node, delete it's children (if required).
-  std::list<PNode*>::iterator tmp = this->children.begin();
-  std::list<PNode*>::iterator deleteNode;
-  while (tmp != this->children.end())
-  {
-    deleteNode = tmp++;
-    if ((this->parentMode & PNODE_PROHIBIT_CHILD_DELETE) || ((*deleteNode)->parentMode & PNODE_PROHIBIT_DELETE_WITH_PARENT) )
-      (*deleteNode)->reparent();
-    else
-      delete (*deleteNode);
-  }
-
   // remove all other allocated memory.
   if (this->toCoordinate != NULL)
@@ -114 +113 @@
  * @param parent the parent for this PNode
  */
-void PNode::init(PNode* parent)
+void PNode::init()
 {
   this->setClassID(CL_PARENT_NODE, "PNode");
@@ -120 +119 @@
   this->bRelCoorChanged = true;
   this->bRelDirChanged = true;
-  this->parent = parent;
+  this->parent = NULL;
   this->parentMode = PNODE_PARENT_MODE_DEFAULT;
   this->bActive = true;

trunk/src/lib/coord/p_node.h

@@ -73 +73 @@
  public:
   PNode ();
-  PNode(const TiXmlElement* root);
   PNode (const Vector& absCoor, PNode* pNode);
   virtual ~PNode ();
@@ -170 +169 @@
 
  private:
-  void init(PNode* parent);
+  void init();
   /** tells the child that the parent's Coordinate has changed */
   inline void parentCoorChanged () { this->bRelCoorChanged = true; }

trunk/src/lib/graphics/importer/model.cc

@@ -31 +31 @@
   this->pModelInfo.numVertices = 0;
   this->pModelInfo.numTriangles = 0;
+  this->pModelInfo.numNormals = 0;
   this->pModelInfo.numTexCoor = 0;
 

trunk/src/lib/sound/sound_engine.cc

@@ -184 +184 @@
       if (source->isPlaying())
       {
-        int play;
+        int play = 0x000;
         alGetSourcei(source->getID(), AL_SOURCE_STATE, &play);
         if(play == AL_PLAYING)