Changeset 5559 in orxonox.OLD for branches

Timestamp:

Nov 13, 2005, 4:30:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: simple-aiming function, with visible targetting-system

Location:

branches/world_entities/src/world_entities

Files:

• player.cc (modified) (1 diff)
• weapons/aim.cc (modified) (4 diffs)
• weapons/aim.h (modified) (1 diff)
• weapons/aiming_turret.cc (modified) (8 diffs)
• weapons/aiming_turret.h (modified) (2 diffs)

branches/world_entities/src/world_entities/player.cc

@@ -341 +341 @@
 void Player::ADDWEAPON()
 {
-  Weapon* turret1;
-  if ((float)rand()/RAND_MAX < .7)
-    turret1 = new Turret(this->weaponMan);
+  Weapon* turret;
+  if ((float)rand()/RAND_MAX < .1)
+  {
+    turret = new Turret(this->weaponMan);
+    this->weaponMan->addWeapon(turret, 2);
+    this->weaponMan->changeWeaponConfig(2);
+  }
   else
-    turret1 = new AimingTurret(this->weaponMan);
-
-  turret1->setName("Turret");
-  turret1->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
-
-  this->weaponMan->addWeapon(turret1, 2);
-
-  this->weaponMan->changeWeaponConfig(2);
-}
+  {
+    turret = new AimingTurret(this->weaponMan);
+    this->weaponMan->addWeapon(turret, 3);
+
+    this->weaponMan->changeWeaponConfig(3);
+  }
+
+  turret->setName("Turret");
+  turret->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
+}

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

@@ -20 +20 @@
 #include "load_param.h"
 #include "graphics_engine.h"
-#include "glincl.h"
 #include "state.h"
+#include "list.h"
 #include "material.h"
+
+#include "world_entity.h"
 
 using namespace std;
@@ -58 +60 @@
 
   this->setLayer(E2D_LAYER_TOP);
-  this->setRotationSpeed(5);
+  this->setRotationSpeed(30.0* (float)rand()/RAND_MAX + 10.0);
   this->setSize(GraphicsEngine::getInstance()->getResolutionX()/10.0);
 
-//  this->setBindNode(this);
+  this->setBindNode(this);
   this->material = new Material;
 }
@@ -79 +81 @@
       .describe("the Speed with which the Aim should rotate");
 }
+
+void Aim::searchTarget(PNode* source)
+{
+  tIterator<WorldEntity>* iterator = State::getWorldEntityList()->getIterator();
+  WorldEntity* entity = iterator->firstElement();
+  while (likely(entity != NULL))
+  {
+    if (entity->isA(CL_NPC) && (source->getAbsCoor() - entity->getAbsCoor()).len() < 100)
+    {
+      this->setParent(entity);
+      delete iterator;
+      return;
+    }
+    entity = iterator->nextElement();
+  }
+
+  delete iterator;
+}
+
 
 
@@ -109 +130 @@
 
 
-  float z = 0.0f;
-  glReadPixels ((int)this->getAbsCoor2D().x,
-                 GraphicsEngine::getInstance()->getResolutionY()-(int)this->getAbsCoor2D().y-1,
-                 1,
-                 1,
-                 GL_DEPTH_COMPONENT,
-                 GL_FLOAT,
-                 &z);
-
-
-  GLdouble objX=.0, objY=.0, objZ=.0;
-  gluUnProject(this->getAbsCoor2D().x,
-               GraphicsEngine::getInstance()->getResolutionY()-this->getAbsCoor2D().y-1,
-               .99,  // z
-               GraphicsEngine::modMat,
-               GraphicsEngine::projMat,
-               GraphicsEngine::viewPort,
-               &objX,
-               &objY,
-               &objZ );
-
-  this->setAbsCoor(objX, objY, objZ);
+//   float z = 0.0f;
+//   glReadPixels ((int)this->getAbsCoor2D().x,
+//                  GraphicsEngine::getInstance()->getResolutionY()-(int)this->getAbsCoor2D().y-1,
+//                  1,
+//                  1,
+//                  GL_DEPTH_COMPONENT,
+//                  GL_FLOAT,
+//                  &z);
+//
+//
+//   GLdouble objX=.0, objY=.0, objZ=.0;
+//   gluUnProject(this->getAbsCoor2D().x,
+//                GraphicsEngine::getInstance()->getResolutionY()-this->getAbsCoor2D().y-1,
+//                .99,  // z
+//                GraphicsEngine::modMat,
+//                GraphicsEngine::projMat,
+//                GraphicsEngine::viewPort,
+//                &objX,
+//                &objY,
+//                &objZ );
+//
+//   this->setAbsCoor(objX, objY, objZ);
 }
 

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

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

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

@@ -18 +18 @@
 
 #include "weapon_manager.h"
+#include "aim.h"
 #include "projectile.h"
 
@@ -45 +46 @@
   this->init();
 
-  this->loadModel("models/guns/turret1.obj");
+  this->loadModel("models/guns/turret2.obj");
 
 
@@ -66 +67 @@
 {
   // model will be deleted from WorldEntity-destructor
+  delete this->target;
 }
 
@@ -99 +101 @@
   //this->getProjectileFactory()->prepare(100);
 
-  this->target = NULL;
+  this->target = new Aim();
 }
 
@@ -119 +121 @@
 {
   Quaternion quat;
-  if (this->target == NULL)
-    this->target = this->getWeaponManager()->getDistanceTarget(this, 50);
   Vector direction = this->target->getAbsCoor() - this->getAbsCoor();
 
@@ -130 +130 @@
     quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
 
-  this->setAbsDirSoft(quat, 20);
+  this->setAbsDirSoft(quat, 5);
+
+  this->target->tick(dt);
 }
 
@@ -143 +145 @@
   if (target != NULL)
   {
-    pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*100.0 + VECTOR_RAND(13)
+    pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
   }
@@ -153 +155 @@
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
-  this->target = this->getWeaponManager()->getDistanceTarget(this, 50);
+  this->target->searchTarget(this);
 }
 

branches/world_entities/src/world_entities/weapons/aiming_turret.h

@@ -8 +8 @@
 
 #include "weapon.h"
+
+/* FORWARD DECLARATION */
+class Aim;
 
 class AimingTurret : public Weapon
@@ -29 +32 @@
 
   private:
-    PNode*          target;
+    Aim*          target;
   };