Changeset 8767 for code/trunk/src/modules/objects/SpaceBoundaries.cc

Timestamp:

Jul 20, 2011, 11:27:45 PM (13 years ago)

Author:

dafrick

Message:

Some cleanup…

File:

• code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) (17 diffs)

code/trunk/src/modules/objects/SpaceBoundaries.cc

@@ -58 +58 @@
         {
             this->pawnsIn_.clear();
-        
+
             for( std::vector<BillboardAdministration>::iterator current = this->billboards_.begin(); current != this->billboards_.end(); current++)
             {
@@ -69 +69 @@
         }
     }
-    
+
     void SpaceBoundaries::checkWhoIsIn()
     {
@@ -94 +94 @@
         }
     }
-    
+
     void SpaceBoundaries::positionBillboard(const Vector3& position, float alpha)
     {
@@ -124 +124 @@
         this->billboards_[current].billy->setCommonUpVector(upVector);
     }
-    
+
     void SpaceBoundaries::setBillboardOptions(Billboard *billy)
     {
@@ -135 +135 @@
         }
     }
-    
+
     void SpaceBoundaries::removeAllBillboards()
     {
@@ -144 +144 @@
         }
     }
-    
+
     void SpaceBoundaries::setMaxDistance(float r)
     {
@@ -153 +153 @@
         return this->maxDistance_;
     }
-    
+
     void SpaceBoundaries::setWarnDistance(float r)
     {
@@ -162 +162 @@
         return this->warnDistance_;
     }
-    
+
     void SpaceBoundaries::setShowDistance(float r)
     {
@@ -171 +171 @@
         return this->showDistance_;
     }
-    
+
     void SpaceBoundaries::setHealthDecrease(float amount)
     {
@@ -180 +180 @@
         return this->healthDecrease_;
     }
-    
+
     void SpaceBoundaries::setReaction(int mode)
     {
@@ -200 +200 @@
         XMLPortParam(SpaceBoundaries, "reactionMode", setReaction, getReaction, xmlelement, mode);
     }
-    
+
     void SpaceBoundaries::tick(float dt)
     {
         this->checkWhoIsIn();
         this->removeAllBillboards();
-        
+
         float distance;
         bool humanItem;
@@ -247 +247 @@
         }
     }
-    
+
     float SpaceBoundaries::computeDistance(WorldEntity *item)
     {
@@ -258 +258 @@
         }
     }
-    
+
     void SpaceBoundaries::displayWarning(const std::string warnText)
-    {   
+    {
         // TODO
     }
-    
+
     void SpaceBoundaries::displayBoundaries(Pawn *item, float alpha)
     {
-        
+
         Vector3 direction = item->getPosition() - this->getPosition();
         direction.normalise();
-        
+
         Vector3 boundaryPosition = this->getPosition() + direction * this->maxDistance_;
-        
+
         this->positionBillboard(boundaryPosition, alpha);
     }
-    
+
     void SpaceBoundaries::conditionalBounceBack(Pawn *item, float currentDistance, float dt)
     {
@@ -281 +281 @@
         Vector3 velocity = item->getVelocity();
         float normalSpeed = item->getVelocity().dotProduct(normal);
-        
+
         /* 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"
@@ -292 +292 @@
         }
     }
-    
+
     void SpaceBoundaries::bounceBack(Pawn *item, Vector3 *normal, Vector3 *velocity)
     {
@@ -299 +299 @@
         Vector3 acceleration = item->getAcceleration();
         acceleration = acceleration.reflect(*normal);
-        
+
         item->lookAt( *velocity + this->getPosition() );
-        
+
         item->setAcceleration(acceleration * dampingFactor);
         item->setVelocity(*velocity * dampingFactor);
-        
+
         item->setPosition( item->getPosition() - *normal * 10 ); // Set the position of the Pawn to be well inside the boundary.
     }
-    
+
     bool SpaceBoundaries::isHumanPlayer(Pawn *item)
     {
@@ -319 +319 @@
         return false;
     }
-    
+
 }