Changeset 9180 in orxonox.OLD for branches/presentation/src

Timestamp:

Jul 5, 2006, 12:49:40 AM (19 years ago)

Author:

bensch

Message:

less errors/segfaults

Location:

branches/presentation/src

Files:

• defs/class_id.h (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (2 diffs)
• world_entities/npcs/space_turret.cc (copied) (copied from branches/presentation/src/world_entities/npcs/ground_turret.cc) (9 diffs)
• world_entities/npcs/space_turret.h (copied) (copied from branches/presentation/src/world_entities/npcs/ground_turret.h) (3 diffs)

branches/presentation/src/defs/class_id.h

@@ -229 +229 @@
   CL_BOMB                       =    0x000003e4,
   CL_GROUND_TURRET              =    0x000003e5,
-  CL_GUIDED_MISSILE             =    0x000003e6,
-  CL_HYPERBLAST                 =    0x000003e7,
+  CL_SPACE_TURRET               =    0x000003e6,
+  CL_GUIDED_MISSILE             =    0x000003e7,
+  CL_HYPERBLAST                 =    0x000003e8,
 
   // NPC's

branches/presentation/src/story_entities/game_world_data.cc

@@ -392 +392 @@
     std::string oggFile = ResourceManager::getFullName(name);
     this->music = new OrxSound::OggPlayer(oggFile);
-    this->music->debug();
     if (this->localPlayer != NULL)
       this->localPlayer->hud().notifyUser(std::string("Playing SoundTrack: ") + this->music->artist() + " - " + this->music->title());

branches/presentation/src/world_entities/WorldEntities.am

@@ -4 +4 @@
                 world_entities/npcs/npc_test.cc \
                 world_entities/npcs/ground_turret.cc \
+                world_entities/npcs/space_turret.cc \
                 world_entities/npcs/generic_npc.cc \
                 world_entities/npcs/door.cc \
@@ -74 +75 @@
                 npcs/npc_test1.h \
                 npcs/ground_turret.h \
+                npcs/space_turret.h \
                 npcs/door.cc \
                 npcs/repair_station.h \

branches/presentation/src/world_entities/npcs/space_turret.cc

@@ -14 +14 @@
 */
 
-#include "ground_turret.h"
+#include "space_turret.h"
 #include "model.h"
 #include "world_entities/weapons/turret.h"
@@ -29 +29 @@
 #include "effects/explosion.h"
 
-CREATE_FACTORY(GroundTurret, CL_GROUND_TURRET);
-
-using namespace std;
-
+CREATE_FACTORY(SpaceTurret, CL_SPACE_TURRET);
 
 /**
- * constructs and loads a GroundTurret from a XML-element
+ * constructs and loads a SpaceTurret from a XML-element
  * @param root the XML-element to load from
  */
-GroundTurret::GroundTurret(const TiXmlElement* root)
+SpaceTurret::SpaceTurret(const TiXmlElement* root)
   : NPC(root)
 {
@@ -50 +47 @@
  * standard deconstructor
  */
-GroundTurret::~GroundTurret ()
+SpaceTurret::~SpaceTurret ()
 {
 
@@ -57 +54 @@
 
 /**
- * initializes the GroundTurret
+ * initializes the SpaceTurret
  * @todo change this to what you wish
  */
-void GroundTurret::init()
+void SpaceTurret::init()
 {
-  this->setClassID(CL_GROUND_TURRET, "GroundTurret");
+  this->setClassID(CL_SPACE_TURRET, "SpaceTurret");
   this->loadModel("models/ground_turret_#.obj", 5);
+  this->loadModel("models/comet.obj", .5, 3);
   this->left = NULL;
   this->right = NULL;
@@ -80 +78 @@
 
 /**
- * loads a GroundTurret from a XML-element
+ * loads a SpaceTurret from a XML-element
  * @param root the XML-element to load from
  * @todo make the class Loadable
  */
-void GroundTurret::loadParams(const TiXmlElement* root)
+void SpaceTurret::loadParams(const TiXmlElement* root)
 {
   // all the clases this Entity is directly derived from must be called in this way, to load all settings.
@@ -121 +119 @@
 
 /**
- * advances the GroundTurret about time seconds
+ * advances the SpaceTurret about time seconds
  * @param time the Time to step
  */
-void GroundTurret::tick(float dt)
+void SpaceTurret::tick(float dt)
 {
   if(this->getHealth() > 0.0f && State::getPlayer() &&
@@ -146 +144 @@
  * draws this worldEntity
  */
-void GroundTurret::draw () const
+void SpaceTurret::draw () const
 {
-  WorldEntity::draw();
+  glPushMatrix();
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
+
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+
+  this->getModel()->draw();
+  if (this->getModel() != NULL)
+    this->getModel(3)->draw();
+  glPopMatrix();
 
   if (this->left != NULL)
@@ -162 +171 @@
  *
  */
-void GroundTurret::postSpawn ()
+void SpaceTurret::postSpawn ()
 {
 
@@ -171 +180 @@
  *
  */
-void GroundTurret::leftWorld ()
+void SpaceTurret::leftWorld ()
 {
 
 }
 
-void GroundTurret::destroy(WorldEntity* killer)
+void SpaceTurret::destroy(WorldEntity* killer)
 {
   this->setAbsDirSoft(Quaternion(-90, Vector(0,0,1)), 90);

branches/presentation/src/world_entities/npcs/space_turret.h

@@ -1 +1 @@
 /*!
- * @file ground_turret.h
+ * @file space_turret.h
  * @brief description
 */
 
-#ifndef _GROUND_TURRET_H
-#define _GROUND_TURRET_H
+#ifndef _SPACE_TURRET_H
+#define _SPACE_TURRET_H
 
 #include "npcs/npc.h"
@@ -12 +12 @@
 
 //! A Class to ...
-class GroundTurret : public NPC
+class SpaceTurret : public NPC
 {
 
- public:
-  GroundTurret(const TiXmlElement* root = NULL);
-  virtual ~GroundTurret();
+public:
+  SpaceTurret(const TiXmlElement* root = NULL);
+  virtual ~SpaceTurret();
 
-  void init();
   virtual void loadParams(const TiXmlElement* root);
 
@@ -30 +29 @@
   virtual void tick(float time);
 
- private:
-   PNode  weaponHolder[2];
-   Weapon *left, *right;
+private:
+  void init();
+
+
+private:
+  PNode  weaponHolder[2];
+  Weapon *left, *right;
 };
 
-#endif /* _GROUND_TURRET_H */
+#endif /* _SPACE_TURRET_H */