Math: Renamed Math.h to Functions.h

Math.h is reserved for forward declaration header.

src/CMakeLists.txt

@@ -100,7 +100,7 @@ add_library(MagnumObjects OBJECT ${Magnum_SRCS})
 
 # Files shared between main library and math unit test library
 set(MagnumMath_SRCS
-    Math/Math.cpp
+    Math/Functions.cpp
     Math/Quaternion.cpp
     Math/RectangularMatrix.cpp
     Math/Vector.cpp)

src/Color.h

@@ -21,8 +21,8 @@
 
 #include <tuple>
 
+#include "Math/Functions.h"
 #include "Math/MathTypeTraits.h"
-#include "Math/Math.h"
 #include "Math/Vector4.h"
 #include "Magnum.h"
 

src/DefaultFramebuffer.cpp

@@ -19,6 +19,7 @@
 
 #include "Implementation/State.h"
 #include "Implementation/FramebufferState.h"
+#include "Extensions.h"
 
 namespace Magnum {
 

src/Math/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(MagnumMath_HEADERS
     Constants.h
-    Math.h
+    Functions.h
     MathTypeTraits.h
     Matrix.h
     Matrix3.h

src/Math/Functions.cpp

@@ -13,7 +13,7 @@
     GNU Lesser General Public License version 3 for more details.
 */
 
-#include "Math.h"
+#include "Functions.h"
 
 namespace Magnum { namespace Math {
 

src/Math/Functions.h

@@ -1,5 +1,5 @@
-#ifndef Magnum_Math_Math_h
-#define Magnum_Math_Math_h
+#ifndef Magnum_Math_Functions_h
+#define Magnum_Math_Functions_h
 /*
     Copyright © 2010, 2011, 2012 Vladimír Vondruš <mosra@centrum.cz>
 
@@ -23,7 +23,7 @@
 #include "magnumVisibility.h"
 
 /** @file
- * @brief Math utilities
+ * @brief Functions usable with scalar and vector types
  */
 
 namespace Magnum { namespace Math {

src/Math/Geometry/Distance.h

@@ -19,7 +19,7 @@
  * @brief Class Magnum::Math::Geometry::Distance
  */
 
-#include "Math/Math.h"
+#include "Math/Functions.h"
 #include "Math/Matrix.h"
 #include "Math/Vector3.h"
 

src/Math/Quaternion.h

@@ -23,7 +23,7 @@
 #include <Utility/Assert.h>
 #include <Utility/Debug.h>
 
-#include "Math/Math.h"
+#include "Math/Functions.h"
 #include "Math/MathTypeTraits.h"
 #include "Math/Matrix.h"
 #include "Math/Vector3.h"

src/Math/Test/CMakeLists.txt

@@ -1,5 +1,5 @@
 corrade_add_test(MathConstantsTest ConstantsTest.cpp)
-corrade_add_test(MathTest MathTest.cpp LIBRARIES MagnumMathTestLib)
+corrade_add_test(MathFunctionsTest FunctionsTest.cpp LIBRARIES MagnumMathTestLib)
 corrade_add_test(MathMathTypeTraitsTest MathTypeTraitsTest.cpp)
 
 corrade_add_test(MathRectangularMatrixTest RectangularMatrixTest.cpp LIBRARIES MagnumMathTestLib)

src/Math/Test/ConstantsTest.cpp

@@ -16,7 +16,7 @@
 #include <TestSuite/Tester.h>
 
 #include "Math/Constants.h"
-#include "Math/Math.h"
+#include "Math/Functions.h"
 
 namespace Magnum { namespace Math { namespace Test {
 

src/Math/Test/FunctionsTest.cpp

@@ -15,13 +15,13 @@
 
 #include <TestSuite/Tester.h>
 
-#include "Math/Math.h"
+#include "Math/Functions.h"
 
 namespace Magnum { namespace Math { namespace Test {
 
-class MathTest: public Corrade::TestSuite::Tester {
+class FunctionsTest: public Corrade::TestSuite::Tester {
     public:
-        MathTest();
+        FunctionsTest();
 
         void normalize();
         void denormalize();
@@ -31,16 +31,16 @@ class MathTest: public Corrade::TestSuite::Tester {
         void log2();
 };
 
-MathTest::MathTest() {
-    addTests(&MathTest::normalize,
-             &MathTest::denormalize,
-             &MathTest::clamp,
-             &MathTest::pow,
-             &MathTest::log,
-             &MathTest::log2);
+FunctionsTest::FunctionsTest() {
+    addTests(&FunctionsTest::normalize,
+             &FunctionsTest::denormalize,
+             &FunctionsTest::clamp,
+             &FunctionsTest::pow,
+             &FunctionsTest::log,
+             &FunctionsTest::log2);
 }
 
-void MathTest::normalize() {
+void FunctionsTest::normalize() {
     /* Range for signed and unsigned */
     CORRADE_COMPARE((Math::normalize<float, std::int8_t>(-128)), 0.0f);
     CORRADE_COMPARE((Math::normalize<float, std::int8_t>(127)), 1.0f);
@@ -63,7 +63,7 @@ void MathTest::normalize() {
     CORRADE_COMPARE((Math::normalize<double, std::uint64_t>(std::numeric_limits<std::uint64_t>::max())), 1.0);
 }
 
-void MathTest::denormalize() {
+void FunctionsTest::denormalize() {
     /* Range for signed and unsigned */
     CORRADE_COMPARE(Math::denormalize<std::int8_t>(0.0f), -128);
     CORRADE_COMPARE(Math::denormalize<std::int8_t>(1.0f), 127);
@@ -90,27 +90,27 @@ void MathTest::denormalize() {
 //     }
 }
 
-void MathTest::clamp() {
+void FunctionsTest::clamp() {
     CORRADE_COMPARE(Math::clamp(0.5f, -1.0f, 5.0f), 0.5f);
     CORRADE_COMPARE(Math::clamp(-1.6f, -1.0f, 5.0f), -1.0f);
     CORRADE_COMPARE(Math::clamp(9.5f, -1.0f, 5.0f), 5.0f);
 }
 
-void MathTest::pow() {
+void FunctionsTest::pow() {
     CORRADE_COMPARE(Math::pow<10>(2ul), 1024ul);
     CORRADE_COMPARE(Math::pow<0>(3ul), 1ul);
     CORRADE_COMPARE(Math::pow<2>(2.0f), 4.0f);
 }
 
-void MathTest::log() {
+void FunctionsTest::log() {
     CORRADE_COMPARE(Math::log(2, 256), 8ul);
     CORRADE_COMPARE(Math::log(256, 2), 0ul);
 }
 
-void MathTest::log2() {
+void FunctionsTest::log2() {
     CORRADE_COMPARE(Math::log2(2153), 11);
 }
 
 }}}
 
-CORRADE_TEST_MAIN(Magnum::Math::Test::MathTest)
+CORRADE_TEST_MAIN(Magnum::Math::Test::FunctionsTest)

src/MeshTools/CompressIndices.cpp

@@ -18,7 +18,7 @@
 #include <cstring>
 #include <algorithm>
 
-#include "Math/Math.h"
+#include "Math/Functions.h"
 
 namespace Magnum { namespace MeshTools {
 

src/Physics/Capsule.cpp

@@ -16,7 +16,7 @@
 #include "Capsule.h"
 
 #include "Math/Constants.h"
-#include "Math/Math.h"
+#include "Math/Functions.h"
 #include "Math/Matrix3.h"
 #include "Math/Matrix4.h"
 #include "Math/Geometry/Distance.h"

src/Physics/Sphere.cpp

@@ -16,7 +16,7 @@
 #include "Sphere.h"
 
 #include "Math/Constants.h"
-#include "Math/Math.h"
+#include "Math/Functions.h"
 #include "Math/Matrix3.h"
 #include "Math/Matrix4.h"
 #include "Math/Geometry/Distance.h"