Changeset 9164 in orxonox.OLD

Timestamp:

Jul 4, 2006, 6:50:37 PM (18 years ago)

Author:

bensch

Message:

better npc

Location:

branches/presentation/src/world_entities/npcs

Files:

• npc_test.cc (modified) (5 diffs)
• npc_test.h (modified) (2 diffs)

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

@@ -28 +28 @@
 #include "loading/load_param.h"
 
+#include "effects/explosion.h"
+
 CREATE_FACTORY(NPC2, CL_NPC_TEST2);
 
@@ -37 +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;
   if (likely(Shader::checkShaderAbility()))
     this->shader = Shader::getShader("shaders/toon.vert", "shaders/toon.frag");
-
-  this->obj = gluNewQuadric();
 
   this->randomRotAxis = VECTOR_RAND(1);
@@ -58 +61 @@
   if (this->shader)
     Shader::unload(this->shader);
-  gluDeleteQuadric(this->obj);
 }
 
@@ -65 +67 @@
 {
   NPC::loadParams(root);
+
+}
+
+
+void NPC2::destroy(WorldEntity* killer)
+{
+  Explosion::explode(this, Vector(10,10,10));
+  this->toList(OM_DEAD);
 
 }
@@ -92 +102 @@
   if (this->shader != NULL && this->shader != Shader::getActiveShader())
     shader->activateShader();
-  gluSphere(this->obj, 3, 10, 10);
+
+  this->getModel()->draw();
   shader->deactivateShader();
 

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

@@ -18 +18 @@
   void addAI(AI* ai);
 
+  virtual void destroy(WorldEntity* killer);
+
   virtual void tick(float dt);
   virtual void draw() const;
@@ -24 +26 @@
    Vector   randomRotAxis;
    Shader*  shader;
-   GLUquadricObj* obj;
-
 };