Changeset 6002 in orxonox.OLD for trunk

Timestamp:

Dec 9, 2005, 5:30:44 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: implemented the helicopter

Location:

trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• defs/class_id.h (modified) (1 diff)
• world_entities/space_ships/helicopter.cc (copied) (copied from trunk/src/world_entities/space_ships/space_ship.cc) (19 diffs)
• world_entities/space_ships/helicopter.h (copied) (copied from trunk/src/world_entities/space_ships/space_ship.h) (3 diffs)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (3 diffs)

trunk/src/Makefile.am

@@ -82 +82 @@
                   world_entities/power_ups/laser_power_up.cc \
                   world_entities/space_ships/space_ship.cc \
+                  world_entities/space_ships/helicopter.cc \
                   subprojects/benchmark.cc
 
@@ -122 +123 @@
                  world_entities/power_ups/turret_power_up.h \
                  world_entities/power_ups/laser_power_up.h \
+                 world_entities/space_ships/space_ship.h \
+                 world_entities/space_ships/helicopter.h \
                  defs/stdincl.h \
                  defs/stdlibincl.h \

trunk/src/defs/class_id.h

@@ -145 +145 @@
   CL_TEST_ENTITY                =    0x00000209,
   CL_SPACE_SHIP                 =    0x0000020a,
+  CL_HELICOPTER                 =    0x0000020b,
 
   CL_TURRET_POWER_UP            =    0x00000211,

trunk/src/world_entities/space_ships/helicopter.cc

@@ -10 +10 @@
 
 ### File Specific:
-   main-programmer: Benjamin Knecht
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 
@@ -17 +17 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-#include "executor/executor.h"
-#include "space_ship.h"
+#include "helicopter.h"
 
 #include "objModel.h"
@@ -36 +35 @@
 using namespace std;
 
-CREATE_FACTORY(SpaceShip, CL_SPACE_SHIP);
+CREATE_FACTORY(Helicopter, CL_HELICOPTER);
 
 /**
  *  creates the controlable Spaceship
  */
-SpaceShip::SpaceShip()
+Helicopter::Helicopter()
 {
   this->init();
@@ -49 +48 @@
  *  destructs the spaceship, deletes alocated memory
  */
-SpaceShip::~SpaceShip ()
+Helicopter::~Helicopter ()
 {
 }
@@ -57 +56 @@
  * @param fileName the name of the File to load the spaceship from (absolute path)
  */
-SpaceShip::SpaceShip(const char* fileName)
+Helicopter::Helicopter(const char* fileName)
 {
   this->init();
@@ -64 +63 @@
   if(!doc.LoadFile())
   {
-    PRINTF(2)("Loading file %s failed for spaceship.\n", fileName);
+    PRINTF(2)("Loading file %s failed for Helicopter.\n", fileName);
     return;
   }
@@ -77 +76 @@
    @todo add more parameters to load
 */
-SpaceShip::SpaceShip(const TiXmlElement* root)
+Helicopter::Helicopter(const TiXmlElement* root)
 {
   this->init();
@@ -105 +104 @@
  * initializes a Spaceship
  */
-void SpaceShip::init()
+void Helicopter::init()
 {
 //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
-  this->setClassID(CL_SPACE_SHIP, "SpaceShip");
+  this->setClassID(CL_HELICOPTER, "Helicopter");
 
   PRINTF(4)("SPACESHIP INIT\n");
+
+  this->loadModel("models/ships/helicopter_high.obj", 1.0, 0);
+  this->loadModel("models/ships/helicopter_medium.obj", 1.0, 1);
+  this->loadModel("models/ships/helicopter_low.obj", 1.0, 2);
 
   EventHandler::getInstance()->grabEvents(true);
@@ -177 +180 @@
 
 /**
- * loads the Settings of a SpaceShip from an XML-element.
+ * loads the Settings of a Helicopter from an XML-element.
  * @param root the XML-element to load the Spaceship's properties from
  */
-void SpaceShip::loadParams(const TiXmlElement* root)
+void Helicopter::loadParams(const TiXmlElement* root)
 {
   static_cast<WorldEntity*>(this)->loadParams(root);
@@ -190 +193 @@
  * @param weapon to add
 */
-void SpaceShip::addWeapon(Weapon* weapon)
+void Helicopter::addWeapon(Weapon* weapon)
 {
   this->getWeaponManager()->addWeapon(weapon);
@@ -200 +203 @@
  * @param weapon to remove
 */
-void SpaceShip::removeWeapon(Weapon* weapon)
+void Helicopter::removeWeapon(Weapon* weapon)
 {
   this->getWeaponManager()->removeWeapon(weapon);
@@ -206 +209 @@
 
 /**
- *  effect that occurs after the SpaceShip is spawned
-*/
-void SpaceShip::postSpawn ()
+ *  effect that occurs after the Helicopter is spawned
+*/
+void Helicopter::postSpawn ()
 {
   //setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
@@ -216 +219 @@
  *  the action occuring if the spaceship left the game
 */
-void SpaceShip::leftWorld ()
+void Helicopter::leftWorld ()
 {}
 
-WorldEntity* ref = NULL;
 /**
  *  this function is called, when two entities collide
@@ -226 +228 @@
  * Implement behaviour like damage application or other miscellaneous collision stuff in this function
  */
-void SpaceShip::collidesWith(WorldEntity* entity, const Vector& location)
-{
-  if (entity->isA(CL_TURRET_POWER_UP) && entity != ref)
+void Helicopter::collidesWith(WorldEntity* entity, const Vector& location)
+{
+  if (entity->isA(CL_TURRET_POWER_UP))
   {
     this->ADDWEAPON();
-    ref = entity;
     }
 //  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
 }
 
-/**
- *  draws the spaceship after transforming it.
-*/
-void SpaceShip::draw () const
-{
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  /* rotate */
-  Vector tmpRot = this->getAbsDir().getSpacialAxis();
-  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-  this->getModel()->draw();
-  glPopMatrix();
-
-  this->getWeaponManager()->draw();
-
-  //this->debug(0);
-}
+
 
 /**
@@ -262 +243 @@
  * @param time The timespan passed since last update
 */
-void SpaceShip::tick (float time)
+void Helicopter::tick (float time)
 {
      cycle += time;
@@ -290 +271 @@
  * @param time the timeslice since the last frame
 */
-void SpaceShip::calculateVelocity (float time)
+void Helicopter::calculateVelocity (float time)
 {
   Vector accel(0.0, 0.0, 0.0);
@@ -372 +353 @@
  * weapon manipulation by the player
 */
-void SpaceShip::weaponAction()
+void Helicopter::weaponAction()
 {
   if( this->bFire)
@@ -383 +364 @@
  * @todo switch statement ??
  */
-void SpaceShip::process(const Event &event)
+void Helicopter::process(const Event &event)
 {
 
@@ -412 +393 @@
 #include "weapons/aiming_turret.h"
 // FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG
-void SpaceShip::ADDWEAPON()
+void Helicopter::ADDWEAPON()
 {
   Weapon* turret = NULL;

trunk/src/world_entities/space_ships/helicopter.h

@@ -1 +1 @@
 
 /*!
- * @file space_ship.h
- * Implements the Control of a Spaceship
+ * @file helicopter.h
+ * Implements the Control of a Helicopter
  */
 
-#ifndef _SPACE_SHIP_H
-#define _SPACE_SHIP_H
+#ifndef _HELICOPTER_H
+#define _HELICOPTER_H
 
 #include "playable.h"
 
-template<class T> class tList;
-class Vector;
-class Event;
 
-class SpaceShip : public Playable
+class Helicopter : public Playable
 {
 
   public:
 
-    SpaceShip();
-    SpaceShip(const char* fileName);
-    SpaceShip(const TiXmlElement* root);
-    virtual ~SpaceShip();
+    Helicopter();
+    Helicopter(const char* fileName);
+    Helicopter(const TiXmlElement* root);
+    virtual ~Helicopter();
 
     void init();
@@ -35 +32 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
     virtual void tick(float time);
-    virtual void draw() const;
 
     virtual void process(const Event &event);
@@ -71 +67 @@
 };
 
-#endif /* _SPACE_SHIPS_H */
+#endif /* _HELICOPTERS_H */

trunk/src/world_entities/space_ships/space_ship.cc

@@ -20 +20 @@
 #include "space_ship.h"
 
-#include "objModel.h"
 #include "resource_manager.h"
 

trunk/src/world_entities/world_entity.cc

@@ -27 +27 @@
 #include "obb_tree.h"
 
+#include "state.h"
+
 using namespace std;
 
@@ -95 +97 @@
     PRINTF(4)("fetching %s\n", fileName);
     if (scaling == 1.0)
-      this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN));
+      this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN), modelNumber);
     else
-      this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, &scaling));
-
+      this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, &scaling), modelNumber);
+    if (modelNumber == 0)
     this->buildObbTree(4);
   }
@@ -227 +229 @@
 void WorldEntity::draw() const
 {
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  float matrix[4][4];
-
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  /* rotate */ // FIXME: devise a new Way to rotate this
-  this->getAbsDir ().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-
-  if (this->models[0])
-    this->models[0]->draw();
-  glPopMatrix();
+  if (!this->models.empty())
+  {
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    float matrix[4][4];
+
+    /* translate */
+    glTranslatef (this->getAbsCoor ().x,
+                  this->getAbsCoor ().y,
+                  this->getAbsCoor ().z);
+   /* rotate */ // FIXME: devise a new Way to rotate this
+    this->getAbsDir ().matrix (matrix);
+    glMultMatrixf((float*)matrix);
+
+    float cameraDistance = (State::getCamera()->getAbsCoor() - this->getAbsCoor()).len();
+    if (this->isA(CL_HELICOPTER))
+        printf("Test %f %d\n", cameraDistance, this->models.size());
+    if (cameraDistance > 100 && this->models.size() >= 3 && this->models[2] != NULL)
+    {
+      if (this->isA(CL_HELICOPTER))printf("====== 2 ===\n");
+       this->models[2]->draw();
+    } 
+    else if (cameraDistance > 50 && this->models.size() >= 2 && this->models[1] != NULL)
+    {
+      if (this->isA(CL_HELICOPTER))printf("====== 1 ===\n");
+      this->models[1]->draw();
+    } 
+    else if (this->models.size() >= 1 && this->models[0] != NULL) 
+    {
+      if (this->isA(CL_HELICOPTER))printf("====== 0 ===\n");
+      this->models[0]->draw();
+    }
+    glPopMatrix();
+  }
 }