Changeset 6948 for code/branches/rocket

Timestamp:

May 21, 2010, 9:33:13 AM (14 years ago)

Author:

scheusso

Message:

somes fixes/changes in NewHumanController

File:

• code/branches/rocket/src/orxonox/controllers/NewHumanController.cc (modified) (3 diffs)

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

@@ -359 +359 @@
         Ogre::RaySceneQueryResult& result = rsq->execute();
         Pawn* pawn = orxonox_cast<Pawn*>(this->getControllableEntity());
+        WorldEntity* myWe = static_cast<WorldEntity*>(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)
+//             CCOUT(0) << "testing object as target" << endl;
+            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()));
+                
+                // make sure we don't shoot ourselves
+                if( wePtr==myWe )
+                    continue;
+                
                 if (wePtr)
                 {
@@ -374 +381 @@
                     while (parent)
                     {
-                        if (this->targetMask_.isExcluded(parent->getIdentifier()))
+                        if (this->targetMask_.isExcluded(parent->getIdentifier()) || parent==myWe)
                         {
                             parent = parent->getParent();
@@ -574 +581 @@
         }
     }
-                
-
-        
+        
+
+