Changeset 10045 in orxonox.OLD for branches/ai/src/ai

Timestamp:

Dec 12, 2006, 10:43:36 PM (17 years ago)

Author:

tfahrni

Message:

 

Location:

branches/ai/src/ai

Files:

• Makefile (added)
• Makefile.am (added)
• Makefile.in (added)
• ai_engine.cc (modified) (1 diff)
• ai_engine.h (modified) (1 diff)
• ai_module.cc (modified) (1 diff)
• ai_module.h (modified) (2 diffs)
• ai_team.cc (modified) (1 diff)
• ai_team_member.cc (modified) (4 diffs)
• ai_team_member.h (modified) (1 diff)
• libORXai.a (deleted)
• movement_module.cc (modified) (4 diffs)
• movement_module.h (modified) (1 diff)
• shooting_module.cc (modified) (2 diffs)

branches/ai/src/ai/ai_engine.cc

@@ -55 +55 @@
 
 
-void AIEngine::process()
+void AIEngine::tick(float dtS)
 {
+        this->dtS=dtS;
         int teamCount=teams.size();
         for(int i=0; i < teamCount; i++ )
         {
-        //std::cout << "Processing Team " << i <<  "...\n";
+                //std::cout << "hello";
+        //std::cout << "DT " << dtS <<  "...\n";
         teams.at(i)->process();
         }

branches/ai/src/ai/ai_engine.h

@@ -13 +13 @@
    static AIEngine* getInstance() { if( singletonRef == NULL) singletonRef = new AIEngine(); return singletonRef; }
 
-   void process();
+   void tick(float dtS);
    AITeam* getTeam(int);
         int newTeam();
+        float dtS;
  private:
         AIEngine();

branches/ai/src/ai/ai_module.cc

@@ -12 +12 @@
 
    ### File Specific:
-   main-programmer: Patrick Boenzli
+   main-programmer: Thomas Fahrni
    co-programmer:
 */
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_AI
 
 #include "ai_module.h"
+#include "ai_engine.h"
+#include "debug.h"
 
 
-AIModule::AIModule(){
-}
 
-AIModule::~AIModule(){
+AIModule::AIModule()
+{
 }
 
 
-void AIModule::process()
-{}
+AIModule::~AIModule()
+{
+}
 
 
+
+void AIModule::process()
+{
+std::cout << "Processing Module...\n";
+}
+
+
+
+void AIModule::setDifficulty(int newDifficulty)
+{
+        difficulty=newDifficulty;
+}
+
+
+
+void AIModule::setOwner(AITeamMember* newOwner)
+{
+        owner=newOwner;
+}
+

branches/ai/src/ai/ai_module.h

@@ -3 +3 @@
 #define _AI_MODULE_H
 
+class AITeamMember;
 
 class AIModule{
@@ -9 +10 @@
    ~AIModule();
    void process();
+   void setDifficulty(int newDifficulty);
+   void setOwner(AITeamMember* newOwner);
  private:
    int difficulty;
+   AITeamMember* owner;
 };
 

branches/ai/src/ai/ai_team.cc

@@ -12 +12 @@
 
    ### File Specific:
-   main-programmer: Patrick Boenzli
+   main-programmer: Thomas Fahrni
    co-programmer:
 */

branches/ai/src/ai/ai_team_member.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_AI
 #include "ai_team_member.h"
+#include "movement_module.h"
 #include "ai_engine.h"
+#include "debug.h"
+
 
 AITeamMember::AITeamMember()
@@ -31 +34 @@
         for(int i=0; i < moduleCount; i++ )
         {
-        std::cout << "Processing AIModule " << i <<  "...\n";
+        std::cout << "Processing AIModule " << i << " (" << moduleCount << ")\n";
         modules.at(i)->process();
         }
@@ -41 +44 @@
 void AITeamMember::addToTeam(int aiTeamNumber)
 {
-        //funktionniert nur so pseudomässig...
+        //macht nicht so ganz das was es eigntlich machen sollte..
         AIEngine* aiEngine=AIEngine::getInstance();
         int teamNumber=aiEngine->newTeam();
         aiEngine->getTeam(teamNumber)->addMember(this);
+        MovementModule* nMod=new MovementModule;
+        nMod->process();
+        modules.push_back(nMod);
+        modules.at(0)->process();
 }
 
@@ -50 +57 @@
 
 
-void AITeamMember::addModule(AIModule* newModule){
+void AITeamMember::addModule(AIModule* newModule)
+{
+                std::cout << "AIModule added\n";
                 modules.push_back(newModule);
+                newModule->setOwner(this);
 }

branches/ai/src/ai/ai_team_member.h

@@ -6 +6 @@
 #include "ai_module.h"
 
+//class AIModule;
 
 class AITeamMember : public WorldEntity{

branches/ai/src/ai/movement_module.cc

@@ -1 @@
-
-
 /*
    orxonox - the future of 3D-vertical-scrollers
@@ -12 +10 @@
 
    ### File Specific:
-   main-programmer: Patrick Boenzli
+   main-programmer: Thomas Fahrni
    co-programmer:
 */
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_AI
 
 #include "movement_module.h"
+#include "ai_engine.h"
+#include "state.h"
+#include "debug.h"
+
+//class AIEngine;
 
 MovementModule::MovementModule(){
+        //std::cout << "MovementModule created...\n";
 }
 
@@ -28 +32 @@
 void MovementModule::process()
 {
+        //float dt=AIEngine::getInstance()->dtS;
+        std::cout << "///////////////////Processing Movement Module/////////////////////\n";
 
         //How does the Module know the AITeamMember it belongs to??
-        
-        /*Vector absPosition = this->getAbsCoor();
+        //partialy solved...
+        /*
+        Vector absPosition = owner->getAbsCoor();
 
         PRINTF(0)(" npc abs coor: %f, %f, %f\n", absPosition.x, absPosition.y, absPosition.z);
 
-        Player* pl = State::getPlayer();
-        Vector playerAbsPos = pl->getPlayable()->getAbsCoor();
+        //Player* pl = State::getPlayer();
+        /*Vector playerAbsPos = pl->getPlayable()->getAbsCoor();
 
-        PRINTF(0)(" player abs coor: %f, %f, %f\n", playerAbsPos.x, playerAbsPos.y, playerAbsPos.z);
+        //PRINTF(0)(" player abs coor: %f, %f, %f\n", playerAbsPos.x, playerAbsPos.y, playerAbsPos.z);
 
 
@@ -48 +55 @@
         float speed = 10.0f;
 
-        this->shiftCoor( distanceVector * speed * dt);*/
+        owner->shiftCoor( distanceVector * speed * dt);*/
 }
 

branches/ai/src/ai/movement_module.h

@@ -11 +11 @@
    virtual void process();
  private:
+        //AITeamMember* owner;
 };
 

branches/ai/src/ai/shooting_module.cc

@@ -12 +12 @@
 
    ### File Specific:
-   main-programmer: Patrick Boenzli
+   main-programmer: Thomas Fahrni
    co-programmer:
 */
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_AI
+#include "debug.h"
+#include "shooting_module.h"
 
-#include "shooting_module.h"
 
 ShootingModule::ShootingModule()
@@ -28 +29 @@
 
 void ShootingModule::process()
-{}
+{
+        //std::cout << "Processing Shooting Module...\n";
+        return;
+}