Changeset 6905 for code/branches/rocket/src/orxonox/controllers

Timestamp:

May 15, 2010, 6:12:13 PM (15 years ago)

Author:

gnadler

Message:

rockets get target but moveToPosition function does not work correctly.

Location:

code/branches/rocket/src/orxonox/controllers

Files:

• DroneController.cc (modified) (3 diffs)
• DroneController.h (modified) (1 diff)
• NewHumanController.cc (modified) (1 diff)
• NewHumanController.h (modified) (1 diff)

code/branches/rocket/src/orxonox/controllers/DroneController.cc

@@ -49 +49 @@
         assert(dynamic_cast<Drone*>(creator)!=0);
         this->setControllableEntity(dynamic_cast<Drone*>(creator));
+                this->counter=0;
     }
 
@@ -63 +64 @@
     void DroneController::tick(float dt)
     {
+                this->counter++;
         // Place your code here:
         // - steering commands
@@ -70 +72 @@
         // - rotatePitch, rotateYaw, rotateRoll 
         // - apply the to myDrone (e.g. myDrone->rotateYaw(..) ) 
-
-                myDrone->rotateYaw(0.2);
+                myDrone->rotatePitch(0.08);
+                myDrone->moveFrontBack(1);
 
     }

code/branches/rocket/src/orxonox/controllers/DroneController.h

@@ -54 +54 @@
 
         private:
+                        int counter;
     };
 }

code/branches/rocket/src/orxonox/controllers/NewHumanController.cc

@@ -574 +574 @@
         }
     }
-
-        Pawn* NewHumanController::getRocketTarget() {
-
-
- Ogre::RaySceneQuery * rsq = HumanController::localController_s->getControllableEntity()->getScene()->getSceneManager()->createRayQuery(Ogre::Ray());
-
-        Ogre::Ray mouseRay = HumanController::localController_s->getControllableEntity()->getCamera()->getOgreCamera()->getCameraToViewportRay(static_cast<float>(this->currentYaw_)/2*-1+.5f, static_cast<float>(this->currentPitch_)/2*-1+.5f);
-
-        rsq->setRay(mouseRay);
-        rsq->setSortByDistance(true);
-
-        /*
-        Distance of objects:
-        ignore everything under 200 maybe even take 1000 as min distance to shoot at
-
-        shots are regularly traced and are entities!!!!!!!!! this is the biggest problem
-        they vanish only after a distance of 10'000
-        */
-
-
-        Ogre::RaySceneQueryResult& result = rsq->execute();
-        Pawn* pawn = orxonox_cast<Pawn*>(this->getControllableEntity());
-
-        Ogre::RaySceneQueryResult::iterator itr;
-        for (itr = result.begin(); itr != result.end(); ++itr)
-        {
-            if (itr->movable->isInScene() && itr->movable->getMovableType() == "Entity" && itr->distance > 500)
-            {
-                // Try to cast the user pointer
-                WorldEntity* wePtr = dynamic_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(itr->movable->getUserAny()));
-                if (wePtr)
-                {
-                    // go through all parents of object and look whether they are sightable or not
-                    bool isSightable = false;
-                    WorldEntity* parent = wePtr->getParent();
-                    while (parent)
-                    {
-                        if (this->targetMask_.isExcluded(parent->getIdentifier()))
-                        {
-                            parent = parent->getParent();
-                            continue;
-                        }
-                        else
-                        {
-                            isSightable = true;
-                            break;
-                        }
-                    }
-                    if (!isSightable)
-                        continue;
-                }
-
-                                return dynamic_cast<Pawn*> (wePtr);
-                        }
-                }
-        }
                 
 

code/branches/rocket/src/orxonox/controllers/NewHumanController.h

@@ -67 +67 @@
             virtual void doResumeControl();
 
-                        Pawn* getRocketTarget();
-
 
         protected: