Changeset 9235 in orxonox.OLD for trunk/src/world_entities/npcs

Timestamp:

Jul 5, 2006, 4:39:02 PM (18 years ago)

Author:

bensch

Message:

merged the presentation back

Location:

trunk/src/world_entities/npcs

Files:

• attractor_mine.cc (copied) (copied from branches/presentation/src/world_entities/npcs/attractor_mine.cc)
• attractor_mine.h (copied) (copied from branches/presentation/src/world_entities/npcs/attractor_mine.h)
• gate.cc (copied) (copied from branches/presentation/src/world_entities/npcs/gate.cc)
• gate.h (copied) (copied from branches/presentation/src/world_entities/npcs/gate.h)
• generic_npc.cc (modified) (3 diffs)
• generic_npc.h (modified) (1 diff)
• ground_turret.cc (modified) (1 diff)
• ground_turret.h (modified) (1 diff)
• npc.cc (modified) (2 diffs)
• npc_test.cc (modified) (6 diffs)
• npc_test.h (modified) (2 diffs)
• npc_test1.cc (modified) (1 diff)
• space_turret.cc (copied) (copied from branches/presentation/src/world_entities/npcs/space_turret.cc)
• space_turret.h (copied) (copied from branches/presentation/src/world_entities/npcs/space_turret.h)

trunk/src/world_entities/npcs/generic_npc.cc

@@ -82 +82 @@
 {
   this->setClassID(CL_GENERIC_NPC, "GenericNPC");
+
   this->toList(OM_GROUP_00);
 
@@ -206 +207 @@
 /**
  * each animation has to be initialized here
+ */
+/**
+ *
  */
 void GenericNPC::initNPC()
@@ -578 +582 @@
 
 
-void GenericNPC::destroy()
+void GenericNPC::destroy(WorldEntity* killer)
 {
   int randi = (int)(5.0f * (float)rand()/(float)RAND_MAX);

trunk/src/world_entities/npcs/generic_npc.h

@@ -77 +77 @@
 
 
-  void destroy();
+  virtual void destroy(WorldEntity* killer);
 
   private:

trunk/src/world_entities/npcs/ground_turret.cc

@@ -176 +176 @@
 }
 
-void GroundTurret::destroy()
+void GroundTurret::destroy(WorldEntity* killer)
 {
   this->setAbsDirSoft(Quaternion(-90, Vector(0,0,1)), 90);

trunk/src/world_entities/npcs/ground_turret.h

@@ -25 +25 @@
   virtual void leftWorld ();
 
-  virtual void destroy();
+  virtual void destroy(WorldEntity* killer);
 
   virtual void draw() const;

trunk/src/world_entities/npcs/npc.cc

@@ -19 +19 @@
 
 #include "npc.h"
-
-
-using namespace std;
 
 
@@ -51 +48 @@
 void NPC::loadParams(const TiXmlElement* root)
 {
-  if(root != NULL)
    WorldEntity::loadParams(root);
 }

trunk/src/world_entities/npcs/npc_test.cc

@@ -23 +23 @@
 #include "shader.h"
 #include "state.h"
-#include "stdlibincl.h"
 #include "debug.h"
 
+#include "loading/factory.h"
+#include "loading/load_param.h"
 
-using namespace std;
+#include "effects/explosion.h"
+
+CREATE_FACTORY(NPC2, CL_NPC_TEST2);
 
 
-NPC2::NPC2()
+NPC2::NPC2(const TiXmlElement* root)
   : NPC(NULL)
 {
@@ -36 +39 @@
 
   if ((float)rand()/RAND_MAX > .5f)
-    this->loadModel("models/ships/bolido.obj", 3);
+    this->loadModel("models/ships/bolido.obj", 6);
   else
-    this->loadModel("models/ships/gobblin.obj", 3);
+    this->loadModel("models/ships/gobblin.obj", 6);
+
+
+
 
   this->shader = NULL;
@@ -44 +50 @@
     this->shader = Shader::getShader("shaders/toon.vert", "shaders/toon.frag");
 
-  this->obj = gluNewQuadric();
+  this->randomRotAxis = VECTOR_RAND(1);
 
-  this->randomRotAxis = VECTOR_RAND(1);
+  if (root != NULL)
+    this->loadParams(root);
 }
 
@@ -54 +61 @@
   if (this->shader)
     Shader::unload(this->shader);
-  gluDeleteQuadric(this->obj);
+}
+
+
+void NPC2::loadParams(const TiXmlElement* root)
+{
+  NPC::loadParams(root);
+
+}
+
+
+void NPC2::destroy(WorldEntity* killer)
+{
+  Explosion::explode(this, Vector(10,10,10));
+  this->toList(OM_DEAD);
+
 }
 
@@ -67 +88 @@
 void NPC2::draw() const
 {
-//   glMatrixMode(GL_MODELVIEW);
-//   glPushMatrix();
-//   float matrix[4][4];
-//
-//   /* translate */
-//   glTranslatef (this->getAbsCoor ().x,
-//                 this->getAbsCoor ().y,
-//                 this->getAbsCoor ().z);
-//   /* rotate */
-//   this->getAbsDir ().matrix (matrix);
-//   glMultMatrixf((float*)matrix);
-//
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  float matrix[4][4];
+
+  /* translate */
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
+  /* rotate */
+  this->getAbsDir ().matrix (matrix);
+  glMultMatrixf((float*)matrix);
+
 //   if (this->shader != NULL && this->shader != Shader::getActiveShader())
 //     shader->activateShader();
-//   gluSphere(this->obj, 3, 10, 10);
+
+  this->getModel()->draw();
 //   shader->deactivateShader();
-//
-//
-// /*  if (this->model)
-//     this->model->draw();*/
-//   glPopMatrix();
+
+
+/*  if (this->model)
+    this->model->draw();*/
+  glPopMatrix();
 }
 
@@ -97 +119 @@
   //if (directin.len() < 100)
 //  this->shiftCoor(direction *dt * 5 * exp(-direction.len() / 30.0));
-  this->shiftDir(Quaternion(dt, this->randomRotAxis));
+//  this->shiftDir(Quaternion(dt, this->randomRotAxis));
 
 }

trunk/src/world_entities/npcs/npc_test.h

@@ -11 +11 @@
 
  public:
-  NPC2 ();
+  NPC2 (const TiXmlElement* root);
   virtual ~NPC2 ();
 
+  virtual void loadParams(const TiXmlElement* root);
 
   void addAI(AI* ai);
+
+  virtual void destroy(WorldEntity* killer);
 
   virtual void tick(float dt);
@@ -23 +26 @@
    Vector   randomRotAxis;
    Shader*  shader;
-   GLUquadricObj* obj;
-
 };
 

trunk/src/world_entities/npcs/npc_test1.cc

@@ -24 +24 @@
 #include "power_ups/turret_power_up.h"
 #include "power_ups/laser_power_up.h"
-
-using namespace std;