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

Timestamp:

Jul 4, 2006, 6:07:10 PM (18 years ago)

Author:

bensch

Message:

new NPC

Location:

branches/presentation/src/world_entities/npcs

Files:

• npc.cc (modified) (1 diff)
• npc_test.cc (modified) (4 diffs)
• npc_test.h (modified) (1 diff)
• npc_test1.cc (modified) (1 diff)

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

@@ -51 +51 @@
 void NPC::loadParams(const TiXmlElement* root)
 {
-  if(root != NULL)
    WorldEntity::loadParams(root);
 }

branches/presentation/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;
+CREATE_FACTORY(NPC2, CL_NPC_TEST2);
 
 
-NPC2::NPC2()
+NPC2::NPC2(const TiXmlElement* root)
   : NPC(NULL)
 {
@@ -47 +48 @@
 
   this->randomRotAxis = VECTOR_RAND(1);
+
+  if (root != NULL)
+    this->loadParams(root);
 }
 
@@ -55 +59 @@
     Shader::unload(this->shader);
   gluDeleteQuadric(this->obj);
+}
+
+
+void NPC2::loadParams(const TiXmlElement* root)
+{
+  NPC::loadParams(root);
+
 }
 
@@ -67 +78 @@
 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);
-//
-//   if (this->shader != NULL && this->shader != Shader::getActiveShader())
-//     shader->activateShader();
-//   gluSphere(this->obj, 3, 10, 10);
-//   shader->deactivateShader();
-//
-//
-// /*  if (this->model)
-//     this->model->draw();*/
-//   glPopMatrix();
+  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);
+  shader->deactivateShader();
+
+
+/*  if (this->model)
+    this->model->draw();*/
+  glPopMatrix();
 }
 

branches/presentation/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);

branches/presentation/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;