Changeset 10875 for code/branches

Timestamp:

Nov 27, 2015, 1:41:26 PM (9 years ago)

Author:

gania

Message:

fixed library dependencies

Location:

code/branches/campaignHS15

Files:

• data/levels/AITest.oxw (modified) (4 diffs)
• src/orxonox/controllers/ActionpointController.cc (modified) (2 diffs)
• src/orxonox/controllers/CommonController.cc (modified) (1 diff)
• src/orxonox/controllers/CommonController.h (modified) (1 diff)
• src/orxonox/controllers/FightingController.cc (modified) (1 diff)
• src/orxonox/controllers/FlyingController.cc (modified) (2 diffs)
• src/orxonox/controllers/FlyingController.h (modified) (1 diff)
• src/orxonox/controllers/SectionController.cc (modified) (2 diffs)
• src/orxonox/controllers/WingmanController.cc (modified) (2 diffs)

code/branches/campaignHS15/data/levels/AITest.oxw

@@ -62 +62 @@
 <!-- HERE STARTS DEMO FOR THE ACTIONPOINTS. 
 P.S. Never set protectMe in the first actionpoint: if human didn't spawn, that actionpoint will be skipped -->
-       <!-- 
+       
     <Model mesh="cube.mesh" scale=8 position="0,0,0" />
 
@@ -124 +124 @@
     </SpaceShip> 
  
-    -->
+   
 <!-- HERE ENDS DEMO FOR THE ACTIONPOINTS -->
 <!-- HERE STARTS DEMO FOR FIGHTING -->
@@ -210 +210 @@
 <!-- HERE ENDS DEMO FOR FIGHTING -->
 <!-- HERE STARTS DEMO FOR FORMATIONS -->
-    
+    <!-- 
     <Model mesh="cube.mesh" scale=8 position="   0,2000,    0" />
     <Model mesh="cube.mesh" scale=8 position="   0,2000,-2000" />
@@ -259 +259 @@
       </controller>
     </SpaceShip> 
-   
+    -->
 <!-- HERE ENDS DEMO FOR FORMATIONS -->
     

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

@@ -30 +30 @@
 
 #include "core/XMLPort.h"
-
-#include "controllers/NewHumanController.h"
+#include <algorithm>
+
 
 namespace orxonox
@@ -295 +295 @@
                     for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>::begin(); itP; ++itP)
                     {
-                        if (orxonox_cast<ControllableEntity*>(*itP) && ((*itP)->getController()) && orxonox_cast <NewHumanController*> ((*itP)->getController()))
+                        if (orxonox_cast<ControllableEntity*>(*itP) && ((*itP)->getController()) && ((*itP)->getController()->getIdentifier()->getName() == "NewHumanController"))
                         {
                             this->setProtect (static_cast<ControllableEntity*>(*itP));

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

@@ -38 +38 @@
 #include "controllers/NewHumanController.h"
 #include "controllers/DroneController.h"
+#include "util/Math.h"
 
 namespace orxonox

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

@@ -34 +34 @@
 #include "worldentities/ControllableEntity.h"
 #include "worldentities/pawns/Pawn.h"
-#include "util/Math.h"
 
 #include "tools/Timer.h"
 #include "tools/interfaces/Tickable.h"
 #include <limits>
-#include <algorithm>
 #include "worldentities/Actionpoint.h"
-#include "worldentities/pawns/SpaceShip.h"
 
 namespace orxonox

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

@@ -28 +28 @@
 #include "controllers/FightingController.h"
 #include "core/XMLPort.h"
-#include <limits>                                                               //for finding closest target
+#include "util/Math.h"
 
 

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

@@ -29 +29 @@
 #include "core/XMLPort.h"
 #include "worldentities/pawns/SpaceShip.h"
+#include "util/Math.h"
 
 namespace orxonox
@@ -128 +129 @@
     void FlyingController::copyOrientation( const Quaternion& orient, float dt )
     {
-        //roll angle difference in radian
-        float diff=orient.getRoll(false).valueRadians() -
+
+        double diff=orient.getRoll(false).valueRadians() -
                         ( this->getControllableEntity() ->getOrientation() .getRoll( false ).valueRadians() );
-        while( diff>math::twoPi )diff-=math::twoPi;
+        while( diff>math::twoPi)diff-=math::twoPi;
         while( diff<-math::twoPi )diff+=math::twoPi;
-        this->getControllableEntity() ->rotateRoll( diff*0.2f*ROTATEFACTOR * dt );
+
+        this->getControllableEntity() ->rotateRoll(diff * ROTATEFACTOR * dt);
     }
+    //change log: increased precision, increased rotation speed
     void FlyingController::copyTargetOrientation( float dt )
     {

code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h

@@ -36 +36 @@
 {   
     const float SPEED = 0.9f/0.02f;
-    const float ROTATEFACTOR = 1.0f/0.02f;
+    const float ROTATEFACTOR = 0.6f/0.02f;
     namespace FormationMode
     {

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

@@ -78 +78 @@
         if (!this->isActive())
             return;
-      
-        
+
+    //this doesn't fight in formation flight, thus we can afford executing following code in tick: when nobody fights, tick is anyway stable.
+        if (this->myDivisionLeader_ && this->myDivisionLeader_->getAction() != Action::FIGHT && this->myDivisionLeader_->getAction() !=
+            Action::FIGHTALL && this->myDivisionLeader_->getAction() != Action::ATTACK)
+        {
+            ControllableEntity* myEntity = this->getControllableEntity();
+            Vector3 myPosition = myEntity->getWorldPosition();
+            if (!this->myDivisionLeader_)
+            {
+                return;
+            }
+            ControllableEntity* leaderEntity = this->myDivisionLeader_->getControllableEntity();
+            Quaternion orient = leaderEntity->getWorldOrientation();
+            Vector3 leaderPosition = leaderEntity->getWorldPosition();
+
+            Vector3 targetRelativePosition = getFormationPosition();
+            if (!this->myDivisionLeader_)
+            {
+                return;
+            }
+            Vector3 targetAbsolutePosition = 
+                (leaderPosition + (orient*WorldEntity::FRONT) * (leaderEntity->getVelocity().length()/5)
+                 + (orient* (targetRelativePosition)));
+       
+            this->setAction (Action::FLY, targetAbsolutePosition, orient);
+            if ((targetAbsolutePosition - myPosition).length() > this->tolerance_ * 1.5f)
+            {
+                this->boostControl();
+            }
+            else
+            {
+               this->getControllableEntity()->boost(false);
+            }
+        }    
         SUPER(SectionController, tick, dt);
     }
@@ -143 +175 @@
                 default:
                 {
-                    ControllableEntity* myEntity = this->getControllableEntity();
-                    Vector3 myPosition = myEntity->getWorldPosition();
-                    if (!this->myDivisionLeader_)
-                    {
-                        return;
-                    }
-                    ControllableEntity* leaderEntity = this->myDivisionLeader_->getControllableEntity();
-                    Quaternion orient = leaderEntity->getWorldOrientation();
-                    Vector3 leaderPosition = leaderEntity->getWorldPosition();
-
-                    Vector3 targetRelativePosition = getFormationPosition();
-                    if (!this->myDivisionLeader_)
-                    {
-                        return;
-                    }
-                    Vector3 targetAbsolutePosition = 
-                        (leaderPosition + (orient*WorldEntity::FRONT) * (leaderEntity->getVelocity().length()/5)
-                         + (orient* (targetRelativePosition)));
-               
-                    this->setAction (Action::FLY, targetAbsolutePosition, orient);
-                    if ((targetAbsolutePosition - myPosition).length() > this->tolerance_ * 1.5f)
-                    {
-                        this->boostControl();
-                    }
-                    else
-                    {
-                       this->getControllableEntity()->boost(false);
-                    }
+                    //formation flight is executed in tick
                 }
             }

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

@@ -68 +68 @@
         if (!this->isActive())
             return;
-        
+        if (this->myLeader_ && this->myLeader_->getAction() != Action::FIGHT && this->myLeader_->getAction() !=
+            Action::FIGHTALL && this->myLeader_->getAction() != Action::ATTACK)
+        {
+            ControllableEntity* myEntity = this->getControllableEntity();
+            Vector3 myPosition = myEntity->getWorldPosition();
+            if (!this->myLeader_)
+            {
+                return;
+            }
+            ControllableEntity* leaderEntity = this->myLeader_->getControllableEntity();
+            Quaternion orient = leaderEntity->getWorldOrientation();
+            Vector3 leaderPosition = leaderEntity->getWorldPosition();
+
+            Vector3 targetRelativePosition = getFormationPosition();
+            if (!this->myLeader_)
+            {
+                return;
+            }
+            Vector3 targetAbsolutePosition = 
+                (leaderPosition + (orient*WorldEntity::FRONT) * (leaderEntity->getVelocity().length()/5)
+                 + (orient* (targetRelativePosition)));
+       
+            this->setAction (Action::FLY, targetAbsolutePosition, orient);
+            if ((targetAbsolutePosition - myPosition).length() > this->tolerance_ * 1.5f)
+            {
+                this->boostControl();
+            }
+            else
+            {
+               this->getControllableEntity()->boost(false);
+            }
+        }   
         
         SUPER(WingmanController, tick, dt);
@@ -123 +154 @@
                 default:
                 {
-                    ControllableEntity* myEntity = this->getControllableEntity();
-                    Vector3 myPosition = myEntity->getWorldPosition();
-                    if (!this->myLeader_)
-                    {
-                        return;
-                    }
                     
-                    ControllableEntity* leaderEntity = this->myLeader_->getControllableEntity();
-                    Quaternion orient = leaderEntity->getWorldOrientation();
-                    Vector3 leaderPosition = leaderEntity->getWorldPosition();
-
-                    Vector3 targetRelativePosition = getFormationPosition();
-                    if (!this->myLeader_)
-                    {
-                        return;
-                    }
-                    Vector3 targetAbsolutePosition = 
-                        (leaderPosition + (orient*WorldEntity::FRONT) * (leaderEntity->getVelocity().length()/5)
-                         + (orient* (targetRelativePosition)));
-               
-                    this->setAction (Action::FLY, targetAbsolutePosition, orient);
-                    if ((targetAbsolutePosition - myPosition).length() > this->tolerance_ * 1.5f)
-                    {
-                        this->boostControl();
-                    }
-                    else
-                    {
-                       this->getControllableEntity()->boost(false);
-                    }
                 }
             }