Changeset 4955 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Jul 25, 2005, 3:48:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: extemely stupid aiming, but it works. Had to fix quite a few bugs in the process.

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (2 diffs)
• weapons/crosshair.cc (modified) (4 diffs)
• weapons/projectile.cc (modified) (1 diff)
• weapons/test_gun.cc (modified) (4 diffs)
• weapons/test_gun.h (modified) (1 diff)
• weapons/weapon.cc (modified) (2 diffs)
• weapons/weapon.h (modified) (4 diffs)
• weapons/weapon_manager.h (modified) (2 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -46 +46 @@
 
   //weapons:
-  Weapon* wpRight = new TestGun(0);
-  Weapon* wpLeft = new TestGun(1);
+  Weapon* wpRight = new TestGun(this->weaponMan, 0);
+  Weapon* wpLeft = new TestGun(this->weaponMan, 1);
 
   this->weaponMan->addWeapon(wpRight);
@@ -80 +80 @@
 
   //weapons:
-  Weapon* wpRight = new TestGun(0);
+  Weapon* wpRight = new TestGun(this->weaponMan, 0);
   wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(1);
+  Weapon* wpLeft = new TestGun(this->weaponMan, 1);
   wpLeft->setName("testGun Left");
 

orxonox/trunk/src/world_entities/weapons/crosshair.cc

@@ -165 +165 @@
   gluUnProject(position2D[0],
                GraphicsEngine::getInstance()->getResolutionY()-position2D[1]-1,
-               .99,
+               .99,  // z
                GraphicsEngine::modMat,
                GraphicsEngine::projMat,
@@ -183 +183 @@
 void Crosshair::draw() const
 {
-  GraphicsEngine::storeMatrices();
-
-
-
-
 //   glBegin(GL_TRIANGLES);
 //   glColor3f(1,0,0);
@@ -194 +189 @@
 //   glVertex3f(objX, objY, objZ+1);
 //   glEnd();
-
-  this->debugDraw();
-
-  GraphicsEngine::enter2DMode();
+  glPushMatrix();
   GLdouble pos[3];
   gluProject(this->getAbsCoor().x,
@@ -221 +213 @@
   glVertex2f(size, size);
   glEnd();
-
-  GraphicsEngine::leave2DMode();
-}
+  glPopMatrix();
+
+}

orxonox/trunk/src/world_entities/weapons/projectile.cc

@@ -91 +91 @@
 void Projectile::setVelocity(const Vector &velocity)
 {
-  Vector offsetVel = this->velocity = velocity;
-  offsetVel.normalize();
-  this->velocity += (offsetVel * 50.0);
+  //Vector offsetVel =
+  this->velocity = velocity;
+ // offsetVel.normalize();
+  //this->velocity += (offsetVel * 50.0);
 }
 

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -26 +26 @@
 #include "model.h"
 #include "test_bullet.h"
+#include "weapon_manager.h"
 
 #include "state.h"
@@ -44 +45 @@
    creates a new weapon
 */
-TestGun::TestGun (int leftRight)
+TestGun::TestGun (WeaponManager* weaponManager, int leftRight)
+  : Weapon(weaponManager)
 {
   this->setClassID(CL_TEST_GUN, "TestGun");
@@ -158 +160 @@
   Projectile* pj =  dynamic_cast<Projectile*>(this->getProjectileFactory()->resurrect());
 
+  PNode* target = this->getWeaponManager()->getFixedTarget();
+
+  if (target != NULL)
+  {
+    target->debugDraw();
+    Vector test = ((target->getAbsCoor() - this->getAbsCoor())*5);
+    pj->setVelocity(test/20.0);//this->getVelocity());
+  }
+  else
+    pj->setVelocity(target->getVelocity());
+
+
   pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());
-  pj->setVelocity(this->getVelocity());
   State::getWorldEntityList()->add(pj);
 }
@@ -191 +204 @@
 void TestGun::draw ()
 {
+  this->getWeaponManager()->getFixedTarget()->debugDraw(10);
+
   /* draw gun body */
   glMatrixMode(GL_MODELVIEW);

orxonox/trunk/src/world_entities/weapons/test_gun.h

@@ -29 +29 @@
   {
   public:
-    TestGun (int leftRight);
+    TestGun (WeaponManager* weaponManager, int leftRight);
     virtual ~TestGun ();
 

orxonox/trunk/src/world_entities/weapons/weapon.cc

@@ -39 +39 @@
  * creates a new weapon
 */
-Weapon::Weapon ()
+Weapon::Weapon (WeaponManager* weaponManager)
 {
   this->init();
+  this->setWeaponManager(weaponManager);
 }
 
@@ -88 +89 @@
   this->energy = .0;
   this->energyMax = 10.0;
+
+  this->setWeaponManager(NULL);
 }
 

orxonox/trunk/src/world_entities/weapons/weapon.h

@@ -24 +24 @@
 // FORWARD DECLARATION
 class Projectile;
-class Weapon;
+class WeaponManager;
 class Animation3D;
 class TiXmlElement;
@@ -72 +72 @@
   public:
     // INITIALISATION //
-    Weapon ();
+    Weapon (WeaponManager* weaponManager = NULL);
     Weapon(const TiXmlElement* root);
     virtual ~Weapon ();
@@ -85 +85 @@
     ///////////////////
 
+    /** @param weaponManager sets the WeaponManager for this Weapon (NULL if free))*/
+    inline void setWeaponManager(WeaponManager* weaponManager) { this->weaponManager = weaponManager; };
+    /** @returns the WeaponManager of this Weapon (or NULL if it is free) */
+    inline WeaponManager* getWeaponManager() const { return this->weaponManager; };
 
     /** @returns true if the Weapon is Active  (this is used to check if the weapon must be drawn)*/
@@ -199 +203 @@
     ClassID              projectile;                      //!< the projectile used for this weapon (since they should be generated via macro and the FastFactory, only the ClassID must be known.)
     FastFactory*         projectileFactory;               //!< A factory, that produces and handles the projectiles.
+
+    WeaponManager*       weaponManager;                   //!< The weaponManager this weapon is connected to. if NULL it is assumed, that the weapon is freely connected to an entity without a binding WeaponManager.
   };
 

orxonox/trunk/src/world_entities/weapons/weapon_manager.h

@@ -14 +14 @@
 
 #include "p_node.h"
+#include "crosshair.h"
 
 // FORWARD DECLARATION
 class PNode;
 class Weapon;
-class Crosshair;
 template <class T> class tAnimation;
 
@@ -87 +87 @@
     void removeWeapon(Weapon* weapon, int configID = -1);
 
+
+
     void nextWeaponConfig();
     void previousWeaponConfig();
     void changeWeaponConfig(int weaponConfig);
 
+    /** @returns a fixed target namely the Crosshair's 3D position */
+    inline PNode* getFixedTarget() { return this->crosshair; }
     void fire();