Changeset 5739 in orxonox.OLD for branches/world_entities/src

Timestamp:

Nov 23, 2005, 3:33:40 PM (19 years ago)

Author:

manuel

Message:

groundturret loads

Location:

branches/world_entities/src/world_entities

Files:

• Makefile.am (modified) (1 diff)
• weapons/ground_turret.cc (modified) (5 diffs)
• weapons/ground_turret.h (modified) (1 diff)

branches/world_entities/src/world_entities/Makefile.am

@@ -27 +27 @@
                   weapons/ground_turret.cc \
                   weapons/crosshair.cc \
+                  weapons/ground_turret.cc \
                   power_ups/power_up.cc \
                   power_ups/turret_power_up.cc \

branches/world_entities/src/world_entities/weapons/ground_turret.cc

@@ -15 +15 @@
 
 #include "ground_turret.h"
+#include "factory.h"
+#include "model.h"
+
+CREATE_FACTORY(GroundTurret, CL_GROUND_TURRET);
 
 using namespace std;
@@ -47 +51 @@
 {
   this->setClassID(CL_GROUND_TURRET, "GroundTurret");
+  this->loadModel("models/ground_turret.obj", 5);
 
 }
@@ -59 +64 @@
 {
   // all the clases this Entity is directly derived from must be called in this way, to load all settings.
-//  static_cast<WorldEntity*>(this)->loadParam(root);
+  static_cast<NPC*>(this)->loadParams(root);
 
 
@@ -72 +77 @@
  * @param time the Time to step
  */
-//GroundTurret::tick(float time)
-//{
-//
-//}
+void GroundTurret::tick(float time)
+{
+
+}
 
 /**
@@ -94 +99 @@
   glMultMatrixf((float*)matrix);
 
-//  if (model)
-//    model->draw();
+  if (model)
+    model->draw();
   glPopMatrix();
 }

branches/world_entities/src/world_entities/weapons/ground_turret.h

@@ -25 +25 @@
 
   virtual void draw() const;
-//  virtual void tick(float time);
+  virtual void tick(float time);
   virtual void collidesWith (WorldEntity* entity, const Vector& location);