Changeset 10031 for code/branches/turretFS14/src/modules/objects/controllers

Timestamp:

Apr 10, 2014, 4:06:03 PM (11 years ago)

Author:

muemart

Message:

Limit turret's rotation (another method…), work a bit on the controller, and make a (ugly?) hack to allow attaching dynamic objects

Location:

code/branches/turretFS14/src/modules/objects/controllers

Files:

• TurretController.cc (modified) (3 diffs)
• TurretController.h (modified) (1 diff)

code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc

@@ -27 +27 @@
  */
 
- #include "TurretController.h"
+#include "TurretController.h"
+#include "worldentities/pawns/Pawn.h"
+#include "Turret.h"
 
  namespace orxonox
@@ -36 +38 @@
         {
                 RegisterObject(TurretController);
-                counter = 0;
-                flag = false;
         }
 
@@ -45 +45 @@
         }
 
+        void TurretController::searchTarget()
+        {
+        Turret* turret = orxonox_cast<Turret*>(this->getControllableEntity());
+        if(target_ && turret->isInRange(target_->getPosition()))
+        {
+                return;
+        }
+        else
+        {
+                this->forgetTarget();
+        }
+
+
+        ControllableEntity* parent = orxonox_cast<ControllableEntity*>(turret->getParent());
+        if(parent)
+        {
+                Pawn* parenttarget = orxonox_cast<Pawn*>(parent->getTarget());
+                if(parenttarget && turret->isInRange(parenttarget->getPosition()))
+                {
+                        this->setTarget(parenttarget);
+                        turret->setTarget(parenttarget);
+                        return;
+                }
+        }
+
+                for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
+        {
+                Pawn* entity = orxonox_cast<Pawn*>(*it);
+            if (ArtificialController::sameTeam(this->getControllableEntity(), entity, this->getGametype()))
+                continue;
+
+            if(turret->isInRange(entity->getPosition()))
+            {
+                this->setTarget(entity);
+                turret->setTarget(entity);
+                break;
+            }
+        }               
+        }
+
         void TurretController::tick(float dt)
         {
-                counter += dt;
-                if(counter >= 10)
+        if (!this->isActive() || !this->getControllableEntity())
+            return;
+                this->searchTarget();
+                this->getControllableEntity()->rotatePitch(0.2);
+                /*if(target_)
                 {
-                        counter = 0;
-                        flag = !flag;
-                        orxout() << "Direction change" << endl;
-                }
-                if(flag)
-                {
-                        this->getControllableEntity()->rotatePitch(10*dt);
-                        //this->getControllableEntity()->rotateYaw(10*dt);
-                }
-                else
-                {
-                        this->getControllableEntity()->rotatePitch(-10*dt);
-                        //this->getControllableEntity()->rotateYaw(-10*dt);
-                }
+                        this->aimAtTarget();
+                        //It says move, but really it only turns
+                        this->moveToTargetPosition();
+                        if(this->isLookingAtTarget(Degree(5).valueRadians()))
+                        {
+                                orxout() << 42 << endl;
+                        }
+                }*/
         }
  }

code/branches/turretFS14/src/modules/objects/controllers/TurretController.h

@@ -44 +44 @@
 
                 private:
-                        float counter;
-                        bool flag;
+                        void searchTarget();
         };
  }