Changeset 10244 in orxonox.OLD

Timestamp:

Jan 17, 2007, 12:43:30 AM (17 years ago)

Author:

tfahrni

Message:

tired

Location:

branches/ai/src/ai

Files:

• Makefile.am (modified) (2 diffs)
• ai_engine.cc (modified) (1 diff)
• ai_module.h (modified) (3 diffs)
• ai_swarm.cc (modified) (4 diffs)
• ai_swarm.h (modified) (1 diff)
• ai_team.cc (modified) (3 diffs)
• ai_team.h (modified) (2 diffs)
• attack_module.cc (modified) (2 diffs)
• movement_module.cc (modified) (1 diff)
• swarm_gorel.cc (added)
• swarm_gorel.h (added)
• swarm_module.cc (added)
• swarm_module.h (added)
• swarm_wait.cc (added)
• swarm_wait.h (added)

branches/ai/src/ai/Makefile.am

@@ -8 +8 @@
                         ai_module.cc \
                         ai_team.cc \
-                        ai_swarm.cc \
                         ai_team_member.cc \
                         movement_module.cc \
                         shooting_module.cc \
-                        attack_module.cc
+                        attack_module.cc\
+                        swarm_module.cc\
+                        swarm_wait.cc\
+                        swarm_gorel.cc
 
 noinst_HEADERS =        \
@@ -18 +20 @@
                         ai_module.h \
                         ai_team.h \
-                        ai_swarm.h \
                         ai_team_member.h \
                         movement_module.h \
                         shooting_module.h \
-                        attack_module.h
+                        attack_module.h\
+                        swarm_module.h\
+                        swarm_wait.h\
+                        swarm_gorel.h

branches/ai/src/ai/ai_engine.cc

@@ -30 +30 @@
         for (it=teams.begin(); it!= teams.end(); it++ )
         {
-                //find enemys for the team
-                for(ObjectList<NPC2>::const_iterator npc = NPC2::objectList().begin(); npc != NPC2::objectList().end(); ++npc)
-                        if((*npc)->getTeam() != it->first)enemyList->push_back(*npc);
-
                 //add player to enemys (player belongs to team 0)
                 if(it->first!=0){
-                        //std::cout << "adding player to enemyList\n";
                         Player* pl = State::getPlayer();
                         if(pl != NULL)enemyList->push_back(pl->getPlayable());
                 }
+        
+                //find other enemys for this team
+                for(ObjectList<NPC2>::const_iterator npc = NPC2::objectList().begin(); npc != NPC2::objectList().end(); ++npc)
+                        if((*npc)->getTeam() != it->first)enemyList->push_back(*npc);
 
                 //process the team

branches/ai/src/ai/ai_module.h

@@ -7 +7 @@
 class AIModule {
  public:
-        AIModule(){}
+        inline AIModule(){taskComplete=false;}
    virtual ~AIModule(){}
    virtual void process(float dt){}
@@ -25 +25 @@
         inline float getMaxAcceleration(){return accelerationMax;}
         inline float getMaxSpeed(){return speedMax;}
+        inline float getNPCRadius(){return getRadius(npc);}
+
+        inline bool done(){return taskComplete;}
 
         void getAttributesFrom(AIModule* oldModule);
@@ -35 +38 @@
         Vector destinationView;
 
-
+        bool taskComplete;
         Vector movement;
         Vector view;

branches/ai/src/ai/ai_swarm.cc

@@ -14 +14 @@
 */
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_AI
-#include "ai_swarm.h"
+#include "swarm_gorel.h"
 #include "ai_module.h"
 #include "movement_module.h"
@@ -33 +33 @@
         std::map<WorldEntity*,AIModule*>::iterator it;
 
+        if(enemys==NULL || enemys->size()<1)return;
+        target=enemys->at(0);
+        
         Vector swarmPosition=this->getPosition();
         Vector targetPosition=target->getAbsCoor();
@@ -78 +81 @@
 
 
-
+        destination=taskRelObject->getAbsCoor()+taskRelPos;
         Vector correction=(destination+randomVector-swarmPosition)-movement;
         correction.y=0;
@@ -100 +103 @@
         }
 }
-
-
-
-void AISwarm::addAI(WorldEntity* npc)
-{
-        std::pair< std::map<WorldEntity*,AIModule*>::iterator , bool > p;
-        AIModule* newAIModule=new MovementModule(npc);
-        p=members.insert(std::make_pair(npc,newAIModule));
-        if(!p.second)delete newAIModule;
-}
-
-
-void AISwarm::removeAI(WorldEntity* npc)
-{
-        std::map<WorldEntity*,AIModule*>::iterator it = members.find(npc);
-        if(it==members.end())return;            //npc not found
-        delete it->second;                                      //delete AIModule
-        members.erase(it);                                      //remove AIModule from members
-}
-
-
-Vector AISwarm::getPosition()
-{
-        Vector center=Vector(0,0,0);
-        std::map<WorldEntity*,AIModule*>::iterator it;
-        for (it= members.begin(); it!= members.end(); it++ )
-                center=center+it->second->getPosition();
-
-        return center/members.size();
-}
-
-float AISwarm::getRadius(WorldEntity* object)
-{
-        AABB* aabb = object->getModelAABB();
-        if( aabb == NULL)return -1;
-
-        float a = aabb->halfLength[0];
-        float b = aabb->halfLength[1];
-        float c = aabb->halfLength[2];
-
-        if(a>b){
-                return (c>a)?c:a;
-        }else{
-                return (c>b)?c:b;
-        }
-}

branches/ai/src/ai/ai_swarm.h

@@ -5 +5 @@
 #include "world_entity.h"
 #include "ai_module.h"
+#include "swarm_module.h"
 
 
-
-class AISwarm{
+class AISwarm : public SwarmModule{
         public:
                 AISwarm();
-                ~AISwarm(){}
-                void process(float dt);
-                void addAI(WorldEntity*);
-                void removeAI(WorldEntity*);
+                virtual ~AISwarm(){}
+                virtual void process(float dt);
 
-                inline int getSwarmSize(){return members.size();}
                 inline void setDestination(Vector destination){this->destination=destination;}
                 inline void setTarget(WorldEntity* target){this->target=target;}
-                Vector getPosition();
 
                 enum statusType{ATTACKING,MOVING,WAITING};
 
         private:
-                float getRadius(WorldEntity* object);
-
-
                 Vector destination;
                 Vector movement;
                 WorldEntity* target;
                 statusType status;
-
-                std::map<WorldEntity*,AIModule*> members;
 
                 int tickCount;

branches/ai/src/ai/ai_team.cc

@@ -15 +15 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_AI
 #include "ai_team.h"
+#include "swarm_gorel.h"
+#include "swarm_module.h"
 #include "debug.h"
 
 void AITeam::process(float dt)
 {
-        std::map<int,AISwarm*>::iterator it;
+        std::map<int,SwarmModule*>::iterator it;
         for (it= swarms.begin(); it!= swarms.end(); it++ ){
-                if(enemyList->size()>0){
-                        it->second->setTarget(enemyList->at(0));
-                        it->second->setDestination(enemyList->at(0)->getAbsCoor());
+        
+                if(it->second->taskDone()){
+                        std::cout << "Task Done!\n";
+                        changeSwarmModule(it, new SwarmGoRel);
+                
+                        if(enemyList->size()>0){
+                                it->second->setEnemyList(enemyList);
+                                it->second->orderRelObject(enemyList->at(0));
+                                it->second->orderRelPos(Vector(60,0,0));
+                                it->second->orderSpeed(50);
+                                it->second->orderView(Vector(0,0,1));
+                                it->second->orderMaxTime(5);
+                        }
                 }
                 it->second->process(dt);
@@ -29 +41 @@
 }
 
+void AITeam::changeSwarmModule(std::map<int,SwarmModule*>::iterator it,SwarmModule* newAI)
+{
+                        SwarmModule* oldAI = it->second;
+                        newAI->getAttributesFrom(oldAI);
+                        it->second=newAI;
+                        delete oldAI;
+}
+
 
 void AITeam::addAI(int swarmNumber, WorldEntity* npc)
 {
-        std::pair<std::map<int,AISwarm*>::iterator,bool> p;
-        AISwarm* newSwarm=new AISwarm();
+        std::pair<std::map<int,SwarmModule*>::iterator,bool> p;
+        SwarmModule* newSwarm=new SwarmGoRel();
         p=swarms.insert(std::make_pair(swarmNumber,newSwarm));
         if(!p.second)delete newSwarm;
@@ -42 +62 @@
 void AITeam::removeAI(int swarmNumber, WorldEntity* npc)
 {
-        std::map<int,AISwarm*>::iterator it = swarms.find(swarmNumber);
+        std::map<int,SwarmModule*>::iterator it = swarms.find(swarmNumber);
         if(it==swarms.end())return;
         it->second->removeAI(npc);

branches/ai/src/ai/ai_team.h

@@ -3 +3 @@
 #define _AI_TEAM_H
 
-#include "ai_swarm.h"
+#include "swarm_module.h"
 
 class AITeam{
@@ -17 +17 @@
  private:
         std::vector<WorldEntity*>* enemyList;
-        std::map<int,AISwarm*> swarms;
+        std::map<int,SwarmModule*> swarms;
+        void changeSwarmModule(std::map<int,SwarmModule*>::iterator it,SwarmModule* newAI);
 };
 

branches/ai/src/ai/attack_module.cc

@@ -45 +45 @@
 {
         tickCount=0;
-        randomFreq=60;
+        randomFreq=40;
 }
 
@@ -100 +100 @@
         //random movement
         //randomFreq=testValue2;
-        if(++tickCount>=randomFreq && movement.len()<60){
+        if(++tickCount>=randomFreq){
                 tickCount=0;
                 int x = (rand()%101)-50;                        //-50-50

branches/ai/src/ai/movement_module.cc

@@ -32 +32 @@
 float MovementModule::distanceToPlayer=15;
 float MovementModule::distanceToNPC=2;
-float MovementModule::maxAccleration=300.0f;
+float MovementModule::maxAccleration=250.0f;
 float MovementModule::testValue=2;
 float MovementModule::testValue2=40;