Changeset 9516 in orxonox.OLD

Timestamp:

Jul 27, 2006, 6:45:58 PM (18 years ago)

Author:

bensch

Message:

orxonox/proxy: the rockets from the targeting turrets aquire targets as they are supposed, but they do not get fired unless the player is near of them… strangely

Location:

branches/proxy/src

Files:

• util/object_manager.cc (modified) (1 diff)
• world_entities/projectiles/guided_missile.h (modified) (1 diff)
• world_entities/weapons/aim.cc (modified) (8 diffs)
• world_entities/weapons/aim.h (modified) (4 diffs)
• world_entities/weapons/targeting_turret.cc (modified) (7 diffs)
• world_entities/weapons/targeting_turret.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

branches/proxy/src/util/object_manager.cc

@@ -177 +177 @@
 {
   if (omList == OM_INIT || omList == OM_SIZE)
-    return ObjectManager::objectManagerListNames[0];
+    return ObjectManager::objectManagerListNames[OM_NULL];
 
   printf("%d\n", omList);

branches/proxy/src/world_entities/projectiles/guided_missile.h

@@ -13 +13 @@
 class ParticleEmitter;
 class FastFactory;
-class Aim;
 
 class GuidedMissile : public Projectile

branches/proxy/src/world_entities/weapons/aim.cc

@@ -50 +50 @@
 Aim::~Aim ()
 {
-  if (this->material)
-    delete this->material;
-
 /*  if (this->text != NULL)
     delete this->text;*/
@@ -70 +67 @@
 
   this->setBindNode(this);
-  this->material = new Material;
   this->source = NULL;
 
   this->range = 10000;
   this->angle = M_PI_4;
-  this->group = OM_GROUP_01;
+  this->targetGroup = OM_GROUP_02_PROJ;
   this->anim = new tAnimation<Aim>(this, &Aim::setSize);
   this->anim->setInfinity(ANIM_INF_CONSTANT);
@@ -103 +99 @@
   LoadParam(root, "rotation-speed", this, Aim, setRotationSpeed)
       .describe("the Speed with which the Aim should rotate");
+
+  LoadParam(root, "target-group", this, Aim, setTargetGroupS);
 }
 
@@ -108 +106 @@
 {
   ObjectManager::EntityList::iterator entity;
-
-  for (entity = State::getObjectManager()->getObjectList(group).begin();
-       entity != State::getObjectManager()->getObjectList(group).end();
+  //printf("%d\n", this->targetGroup);
+
+  for (entity = State::getObjectManager()->getObjectList(this->targetGroup).begin();
+       entity != State::getObjectManager()->getObjectList(this->targetGroup).end();
        entity ++)
   {
     diffVec = ( (*entity)->getAbsCoor() - this->source->getAbsCoor() );
 
-    if ( diffVec.len() < range &&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) )  < angle)
+    if ( diffVec.len() < range )//&&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) )  < angle)
     {
       //if (this->getParent() != (*entity))
       {
+        printf("found target::: %d %s::%s\n", (*entity)->getOMListNumber(), (*entity)->getClassCName(), (*entity)->getCName());
         this->anim->replay();
-        this->setParentSoft(*entity, 5);
+        this->setParent/*Soft*/(*entity/*, 5 */);
         return;
       }
@@ -128 +128 @@
    //if no target found:
    this->setParent(PNode::getNullParent());
-
-
-
-}
-
+}
+
+void Aim::setTargetGroupS(const std::string& groupName)
+{
+  printf("::::::::::::::::::::::: TEST\n");
+  OM_LIST id = ObjectManager::StringToOMList(groupName);
+  if (id != OM_NULL)
+    this->setTargetGroup(id);
+  else
+    PRINTF(2)("List %s not found for targetting\n", groupName.c_str());
+
+  printf("targetGroup: %s, %d", groupName.c_str(), id);
+}
 
 /**
@@ -149 +157 @@
 void Aim::setTexture(const std::string& textureFile)
 {
-  this->material->setDiffuseMap(textureFile);
+  this->material.setDiffuseMap(textureFile);
 }
 
@@ -170 +178 @@
 //only look for target if the aim hasn`t locked a target yet or if the actual target is out of range
    if(this->getParent() == PNode::getNullParent() ||
-      diffVec.len() > range  ||
-     ( acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) > angle))
+      diffVec.len() > range )// ||
+     //( acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) > angle))
     {
      this->setParentSoft(PNode::getNullParent(),5);
@@ -213 +221 @@
 
   glRotatef(this->getAbsDir2D(), 0,0,1);
-  this->material->select();
+  this->material.select();
   glBegin(GL_TRIANGLE_STRIP);
   glTexCoord2f(0, 0);

branches/proxy/src/world_entities/weapons/aim.h

@@ -11 +11 @@
 #include "object_manager.h"
 
+#include "material.h"
+
 // FORWARD DECLARATION
 class Model;
 class Text;
-class Material;
 class TiXmlElement;
 template<class T> class tAnimation;
@@ -25 +26 @@
  * Also the Aim is a Element2D, as it draws a cross onto the Target.
  */
-class Aim : public PNode, public Element2D {
+class Aim : public PNode, public Element2D
+{
 
- public:
+public:
   Aim(PNode* source, const TiXmlElement* root = NULL);
   virtual ~Aim();
 
-  void init();
   virtual void loadParams(const TiXmlElement* root);
 
@@ -43 +44 @@
   void setRange(float range) {this->range = range;};
   void setAngle(float angle) {this->angle = angle;};
-  void setGroup(OM_LIST group) {this->group = group;};
+  void setTargetGroup(OM_LIST group) { this->targetGroup = group; };
+  void setTargetGroupS(const std::string& grounName);
 
   void setSize(float size);
@@ -53 +55 @@
   virtual void draw() const;
 
- private:
-   Material*        material;             //!< a material for the Aim.
-   float            rotationSpeed;        //!< Speed of the Rotation.
-   tAnimation<Aim>* anim;
+private:
+  void init();
 
-   float            range;                //!<
-   float            angle;                //!<
-   Vector           diffVec;
-   OM_LIST          group;
 
-   PNode*           source;               //!< Where this Shot has come from.
+private:
+  Material         material;             //!< a material for the Aim.
+  float            rotationSpeed;        //!< Speed of the Rotation.
+  tAnimation<Aim>* anim;
 
-   Text*            text;                 //!< A Text to display onto this Node. (distance to Target)
+  float            range;                //!<
+  float            angle;                //!<
+  Vector           diffVec;
+  OM_LIST          targetGroup;
+
+  PNode*           source;               //!< Where this Shot has come from.
+
+  //   Text             text;                 //!< A Text to display onto this Node. (distance to Target)
 };
 

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

@@ -17 +17 @@
 #include "targeting_turret.h"
 
-#include "weapon_manager.h"
-#include "aim.h"
-#include "world_entities/projectiles/projectile.h"
+#include "projectiles/projectile.h"
 
 #include "model.h"
@@ -25 +23 @@
 #include "animation3d.h"
 
+#include "util/loading/load_param.h"
 #include "util/loading/factory.h"
 
@@ -30 +29 @@
 
 
-
-
-/**
- *  standard constructor
-
-   creates a new weapon
-*/
-TargetingTurret::TargetingTurret ()
-  : Weapon()
-{
-  this->init();
-
-}
-
-
 TargetingTurret::TargetingTurret(const TiXmlElement* root)
+  : target(this)
 {
   this->init();
@@ -91 +76 @@
   //this->getProjectileFactory()->prepare(100);
 
-  this->target = new Aim(this);
-  this->target->setVisibility(false);
-  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;
@@ -112 +97 @@
   Weapon::loadParams(root);
 
+  LoadParam(root, "target-group", &target, Aim, setTargetGroupS);
+
 }
 
@@ -122 +109 @@
 void TargetingTurret::deactivate()
 {
-  this->target->setVisibility(false);
+  this->target.setVisibility(false);
 }
 
@@ -130 +117 @@
     return;
 
+  this->target.tick(dt);
+
   if( lockedTime >= neededLockTime )
    {
-    lockedTarget = this->target->getParent();
+    lockedTarget = this->target.getParent();
     lockedTime = 0;
    }
 
-  this->target->tick(dt);
 
-  if(this->target->getParent() == PNode::getNullParent())
+  if(this->target.getParent() == PNode::getNullParent())
    lockedTime = 0;
   else

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

@@ -8 +8 @@
 
 #include "weapon.h"
-
-/* FORWARD DECLARATION */
-class Aim;
+#include "aim.h"
 
 class TargetingTurret : public Weapon
-  {
-  public:
-    TargetingTurret ();
-    TargetingTurret(const TiXmlElement* root);
-    virtual ~TargetingTurret ();
+{
+public:
+  TargetingTurret(const TiXmlElement* root = NULL);
+  virtual ~TargetingTurret ();
 
-    void init();
-    virtual void loadParams(const TiXmlElement* root);
+  virtual void loadParams(const TiXmlElement* root);
 
-    virtual void activate();
-    virtual void deactivate();
+  virtual void activate();
+  virtual void deactivate();
 
-    virtual void tick(float dt);
-    virtual void fire();
+  virtual void tick(float dt);
+  virtual void fire();
 
-    virtual void draw() const;
+  virtual void draw() const;
 
-  private:
-    Aim*           target;
-    PNode*         lockedTarget;
-    float          lockedTime;
-    float          neededLockTime;
-  };
+private:
+  void init();
+
+private:
+  Aim            target;
+  PNode*         lockedTarget;
+  float          lockedTime;
+  float          neededLockTime;
+};
 
 #endif /* _TARGETING_TURRET_H */

branches/proxy/src/world_entities/world_entity.cc

@@ -28 +28 @@
 #include "util/loading/resource_manager.h"
 #include "util/loading/load_param.h"
-#include "vector.h"
 #include "obb_tree.h"