Changeset 6388 for code/branches/presentation2/src/orxonox

Timestamp:

Dec 21, 2009, 1:28:10 PM (15 years ago)

Author:

rgrieder

Message:

Found some end of line leftover spaces.

Location:

code/branches/presentation2/src/orxonox

Files:

• controllers/HumanController.h (modified) (1 diff)
• controllers/NewHumanController.cc (modified) (1 diff)
• overlays/OrxonoxOverlay.h (modified) (1 diff)
• pickup/UsableItem.cc (modified) (1 diff)
• sound/AmbientSound.cc (modified) (2 diffs)
• sound/BaseSound.cc (modified) (2 diffs)
• sound/SoundManager.cc (modified) (4 diffs)
• sound/WorldSound.cc (modified) (1 diff)
• worldentities/MovableEntity.h (modified) (1 diff)

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

@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport HumanController 
+    class _OrxonoxExport HumanController
 // tolua_end
         : public Controller, public Tickable

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

@@ -248 +248 @@
                     HumanController::moveFrontBack(Vector2(1, 0));
                 else
-                    HumanController::moveFrontBack(Vector2(this->acceleration_, 0)); 
+                    HumanController::moveFrontBack(Vector2(this->acceleration_, 0));
                 this->accelerating_ = false;
                 //HumanController::moveFrontBack(Vector2(clamp(this->acceleration_ + this->currentAcceleration_, 0.0f, 1.0f), 0));

code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h

@@ -177 +177 @@
         inline OverlayGroup* getOverlayGroup() const
             { return this->group_; }
-        virtual void changedOverlayGroup() 
+        virtual void changedOverlayGroup()
             { this->changedVisibility(); }
 

code/branches/presentation2/src/orxonox/pickup/UsableItem.cc

@@ -41 +41 @@
         @param creator Pointer to the object which created this item.
     */
-    UsableItem::UsableItem(BaseObject* creator) : BaseItem(creator) 
+    UsableItem::UsableItem(BaseObject* creator) : BaseItem(creator)
     {
         RegisterObject(UsableItem);

code/branches/presentation2/src/orxonox/sound/AmbientSound.cc

@@ -118 +118 @@
                 this->setSource(path);
             else
-                COUT(3) << "Sound: " << source << ": Not a valid name! Ambient sound will not change." << std::endl;       
+                COUT(3) << "Sound: " << source << ": Not a valid name! Ambient sound will not change." << std::endl;
         }
     }
@@ -134 +134 @@
         if (this->isActive())
             this->play();
-        else 
+        else
             this->stop();
     }

code/branches/presentation2/src/orxonox/sound/BaseSound.cc

@@ -177 +177 @@
             pitch = pitch > 2 ? 2 : pitch;
             pitch = pitch < 0.5 ? 0.5 : pitch;
-        }        
+        }
         this->pitch_ = pitch;
         if (alIsSource(this->audioSource_))
@@ -224 +224 @@
         if (alIsSource(this->audioSource_)) // already playing or paused
         {
-            // Set new buffer 
+            // Set new buffer
             alSourcei(this->audioSource_, AL_BUFFER, this->soundBuffer_->getBuffer());
             if (ALuint error = alGetError())

code/branches/presentation2/src/orxonox/sound/SoundManager.cc

@@ -254 +254 @@
     }
 
-    float SoundManager::getVolume(SoundType::Value type) 
+    float SoundManager::getVolume(SoundType::Value type)
     {
         if (type < 0 || type > SoundType::Effects)
@@ -261 +261 @@
     }
 
-    float SoundManager::getRealVolume(SoundType::Value type) 
+    float SoundManager::getRealVolume(SoundType::Value type)
     {
         if (type != SoundType::Music && type != SoundType::Effects)
@@ -339 +339 @@
             }
 
-            if (!this->ambientSounds_.empty()) 
+            if (!this->ambientSounds_.empty())
             {
                 this->fadeOut(ambientSounds_.front().first);
@@ -354 +354 @@
             return;
 
-        if (this->ambientSounds_.front().first == oldAmbient) 
+        if (this->ambientSounds_.front().first == oldAmbient)
         {
             this->fadeOut(oldAmbient);

code/branches/presentation2/src/orxonox/sound/WorldSound.cc

@@ -110 +110 @@
     }
 
-    void WorldSound::changedActivity() 
+    void WorldSound::changedActivity()
     {
         SUPER(WorldSound, changedActivity);
         if (this->isActive())
             this->play();
-        else 
+        else
             this->stop();
     }

code/branches/presentation2/src/orxonox/worldentities/MovableEntity.h

@@ -70 +70 @@
 
             inline void setEnableCollisionDamage(bool c)
-            { 
-                this->enableCollisionDamage_ = c; 
+            {
+                this->enableCollisionDamage_ = c;
                 this->enableCollisionCallback();
-            } 
+            }
 
             inline bool getEnableCollisionDamage()