Changeset 3888 in orxonox.OLD

Timestamp:

Apr 19, 2005, 1:16:16 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: deconstructor cleanup in weapon/gun

Location:

orxonox/trunk/src/world_entities

Files:

• test_gun.cc (modified) (4 diffs)
• test_gun.h (modified) (1 diff)
• weapon.cc (modified) (3 diffs)
• weapon.h (modified) (1 diff)

orxonox/trunk/src/world_entities/test_gun.cc

@@ -47 +47 @@
   this->leftRight = leftRight;
 
-  if( this->leftRight == 0)
-    this->projOffset = new Vector(1.0, 0.0, -0.35);
-  else if( this->leftRight == 1)
-    this->projOffset = new Vector(1.0, 0.0, 0.5);
-
-
-  //this->dummy1 = new WorldEntity(); // a world entity that is not drawed: use this for the weapon 
   this->objectComponent1 = new PNode();
   this->animation1 = new Animation3D(this->objectComponent1);
-
   parent->addChild(this->objectComponent1, PNODE_ALL);
 
@@ -63 +55 @@
   if( this->leftRight == W_LEFT)
     {
+      this->projectileOffset = Vector(1.0, 0.0, -0.35);
+
       this->animation1->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR); 
       this->animation1->addKeyFrame(Vector(-3.0, 0.1, 3.0), Quaternion(), 0.5, ANIM_LINEAR);
@@ -69 +63 @@
   else if( this->leftRight == W_RIGHT)
     {
+      this->projectileOffset = Vector(1.0, 0.0, 0.5);
+
       this->animation1->addKeyFrame(Vector(-2.6, 0.1, -2.5), Quaternion(), 0.1, ANIM_LINEAR);
       this->animation1->addKeyFrame(Vector(-3.0, 0.1, -2.5), Quaternion(), 0.5, ANIM_LINEAR);
@@ -119 +115 @@
       return;
     }
+
   Projectile* pj = new TestBullet(this);
-
-  pj->setAbsCoor(this->getAbsCoor() + *this->projOffset);
+  pj->setAbsCoor(this->getAbsCoor() + this->projectileOffset);
   pj->setAbsDir(this->getAbsDir());
-
   pj->setFlightDirection(this->getAbsDir());
   pj->setSpeed(this->getSpeed());
-
   this->worldEntities->add(pj);
   this->localTime = 0;

orxonox/trunk/src/world_entities/test_gun.h

@@ -51 +51 @@
   virtual void draw(void);
 
- private:
-  Animation3D* animation;
-  Vector* projOffset;
-  int leftRight;   // this will become an enum
+
+
 
 };

orxonox/trunk/src/world_entities/weapon.cc

@@ -52 +52 @@
   /* 
      i dont have to delete the weapons itself, because they are 
-     worldentities and therefore in the entities list of the world
+     worldentities and therefore in the entities list of the world.
+     world will clean them up for me
   */
   for(int i = 0; i < W_MAX_CONFIGS; ++i)
@@ -207 +208 @@
   WorldInterface* wi = WorldInterface::getInstance();
   this->worldEntities = wi->getEntityList();
+
+  this->objectComponent1 = NULL;
+  this->objectComponent2 = NULL;
+  this->objectComponent3 = NULL;
+
+  this->animation1 = NULL;
+  this->animation2 = NULL;
+  this->animation3 = NULL;
 }
 
@@ -216 +225 @@
 {
   // model will be deleted from WorldEntity-destructor
+  //this->worldEntities = NULL;
+  
+  /* dont delete objectComponentsX here, they will be killed when the pnodes are cleaned out */
+
+  /* all animations are deleted via the animation player*/
 }
 

orxonox/trunk/src/world_entities/weapon.h

@@ -172 +172 @@
   Animation3D* animation3;
 
-  Vector* projectileOffset;
+  Vector projectileOffset;
   int leftRight;   // this will become an enum