Changeset 10138 in orxonox.OLD for branches/ai/src/world_entities

Timestamp:

Dec 21, 2006, 10:14:15 PM (17 years ago)

Author:

tfahrni

Message:

startet to implement swarming

Location:

branches/ai/src/world_entities

Files:

• npcs/npc.h (modified) (1 diff)
• npcs/npc_test.cc (modified) (1 diff)
• npcs/npc_test.h (modified) (1 diff)
• space_ships/spacecraft_2d.cc (modified) (1 diff)

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

@@ -4 +4 @@
 
 #include "world_entity.h"
-#include "ai_team_member.h"
 
 class AI;
 
-class NPC : public AITeamMember {
+class NPC : public WorldEntity {
   ObjectListDeclaration(NPC);
  public:

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

@@ -51 +51 @@
         std::cout << "Team Number: " << teamNumber << "\n";
         std::cout << "Swarm Number:" << swarmNumber << "\n";
-
-        AITeam* myTeam=AIEngine::getInstance()->getCreateTeam(teamNumber);
-        //std::cout << "Testpoint 4: " << myTeam << "\n";
-        AISwarm* mySwarm=myTeam->getCreateSwarm(swarmNumber);
-        //std::cout << "Testpoint 5: " << mySwarm << "\n";
-        mySwarm->addToSwarm(new MovementModule(this));
-
+        aiModule=new MovementModule(this);
+        AIEngine::getInstance()->addAI(teamNumber,swarmNumber,aiModule);
 }
 
-
+NPC2::~NPC2()
+{
+        AIEngine::getInstance()->removeAI(teamNumber,swarmNumber,aiModule);
+}
 
 void NPC2::loadParams(const TiXmlElement* root)

branches/ai/src/world_entities/npcs/npc_test.h

@@ -15 +15 @@
         public:
                 NPC2 (const TiXmlElement* root);
-                virtual ~NPC2 (){};
+                virtual ~NPC2 ();
                 virtual void loadParams(const TiXmlElement* root);
                 virtual void tick(float dt);
+                inline int getTeam(){return teamNumber;}
 
 

branches/ai/src/world_entities/space_ships/spacecraft_2d.cc

@@ -151 +151 @@
   this->travelNode = new PNode();
 
-  this->loadModel("models/ships/mantawing.obj", 5.0f);
+  this->loadModel("models/ships/mantawing.obj", 2.5f);
 
   // camera - issue