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

Timestamp:

Jul 11, 2005, 5:47:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: crosshair in WeaponManager (instead of World) and implemented easy Cyling for LoadParam

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (3 diffs)
• player.h (modified) (1 diff)
• weapons/crosshair.cc (modified) (6 diffs)
• weapons/weapon.cc (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (7 diffs)
• weapons/weapon_manager.h (modified) (3 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -54 +54 @@
 
   //weapons:
-  this->weaponMan = new WeaponManager();
   Weapon* wpRight = new TestGun(this, Vector(-2.6, 0.1, 3.0), Quaternion(), 0);
   Weapon* wpLeft = new TestGun(this, Vector(-2.6, 0.1, -3.0), Quaternion(), 1);
@@ -90 +89 @@
 
   //weapons:
-  this->weaponMan = new WeaponManager();
   Weapon* wpRight = new TestGun(this, Vector(-2.6, 0.1, 3.0), Quaternion(), 0);
   Weapon* wpLeft = new TestGun(this, Vector(-2.6, 0.1, -3.0), Quaternion(), 1);
@@ -114 +112 @@
   this->bWeaponChange = false;
   acceleration = 10.0;
+
+
+  this->weaponMan = new WeaponManager();
 }
 

orxonox/trunk/src/world_entities/player.h

@@ -75 +75 @@
 
     Crosshair*  crosshair; //!< the crosshair of the player
-
 };
 

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

@@ -43 +43 @@
 }
 
-
 /**
  * destroys a Crosshair
@@ -68 +67 @@
 
   this->rotation = 0;
-  this->rotationSpeed = 5;
+  this->setRotationSpeed(5);
   this->setSize(GraphicsEngine::getInstance()->getResolutionX()/10.0);
 
@@ -155 +154 @@
 void Crosshair::tick(float dt)
 {
+  // let the crosshair rotate
   this->rotation += dt * rotationSpeed;
 
 
-
-}
-
-/**
- * draws the crosshair
- */
-void Crosshair::draw()
-{
-  /*
-  const PNode* camera = State::getInstance()->getCamera();  //!< \todo MUST be different
-  Vector cameraPos = camera->getAbsCoor();
-  Vector cameraTargetPos = State::getInstance()->getCameraTarget()->getAbsCoor();
-  Vector view = cameraTargetPos - cameraPos;
-  Vector up = Vector(0, 1, 0);
-  up = camera->getAbsDir().apply(up);
-  Vector h = up.cross(view);
-  Vector v = h.cross(view);
-  h.normalize();
-  v.normalize();
-
-  float px = (position2D[0]-GraphicsEngine::getInstance()->getResolutionX()/2)*.05;
-  float py = -(position2D[1]-GraphicsEngine::getInstance()->getResolutionY()/2)*.05;
-
-  glBegin(GL_TRIANGLES);
-  glVertex3f(cameraTargetPos.x - h.x*px - v.x*py,
-  cameraTargetPos.y - h.y*px - v.y*py,
-  cameraTargetPos.z - h.z*px - v.z*py);
-
-  glVertex3f(cameraTargetPos.x - h.x*(px+1) - v.x*py,
-  cameraTargetPos.y - h.y*(px+1) - v.y*py,
-  cameraTargetPos.z - h.z*(px+1) - v.z*py);
-
-  glVertex3f(cameraTargetPos.x - h.x*px - v.x*(py+1),
-  cameraTargetPos.y - h.y*px - v.y*(py+1),
-  cameraTargetPos.z - h.z*px - v.z*(py+1));
-
-  glEnd();
-
-  */
-
-
-  GraphicsEngine::storeMatrices();
-
-///  float z;
-//   glReadPixels ((int)position2D[0], GraphicsEngine::getInstance()->getResolutionY()-(int)position2D[1]-1, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &z);
-
-
-  //cout << z <<"  "<< scale << "  "  << bias<< endl;
-
+  float z;
+  glReadPixels ((int)position2D[0], GraphicsEngine::getInstance()->getResolutionY()-(int)position2D[1]-1, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &z);
+  //cout << z << endl;
 
   GLdouble objX, objY, objZ;
@@ -221 +175 @@
   this->setAbsCoor(objX, objY, objZ);
 
+
+}
+
+/**
+ * draws the crosshair
+ */
+void Crosshair::draw()
+{
+  GraphicsEngine::storeMatrices();
+
+
+
+
 //   glBegin(GL_TRIANGLES);
 //   glColor3f(1,0,0);
@@ -228 +195 @@
 //   glEnd();
 
+  this->debugDraw();
 
   GraphicsEngine::enter2DMode();
@@ -253 +221 @@
   glVertex2f(size, size);
   glEnd();
-  /*
-  glBegin(GL_QUADS);
-  {
-    glColor4f(1,0,0,1);
-    glVertex2f(position2D[0]-10, position2D[1]-10);
-    glVertex2f(position2D[0]+10, position2D[1]-10);
-    glVertex2f(position2D[0]+10, position2D[1]+10);
-    glVertex2f(position2D[0]-10, position2D[1]+10);
-
-    //     glVertex2f(pos[0]-10, pos[1]-10);
-    //     glVertex2f(pos[0]-10, pos[1]+10);
-    //     glVertex2f(pos[0]+10, pos[1]+10);
-    //     glVertex2f(pos[0]+10, pos[1]-10);
-  }
-  glEnd();
-  */
+
   GraphicsEngine::leave2DMode();
 }

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

@@ -16 +16 @@
 
 #include "weapon.h"
-#include "weapon_manager.h"
 
+#include "projectile.h"
+
+#include "load_param.h"
 #include "vector.h"
-#include "projectile.h"
 #include "list.h"
 #include "state.h"

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

@@ -19 +19 @@
 #include "weapon_manager.h"
 #include "weapon.h"
-
+#include "crosshair.h"
+
+#include "load_param.h"
+#include "factory.h"
 #include "vector.h"
 #include "list.h"
@@ -53 +56 @@
       this->configs[i].slots[j] = NULL;
   }
-}
-
+
+  // crosshair being a PNode it must not be deleted (this is because PNodes delete themselves.)
+  //delete this->crosshair;
+}
+
+/**
+ * initializes the WeaponManager
+ */
 void WeaponManager::init()
 {
@@ -66 +75 @@
   }
   this->currConfID = W_CONFIG0;
-
+  this->crosshair = new Crosshair();
+}
+
+/**
+ *
+ * @param root the XML-element to load from
+ */
+void WeaponManager::loadParams(const TiXmlElement* root)
+{
+  static_cast<BaseObject*>(this)->loadParams(root);
+
+  LoadParam<WeaponManager>(root, "slot-count", this, &WeaponManager::setSlotCount)
+      .describe("how many slots(cannons) the WeaponManager can handle");
+
+  LOAD_PARAM_START_CYCLE;
+
+  LoadParam<WeaponManager>(root, "Weapons", this, &WeaponManager::loadWeapons)
+      .describe("loads Weapons");
+      // LoadParam<WeaponManager>(root, "Weapon", this, &WeaponManager::addWeapon);
+
+  LOAD_PARAM_END_CYCLE;
+}
+
+/**
+ * loads a Weapon onto the WeaponManager
+ * @param root the XML-element to load the Weapons from
+ */
+void WeaponManager::loadWeapons(const TiXmlElement* root)
+{
+  LOAD_PARAM_START_CYCLE;
+
+  Weapon* newWeapon = dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(element));
+
+
+
+  LOAD_PARAM_END_CYCLE;
+}
+
+
+/**
+ * sets the number of Slots the WeaponManager has
+ * @param nrOfSlots the number of slots
+ */
+void WeaponManager::setSlotCount(int nrOfSlots)
+{
+  this->nrOfSlots = nrOfSlots;
 }
 
@@ -100 +154 @@
 }
 
-
+/**
+ * removes a Weapon from the WeaponManager
+ */
 void WeaponManager::removeWeapon(Weapon* weapon, int configID)
 {
@@ -163 +219 @@
     if( firingWeapon != NULL) firingWeapon->fire();
   }
+  this->crosshair->setRotationSpeed(-500);
 }
 
@@ -178 +235 @@
     if( w != NULL) w->tick(dt);
   }
+
+  crosshair->tick(dt);
+  crosshair->setRotationSpeed(5);
 }
 
@@ -193 +253 @@
       w->draw();
   }
+  crosshair->draw();
 }
 

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

@@ -32 +32 @@
 // FORWARD DECLARATION
 class Weapon;
+class Crosshair;
 
 #define    W_MAX_SLOTS       8
@@ -71 +72 @@
     void init();
     void loadParams(const TiXmlElement* root);
+    void loadWeapons(const TiXmlElement* root);
+
+    void setSlotCount(int nrOfSlots);
 
     void addWeapon(Weapon* weapon, int configID = W_CONFIG0, int slotID = W_FREE_SLOT);
@@ -81 +85 @@
 
   private:
+    Crosshair*            crosshair;               //!< an aim.
+
     int                   nrOfSlots;               //<! number of weapon slots a ship has
     int                   currConfID;              //<! the currently selected config