Changeset 10249 in orxonox.OLD

Timestamp:

Jan 17, 2007, 12:23:35 PM (17 years ago)

Author:

tfahrni

Message:

 

Location:

branches/ai/src/ai

Files:

• ai_team.cc (modified) (2 diffs)
• swarm_gorel.cc (modified) (6 diffs)
• swarm_gorel.h (modified) (1 diff)
• swarm_module.cc (modified) (2 diffs)
• swarm_module.h (modified) (3 diffs)
• swarm_wait.h (modified) (1 diff)

branches/ai/src/ai/ai_team.cc

@@ -17 +17 @@
 #include "swarm_gorel.h"
 #include "swarm_module.h"
+#include "swarm_wait.h"
 #include "debug.h"
+#include "player.h"
+#include "playable.h"
+#include "state.h"
 
 void AITeam::process(float dt)
@@ -25 +29 @@
         
                 if(it->second->taskDone()){
-                        std::cout << "Task Done!\n";
+                        std::cout << "Swarm Task Complete!\n";
+                                        
+                        if(enemyList->size()==0){
+                                changeSwarmModule(it, new SwarmWait);
+                                it->second->orderMaxTime(2);    //sleep 2 seconds..
+                                it->second->process(dt);
+                                continue;
+                        }
+                        
+                        Vector position=it->second->getPosition();
+                        Vector newPosition;
+                        WorldEntity* target=enemyList->at(0);
+                        
+                        //check if enemy is the player..
+                        bool isPlayer=(State::getPlayer()->getPlayable()==target);
+                        float speed;
+                        
+                        //find new Position
+                        if(isPlayer){
+                                float x=(target->getAbsCoor()).x;
+                                float z=(target->getAbsCoor()).z;
+                                int zNorm=(position.z>z)?1:-1;
+                                
+                                if(x+100 > position.x && x+20 < position.x){
+                                        newPosition=Vector(0,0,zNorm*80);               //just go away
+                                        speed=80;
+                                }else if(x+100 < position.x){
+                                        newPosition=Vector(80,0,zNorm*30);      //attack
+                                        speed=70;
+                                }else{
+                                        zNorm=1-2*(rand()%2); //-1 or 1
+                                        newPosition=Vector(200,0,zNorm*80);     //go to attack position
+                                        speed=100;
+                                }
+                        }else{
+                        
+                        }
+
                         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->orderRelObject(target);
+                                it->second->orderRelPos(newPosition);
+                                it->second->orderSpeed(speed);
+                                //it->second->orderView(Vector(0,0,1));
+                                it->second->orderMaxTime((rand()%6)+5); //5-10
+                                //it->second->newOrder();
                         }
                 }

branches/ai/src/ai/swarm_gorel.cc

@@ -28 +28 @@
         }
         averageRadius=averageRadius/members.size();
-        aMax=1000/averageRadius;
-        vMax=1000/averageRadius;
+        aMax=500/averageRadius;
+        vMax=500/averageRadius;
+        viewChangeMax=90/averageRadius;
         
         //load correct ai-module..
@@ -36 +37 @@
         }
         
+        //get swarm position..
+        //position=this->getPosition();
 }
 
@@ -42 +45 @@
         std::map<WorldEntity*,AIModule*>::iterator it;
 
-        Vector swarmPosition=this->getPosition();
+        //Vector swarmPosition=this->getPosition();
         Vector correction=Vector(0,0,0);
         Vector destination;
@@ -48 +51 @@
         if(taskRelObject!=NULL && taskMaxTime>0){
                 destination=taskRelObject->getAbsCoor()+taskRelPos;
-                correction=(destination-swarmPosition)-view*speed;
+                correction=(destination-position)-view*speed;
                 correction.y=0;
                 taskMaxTime-=dt;
@@ -64 +67 @@
         if(movementLen>vMax)movement=movement/movementLen*vMax;
         
-        speed=movement.len();
-        view=movement.getNormalized();
+        float newSpeed=movement.len();
+        Vector newView=movement.getNormalized();
+        
+        if((newSpeed<=taskSpeed && speed>=taskSpeed)||(newSpeed>=taskSpeed && speed<=taskSpeed)){
+                newSpeed=taskSpeed;
+        }else if((newSpeed>speed && speed<taskSpeed) || (newSpeed < speed && speed < taskSpeed)){
+                newSpeed=taskSpeed;
+        }
+        
+        if(angleDeg(view,newView)>viewChangeMax){
+                std::cout << "alarm\n";
+        }
+        speed=newSpeed;
+        view=newView;
+        position=position+view*speed*dt;
 
         //tell orders to swarm-members...
         for (it= members.begin(); it!= members.end(); it++ ){
-                it->second->setDestination(swarmPosition);
-                it->second->setDestinationMovement(movement);
+                it->second->setDestination(position);
+                it->second->setDestinationMovement(view*speed);
                 it->second->process(dt);
         }
@@ -76 +92 @@
         //check if destination reached
         if(!taskComplete){
-                swarmPosition=this->getPosition();
-                if((destination-swarmPosition).len()<10)taskComplete=true;
+                //swarmPosition=this->getPosition();
+                if((destination-position).len()<10)taskComplete=true;
         }
 }

branches/ai/src/ai/swarm_gorel.h

@@ -17 +17 @@
                 float vMax;
                 float aMax;
+                float viewChangeMax;
 };
 

branches/ai/src/ai/swarm_module.cc

@@ -44 +44 @@
 }
 
-Vector SwarmModule::getPosition()
+Vector SwarmModule::getSwarmPosition()
 {
         Vector center=Vector(0,0,0);
@@ -76 +76 @@
         this->view=other->getView();
         this->enemys=other->getEnemyList();
+        this->position=other->getPosition();
         
         this->initialize();

branches/ai/src/ai/swarm_module.h

@@ -19 +19 @@
         inline void setEnemyList(std::vector<WorldEntity*>* enemys){this->enemys=enemys;}       
         
+        inline void newOrder(){this->taskComplete=false;}
         inline void orderRelPos(Vector taskRelPos){this->taskRelPos=taskRelPos;}
         inline void orderAbsPos(Vector taskAbsPos){this->taskAbsPos=taskAbsPos;}
@@ -26 +27 @@
         inline void orderMaxTime(float taskMaxTime){this->taskMaxTime=taskMaxTime;}
 
-        Vector getPosition();
+        Vector getSwarmPosition();
+        inline Vector getPosition(){return position;}
         inline float getSpeed(){return speed;}
         inline Vector getView(){return view;}
@@ -45 +47 @@
         
         Vector view;
+        Vector position;
         float speed;
         

branches/ai/src/ai/swarm_wait.h

@@ -8 +8 @@
 class SwarmWait : public SwarmModule{
         public:
-                SwarmWait();
+                SwarmWait(){}
                 virtual ~SwarmWait(){}
                 virtual void process(float dt);