Changeset 8514 in orxonox.OLD

Timestamp:

Jun 16, 2006, 1:36:30 AM (18 years ago)

Author:

patrick

Message:

bsp: added a generic npc model and extended the normal npc model

Location:

branches/bsp_model/src

Files:

• defs/class_id.h (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (1 diff)
• world_entities/npcs/generic_npc.cc (added)
• world_entities/npcs/generic_npc.h (added)
• world_entities/npcs/ground_turret.cc (modified) (1 diff)
• world_entities/npcs/npc.cc (modified) (2 diffs)
• world_entities/npcs/npc.h (modified) (2 diffs)
• world_entities/npcs/npc_test.cc (modified) (1 diff)
• world_entities/npcs/npc_test1.cc (modified) (1 diff)

branches/bsp_model/src/defs/class_id.h

@@ -219 +219 @@
   CL_NPC_TEST1                  =    0x00000401,
   CL_NPC_TEST2                  =    0x00000402,
+  CL_GENERIC_NPC                =    0x00000403,
 
   // Testing Entities

branches/bsp_model/src/world_entities/WorldEntities.am

@@ -4 +4 @@
                 world_entities/npcs/npc_test.cc \
                 world_entities/npcs/ground_turret.cc \
+                world_entities/npcs/generic_npc.cc \
                 \
                 world_entities/environment.cc \

branches/bsp_model/src/world_entities/npcs/ground_turret.cc

@@ -39 +39 @@
  */
 GroundTurret::GroundTurret(const TiXmlElement* root)
+  : NPC(root)
 {
   this->init();

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

@@ -19 +19 @@
 
 #include "npc.h"
-#include "obb_tree.h"
 
-#include "state.h"
-#include "stdlibincl.h"
-#include "power_ups/turret_power_up.h"
-#include "power_ups/laser_power_up.h"
 
 using namespace std;
 
 
-NPC::NPC()
+NPC::NPC(const TiXmlElement* root)
 {
   this->setClassID(CL_NPC, "NPC");
+
   this->toList(OM_GROUP_00);
 }
@@ -39 +35 @@
 
 
-void NPC::collidesWith(WorldEntity* entity, const Vector& location)
-{
 
-  if (entity == collider)
-    return;
-  collider = entity;
-
-  if (entity->isA(CL_PROJECTILE))
-  {
-    this->decreaseHealth(entity->getHealth() *(float)rand()/(float)RAND_MAX);
-    // EXTREME HACK
-    if (this->getHealth() <= 0.0f)
-    {
-      this->destroy();
-    }
-  }
+/**
+ * adds an AI to this NPC
+ */
+void NPC::addAI(AI* ai)
+{}
 
 
-// //    PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getName(), entity->getName(), location.x, location.y, location.z);
-// //    this->applyForce(Vector(0,0,0)-location*1000);
-//     if ((float)rand()/RAND_MAX < .3)
-//     {
-//       WorldEntity* powerUp = new TurretPowerUp();
-//       powerUp->setAbsCoor(this->getAbsCoor());
-// //      powerUp->toList(OM_COMMON);
-//     }
-//     else if ((float)rand()/RAND_MAX < .3)
-//     {
-//       WorldEntity* powerUp = new LaserPowerUp();
-//       powerUp->setAbsCoor(this->getAbsCoor());
-//       powerUp->toList(OM_COMMON);
-//     }
-//     this->toList(OM_DEAD);
-//     this->removeNode();
-//
-//       this->collider = entity;
-//   }
-//   //  else if (entity->isA(CL_PLAYER))
-//   //    this->applyForce(Vector(0,0,0)-location*100);
-//   else if (entity->isA(CL_NPC))
-//   {
-//     this->setVisibiliy(false);
-//     this->toList(OM_DEAD);
-//     this->removeNode();
-//   }
+
+/**
+ * loads the xml tags
+ * @param root: root xml tag for this element
+ */
+void NPC::loadParams(const TiXmlElement* root)
+{
+  WorldEntity::loadParams(root);
 }
+

branches/bsp_model/src/world_entities/npcs/npc.h

@@ -4 +4 @@
 
 #include "world_entity.h"
-#include "physics_interface.h"
 
 class AI;
@@ -11 +10 @@
 
  public:
-  NPC ();
+   NPC (const TiXmlElement* root);
   virtual ~NPC ();
 
+  virtual void loadParams(const TiXmlElement* root = NULL);
 
   void addAI(AI* ai);
-
-  virtual void collidesWith (WorldEntity* entity, const Vector& location);
 
 
  private:
 
-   WorldEntity* collider;
-
 };
 

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

@@ -31 +31 @@
 
 NPC2::NPC2()
+  : NPC(NULL)
 {
   this->setClassID(CL_NPC_TEST2, "NPC2");

branches/bsp_model/src/world_entities/npcs/npc_test1.cc

@@ -29 +29 @@
 
 NPCTest1::NPCTest1()
+  : NPC(NULL)
 {
   this->setClassID(CL_NPC_TEST1, "NPCTest1");