Changeset 8561 for code/branches/presentation/src/orxonox/controllers

Timestamp:

May 24, 2011, 4:44:39 PM (14 years ago)

Author:

dafrick

Message:

Merging dockingsystem2 branch to presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/ArtificialController.cc (modified) (2 diffs)
• src/orxonox/controllers/ArtificialController.h (modified) (1 diff)

code/branches/presentation/src/orxonox/controllers/ArtificialController.cc

@@ -381 +381 @@
             }
         }
+
+        if (distance < 10)
+        {
+            this->positionReached();
+        }
     }
 
@@ -387 +392 @@
         this->moveToPosition(this->targetPosition_);
     }
-
 
     /**

code/branches/presentation/src/orxonox/controllers/ArtificialController.h

@@ -97 +97 @@
             void moveToTargetPosition();
 
+            virtual void positionReached() {}
+
             void removeFromFormation();
             void unregisterSlave();