Changeset 9755 in orxonox.OLD for branches/new_class_id/src/world_entities

Timestamp:

Sep 17, 2006, 11:33:22 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: some minor work… nothing too special, and nothing too big… tried to fix the PNode, and some documentations…

hmm… i also think of writing a book. maybe i will write the whole story as a Commit message so it is backed up. hehe

Location:

branches/new_class_id/src/world_entities/weapons

Files:

• targeting_turret.cc (modified) (7 diffs)
• targeting_turret.h (modified) (2 diffs)
• weapon_manager.cc (modified) (1 diff)

branches/new_class_id/src/world_entities/weapons/targeting_turret.cc

@@ -32 +32 @@
 
 TargetingTurret::TargetingTurret(const TiXmlElement* root)
-  : target(this)
 {
   this->init();
@@ -44 +43 @@
 TargetingTurret::~TargetingTurret ()
 {
+  if(Aim::objectList().exists(target))
+    delete target;
   // model will be deleted from WorldEntity-destructor
 //  delete this->target;
@@ -51 +52 @@
 {
   this->registerObject(this, TargetingTurret::_objectList);
+  this->target = new Aim(this);
 
   Animation3D* animation1 = this->getAnimation(WS_ACTIVATING, this);
@@ -78 +80 @@
   //this->getProjectileFactory()->prepare(100);
 
-  this->target.setVisibility(false);
-  this->target.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT | PNODE_PROHIBIT_CHILD_DELETE);
-  this->target.setRange(1000);
-  this->target.setAngle(M_PI_4);
-  this->lockedTarget = &this->target;
+  this->target->setVisibility(false);
+  this->target->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT | PNODE_PROHIBIT_CHILD_DELETE);
+  this->target->setRange(1000);
+  this->target->setAngle(M_PI_4);
+  this->lockedTarget = this->target;
 
   this->lockedTime = 0;
@@ -99 +101 @@
   Weapon::loadParams(root);
 
-  LoadParam(root, "target-group", &target, Aim, setTargetGroupS);
+  LoadParam(root, "target-group", target, Aim, setTargetGroupS);
 
 }
@@ -111 +113 @@
 void TargetingTurret::deactivate()
 {
-  this->target.setVisibility(false);
+  this->target->setVisibility(false);
 }
 
@@ -119 +121 @@
     return;
 
-  this->target.tick(dt);
+  this->target->tick(dt);
 
   if( lockedTime >= neededLockTime )
    {
-    lockedTarget = this->target.getParent();
+    lockedTarget = this->target->getParent();
     lockedTime = 0;
    }
 
 
-  if(this->target.getParent() == PNode::getNullParent())
+  if(this->target->getParent() == PNode::getNullParent())
    lockedTime = 0;
   else

branches/new_class_id/src/world_entities/weapons/targeting_turret.h

@@ -27 +27 @@
   virtual void draw() const;
 
-  void setTargetGroup(OM_LIST targetGroup) { this->target.setTargetGroup(targetGroup); };
+  void setTargetGroup(OM_LIST targetGroup) { this->target->setTargetGroup(targetGroup); };
   const PNode* getLockedTarget() const { return lockedTarget; };
 
@@ -34 +34 @@
 
 private:
-  Aim            target;
+  Aim*           target;
   PNode*         lockedTarget;
   float          lockedTime;

branches/new_class_id/src/world_entities/weapons/weapon_manager.cc

@@ -57 +57 @@
   // crosshair being a PNode it must not be deleted (this is because PNodes delete themselves.)
   // rennerc: crosshair seems not to delete itselve
-  if (Crosshair::objectList().exists(this->crosshair))
-    delete this->crosshair;
+  //if (Crosshair::objectList().exists(this->crosshair))
+  //  delete this->crosshair;
 }