ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Code cleanup.

vectorfields
Vladimír Vondruš 14 years ago
parent
16382c9ba9
commit
d65b2386b2
10 changed files with 21 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/Color.h
  2. 4
      src/Math/Matrix.h
  3. 4
      src/Math/Matrix3.h
  4. 4
      src/Math/Matrix4.h
  5. 4
      src/Math/Point2D.h
  6. 4
      src/Math/Point3D.h
  7. 2
      src/Math/Vector.h
  8. 4
      src/Math/Vector2.h
  9. 4
      src/Math/Vector3.h
  10. 4
      src/Math/Vector4.h

8
src/Color.h
Unescape View File

@ -406,13 +406,13 @@ template<class T> class Color4: public Math::Vector4<T> {
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Color4, 4) MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Color4, 4)
/** @debugoperator{Magnum::Color3} */ /** @debugoperator{Magnum::Color3} */
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Color3<T>& value) { template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Color3<T>& value) {
return debug << static_cast<const Magnum::Math::Vector3<T>&>(value); return debug << static_cast<const Math::Vector3<T>&>(value);
} }
/** @debugoperator{Magnum::Color4} */ /** @debugoperator{Magnum::Color4} */
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Color4<T>& value) { template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Color4<T>& value) {
return debug << static_cast<const Magnum::Math::Vector4<T>&>(value); return debug << static_cast<const Math::Vector4<T>&>(value);
} }
} }

4
src/Math/Matrix.h
Unescape View File

@ -168,8 +168,8 @@ template<size_t size, class T, class U> inline typename std::enable_if<std::is_a
#endif #endif
/** @debugoperator{Magnum::Math::Matrix} */ /** @debugoperator{Magnum::Math::Matrix} */
template<size_t size, class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Matrix<size, T>& value) { template<size_t size, class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Matrix<size, T>& value) {
return debug << static_cast<const Magnum::Math::RectangularMatrix<size, size, T>&>(value); return debug << static_cast<const RectangularMatrix<size, size, T>&>(value);
} }
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT

4
src/Math/Matrix3.h
Unescape View File

@ -152,8 +152,8 @@ template<class T> class Matrix3: public Matrix<3, T> {
}; };
/** @debugoperator{Magnum::Math::Matrix3} */ /** @debugoperator{Magnum::Math::Matrix3} */
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Matrix3<T>& value) { template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Matrix3<T>& value) {
return debug << static_cast<const Magnum::Math::Matrix<3, T>&>(value); return debug << static_cast<const Matrix<3, T>&>(value);
} }
}} }}

4
src/Math/Matrix4.h
Unescape View File

@ -249,8 +249,8 @@ template<class T> class Matrix4: public Matrix<4, T> {
}; };
/** @debugoperator{Magnum::Math::Matrix4} */ /** @debugoperator{Magnum::Math::Matrix4} */
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Matrix4<T>& value) { template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Matrix4<T>& value) {
return debug << static_cast<const Magnum::Math::Matrix<4, T>&>(value); return debug << static_cast<const Matrix<4, T>&>(value);
} }
}} }}

4
src/Math/Point2D.h
Unescape View File

@ -75,8 +75,8 @@ template<class T> class Point2D: public Vector3<T> {
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Point2D, 3) MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Point2D, 3)
/** @debugoperator{Magnum::Math::Point2D} */ /** @debugoperator{Magnum::Math::Point2D} */
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Point2D<T>& value) { template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Point2D<T>& value) {
return debug << static_cast<const Magnum::Math::Vector<3, T>&>(value); return debug << static_cast<const Vector<3, T>&>(value);
} }
}} }}

4
src/Math/Point3D.h
Unescape View File

@ -76,8 +76,8 @@ template<class T> class Point3D: public Vector4<T> {
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Point3D, 4) MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Point3D, 4)
/** @debugoperator{Magnum::Math::Point3D} */ /** @debugoperator{Magnum::Math::Point3D} */
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Point3D<T>& value) { template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Point3D<T>& value) {
return debug << static_cast<const Magnum::Math::Vector<4, T>&>(value); return debug << static_cast<const Vector<4, T>&>(value);
} }
}} }}

2
src/Math/Vector.h
Unescape View File

@ -240,7 +240,7 @@ template<size_t size, class T, class U> inline typename std::enable_if<std::is_a
#endif #endif
/** @debugoperator{Magnum::Math::Vector} */ /** @debugoperator{Magnum::Math::Vector} */
template<size_t size, class T> Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Vector<size, T>& value) { template<size_t size, class T> Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Vector<size, T>& value) {
debug << "Vector("; debug << "Vector(";
debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false); debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false);
for(size_t i = 0; i != size; ++i) { for(size_t i = 0; i != size; ++i) {

4
src/Math/Vector2.h
Unescape View File

@ -95,8 +95,8 @@ template<class T> class Vector2: public Vector<2, T> {
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Vector2, 2) MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Vector2, 2)
/** @debugoperator{Magnum::Math::Vector2} */ /** @debugoperator{Magnum::Math::Vector2} */
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Vector2<T>& value) { template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Vector2<T>& value) {
return debug << static_cast<const Magnum::Math::Vector<2, T>&>(value); return debug << static_cast<const Vector<2, T>&>(value);
} }
}} }}

4
src/Math/Vector3.h
Unescape View File

@ -149,8 +149,8 @@ template<class T> class Vector3: public Vector<3, T> {
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Vector3, 3) MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Vector3, 3)
/** @debugoperator{Magnum::Math::Vector3} */ /** @debugoperator{Magnum::Math::Vector3} */
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Vector3<T>& value) { template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Vector3<T>& value) {
return debug << static_cast<const Magnum::Math::Vector<3, T>&>(value); return debug << static_cast<const Vector<3, T>&>(value);
} }
}} }}

4
src/Math/Vector4.h
Unescape View File

@ -92,8 +92,8 @@ template<class T> class Vector4: public Vector<4, T> {
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Vector4, 4) MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Vector4, 4)
/** @debugoperator{Magnum::Math::Vector4} */ /** @debugoperator{Magnum::Math::Vector4} */
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Vector4<T>& value) { template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Vector4<T>& value) {
return debug << static_cast<const Magnum::Math::Vector<4, T>&>(value); return debug << static_cast<const Vector<4, T>&>(value);
} }
}} }}

Write Preview
Loading…
Cancel
Save