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

Timestamp:

Jan 27, 2006, 4:16:02 PM (19 years ago)

Author:

bensch

Message:

trunk: new Hover

Location:

trunk/src/world_entities

Files:

• space_ships/hover.cc (copied) (copied from trunk/src/world_entities/space_ships/helicopter.cc) (27 diffs)
• space_ships/hover.h (copied) (copied from trunk/src/world_entities/space_ships/helicopter.h) (3 diffs)
• weapons/cannon.cc (modified) (1 diff)

trunk/src/world_entities/space_ships/hover.cc

@@ -17 +17 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-#include "helicopter.h"
+#include "hover.h"
 
 #include "weapons/weapon_manager.h"
@@ -33 +33 @@
 using namespace std;
 
-CREATE_FACTORY(Helicopter, CL_HELICOPTER);
-
-/**
- *  creates the controlable Helicopter
- */
-Helicopter::Helicopter()
+CREATE_FACTORY(Hover, CL_HOVER);
+
+/**
+ *  creates the controlable Hover
+ */
+Hover::Hover()
 {
   this->init();
@@ -44 +44 @@
 
 /**
- *  destructs the helicopter, deletes alocated memory
- */
-Helicopter::~Helicopter ()
-{
-}
-
-/**
- * loads a Helicopter information from a specified file.
- * @param fileName the name of the File to load the helicopter from (absolute path)
- */
-Helicopter::Helicopter(const char* fileName)
+ *  destructs the hover, deletes alocated memory
+ */
+Hover::~Hover ()
+{
+}
+
+/**
+ * loads a Hover information from a specified file.
+ * @param fileName the name of the File to load the hover from (absolute path)
+ */
+Hover::Hover(const char* fileName)
 {
   this->init();
@@ -61 +61 @@
   if(!doc.LoadFile())
   {
-    PRINTF(2)("Loading file %s failed for Helicopter.\n", fileName);
+    PRINTF(2)("Loading file %s failed for Hover.\n", fileName);
     return;
   }
@@ -74 +74 @@
    @todo add more parameters to load
 */
-Helicopter::Helicopter(const TiXmlElement* root)
+Hover::Hover(const TiXmlElement* root)
 {
   this->init();
@@ -101 +101 @@
 
 /**
- * initializes a Helicopter
- */
-void Helicopter::init()
+ * initializes a Hover
+ */
+void Hover::init()
 {
 //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
-  this->setClassID(CL_HELICOPTER, "Helicopter");
-
-  PRINTF(4)("HELICOPTER INIT\n");
-
-  this->loadModel("models/ships/helicopter_#.obj", 1.0);
+  this->setClassID(CL_HOVER, "Hover");
+
+  PRINTF(4)("HOVER INIT\n");
+
+  this->loadModel("models/ships/hover_#.obj", 1.0);
 
   EventHandler::getInstance()->grabEvents(true);
@@ -124 +124 @@
 
   //cycle = 0.0;
-  
+
   // cameraissue
   this->cameraNode.setParent(this);
   this->cameraNode.setParentMode(PNODE_ALL);
-  
-  
+
+
   // rotors
   this->topRotor.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
   this->tailRotor.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
-  
+
   this->topRotor.setParent(this);
   this->tailRotor.setParent(this);
-  
+
   this->topRotor.setRelCoor(Vector(-0.877,0.627,0));
   this->tailRotor.setRelCoor(Vector(-4.43,0.297,0.068));
   this->tailRotor.setAbsDir(Quaternion(M_PI_2,Vector(1,0,0)));
-  
+
   this->loadModel("models/ships/rotor.obj",1.0,3);
   this->loadModel("models/ships/rotor.obj",0.2,4);
@@ -205 +205 @@
 
 /**
- * loads the Settings of a Helicopter from an XML-element.
+ * loads the Settings of a Hover from an XML-element.
  * @param root the XML-element to load the Spaceship's properties from
  */
-void Helicopter::loadParams(const TiXmlElement* root)
+void Hover::loadParams(const TiXmlElement* root)
 {
   WorldEntity::loadParams(root);
 }
 
-void  Helicopter::attachCamera()
+void  Hover::attachCamera()
 {
   State::getCamera()->setParentSoft(this->getWeaponManager()->getFixedTarget());
@@ -221 +221 @@
 
 
-void Helicopter::enter()
+void Hover::enter()
 {
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
@@ -229 +229 @@
 }
 
-void Helicopter::leave()
+void Hover::leave()
 {
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
@@ -238 +238 @@
 
 /**
- *  effect that occurs after the Helicopter is spawned
-*/
-void Helicopter::postSpawn ()
+ *  effect that occurs after the Hover is spawned
+*/
+void Hover::postSpawn ()
 {
   //setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
@@ -246 +246 @@
 
 /**
- *  the action occuring if the helicopter left the game
-*/
-void Helicopter::leftWorld ()
+ *  the action occuring if the hover left the game
+*/
+void Hover::leftWorld ()
 {}
 
@@ -257 +257 @@
  * Implement behaviour like damage application or other miscellaneous collision stuff in this function
  */
-void Helicopter::collidesWith(WorldEntity* entity, const Vector& location)
+void Hover::collidesWith(WorldEntity* entity, const Vector& location)
 {
   if (entity->isA(CL_TURRET_POWER_UP))
@@ -272 +272 @@
  * @param time The timespan passed since last update
 */
-void Helicopter::tick (float time)
+void Hover::tick (float time)
 {
   if( xMouse != 0 || yMouse != 0)
@@ -281 +281 @@
     else if (yMouse < -controlVelocityY) yMouse = -controlVelocityY;
   }
-  
+
   // rotorrotation
   this->topRotor.shiftDir(Quaternion(time*10, Vector(0,1,0)));
   this->tailRotor.shiftDir(Quaternion(time*10, Vector(0,1,0)));
-  
+
   // spaceship controlled movement
   this->calculateVelocity(time);
@@ -293 +293 @@
   // this is the air friction (necessary for a smooth control)
   if(velocity.len() != 0) velocity -= velocity*0.1;
-  
+
   //travelSpeed = velocity.len();
 
@@ -301 +301 @@
   this->shiftCoor(getAbsDirY()*rotorspeed);
   */
-  
+
   /*
   //hoover effect
@@ -326 +326 @@
  * @param time the timeslice since the last frame
 */
-void Helicopter::calculateVelocity (float time)
+void Hover::calculateVelocity (float time)
 {
   Vector accel(0.0, 0.0, 0.0);
@@ -338 +338 @@
      //this->shiftCoor(this->getAbsDirX());
      //accel -= this->getAbsDirY();
-     
+
      accel += Vector((this->getAbsDirX()).x,0,(this->getAbsDirX()).z);
      if((this->getAbsDirX()).y >= -0.1) rotValZ -= time;
@@ -351 +351 @@
      //this->shiftCoor((this->getAbsDirX())*-1);
      //accel -= this->getAbsDirY();
-     
+
      accel -= Vector((this->getAbsDirX()).x,0,(this->getAbsDirX()).z);
      rotValZ += time;
@@ -365 +365 @@
     //accel -= this->getAbsDirY();
     //velocityDir.normalize();
-    
+
     accel -= Vector((this->getAbsDirZ()).x,0,(this->getAbsDirZ()).z);
     rotValX -= time;
@@ -379 +379 @@
     //accel += this->getAbsDirY();
     //velocityDir.normalize();
-    
+
     accel += Vector((this->getAbsDirZ()).x,0,(this->getAbsDirZ()).z);
     rotValX += time;
@@ -443 +443 @@
 
 
-void Helicopter::draw() const
+void Hover::draw() const
 {
   WorldEntity::draw();
-  
+
   glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
@@ -478 +478 @@
  * weapon manipulation by the player
 */
-void Helicopter::weaponAction()
+void Hover::weaponAction()
 {
   if( this->bFire)
@@ -489 +489 @@
  * @todo switch statement ??
  */
-void Helicopter::process(const Event &event)
+void Hover::process(const Event &event)
 {
 
@@ -517 +517 @@
 
     this->shiftDir(Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0)));
-    
+
     Quaternion yDir = Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1));
 
-    
+
     if ((this->cameraNode.getAbsDirY()).y < 0.5)
     {
@@ -538 +538 @@
 #include "weapons/aiming_turret.h"
 // FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG
-void Helicopter::ADDWEAPON()
+void Hover::ADDWEAPON()
 {
   Weapon* turret = NULL;

trunk/src/world_entities/space_ships/hover.h

@@ -1 +1 @@
 
 /*!
- * @file helicopter.h
- * Implements the Control of a Helicopter
+ * @file hover.h
+ * Implements the Control of a Hover
  */
 
-#ifndef _HELICOPTER_H
-#define _HELICOPTER_H
+#ifndef _HOVER_H
+#define _HOVER_H
 
 #include "playable.h"
 
 
-class Helicopter : public Playable
+class Hover : public Playable
 {
 
   public:
 
-    Helicopter();
-    Helicopter(const char* fileName);
-    Helicopter(const TiXmlElement* root);
-    virtual ~Helicopter();
+    Hover();
+    Hover(const char* fileName);
+    Hover(const TiXmlElement* root);
+    virtual ~Hover();
 
     void init();
@@ -63 +63 @@
     int                   controlVelocityY;
     //float                 cycle;              //!< hovercycle
-    
+
     PNode                 topRotor;
     PNode                 tailRotor;
-    
+
     PNode                 cameraNode;
 
@@ -80 +80 @@
 };
 
-#endif /* _HELICOPTERS_H */
+#endif /* _HOVERS_H */

trunk/src/world_entities/weapons/cannon.cc

@@ -74 +74 @@
 //  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
-  this->loadModel("models/guns/cannon.obj");
+  this->loadModel("models/guns/plasmadriver_#.obj");
 
   this->setStateDuration(WS_SHOOTING, 2.0);