Changeset 3262

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

Files:

• core/CommandLine.cc (modified) (1 diff)
• core/Executor.cc (modified) (1 diff)
• core/Executor.h (modified) (2 diffs)
• orxonox/objects/worldentities/Backlight.cc (modified) (2 diffs)
• orxonox/objects/worldentities/Camera.cc (modified) (2 diffs)
• orxonox/objects/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• orxonox/overlays/console/InGameConsole.cc (modified) (2 diffs)
• util/Math.h (modified) (1 diff)

code/branches/core4/src/core/CommandLine.cc

@@ -29 +29 @@
 #include "CommandLine.h"
 
+#include <algorithm>
 #include <sstream>
 #include <boost/filesystem.hpp>

code/branches/core4/src/core/Executor.cc

@@ -99 +99 @@
 
             // assign all given arguments to the multitypes
-            for (unsigned int i = 0; i < min(tokens.size(), (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++)
+            for (unsigned int i = 0; i < std::min(tokens.size(), (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++)
                 param[i] = tokens[i];
 
             // fill the remaining multitypes with default values
-            for (unsigned int i = tokens.size(); i < min(paramCount, (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++)
+            for (unsigned int i = tokens.size(); i < std::min(paramCount, (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++)
                 param[i] = this->defaultValue_[i];
 
             // evaluate the param types through the functor
-            for (unsigned int i = 0; i < min(paramCount, (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++)
+            for (unsigned int i = 0; i < std::min(paramCount, (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++)
                 this->functor_->evaluateParam(i, param[i]);
 

code/branches/core4/src/core/Executor.h

@@ -32 +32 @@
 
 #include "CorePrereqs.h"
+
+#include <algorithm>
+#include <string>
 
 #include "util/Debug.h"
@@ -101 +104 @@
             COUT(5) << tokens[i]; \
         } \
-        COUT(5) << ") and " << max((int)paramCount - (int)tokens.size(), 0) << " default values ("; \
+        COUT(5) << ") and " << std::max((int)paramCount - (int)tokens.size(), 0) << " default values ("; \
         for (unsigned int i = tokens.size(); i < paramCount; i++) \
         { \

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_);
     }
 

code/branches/core4/src/orxonox/overlays/console/InGameConsole.cc

@@ -30 +30 @@
 #include "InGameConsole.h"
 
+#include <algorithm>
 #include <string>
 #include <OgreOverlay.h>
@@ -425 +426 @@
 
         if (LINES > 0)
-            this->maxCharsPerLine_ = max((unsigned int)10, (unsigned int) ((float)this->desiredTextWidth_ / CHAR_WIDTH));
+            this->maxCharsPerLine_ = std::max((unsigned int)10, (unsigned int) ((float)this->desiredTextWidth_ / CHAR_WIDTH));
         else
             this->maxCharsPerLine_ = 10;

code/branches/core4/src/util/Math.h

@@ -78 +78 @@
     {
         return (x >= 0) ? 1 : -1;
-    }
-
-    /**
-        @brief Returns the smaller of two values.
-    */
-    template <typename T>
-    inline T min(T a, T b)
-    {
-        return (a <= b) ? a : b;
-    }
-
-    /**
-        @brief Returns the greater of two values.
-    */
-    template <typename T>
-    inline T max(T a, T b)
-    {
-        return (a >= b) ? a : b;
     }