Changeset 8613 for code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc

Timestamp:

May 26, 2011, 5:23:31 PM (13 years ago)

Author:

dafrick

Message:

Cleanup.

File:

• code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc (modified) (6 diffs)

code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc

@@ -211 +211 @@
         this->checkWhoIsIn();
         this->removeAllBillboards();
-        COUT(4) << "Groesse der Pawn-Liste 'SpaceBoundaries::pawnsIn_': " << (int) pawnsIn_.size() << std::endl;
         
         float distance;
@@ -222 +221 @@
                 distance = this->computeDistance(currentPawn);
                 humanItem = this->isHumanPlayer(currentPawn);
-                COUT(5) << "Distanz:" << distance << std::endl; // message for debugging
-                if(distance > this->warnDistance_ && distance < this->maxDistance_) // Zeige Warnung an!
+                COUT(5) << "Distance:" << distance << std::endl; // message for debugging
+                if(distance > this->warnDistance_ && distance < this->maxDistance_) // Display warning
                 {
                     if(humanItem)
                     {
-                        COUT(5) << "humanItem ist true" << std::endl;
                         this->displayWarning("Attention! You are close to the boundary!");
                     }
@@ -233 +231 @@
                 if(/* humanItem &&*/ abs(this->maxDistance_ - distance) < this->showDistance_ )
                 {
-                    this->displayBoundaries(currentPawn); // Zeige Grenze an!
+                    this->displayBoundaries(currentPawn); // Show the boundary
                 }
                 if(distance > this->maxDistance_ && (this->reaction_ == 1) )
@@ -244 +242 @@
                     currentPawn->removeHealth( (distance - this->maxDistance_) * this->healthDecrease_);
                 }
-                if( (this->reaction_ == 0) && (distance + 100 > this->maxDistance_)) // Annahme: Ein Pawn kann von einem Tick bis zum nächsten nicht mehr als 100 Distanzeinheiten zurücklegen.
+                if( (this->reaction_ == 0) && (distance + 100 > this->maxDistance_)) // Exception: A Pawn can't move more than 100 units per tick.
                 {
                     this->conditionalBounceBack(currentPawn, distance, dt);
@@ -290 +288 @@
         float normalSpeed = item->getVelocity().dotProduct(normal);
         
-        /* Checke, ob das Pawn innerhalb des nächsten Ticks, das erlaubte Gebiet verlassen würde.
-           Falls ja: Spicke es zurück. */
+        /* Check, whether the Pawn would leave the boundary in the next tick, if so send it back. */
         if( this->reaction_ == 0 && currentDistance + normalSpeed * dt > this->maxDistance_ - 10 ) // -10: "security measure"
         {
@@ -314 +311 @@
         item->setVelocity(*velocity * dampingFactor);
         
-        item->setPosition( item->getPosition() - *normal * 10 ); // Setze das SpaceShip noch etwas von der Grenze weg.
+        item->setPosition( item->getPosition() - *normal * 10 ); // Set the position of the Pawn to be well inside the boundary.
     }