Changeset 3262 for code/branches/core4/src/orxonox/objects

Timestamp:

Jul 1, 2009, 10:04:54 AM (15 years ago)

Author:

rgrieder

Message:

Replaced orxonox::min and orxonox::max with std version (which do exactly the same).
The std version are in the <algorithm> header.

Location:

code/branches/core4/src/orxonox/objects/worldentities

Files:

• Backlight.cc (modified) (2 diffs)
• Camera.cc (modified) (2 diffs)
• pawns/Pawn.cc (modified) (2 diffs)

code/branches/core4/src/orxonox/objects/worldentities/Backlight.cc

@@ -29 +29 @@
 #include "Backlight.h"
 
+#include <algorithm>
 #include <OgreRibbonTrail.h>
 #include <OgreSceneManager.h>
@@ -175 +176 @@
     void Backlight::stopturnonoff()
     {
-        this->postprocessingtime_ = max(0.0f, this->lifetime_ - this->turnofftime_);
+        this->postprocessingtime_ = std::max(0.0f, this->lifetime_ - this->turnofftime_);
 
         FadingBillboard::stopturnonoff();

code/branches/core4/src/orxonox/objects/worldentities/Camera.cc

@@ -29 +29 @@
 #include "Camera.h"
 
+#include <algorithm>
 #include <OgreCamera.h>
 #include <OgreSceneManager.h>
@@ -104 +105 @@
         {
             // this stuff here may need some adjustments
-            float coeff = min(1.0f, 15.0f * dt);
+            float coeff = std::min(1.0f, 15.0f * dt);
 
             Vector3 offset = this->getWorldPosition() - this->cameraNode_->_getDerivedPosition();

code/branches/core4/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -28 +28 @@
 
 #include "Pawn.h"
+
+#include <algorithm>
 
 #include "core/CoreIncludes.h"
@@ -152 +154 @@
     void Pawn::setHealth(float health)
     {
-        this->health_ = min(health, this->maxHealth_);
+        this->health_ = std::min(health, this->maxHealth_);
     }