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

Timestamp:

May 19, 2006, 11:58:19 AM (19 years ago)

Author:

bensch

Message:

trunk: const Executor introduced

Location:

trunk/src/lib/coord

Files:

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

trunk/src/lib/coord/p_node.cc

@@ -29 +29 @@
 
 #include "synchronizeable.h"
-
-using namespace std;
-
 
 /**
@@ -595 +592 @@
 void PNode::removeNode()
 {
-  list<PNode*>::iterator child = this->children.begin();
-  list<PNode*>::iterator reparenter;
+  std::list<PNode*>::iterator child = this->children.begin();
+  std::list<PNode*>::iterator reparenter;
   while (child != this->children.end())
   {
@@ -857 +854 @@
   if(!this->children.empty() && (this->bActive || this->parentMode & PNODE_UPDATE_CHILDREN_IF_INACTIVE ))
   {
-    list<PNode*>::iterator child;
+    std::list<PNode*>::iterator child;
     for (child = this->children.begin(); child != this->children.end(); child ++)
     {
@@ -888 +885 @@
 {
   nodes++;
-  list<PNode*>::const_iterator child;
+  std::list<PNode*>::const_iterator child;
   for (child = this->children.begin(); child != this->children.end(); child ++)
     (*child)->countChildNodes(nodes);
@@ -928 +925 @@
   if (depth >= 2 || depth == 0)
   {
-    list<PNode*>::const_iterator child;
+    std::list<PNode*>::const_iterator child;
     for (child = this->children.begin(); child != this->children.end(); child ++)
     {
@@ -1006 +1003 @@
     /* rotate the current color in HSV space around 20 degree */
     Vector childColor =  Color::HSVtoRGB(Color::RGBtoHSV(color)+Vector(20,0,.0));
-    list<PNode*>::const_iterator child;
+    std::list<PNode*>::const_iterator child;
     for (child = this->children.begin(); child != this->children.end(); child ++)
     {
@@ -1176 +1173 @@
   //   int n = children.size();
   //   //check if camera is in children
-  //   for (std::list<PNode*>::const_iterator it = children.begin(); it!=children.end(); it++)
+  //   for (std::std::list<PNode*>::const_iterator it = children.begin(); it!=children.end(); it++)
   //   {
   //     if ( (*it)->isA(CL_CAMERA) )

trunk/src/lib/coord/p_node.h

@@ -178 +178 @@
   // DEBUG //
   void countChildNodes(int& nodes) const;
-  void debugNodeSC (unsigned int depth = 1, unsigned int level = 0) { this->debugNode(depth, level); };
   void debugNode (unsigned int depth = 1, unsigned int level = 0) const;
   void debugDraw(unsigned int depth = 1, float size = 1.0, const Vector& color = Vector(1, 0, 0), unsigned int level = 0) const;