Changeset 6387 for code/branches/presentation2/src/orxonox/controllers

Timestamp:

Dec 21, 2009, 1:18:36 PM (14 years ago)

Author:

rgrieder

Message:

Found some non empty new lines.

Location:

code/branches/presentation2/src/orxonox/controllers

Files:

• ArtificialController.cc (modified) (2 diffs)
• ArtificialController.h (modified) (1 diff)
• Controller.h (modified) (1 diff)
• NewHumanController.cc (modified) (4 diffs)

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

@@ -46 +46 @@
         this->bHasTargetPosition_ = false;
         this->targetPosition_ = Vector3::ZERO;
-        
+
         this->target_.setCallback(createFunctor(&ArtificialController::targetDied, this));
     }
@@ -143 +143 @@
         this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getPosition(), hardcoded_projectile_speed, this->target_->getPosition(), this->target_->getVelocity());
         this->bHasTargetPosition_ = (this->targetPosition_ != Vector3::ZERO);
-        
+
         Pawn* pawn = dynamic_cast<Pawn*>(this->getControllableEntity());
         if (pawn)

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

@@ -42 +42 @@
             ArtificialController(BaseObject* creator);
             virtual ~ArtificialController();
-            
+
             void abandonTarget(Pawn* target);
 

code/branches/presentation2/src/orxonox/controllers/Controller.h

@@ -51 +51 @@
 
             virtual inline void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) {};
-            
+
             void setGodMode( bool mode ){ this->bGodMode_ = mode; }
             bool getGodMode(){ return this->bGodMode_; }

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

@@ -140 +140 @@
                 arrowsOverlay1_->setPosition(Vector2(0.5, 0.5));
                 arrowsOverlay1_->hide();
-    
+
                 arrowsOverlay2_ = new OrxonoxOverlay(this);
                 arrowsOverlay2_->setBackgroundMaterial("Orxonox/DirectionArrows2");
@@ -147 +147 @@
                 arrowsOverlay2_->setPosition(Vector2(0.5, 0.5));
                 arrowsOverlay2_->hide();
-    
+
                 arrowsOverlay3_ = new OrxonoxOverlay(this);
                 arrowsOverlay3_->setBackgroundMaterial("Orxonox/DirectionArrows3");
@@ -154 +154 @@
                 arrowsOverlay3_->setPosition(Vector2(0.5, 0.5));
                 arrowsOverlay3_->hide();
-    
+
                 arrowsOverlay4_ = new OrxonoxOverlay(this);
                 arrowsOverlay4_->setBackgroundMaterial("Orxonox/DirectionArrows4");
@@ -502 +502 @@
         {
             hideArrows();
-    
+
             float distance = sqrt(pow(static_cast<float>(this->currentYaw_)/2*-1,2) + pow(static_cast<float>(this->currentPitch_)/2*-1,2));
-    
+
             if (distance > 0.04 && distance <= 0.59 * arrowsSize_ / 2.0 )
             {