diff --git a/src/Primitives/CMakeLists.txt b/src/Primitives/CMakeLists.txt index 6c44f1c81..9675469aa 100644 --- a/src/Primitives/CMakeLists.txt +++ b/src/Primitives/CMakeLists.txt @@ -29,6 +29,7 @@ set(MagnumPrimitives_SRCS Cube.cpp Cylinder.cpp Icosphere.cpp + Line.cpp Plane.cpp Square.cpp UVSphere.cpp) @@ -40,6 +41,7 @@ set(MagnumPrimitives_HEADERS Cube.h Cylinder.h Icosphere.h + Line.h Plane.h Square.h UVSphere.h diff --git a/src/Primitives/Line.cpp b/src/Primitives/Line.cpp new file mode 100644 index 000000000..53926a9f6 --- /dev/null +++ b/src/Primitives/Line.cpp @@ -0,0 +1,45 @@ +/* + This file is part of Magnum. + + Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +#include "Line.h" + +#include "Math/Vector3.h" +#include "Trade/MeshData2D.h" +#include "Trade/MeshData3D.h" + +namespace Magnum { namespace Primitives { + +Trade::MeshData2D Line2D::wireframe() { + return Trade::MeshData2D(Mesh::Primitive::Lines, nullptr, {new std::vector{ + {0.0f, 0.0f}, {1.0f, 0.0f} + }}, {}); +} + +Trade::MeshData3D Line3D::wireframe() { + return Trade::MeshData3D(Mesh::Primitive::Lines, nullptr, {new std::vector{ + {0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 0.0f}, + }}, {}, {}); +} + +}} diff --git a/src/Primitives/Line.h b/src/Primitives/Line.h new file mode 100644 index 000000000..59a0d7a6c --- /dev/null +++ b/src/Primitives/Line.h @@ -0,0 +1,67 @@ +#ifndef Magnum_Primitives_Line_h +#define Magnum_Primitives_Line_h +/* + This file is part of Magnum. + + Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +/** @file + * @brief Class Magnum::Primitives::Line2D, Magnum::Primitives::Line3D + */ + +#include "Trade/Trade.h" + +#include "Primitives/magnumPrimitivesVisibility.h" + +namespace Magnum { namespace Primitives { + +/** +@brief 2D line primitive + +Unit-size line in direction of positive X axis. Non-indexed +@ref Mesh::Primitive "Lines". +*/ +class MAGNUM_PRIMITIVES_EXPORT Line2D { + public: + /** @brief Wireframe line */ + static Trade::MeshData2D wireframe(); + + Line2D() = delete; +}; + +/** +@brief 3D line primitive + +Unit-size line in direction of positive X axis. Non-indexed +@ref Mesh::Primitive "Lines". +*/ +class MAGNUM_PRIMITIVES_EXPORT Line3D { + public: + /** @brief Wireframe line */ + static Trade::MeshData3D wireframe(); + + Line3D() = delete; +}; + +}} + +#endif