Changeset 5087 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Aug 20, 2005, 5:39:13 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: added some droids in the middle of the track to the left side. They die on shooting. Bensch: have some fun

Location:

trunk/src/world_entities

Files:

• npc.cc (modified) (1 diff)
• test_entity.cc (modified) (3 diffs)
• test_entity.h (modified) (1 diff)

trunk/src/world_entities/npc.cc

@@ -30 +30 @@
   this->setClassID(CL_NPC, "NPC");
 
-  this->loadModelWithScale("models/ships/bolido.obj",5);
+  this->loadModelWithScale("models/ships/bolido.obj", 5);
 
   this->randomRotAxis = VECTOR_RAND(1);

trunk/src/world_entities/test_entity.cc

@@ -22 +22 @@
 #include "md2Model.h"
 #include "obb_tree.h"
+#include "state.h"
+#include "list.h"
 
 using namespace std;
@@ -31 +33 @@
   this->setClassID(CL_TEST_ENTITY, "TestEntity");
 
+  this->md2Model = new MD2Model("models/droidika.md2", "models/droideka.pcx");
 //   this->md2Model = new MD2Model("models/tris.md2", "models/tris.pcx");
- this->md2Model = new MD2Model("models/goblin.md2", "maps/goblin.bmp");
-  this->obbTree = new OBBTree(15, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
+// this->md2Model = new MD2Model("models/goblin.md2", "maps/goblin.bmp");
+  this->obbTree = new OBBTree(4, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
 
-  this->md2Model->setAnim(STAND);
+  this->md2Model->setAnim(RUN);
   this->md2Model->debug();
 }
@@ -57 +60 @@
 }
 
+
+void TestEntity::collidesWith(WorldEntity* entity, const Vector& location)
+{
+  if (entity->isA(CL_PROJECTILE))
+  {
+    PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getName(), entity->getName(), location.x, location.y, location.z);
+  this->setVisibiliy(false);
+  State::getWorldEntityList()->remove(this);
+  }
+}
 
 void TestEntity::hit (WorldEntity* weapon, Vector* loc) {}

trunk/src/world_entities/test_entity.h

@@ -25 +25 @@
   virtual void destroy ();
   virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
+  virtual void collidesWith(WorldEntity* entity, const Vector& location);
   virtual void draw ();