Changeset 10859 for code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc

Timestamp:

Nov 25, 2015, 6:46:20 PM (8 years ago)

Author:

gania

Message:

almost all works now, check AITest.oxw

File:

• code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (modified) (9 diffs)

code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc

@@ -63 +63 @@
     CommonController::CommonController( Context* context ): Controller( context )
     {
-        this->squaredaccuracy_ = 10000;
+        this->squaredaccuracy_ = 2500;
         this->bFirstTick_ = true;
         this->tolerance_ = 50;
@@ -71 +71 @@
         this->bInLoop_ = false;
         this->bLoop_ = false;
+        this->bEndLoop_ = false;
+        this->parsedActionpoints_.clear();
         RegisterObject( CommonController );
+
     }
     CommonController::~CommonController() 
     {
-       
     }
     void CommonController::tick(float dt)
@@ -161 +163 @@
         Vector3 position;
         std::string targetName;
-        bool inLoop;
+        bool inLoop = false;
         Point p;
         if (static_cast<Actionpoint*> (actionpoint))
@@ -170 +172 @@
             position = ap->getWorldPosition();
 
-            if (!this->bInLoop_ && ap->getStartLoop())
+            if (this->bEndLoop_)
+            {
+                this->bInLoop_ = false;
+            }
+            if (!this->bInLoop_ && ap->getLoopStart())
             {
                 this->bInLoop_ = true;
             }
-            if (this->bInLoop_ && ap->getEndLoop())
-            {
-                this->bInLoop_ = false;
+            if (this->bInLoop_ && ap->getLoopEnd())
+            {
+                this->bEndLoop_ = true;
             }
             inLoop = this->bInLoop_;
@@ -197 +203 @@
                 ThrowException( ParseError, std::string( "Attempting to set an unknown Action: '" )+ actionName + "'." );
             p.action = value; p.name = targetName; p.position = position; p.inLoop = inLoop;
-            parsedActionpoints_.push_back(p);
         }
         else
@@ -519 +524 @@
         while( diff>math::twoPi )diff-=math::twoPi;
         while( diff<-math::twoPi )diff+=math::twoPi;
-        this->getControllableEntity() ->rotateRoll( diff*ROTATEFACTOR * dt );
+        this->getControllableEntity() ->rotateRoll( diff*0.2f*ROTATEFACTOR * dt );
     }
     void CommonController::copyTargetOrientation( float dt )
@@ -975 +980 @@
     void CommonController::nextActionpoint()
     {
+        if (!this || !this->getControllableEntity())
+            return;
         if (this->bLoop_)
         {
@@ -1019 +1026 @@
     void CommonController::action()
     {
+        if (!this || !this->getControllableEntity())
+            return;
+        orxout (internal_error) << "Size of actions is " << this->parsedActionpoints_.size() << endl;
         this->startAttackingEnemiesThatAreClose();
         //No action -> pop one from stack
@@ -1126 +1136 @@
       this->bLoop_ = b;
       this->setAction (Action::NONE);
-      this->setTarget(0);
-      this->setTargetPosition (this->getControllableEntity()->getWorldPosition());
+      // this->setTarget(0);
+      // this->setTargetPosition (this->getControllableEntity()->getWorldPosition());
       orxout(internal_error) << "Top action is " << this->parsedActionpoints_.back().action << endl;
     }