Changeset 10135 in orxonox.OLD for branches/ai/src/world_entities/npcs

Timestamp:

Dec 20, 2006, 7:47:45 PM (17 years ago)

Author:

tfahrni

Message:

 

Location:

branches/ai/src/world_entities/npcs

Files:

• npc_test.cc (modified) (5 diffs)
• npc_test.h (modified) (1 diff)

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

@@ -19 +19 @@
 
 #include "npc_test.h"
-
+#include <stdio.h>
 
 #include "state.h"
@@ -34 +34 @@
 #include "movement_module.h"
 #include "ai_module.h"
-
+#include "ai_team.h"
+#include "ai_swarm.h"
+#include "ai_engine.h"
 
 ObjectListDefinitionID(NPC2, CL_NPC_TEST2);
@@ -43 +45 @@
 {
         this->registerObject(this, NPC2::_objectList);
-        if (root != NULL)this->loadParams(root);
-        
-        this->aiModule=new MovementModule(this); 
+
+        if (root != NULL)
+                this->loadParams(root);
+
+        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));
+
 }
 
-
-NPC2::~NPC2 ()
-{}
 
 
@@ -56 +65 @@
 {
   NPC::loadParams(root);
+
+  LoadParam(root, "team", this, NPC2, setTeamNumber)
+                .describe("this sets the team number")
+                .defaultValues(0);
+
+  LoadParam(root, "swarm", this, NPC2, setSwarmNumber)
+                .describe("this sets the swarm number")
+                .defaultValues(0);
 }
 
@@ -65 +82 @@
         if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(MD2Model::staticClassID()))
                 ((MD2Model*)this->getModel(0))->tick(dt);
-
-        // processing AI
-        //PRINTF(0)("Processing NPC\n");
-        if(this->aiModule!=NULL)this->aiModule->process(dt);
 }
 

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

@@ -11 +11 @@
 
 class NPC2 : public NPC {
-  ObjectListDeclaration(NPC2);
+        ObjectListDeclaration(NPC2);
 
- public:
-  NPC2 (const TiXmlElement* root);
-  virtual ~NPC2 ();
-  virtual void loadParams(const TiXmlElement* root);
-  virtual void tick(float dt);
+        public:
+                NPC2 (const TiXmlElement* root);
+                virtual ~NPC2 (){};
+                virtual void loadParams(const TiXmlElement* root);
+                virtual void tick(float dt);
 
-        int team;
-        int swarm;
-        int difficulty;
-        AIModule* aiModule;
+
+        private:
+                inline void setTeamNumber(int number){teamNumber=number;}
+                inline void setSwarmNumber(int number){swarmNumber=number;}
+
+                int teamNumber;
+                int swarmNumber;
+                int difficulty;
+
+                AIModule* aiModule;
 };