Changeset 6078 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Dec 13, 2005, 2:55:08 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: PNode compiles again
PNode is now handled with the erase function of stl, rather than remove (which is totally the wrong way when iterating through a list and delete elements)

Location:

trunk/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (1 diff)
• weapons/aim.cc (modified) (1 diff)
• weapons/guided_missile.cc (modified) (1 diff)
• weapons/projectile.cc (modified) (2 diffs)
• weapons/projectile.h (modified) (1 diff)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -112 +112 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  EventHandler::getInstance()->grabEvents(false);
+  EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;

trunk/src/world_entities/weapons/aim.cc

@@ -65 +65 @@
   this->setClassID(CL_CROSSHAIR, "Aim");
   this->setName("Aim");
-
-  this->addNodeModeFlags(PNODE_REPARENT_TO_NULLPARENT);
 
   this->setLayer(E2D_LAYER_TOP);

trunk/src/world_entities/weapons/guided_missile.cc

@@ -150 +150 @@
 {
   //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
-  if (target.getParent() != PNode::getNullParent())
+  if (this->target != NULL && this->target->getParent() != PNode::getNullParent())
    {
-     velocity += ((target.getAbsCoor() - this->getAbsCoor()).getNormalized())*agility;
+     printf("========%s::%s\n", target->getParent()->getClassName(), target->getParent()->getName() );
+     velocity += ((target->getAbsCoor() - this->getAbsCoor()).getNormalized())*agility;
      float speed = velocity.len();
      if (speed > this->maxVelocity)

trunk/src/world_entities/weapons/projectile.cc

@@ -37 +37 @@
   this->lifeCycle = 0.0;
   this->lifeSpan = 1.0f; /* sec */
-  this->target.addNodeModeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT |
-                                PNODE_REPARENT_TO_NULLPARENT);
-
+  this->target = NULL;
   this->removeNode();
 }
@@ -103 +101 @@
 void Projectile::setTarget(PNode* target)
 {
-  this->target.setParent(target);
+  if (this->target == NULL)
+    this->target = new PNode(target, PNODE_PARENT_MODE_DEFAULT | PNODE_REPARENT_ON_PARENTS_REMOVE);
+  else
+    this->target->setParent(target);
 }
 

trunk/src/world_entities/weapons/projectile.h

@@ -60 +60 @@
     Vector                velocity;                  //!< velocity of the projectile.
 
-    PNode                 target;                    //!< A target for guided Weapons.
+    PNode*                target;                    //!< A target for guided Weapons.
 };