Changeset 9045 in orxonox.OLD

Timestamp:

Jul 3, 2006, 3:55:07 PM (18 years ago)

Author:

bensch

Message:

added Spacecraft2D entity

Location:

branches/single_player_map/src/world_entities/space_ships

Files:

• spacecraft_2d.cc (copied) (copied from branches/single_player_map/src/world_entities/space_ships/turbine_hover.cc) (18 diffs)
• spacecraft_2d.h (copied) (copied from branches/single_player_map/src/world_entities/space_ships/turbine_hover.h) (4 diffs)

branches/single_player_map/src/world_entities/space_ships/spacecraft_2d.cc

@@ -17 +17 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-#include "turbine_hover.h"
+#include "spacecraft_2d.h"
 
 #include "weapons/weapon_manager.h"
@@ -34 +34 @@
 #include "debug.h"
 
-CREATE_FACTORY(TurbineHover, CL_TURBINE_HOVER);
-
-/**
- *  destructs the turbine_hover, deletes alocated memory
+CREATE_FACTORY(Spacecraft2D, CL_SPACECRAFT_2D);
+
+/**
+ *  destructs the spacecraft_2d, deletes alocated memory
  */
-TurbineHover::~TurbineHover ()
+Spacecraft2D::~Spacecraft2D ()
 {
   this->setPlayer(NULL);
@@ -45 +45 @@
 
 /**
- * @brief loads a TurbineHover information from a specified file.
- * @param fileName the name of the File to load the turbine_hover from (absolute path)
+ * @brief loads a Spacecraft2D information from a specified file.
+ * @param fileName the name of the File to load the spacecraft_2d from (absolute path)
  */
-TurbineHover::TurbineHover(const std::string& fileName)
+Spacecraft2D::Spacecraft2D(const std::string& fileName)
 {
   this->init();
@@ -55 +55 @@
   if(!doc.LoadFile())
   {
-    PRINTF(2)("Loading file %s failed for TurbineHover.\n", fileName.c_str());
+    PRINTF(2)("Loading file %s failed for Spacecraft2D.\n", fileName.c_str());
     return;
   }
@@ -68 +68 @@
    @todo add more parameters to load
 */
-TurbineHover::TurbineHover(const TiXmlElement* root)
+Spacecraft2D::Spacecraft2D(const TiXmlElement* root)
 {
   this->init();
@@ -95 +95 @@
 
 /**
- * @brief initializes a TurbineHover
+ * @brief initializes a Spacecraft2D
  */
-void TurbineHover::init()
+void Spacecraft2D::init()
 {
   //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
-  this->setClassID(CL_TURBINE_HOVER, "TurbineHover");
+  this->setClassID(CL_SPACECRAFT_2D, "Spacecraft2D");
 
   this->setSupportedPlaymodes(Playable::Full3D | Playable::Horizontal | Playable::Vertical);
@@ -150 +150 @@
   this->burstEmitter[0]->setRelCoor(0, -0.7, 0);
   this->burstEmitter[0]->setRelDir(Quaternion(-M_PI_2, Vector(0,0,1)));
-  this->burstEmitter[0]->setName("TurbineHover_Burst_emitter_Left");
+  this->burstEmitter[0]->setName("Spacecraft2D_Burst_emitter_Left");
 
   this->burstEmitter[1] = new DotEmitter(200, 5.0, .01);
@@ -156 +156 @@
   this->burstEmitter[1]->setRelCoor(0, -0.7, 0);
   this->burstEmitter[1]->setRelDir(Quaternion(-M_PI_2, Vector(0,0,1)));
-  this->burstEmitter[1]->setName("TurbineHover_Burst_emitter_Right");
+  this->burstEmitter[1]->setName("Spacecraft2D_Burst_emitter_Right");
 
 
@@ -211 +211 @@
   this->getWeaponManager().getFixedTarget()->setParent(&this->cameraNode);
   this->getWeaponManager().getFixedTarget()->setRelCoor(1000,0,0);
-  
+
   registerVar( new SynchronizeableBool( &bForward, &bForward, "bForward", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableBool( &bBackward, &bBackward, "bBackward", PERMISSION_OWNER ) );
@@ -224 +224 @@
 
 /**
- * @brief loads the Settings of a TurbineHover from an XML-element.
+ * @brief loads the Settings of a Spacecraft2D from an XML-element.
  * @param root the XML-element to load the Spaceship's properties from
  */
-void TurbineHover::loadParams(const TiXmlElement* root)
+void Spacecraft2D::loadParams(const TiXmlElement* root)
 {
   Playable::loadParams(root);
 }
 
-void TurbineHover::setPlayDirection(const Quaternion& rot, float speed)
+void Spacecraft2D::setPlayDirection(const Quaternion& rot, float speed)
 {
   this->direction = Quaternion (rot.getHeading(), Vector(0,1,0));
 }
 
-void TurbineHover::enter()
+void Spacecraft2D::enter()
 {
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( true);
@@ -249 +249 @@
 }
 
-void TurbineHover::leave()
+void Spacecraft2D::leave()
 {
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
@@ -258 +258 @@
 
 /**
- * @brief effect that occurs after the TurbineHover is spawned
+ * @brief effect that occurs after the Spacecraft2D is spawned
 */
-void TurbineHover::postSpawn ()
+void Spacecraft2D::postSpawn ()
 {
   //setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
@@ -266 +266 @@
 
 /**
- * @brief the action occuring if the turbine_hover left the game
+ * @brief the action occuring if the spacecraft_2d left the game
 */
-void TurbineHover::leftWorld ()
+void Spacecraft2D::leftWorld ()
 {}
 
@@ -277 +277 @@
  * Implement behaviour like damage application or other miscellaneous collision stuff in this function
  */
-void TurbineHover::collidesWith(WorldEntity* entity, const Vector& location)
+void Spacecraft2D::collidesWith(WorldEntity* entity, const Vector& location)
 {
   Playable::collidesWith(entity, location);
@@ -288 +288 @@
  * @param time The timespan passed since last update
 */
-void TurbineHover::tick (float dt)
+void Spacecraft2D::tick (float dt)
 {
   //  this->debugNode(1);
@@ -306 +306 @@
  * @param time the timeslice since the last frame
 */
-void TurbineHover::movement (float dt)
+void Spacecraft2D::movement (float dt)
 {
   Vector accel(0.0, 0.0, 0.0);
@@ -433 +433 @@
 
 
-void TurbineHover::draw() const
+void Spacecraft2D::draw() const
 {
   Vector tmpRot;
@@ -486 +486 @@
  * @todo switch statement ??
  */
-void TurbineHover::process(const Event &event)
+void Spacecraft2D::process(const Event &event)
 {
   Playable::process(event);

branches/single_player_map/src/world_entities/space_ships/spacecraft_2d.h

@@ -1 +1 @@
 
 /*!
- * @file turbine_hover.h
- * Implements the Control of a TurbineHover
+ * @file spacecraft_2d.h
+ * Implements the Control of a Spacecraft2D
  */
 
-#ifndef _TURBINE_HOVER_H
-#define _TURBINE_HOVER_H
+#ifndef _SPACECRAFT_2D_H
+#define _SPACECRAFT_2D_H
 
 #include "playable.h"
@@ -14 +14 @@
 class ParticleSystem;
 
-class TurbineHover : public Playable
+class Spacecraft2D : public Playable
 {
   public:
-    TurbineHover(const std::string& fileName);
-    TurbineHover(const TiXmlElement* root = NULL);
-    virtual ~TurbineHover();
+    Spacecraft2D(const std::string& fileName);
+    Spacecraft2D(const TiXmlElement* root = NULL);
+    virtual ~Spacecraft2D();
 
     virtual void loadParams(const TiXmlElement* root);
@@ -59 +59 @@
     float                 rotation;
 
-   // Vector                velocity;           //!< the velocity of the TurbineHover.
-    Quaternion            direction;          //!< the direction of the TurbineHover.
+   // Vector                velocity;           //!< the velocity of the Spacecraft2D.
+    Quaternion            direction;          //!< the direction of the Spacecraft2D.
     float                 travelSpeed;        //!< the current speed of the Hove (to make soft movement)
-    float                 acceleration;       //!< the acceleration of the TurbineHover.
+    float                 acceleration;       //!< the acceleration of the Spacecraft2D.
     float                 airFriction;        //!< AirFriction.
 
@@ -74 +74 @@
 };
 
-#endif /* _TURBINE_HOVERS_H */
+#endif /* _SPACECRAFT_2DS_H */