Changeset 5769 in orxonox.OLD

Timestamp:

Nov 24, 2005, 11:18:39 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: sync

Location:

trunk/src

Files:

• lib/coord/p_node.cc (modified) (10 diffs)
• lib/coord/p_node.h (modified) (4 diffs)
• lib/graphics/importer/texture.cc (modified) (3 diffs)
• story_entities/world.cc (modified) (2 diffs)
• world_entities/camera.cc (modified) (1 diff)
• world_entities/weapons/aiming_turret.cc (modified) (1 diff)
• world_entities/weapons/bomb.cc (modified) (3 diffs)
• world_entities/weapons/guided_missile.cc (modified) (1 diff)
• world_entities/weapons/laser.cc (modified) (1 diff)
• world_entities/weapons/projectile.cc (modified) (1 diff)
• world_entities/weapons/rocket.cc (modified) (2 diffs)
• world_entities/weapons/test_bullet.cc (modified) (1 diff)

trunk/src/lib/coord/p_node.cc

@@ -496 +496 @@
   if (child != NULL)
   {
-   child->remove();
+   child->removeNode();
 //   this->children->remove(child);
 //   child->parent = NULL;
@@ -507 +507 @@
  * this can be the case, if an entity in the world is being destroyed.
  */
-void PNode::remove()
+void PNode::removeNode()
 {
   tIterator<PNode>* iterator = this->children->getIterator();
@@ -513 +513 @@
 
   while( pn != NULL)
-    {
+  {
       NullParent::getInstance()->addChild(pn);
       pn = iterator->nextElement();
@@ -609 +609 @@
  * worry, normaly...
  */
-void PNode::update (float dt)
+void PNode::updateNode (float dt)
 {
   if( likely(this->parent != NULL))
@@ -698 +698 @@
           pn->parentDirChanged ();
 
-        pn->update(dt);
+        pn->updateNode(dt);
         pn = iterator->nextElement();
       }
@@ -708 +708 @@
 }
 
+
+void PNode::countChildNodes(int& nodes) const
+{
+  nodes++;
+  tIterator<PNode>* it = this->children->getIterator();
+  PNode* node = it->firstElement();
+  while(node != NULL)
+  {
+    node->countChildNodes(nodes);
+    node = it->nextElement();
+  }
+
+}
+
+
 /**
  *  displays some information about this pNode
@@ -714 +729 @@
  * @param level !! INTERNAL !! The n-th level of the Node we draw (this is internal and only for nice output).
  */
-void PNode::debug(unsigned int depth, unsigned int level) const
+void PNode::debugNode(unsigned int depth, unsigned int level) const
 {
   for (unsigned int i = 0; i < level; i++)
@@ -722 +737 @@
   else
     PRINT(0)(" -");
-  PRINT(0)("PNode(%s::%s) - absCoord: (%0.2f, %0.2f, %0.2f), relCoord(%0.2f, %0.2f, %0.2f), direction(%0.2f, %0.2f, %0.2f) - %s\n",
+
+  int childNodeCount = 0;
+  this->countChildNodes(childNodeCount);
+
+  PRINT(0)("PNode(%s::%s) - absCoord: (%0.2f, %0.2f, %0.2f), relCoord(%0.2f, %0.2f, %0.2f), direction(%0.2f, %0.2f, %0.2f) - %s - %d childs\n",
            this->getClassName(),
            this->getName(),
@@ -734 +753 @@
            this->getAbsDirV().y,
            this->getAbsDirV().z,
-           this->parentingModeToChar(parentMode));
+           this->parentingModeToChar(parentMode),
+           childNodeCount);
   if (depth >= 2 || depth == 0)
   {
@@ -743 +763 @@
     {
       if (depth == 0)
-        pn->debug(0, level + 1);
+        pn->debugNode(0, level + 1);
       else
-        pn->debug(depth - 1, level +1);
+        pn->debugNode(depth - 1, level +1);
       pn = iterator->nextElement();
     }

trunk/src/lib/coord/p_node.h

@@ -30 +30 @@
 typedef enum
 {
-  PNODE_LOCAL_ROTATE          =   1,    //!< Rotates all the children around their centers.
-  PNODE_ROTATE_MOVEMENT       =   2,    //!< Moves all the children around the center of their parent, without the rotation around their own centers.
+  // PARENTAL FOLLOWING
+  PNODE_LOCAL_ROTATE                   = 0x00000001,    //!< Rotates all the children around their centers.
+  PNODE_ROTATE_MOVEMENT                = 0x00000002,    //!< Moves all the children around the center of their parent, without the rotation around their own centers.
 
-  PNODE_MOVEMENT              =   4,    //!< Moves all children along with the parent.
+  PNODE_MOVEMENT                       = 0x00000004,    //!< Moves all children along with the parent.
 // special linkage modes
-  PNODE_ALL                   =   3,    //!< Moves all children around the center of their parent, and also rotates their centers
-  PNODE_ROTATE_AND_MOVE       =   5     //!< Rotates all children around their axis, and moves them as the Parent Moves, but does not rotate around the center of their parent.
+  PNODE_ALL                            = 0x00000003,    //!< Moves all children around the center of their parent, and also rotates their centers
+  PNODE_ROTATE_AND_MOVE                = 0x00000005,    //!< Rotates all children around their axis, and moves them as the Parent Moves, but does not rotate around the center of their parent.
+
+
+  PNODE_INACTIVE_NODE                  = 0x00000010,    //!< If the node is Active (if not, it and its child wont be updated).
+
+  // REPARENTING
+  PNODE_REPARENT_TO_NULLPARENT         = 0x00000100,
+  PNODE_REPARENT_KEEP_POSITION         = 0x00000200,
+
+
+  // DELETION
+  PNODE_PROHIBIT_CHILD_DELETE          = 0x00010000,
+  PNODE_PROHIBIT_DELETE_WITH_PARENT    = 0x00020000,
 
 } PARENT_MODE;
 
 //! The default mode of the translation-binding.
-#define PNODE_PARENT_MODE_DEFAULT PNODE_ALL
+#define PNODE_PARENT_MODE_DEFAULT PNODE_ALL | PNODE_REPARENT_KEEP_POSITION
 
 
@@ -101 +114 @@
   void addChild (const char* childName);
   void removeChild (PNode* child);
-  void remove();
+  void removeNode();
 
   void setParent (PNode* parent);
@@ -108 +121 @@
   inline PNode* getParent () const { return this->parent; };
   /** @returns the List of Children of this PNode */
-  inline const tList<PNode>* getChildren() const { return this->children; };
+ // inline const tList<PNode>* getChildren() const { return this->children; };
 
   void setParentSoft(PNode* parentNode, float bias = 1.0);
@@ -119 +132 @@
   int getParentMode() const { return this->parentMode; };
 
-  void update (float dt);
+  void updateNode (float dt);
 
-  void debug (unsigned int depth = 1, unsigned int level = 0) const;
+  void countChildNodes(int& nodes) const;
+  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;
 

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

@@ -33 +33 @@
 {
   this->setClassID(CL_TEXTURE, "Texture");
-  this->setName(imageName);
 
   this->bAlpha = false;
@@ -40 +39 @@
 
   if (imageName != NULL)
+  {
+    this->setName(imageName);
     this->loadImage(imageName);
+  }
 }
 
@@ -116 +118 @@
   if (this->image != NULL)
     {
-      PRINTF(4)("Reloading Texture %s\n", this->getName());
+      PRINTF(1)("Reloading Texture of %s '%s'\n", this->getClassName(), this->getName());
       this->loadTexToGL();
     }

trunk/src/story_entities/world.cc

@@ -666 +666 @@
 
   /* update the object position before game start - so there are no wrong coordinates used in the first processing */
-  NullParent::getInstance()->update (0.001f);
-  NullParent::getInstance()->update (0.001f);
+  NullParent::getInstance()->updateNode (0.001f);
+  NullParent::getInstance()->updateNode (0.001f);
 
 }
@@ -928 +928 @@
   GarbageCollector::getInstance()->update();
   GraphicsEngine::getInstance()->update(this->dtS);
-  NullParent::getInstance()->update (this->dtS);
+  NullParent::getInstance()->updateNode (this->dtS);
 
   SoundEngine::getInstance()->update();

trunk/src/world_entities/camera.cc

@@ -134 +134 @@
       else
         this->target->setParentSoft("Player");
-      this->getParent()->debug(0);
+      this->getParent()->debugNode(0);
 
 //      this->setParent("main-Turret");

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -91 +91 @@
   this->setMaximumEnergy(10000, 50);
   this->increaseEnergy(100000);
-  //this->minCharge = 2;
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);

trunk/src/world_entities/weapons/bomb.cc

@@ -46 +46 @@
   this->energyMin = 1;
   this->energyMax = 1;
-  this->remove();
   this->lifeSpan = 15;
 
@@ -146 +145 @@
 void Bomb::collidesWith (WorldEntity* entity, const Vector& location)
 {
-        this->detonate();
+        this->detonate();
 }
 
@@ -168 +167 @@
   while(lm != NULL)
   {
-   
+
     lm = it->nextElement();
   }

trunk/src/world_entities/weapons/guided_missile.cc

@@ -48 +48 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->remove();
   this->lifeSpan = 5;
   this->agility = 5;

trunk/src/world_entities/weapons/laser.cc

@@ -45 +45 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->remove();
   this->lifeSpan = 1.0;
 

trunk/src/world_entities/weapons/projectile.cc

@@ -40 +40 @@
   this->target = NULL;
 
-  this->remove();
+  this->removeNode();
 }
 

trunk/src/world_entities/weapons/rocket.cc

@@ -46 +46 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->remove();
   this->lifeSpan = 2;
 
@@ -116 +115 @@
   ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::trailParticles);
 
-  this->update(0);
+  this->updateNode(0);
   this->emitter->setEmissionRate(45.0);
   this->emitter->setEmissionVelocity(0.0);

trunk/src/world_entities/weapons/test_bullet.cc

@@ -46 +46 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->remove();
   this->lifeSpan = 2;