mirror of https://github.com/mosra/magnum.git
Vladimír Vondruš
13 years ago
15 changed files with 9 additions and 385 deletions
@ -1,105 +0,0 @@ |
|||||||
#ifndef Magnum_Math_Point2D_h |
|
||||||
#define Magnum_Math_Point2D_h |
|
||||||
/*
|
|
||||||
Copyright © 2010, 2011, 2012 Vladimír Vondruš <mosra@centrum.cz> |
|
||||||
|
|
||||||
This file is part of Magnum. |
|
||||||
|
|
||||||
Magnum is free software: you can redistribute it and/or modify |
|
||||||
it under the terms of the GNU Lesser General Public License version 3 |
|
||||||
only, as published by the Free Software Foundation. |
|
||||||
|
|
||||||
Magnum is distributed in the hope that it will be useful, |
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||||
GNU Lesser General Public License version 3 for more details. |
|
||||||
*/ |
|
||||||
|
|
||||||
/** @file
|
|
||||||
* @brief Class Magnum::Math::Point2D |
|
||||||
*/ |
|
||||||
|
|
||||||
#include "Vector3.h" |
|
||||||
|
|
||||||
namespace Magnum { namespace Math { |
|
||||||
|
|
||||||
/**
|
|
||||||
@brief Two-dimensional homogeneous coordinates |
|
||||||
@tparam T Data type |
|
||||||
|
|
||||||
Same as Vector3, except that constructors have default value for Z component |
|
||||||
set to one. See also @ref matrix-vector for brief introduction. |
|
||||||
@see Magnum::Point2D, Point3D |
|
||||||
@configurationvalueref{Magnum::Math::Point2D} |
|
||||||
*/ |
|
||||||
template<class T> class Point2D: public Vector3<T> { |
|
||||||
public: |
|
||||||
/**
|
|
||||||
* @brief Default constructor |
|
||||||
* |
|
||||||
* @f[ |
|
||||||
* \boldsymbol p = (0, 0, 1)^T |
|
||||||
* @f] |
|
||||||
*/ |
|
||||||
inline constexpr /*implicit*/ Point2D(): Vector3<T>(T(0), T(0), T(1)) {} |
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Constructor |
|
||||||
* |
|
||||||
* @f[ |
|
||||||
* \boldsymbol p = (x, y, z)^T |
|
||||||
* @f] |
|
||||||
*/ |
|
||||||
inline constexpr /*implicit*/ Point2D(T x, T y, T z = T(1)): Vector3<T>(x, y, z) {} |
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Constructor |
|
||||||
* |
|
||||||
* @f[ |
|
||||||
* \boldsymbol p = (v_x, v_y, z)^T |
|
||||||
* @f] |
|
||||||
*/ |
|
||||||
inline constexpr /*implicit*/ Point2D(const Vector2<T>& xy, T z): Vector3<T>(xy, z) {} |
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Construct 2D point from 2D vector |
|
||||||
* |
|
||||||
* @f[ |
|
||||||
* \boldsymbol p = (v_x, v_y, 1)^T |
|
||||||
* @f] |
|
||||||
*/ |
|
||||||
inline constexpr explicit Point2D(const Vector2<T>& xy): Vector3<T>(xy, T(1)) {} |
|
||||||
|
|
||||||
/** @copydoc Vector::Vector(const Vector<size, U>&) */ |
|
||||||
template<class U> inline constexpr explicit Point2D(const Vector<3, U>& other): Vector3<T>(other) {} |
|
||||||
|
|
||||||
/** @brief Copy constructor */ |
|
||||||
inline constexpr Point2D(const Vector<3, T>& other): Vector3<T>(other) {} |
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Vector part of the point |
|
||||||
* |
|
||||||
* Equivalent to calling xy(). Useful for seamless 2D/3D integration. |
|
||||||
* @see Point3D::vector() |
|
||||||
*/ |
|
||||||
inline Vector2<T>& vector() { return Vector3<T>::xy(); } |
|
||||||
inline constexpr Vector2<T> vector() const { return Vector3<T>::xy(); } /**< @overload */ |
|
||||||
|
|
||||||
MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(Point2D, 3) |
|
||||||
}; |
|
||||||
|
|
||||||
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Point2D, 3) |
|
||||||
|
|
||||||
/** @debugoperator{Magnum::Math::Point2D} */ |
|
||||||
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Point2D<T>& value) { |
|
||||||
return debug << static_cast<const Vector<3, T>&>(value); |
|
||||||
} |
|
||||||
|
|
||||||
}} |
|
||||||
|
|
||||||
namespace Corrade { namespace Utility { |
|
||||||
/** @configurationvalue{Magnum::Math::Point2D} */ |
|
||||||
template<class T> struct ConfigurationValue<Magnum::Math::Point2D<T>>: public ConfigurationValue<Magnum::Math::Vector<3, T>> {}; |
|
||||||
}} |
|
||||||
|
|
||||||
#endif |
|
||||||
@ -1,105 +0,0 @@ |
|||||||
#ifndef Magnum_Math_Point3D_h |
|
||||||
#define Magnum_Math_Point3D_h |
|
||||||
/*
|
|
||||||
Copyright © 2010, 2011, 2012 Vladimír Vondruš <mosra@centrum.cz> |
|
||||||
|
|
||||||
This file is part of Magnum. |
|
||||||
|
|
||||||
Magnum is free software: you can redistribute it and/or modify |
|
||||||
it under the terms of the GNU Lesser General Public License version 3 |
|
||||||
only, as published by the Free Software Foundation. |
|
||||||
|
|
||||||
Magnum is distributed in the hope that it will be useful, |
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||||
GNU Lesser General Public License version 3 for more details. |
|
||||||
*/ |
|
||||||
|
|
||||||
/** @file
|
|
||||||
* @brief Class Magnum::Math::Point3D |
|
||||||
*/ |
|
||||||
|
|
||||||
#include "Vector4.h" |
|
||||||
|
|
||||||
namespace Magnum { namespace Math { |
|
||||||
|
|
||||||
/**
|
|
||||||
@brief Three-dimensional homogeneous coordinates |
|
||||||
@tparam T Data type |
|
||||||
|
|
||||||
Same as Vector4, except that constructors have default value for W component |
|
||||||
set to one. See also @ref matrix-vector for brief introduction. |
|
||||||
@see Magnum::Point3D, Point2D |
|
||||||
@configurationvalueref{Magnum::Math::Point3D} |
|
||||||
*/ |
|
||||||
template<class T> class Point3D: public Vector4<T> { |
|
||||||
public: |
|
||||||
/**
|
|
||||||
* @brief Default constructor |
|
||||||
* |
|
||||||
* @f[ |
|
||||||
* \boldsymbol p = (0, 0, 0, 1)^T |
|
||||||
* @f] |
|
||||||
*/ |
|
||||||
inline constexpr /*implicit*/ Point3D(): Vector4<T>(T(0), T(0), T(0), T(1)) {} |
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Constructor |
|
||||||
* |
|
||||||
* @f[ |
|
||||||
* \boldsymbol p = (x, y, z, w)^T |
|
||||||
* @f] |
|
||||||
*/ |
|
||||||
inline constexpr /*implicit*/ Point3D(T x, T y, T z, T w = T(1)): Vector4<T>(x, y, z, w) {} |
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Constructor |
|
||||||
* |
|
||||||
* @f[ |
|
||||||
* \boldsymbol p = (v_x, v_y, v_z, w)^T |
|
||||||
* @f] |
|
||||||
*/ |
|
||||||
inline constexpr /*implicit*/ Point3D(const Vector3<T>& xyz, T w): Vector4<T>(xyz, w) {} |
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Construct 3D point from 3D vector |
|
||||||
* |
|
||||||
* @f[ |
|
||||||
* \boldsymbol p = (v_x, v_y, v_z, 1)^T |
|
||||||
* @f] |
|
||||||
*/ |
|
||||||
inline constexpr explicit Point3D(const Vector3<T>& xyz): Vector4<T>(xyz, T(1)) {} |
|
||||||
|
|
||||||
/** @copydoc Vector::Vector(const Vector<size, U>&) */ |
|
||||||
template<class U> inline constexpr explicit Point3D(const Vector<4, U>& other): Vector4<T>(other) {} |
|
||||||
|
|
||||||
/** @brief Copy constructor */ |
|
||||||
inline constexpr Point3D(const Vector<4, T>& other): Vector4<T>(other) {} |
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Vector part of the point |
|
||||||
* |
|
||||||
* Equivalent to calling xyz(). Useful for seamless 2D/3D integration. |
|
||||||
* @see Point2D::vector() |
|
||||||
*/ |
|
||||||
inline Vector3<T>& vector() { return Vector4<T>::xyz(); } |
|
||||||
inline constexpr Vector3<T> vector() const { return Vector4<T>::xyz(); } /**< @overload */ |
|
||||||
|
|
||||||
MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(Point3D, 4) |
|
||||||
}; |
|
||||||
|
|
||||||
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Point3D, 4) |
|
||||||
|
|
||||||
/** @debugoperator{Magnum::Math::Point3D} */ |
|
||||||
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Point3D<T>& value) { |
|
||||||
return debug << static_cast<const Vector<4, T>&>(value); |
|
||||||
} |
|
||||||
|
|
||||||
}} |
|
||||||
|
|
||||||
namespace Corrade { namespace Utility { |
|
||||||
/** @configurationvalue{Magnum::Math::Point3D} */ |
|
||||||
template<class T> struct ConfigurationValue<Magnum::Math::Point3D<T>>: public ConfigurationValue<Magnum::Math::Vector<4, T>> {}; |
|
||||||
}} |
|
||||||
|
|
||||||
#endif |
|
||||||
@ -1,66 +0,0 @@ |
|||||||
/*
|
|
||||||
Copyright © 2010, 2011, 2012 Vladimír Vondruš <mosra@centrum.cz> |
|
||||||
|
|
||||||
This file is part of Magnum. |
|
||||||
|
|
||||||
Magnum is free software: you can redistribute it and/or modify |
|
||||||
it under the terms of the GNU Lesser General Public License version 3 |
|
||||||
only, as published by the Free Software Foundation. |
|
||||||
|
|
||||||
Magnum is distributed in the hope that it will be useful, |
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||||
GNU Lesser General Public License version 3 for more details. |
|
||||||
*/ |
|
||||||
|
|
||||||
#include <sstream> |
|
||||||
#include <TestSuite/Tester.h> |
|
||||||
#include <Utility/Configuration.h> |
|
||||||
|
|
||||||
#include "Math/Point2D.h" |
|
||||||
|
|
||||||
namespace Magnum { namespace Math { namespace Test { |
|
||||||
|
|
||||||
class Point2DTest: public Corrade::TestSuite::Tester { |
|
||||||
public: |
|
||||||
Point2DTest(); |
|
||||||
|
|
||||||
void construct(); |
|
||||||
void debug(); |
|
||||||
void configuration(); |
|
||||||
}; |
|
||||||
|
|
||||||
typedef Math::Point2D<float> Point2D; |
|
||||||
|
|
||||||
Point2DTest::Point2DTest() { |
|
||||||
addTests(&Point2DTest::construct, |
|
||||||
&Point2DTest::debug, |
|
||||||
&Point2DTest::configuration); |
|
||||||
} |
|
||||||
|
|
||||||
void Point2DTest::construct() { |
|
||||||
CORRADE_COMPARE(Point2D(), (Vector<3, float>(0.0f, 0.0f, 1.0f))); |
|
||||||
CORRADE_COMPARE(Point2D(1, 2), (Vector<3, float>(1.0f, 2.0f, 1.0f))); |
|
||||||
CORRADE_COMPARE(Point2D(Vector<2, float>(1.0f, 2.0f), 3), (Vector<3, float>(1.0f, 2.0f, 3.0f))); |
|
||||||
} |
|
||||||
|
|
||||||
void Point2DTest::debug() { |
|
||||||
std::ostringstream o; |
|
||||||
Debug(&o) << Point2D(0.5f, 15.0f, 1.0f); |
|
||||||
CORRADE_COMPARE(o.str(), "Vector(0.5, 15, 1)\n"); |
|
||||||
} |
|
||||||
|
|
||||||
void Point2DTest::configuration() { |
|
||||||
Corrade::Utility::Configuration c; |
|
||||||
|
|
||||||
Point2D vec(3.0f, 3.125f, 9.55f); |
|
||||||
std::string value("3 3.125 9.55"); |
|
||||||
|
|
||||||
c.setValue("point", vec); |
|
||||||
CORRADE_COMPARE(c.value("point"), value); |
|
||||||
CORRADE_COMPARE(c.value<Point2D>("point"), vec); |
|
||||||
} |
|
||||||
|
|
||||||
}}} |
|
||||||
|
|
||||||
CORRADE_TEST_MAIN(Magnum::Math::Test::Point2DTest) |
|
||||||
@ -1,66 +0,0 @@ |
|||||||
/*
|
|
||||||
Copyright © 2010, 2011, 2012 Vladimír Vondruš <mosra@centrum.cz> |
|
||||||
|
|
||||||
This file is part of Magnum. |
|
||||||
|
|
||||||
Magnum is free software: you can redistribute it and/or modify |
|
||||||
it under the terms of the GNU Lesser General Public License version 3 |
|
||||||
only, as published by the Free Software Foundation. |
|
||||||
|
|
||||||
Magnum is distributed in the hope that it will be useful, |
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||||
GNU Lesser General Public License version 3 for more details. |
|
||||||
*/ |
|
||||||
|
|
||||||
#include <sstream> |
|
||||||
#include <TestSuite/Tester.h> |
|
||||||
#include <Utility/Configuration.h> |
|
||||||
|
|
||||||
#include "Math/Point3D.h" |
|
||||||
|
|
||||||
namespace Magnum { namespace Math { namespace Test { |
|
||||||
|
|
||||||
class Point3DTest: public Corrade::TestSuite::Tester { |
|
||||||
public: |
|
||||||
Point3DTest(); |
|
||||||
|
|
||||||
void construct(); |
|
||||||
void debug(); |
|
||||||
void configuration(); |
|
||||||
}; |
|
||||||
|
|
||||||
typedef Math::Point3D<float> Point3D; |
|
||||||
|
|
||||||
Point3DTest::Point3DTest() { |
|
||||||
addTests(&Point3DTest::construct, |
|
||||||
&Point3DTest::debug, |
|
||||||
&Point3DTest::configuration); |
|
||||||
} |
|
||||||
|
|
||||||
void Point3DTest::construct() { |
|
||||||
CORRADE_COMPARE(Point3D(), Point3D(0.0f, 0.0f, 0.0f, 1.0f)); |
|
||||||
CORRADE_COMPARE(Point3D(1, 2, 3, 4), (Vector<4, float>(1.0f, 2.0f, 3.0f, 4.0f))); |
|
||||||
CORRADE_COMPARE(Point3D(Vector<3, float>(1.0f, 2.0f, 3.0f), 4), (Vector<4, float>(1.0f, 2.0f, 3.0f, 4.0f))); |
|
||||||
} |
|
||||||
|
|
||||||
void Point3DTest::debug() { |
|
||||||
std::ostringstream o; |
|
||||||
Debug(&o) << Point3D(0.5f, 15.0f, 1.0f, 1.0f); |
|
||||||
CORRADE_COMPARE(o.str(), "Vector(0.5, 15, 1, 1)\n"); |
|
||||||
} |
|
||||||
|
|
||||||
void Point3DTest::configuration() { |
|
||||||
Corrade::Utility::Configuration c; |
|
||||||
|
|
||||||
Point3D vec(3.0f, 3.125f, 9.0f, 9.55f); |
|
||||||
std::string value("3 3.125 9 9.55"); |
|
||||||
|
|
||||||
c.setValue("point", vec); |
|
||||||
CORRADE_COMPARE(c.value("point"), value); |
|
||||||
CORRADE_COMPARE(c.value<Point3D>("point"), vec); |
|
||||||
} |
|
||||||
|
|
||||||
}}} |
|
||||||
|
|
||||||
CORRADE_TEST_MAIN(Magnum::Math::Test::Point3DTest) |
|
||||||
Loading…
Reference in new issue