Changeset 7000 in orxonox.OLD for trunk

Timestamp:

Feb 3, 2006, 1:56:25 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: added turbine Hover

Location:

trunk/src/world_entities/space_ships

Files:

• turbine_hover.cc (copied) (copied from trunk/src/world_entities/space_ships/hover.cc) (18 diffs)
• turbine_hover.h (copied) (copied from trunk/src/world_entities/space_ships/hover.h) (3 diffs)

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -17 +17 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-#include "hover.h"
+#include "turbine_hover.h"
 
 #include "weapons/weapon_manager.h"
@@ -33 +33 @@
 using namespace std;
 
-CREATE_FACTORY(Hover, CL_HOVER);
-
-/**
- *  destructs the hover, deletes alocated memory
- */
-Hover::~Hover ()
+CREATE_FACTORY(TurbineHover, CL_TURBINE_HOVER);
+
+/**
+ *  destructs the turbine_hover, deletes alocated memory
+ */
+TurbineHover::~TurbineHover ()
 {
   this->setPlayer(NULL);
@@ -44 +44 @@
 
 /**
- * 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)
+ * loads a TurbineHover information from a specified file.
+ * @param fileName the name of the File to load the turbine_hover from (absolute path)
+ */
+TurbineHover::TurbineHover(const char* fileName)
 {
   this->init();
@@ -54 +54 @@
   if(!doc.LoadFile())
   {
-    PRINTF(2)("Loading file %s failed for Hover.\n", fileName);
+    PRINTF(2)("Loading file %s failed for TurbineHover.\n", fileName);
     return;
   }
@@ -67 +67 @@
    @todo add more parameters to load
 */
-Hover::Hover(const TiXmlElement* root)
+TurbineHover::TurbineHover(const TiXmlElement* root)
 {
   this->init();
@@ -94 +94 @@
 
 /**
- * initializes a Hover
- */
-void Hover::init()
+ * initializes a TurbineHover
+ */
+void TurbineHover::init()
 {
   //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
-  this->setClassID(CL_HOVER, "Hover");
+  this->setClassID(CL_TURBINE_HOVER, "TurbineHover");
 
   this->loadModel("models/ships/hoverglider_wing.obj", 1.0f, 3);
-  this->loadModel("models/ships/hoverglider_rotor.obj", 1.0f, 4);
-  this->loadModel("models/ships/rotor.obj", .45f, 5);
+  this->loadModel("models/ships/hoverglider_turbine.obj", 1.0f, 4);
+  this->loadModel("models/ships/hoverglider_turbine_rotors.obj", 1.0f, 5);
 
   bForward = bBackward = bLeft = bRight = bAscend = bDescend = false;
@@ -179 +179 @@
 
 /**
- * loads the Settings of a Hover from an XML-element.
+ * loads the Settings of a TurbineHover from an XML-element.
  * @param root the XML-element to load the Spaceship's properties from
  */
-void Hover::loadParams(const TiXmlElement* root)
+void TurbineHover::loadParams(const TiXmlElement* root)
 {
   WorldEntity::loadParams(root);
@@ -188 +188 @@
 
 
-void Hover::enter()
+void TurbineHover::enter()
 {
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
@@ -197 +197 @@
 }
 
-void Hover::leave()
+void TurbineHover::leave()
 {
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
@@ -206 +206 @@
 
 /**
- *  effect that occurs after the Hover is spawned
-*/
-void Hover::postSpawn ()
+ *  effect that occurs after the TurbineHover is spawned
+*/
+void TurbineHover::postSpawn ()
 {
   //setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
@@ -214 +214 @@
 
 /**
- *  the action occuring if the hover left the game
-*/
-void Hover::leftWorld ()
+ *  the action occuring if the turbine_hover left the game
+*/
+void TurbineHover::leftWorld ()
 {}
 
@@ -225 +225 @@
  * Implement behaviour like damage application or other miscellaneous collision stuff in this function
  */
-void Hover::collidesWith(WorldEntity* entity, const Vector& location)
+void TurbineHover::collidesWith(WorldEntity* entity, const Vector& location)
 {}
 
@@ -234 +234 @@
  * @param time The timespan passed since last update
 */
-void Hover::tick (float dt)
+void TurbineHover::tick (float dt)
 {
   Playable::tick(dt);
@@ -247 +247 @@
  * @param time the timeslice since the last frame
 */
-void Hover::movement (float dt)
+void TurbineHover::movement (float dt)
 {
   Vector accel(0.0, 0.0, 0.0);
@@ -301 +301 @@
 
 
-void Hover::draw() const
+void TurbineHover::draw() const
 {
   Vector tmpRot;
@@ -323 +323 @@
   glRotatef (this->rotorNodeLeft.getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
   this->getModel(4)->draw();
-  glTranslatef(0,-1,0);
   glRotatef(this->rotorCycle, 0,1,0);
   this->getModel(5)->draw();
@@ -347 +346 @@
   glScalef(1,1,-1);
   this->getModel(4)->draw();
-  glTranslatef(0,-1,0);
   glRotatef(this->rotorCycle, 0,1,0);
   this->getModel(5)->draw();
@@ -356 +354 @@
  * @todo switch statement ??
  */
-void Hover::process(const Event &event)
+void TurbineHover::process(const Event &event)
 {
   Playable::process(event);

trunk/src/world_entities/space_ships/turbine_hover.h

@@ -1 +1 @@
 
 /*!
- * @file hover.h
- * Implements the Control of a Hover
+ * @file turbine_hover.h
+ * Implements the Control of a TurbineHover
  */
 
-#ifndef _HOVER_H
-#define _HOVER_H
+#ifndef _TURBINE_HOVER_H
+#define _TURBINE_HOVER_H
 
 #include "playable.h"
 
-class Hover : public Playable
+class TurbineHover : public Playable
 {
   public:
 
-    Hover(const char* fileName);
-    Hover(const TiXmlElement* root = NULL);
-    virtual ~Hover();
+    TurbineHover(const char* fileName);
+    TurbineHover(const TiXmlElement* root = NULL);
+    virtual ~TurbineHover();
 
     virtual void loadParams(const TiXmlElement* root);
@@ -56 +56 @@
     float                 rotation;
 
-    Vector                velocity;           //!< the velocity of the Hover.
-    Quaternion            direction;          //!< the direction of the Hover.
+    Vector                velocity;           //!< the velocity of the TurbineHover.
+    Quaternion            direction;          //!< the direction of the TurbineHover.
     float                 travelSpeed;        //!< the current speed of the Hove (to make soft movement)
-    float                 acceleration;       //!< the acceleration of the Hover.
+    float                 acceleration;       //!< the acceleration of the TurbineHover.
     float                 airFriction;        //!< AirFriction.
 
@@ -69 +69 @@
 };
 
-#endif /* _HOVERS_H */
+#endif /* _TURBINE_HOVERS_H */