Changeset 9173 in orxonox.OLD

Timestamp:

Jul 4, 2006, 9:57:33 PM (18 years ago)

Author:

bensch

Message:

added attractor_mine

Location:

branches/presentation/src

Files:

• defs/class_id.h (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (2 diffs)
• world_entities/npcs/attractor_mine.cc (copied) (copied from branches/presentation/src/world_entities/npcs/npc_test.cc) (8 diffs)
• world_entities/npcs/attractor_mine.h (copied) (copied from branches/presentation/src/world_entities/npcs/npc_test.h) (3 diffs)
• world_entities/npcs/npc_test.cc (modified) (1 diff)

branches/presentation/src/defs/class_id.h

@@ -236 +236 @@
   CL_NPC_TEST2                  =    0x00000402,
   CL_GENERIC_NPC                =    0x00000403,
+  CL_ATTRACTOR_MINE             =    0x00000404,
 
   // Testing Entities

branches/presentation/src/world_entities/WorldEntities.am

@@ -7 +7 @@
                 world_entities/npcs/door.cc \
                 world_entities/npcs/repair_station.cc \
+                world_entities/npcs/attractor_mine.cc \
                 \
                 world_entities/environment.cc \
@@ -74 +75 @@
                 npcs/ground_turret.h \
                 npcs/door.cc \
-                npcs/repair_station.cc \
+                npcs/repair_station.h \
+                npcs/attractor_mine.h \
                 \
                 environment.h \

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

@@ -18 +18 @@
 
 
-#include "npc_test.h"
-#include "obb_tree.h"
+#include "attractor_mine.h"
+
 
 #include "shader.h"
@@ -30 +30 @@
 #include "effects/explosion.h"
 
-CREATE_FACTORY(NPC2, CL_NPC_TEST2);
+CREATE_FACTORY(AttractorMine, CL_ATTRACTOR_MINE);
 
 
-NPC2::NPC2(const TiXmlElement* root)
+AttractorMine::AttractorMine(const TiXmlElement* root)
   : NPC(NULL)
 {
-  this->setClassID(CL_NPC_TEST2, "NPC2");
+  this->setClassID(CL_ATTRACTOR_MINE, "AttractorMine");
 
   if ((float)rand()/RAND_MAX > .5f)
@@ -57 +57 @@
 
 
-NPC2::~NPC2 ()
+AttractorMine::~AttractorMine ()
 {
   if (this->shader)
@@ -64 +64 @@
 
 
-void NPC2::loadParams(const TiXmlElement* root)
+void AttractorMine::loadParams(const TiXmlElement* root)
 {
   NPC::loadParams(root);
@@ -71 +71 @@
 
 
-void NPC2::destroy(WorldEntity* killer)
+void AttractorMine::destroy(WorldEntity* killer)
 {
   Explosion::explode(this, Vector(10,10,10));
@@ -86 +86 @@
  * Just override this function with whatever you want to be drawn.
  */
-void NPC2::draw() const
+void AttractorMine::draw() const
 {
   glMatrixMode(GL_MODELVIEW);
@@ -113 +113 @@
 
 
-void NPC2::tick(float dt)
+void AttractorMine::tick(float dt)
 {
 //  Vector direction = (State::getCameraTarget()->getAbsCoor() - this->getAbsCoor());
@@ -119 +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));
 
 }

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

@@ -1 +1 @@
 
-#ifndef _NPC22_H
-#define _NPC2_H
+#ifndef _ATTRACTOR_MINE_H
+#define _ATTRACTOR_MINE_H
 
 #include "npc.h"
@@ -8 +8 @@
 class Shader;
 
-class NPC2 : public NPC {
+class AttractorMine : public NPC {
 
  public:
-  NPC2 (const TiXmlElement* root);
-  virtual ~NPC2 ();
+  AttractorMine (const TiXmlElement* root);
+  virtual ~AttractorMine ();
 
   virtual void loadParams(const TiXmlElement* root);
@@ -28 +28 @@
 };
 
-#endif /* _NPC2_H */
+#endif /* _ATTRACTOR_MINE_H */

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

@@ -119 +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));
 
 }