Changeset 6920 in orxonox.OLD

Timestamp:

Jan 31, 2006, 10:37:09 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: default target for turret and other weapons, that support targetting

Location:

trunk/src/world_entities/weapons

Files:

• turret.cc (modified) (1 diff)
• weapon.cc (modified) (1 diff)
• weapon.h (modified) (2 diffs)
• weapon_manager.cc (modified) (1 diff)

trunk/src/world_entities/weapons/turret.cc

@@ -118 +118 @@
 
   Quaternion quat;
-  Vector direction = this->getAbsCoor();/*this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();*/
+  Vector direction;
+  if (this->getDefaultTarget() == NULL)
+    direction = this->getAbsCoor();
+  else
+    direction = this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor();
 
   direction.normalize();

trunk/src/world_entities/weapons/weapon.cc

@@ -87 +87 @@
   this->emissionPoint.setParent(this);             //< One EmissionPoint, that is a PNode connected to the weapon. You can set this to the exitting point of the Projectiles
 
-  this->target = NULL;                             //< Nothing is Targeted by default.
+  this->defaultTarget = NULL;                      //< Nothing is Targeted by default.
 
   this->projectile = CL_NULL;                      //< No Projectile Class is Connected to this weapon

trunk/src/world_entities/weapons/weapon.h

@@ -127 +127 @@
     inline const Vector& getEmissionPoint() const { return this->emissionPoint.getAbsCoor(); };
 
-    inline void setTarget(PNode* target) { this->target = target; };
+    inline void setDefaultTarget(PNode* defaultTarget) { this->defaultTarget = defaultTarget; };
+    inline PNode* getDefaultTarget() const { return this->defaultTarget; };
 
     // STATE CHANGES //
@@ -211 +212 @@
     GLGuiBar*            energyWidget;
 
-    PNode*               target;                           //!< A target for targeting Weapons.
+    PNode*               defaultTarget;                    //!< A target for targeting Weapons.
 
     ////////////

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -281 +281 @@
     if (this->parent->isA(CL_PLAYABLE))
       dynamic_cast<Playable*>(this->parent)->weaponConfigChanged();
+    weapon->setDefaultTarget(this->crosshair);
   }
   PRINTF(3)("Added a new Weapon (%s::%s) to the WeaponManager: config %i/ slot %i\n", weapon->getClassName(), weapon->getName(), configID, slotID);