Changeset 5576 in orxonox.OLD

Timestamp:

Nov 15, 2005, 11:21:57 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/world_entities: zoom only onto targets, that are in front of the Player… (cheap hack)

Location:

branches/world_entities/src

Files:

• lib/coord/p_node.h (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/weapons/aim.cc (modified) (3 diffs)
• world_entities/weapons/aim.h (modified) (1 diff)
• world_entities/weapons/aiming_turret.cc (modified) (1 diff)
• world_entities/weapons/weapon_manager.cc (modified) (1 diff)

branches/world_entities/src/lib/coord/p_node.h

@@ -127 +127 @@
   static const char* parentingModeToChar(int parentingMode);
   static PARENT_MODE charToParentingMode(const char* parentingMode);
+
+
  private:
   void init(PNode* parent);

branches/world_entities/src/world_entities/player.cc

@@ -343 +343 @@
   Weapon* turret = NULL;
 
-  printf("free slot: %d\n", this->weaponMan->getNextFreeSlot(3, WTYPE_TURRET | WTYPE_ALLDIRS));
-
   if ((float)rand()/RAND_MAX < .1)
   {

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

@@ -101 +101 @@
 }
 
-void Aim::searchTarget(PNode* source)
+void Aim::searchTarget(float range)
 {
   tIterator<WorldEntity>* iterator = State::getWorldEntityList()->getIterator();
@@ -107 +107 @@
   while (likely(entity != NULL))
   {
-    if (entity->isA(CL_NPC) && source->getAbsCoor().x < entity->getAbsCoor().x && (source->getAbsCoor() - entity->getAbsCoor()).len() < 100)
+    if (entity->isA(CL_NPC) && this->source->getAbsCoor().x < entity->getAbsCoor().x && (this->source->getAbsCoor() - entity->getAbsCoor()).len() < range)
     {
       if (this->getParent() != entity)
@@ -156 +156 @@
   this->text->setText(outputText);
 
+
+  if (this->source->getAbsCoor().x > this->getAbsCoor().x )
+    this->searchTarget(1000);
 //   float z = 0.0f;
 //   glReadPixels ((int)this->getAbsCoor2D().x,

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

@@ -38 +38 @@
   inline PNode* getTarget(PNode* target) { return this->getParent(); };
 
-  void searchTarget(PNode* source);
+  void searchTarget(float range);
 
   void setSize(float size);

branches/world_entities/src/world_entities/weapons/aiming_turret.cc

@@ -157 +157 @@
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
-  this->target->searchTarget(this);
+  this->target->searchTarget(100);
 }
 

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

@@ -472 +472 @@
         (this->currentSlotConfig[i].capability & capability & WTYPE_ALLKINDS) &&
         (this->currentSlotConfig[i].capability & capability & WTYPE_ALLDIRS))
-        {
-        printf("%d %d %d %d\n", currentSlotConfig[i].capability, capability,  WTYPE_ALLKINDS, WTYPE_ALLDIRS);
-
       return i;
-      }
   }
   return -1;