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

Timestamp:

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

Author:

bensch

Message:

merged the presentation back

File:

• trunk/src/world_entities/npcs/npc_test.cc (modified) (6 diffs)

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));
 
 }