mirror of https://github.com/mosra/magnum.git
Browse Source
I'm going to deprecate the (awfully inefficient) DebugTools::ForceRenderer and ObjectRenderer, and need at least something else to direct the users to. This should suffice.master
Vladimír Vondruš
4 days ago
14 changed files with 412 additions and 19 deletions
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
@ -0,0 +1,107 @@ |
|||||||
|
/*
|
||||||
|
This file is part of Magnum. |
||||||
|
|
||||||
|
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, |
||||||
|
2020, 2021, 2022, 2023, 2024, 2025, 2026 |
||||||
|
Vladimír Vondruš <mosra@centrum.cz> |
||||||
|
|
||||||
|
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 "Arrow.h" |
||||||
|
|
||||||
|
#include "Magnum/Mesh.h" |
||||||
|
#include "Magnum/Math/Vector3.h" |
||||||
|
#include "Magnum/Trade/MeshData.h" |
||||||
|
|
||||||
|
namespace Magnum { namespace Primitives { |
||||||
|
|
||||||
|
namespace { |
||||||
|
|
||||||
|
/* not 8-bit because GPUs (and Vulkan) don't like it nowadays */ |
||||||
|
constexpr UnsignedShort Indices[]{ |
||||||
|
0, 1, |
||||||
|
1, 2, |
||||||
|
1, 3 |
||||||
|
}; |
||||||
|
constexpr Trade::MeshAttributeData Attributes2D[]{ |
||||||
|
Trade::MeshAttributeData{Trade::MeshAttribute::Position, |
||||||
|
VertexFormat::Vector2, 0, 4, sizeof(Vector2)}, |
||||||
|
}; |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
Trade::MeshData arrow2D(const Vector2& a, const Vector2& b) { |
||||||
|
Containers::Array<char> vertexData{NoInit, sizeof(Vector2)*4}; |
||||||
|
auto positions = Containers::arrayCast<Vector2>(vertexData); |
||||||
|
|
||||||
|
/* Line */ |
||||||
|
positions[0] = a; |
||||||
|
positions[1] = b; |
||||||
|
|
||||||
|
/* Arrowhead */ |
||||||
|
const Vector2 direction = (b - a).resized(0.1f); |
||||||
|
const Vector2 perpendicular = direction.perpendicular(); |
||||||
|
positions[2] = b - direction - perpendicular; |
||||||
|
positions[3] = b - direction + perpendicular; |
||||||
|
|
||||||
|
return Trade::MeshData{MeshPrimitive::Lines, |
||||||
|
Trade::DataFlag::Global, Indices, Trade::MeshIndexData{Indices}, |
||||||
|
Utility::move(vertexData), Trade::meshAttributeDataNonOwningArray(Attributes2D)}; |
||||||
|
} |
||||||
|
|
||||||
|
namespace { |
||||||
|
|
||||||
|
constexpr Trade::MeshAttributeData Attributes3D[]{ |
||||||
|
Trade::MeshAttributeData{Trade::MeshAttribute::Position, |
||||||
|
VertexFormat::Vector3, 0, 4, sizeof(Vector3)}, |
||||||
|
}; |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
Trade::MeshData arrow3D(const Vector3& a, const Vector3& b, const Vector3& tangent) { |
||||||
|
Containers::Array<char> vertexData{NoInit, sizeof(Vector3)*4}; |
||||||
|
auto positions = Containers::arrayCast<Vector3>(vertexData); |
||||||
|
|
||||||
|
/* Line */ |
||||||
|
positions[0] = a; |
||||||
|
positions[1] = b; |
||||||
|
|
||||||
|
/* Arrowhead. The perpendicular sign is flipped compared to the 2D version
|
||||||
|
to have vertex positions match the 2D version in the default |
||||||
|
orientation. */ |
||||||
|
const Vector3 direction = (b - a).resized(0.1f); |
||||||
|
const Vector3 perpendicular = Math::cross(direction, tangent).resized(0.1f); |
||||||
|
positions[2] = b - direction + perpendicular; |
||||||
|
positions[3] = b - direction - perpendicular; |
||||||
|
|
||||||
|
return Trade::MeshData{MeshPrimitive::Lines, |
||||||
|
Trade::DataFlag::Global, Indices, Trade::MeshIndexData{Indices}, |
||||||
|
Utility::move(vertexData), Trade::meshAttributeDataNonOwningArray(Attributes3D)}; |
||||||
|
} |
||||||
|
|
||||||
|
Trade::MeshData arrow2D() { |
||||||
|
return arrow2D({0.0f, 0.0f}, {1.0f, 0.0f}); |
||||||
|
} |
||||||
|
|
||||||
|
Trade::MeshData arrow3D() { |
||||||
|
return arrow3D({0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 0.0f}); |
||||||
|
} |
||||||
|
|
||||||
|
}} |
||||||
@ -0,0 +1,103 @@ |
|||||||
|
#ifndef Magnum_Primitives_Arrow_h |
||||||
|
#define Magnum_Primitives_Arrow_h |
||||||
|
/*
|
||||||
|
This file is part of Magnum. |
||||||
|
|
||||||
|
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, |
||||||
|
2020, 2021, 2022, 2023, 2024, 2025, 2026 |
||||||
|
Vladimír Vondruš <mosra@centrum.cz> |
||||||
|
|
||||||
|
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 Function @ref Magnum::Primitives::arrow2D(), @ref Magnum::Primitives::arrow3D() |
||||||
|
* @m_since_latest |
||||||
|
*/ |
||||||
|
|
||||||
|
#include "Magnum/Magnum.h" |
||||||
|
#include "Magnum/Math/Vector3.h" |
||||||
|
#include "Magnum/Primitives/visibility.h" |
||||||
|
#include "Magnum/Trade/Trade.h" |
||||||
|
|
||||||
|
namespace Magnum { namespace Primitives { |
||||||
|
|
||||||
|
/**
|
||||||
|
@brief 2D arrow |
||||||
|
@m_since_latest |
||||||
|
|
||||||
|
Indexed @ref MeshPrimitive::Lines with @ref VertexFormat::Vector2 positions |
||||||
|
going from @p a to @p b and @ref MeshIndexType::UnsignedShort indices. The |
||||||
|
arrowhead has a constant size independent of the length. The returned instance |
||||||
|
references @ref Trade::DataFlag::Global index data --- pass the mesh through |
||||||
|
@ref MeshTools::copy() to get a mutable copy, if needed. |
||||||
|
|
||||||
|
@image html primitives-arrow2d.png width=256px |
||||||
|
|
||||||
|
@see @ref arrow2D(), @ref arrow3D(const Vector3&, const Vector3&, const Vector3&), |
||||||
|
@ref line2D(const Vector2&, const Vector2&), @ref axis2D(), |
||||||
|
@ref crosshair2D() |
||||||
|
*/ |
||||||
|
MAGNUM_PRIMITIVES_EXPORT Trade::MeshData arrow2D(const Vector2& a, const Vector2& b); |
||||||
|
|
||||||
|
/**
|
||||||
|
@brief 2D arrow in an identity transformation |
||||||
|
@m_since_latest |
||||||
|
|
||||||
|
Unit-size arrow in direction of positive X axis. Equivalent to calling |
||||||
|
@ref arrow2D(const Vector2&, const Vector2&) as |
||||||
|
|
||||||
|
@snippet Primitives.cpp arrow2D-identity |
||||||
|
*/ |
||||||
|
MAGNUM_PRIMITIVES_EXPORT Trade::MeshData arrow2D(); |
||||||
|
|
||||||
|
/**
|
||||||
|
@brief 3D arrow |
||||||
|
@m_since_latest |
||||||
|
|
||||||
|
Indexed @ref MeshPrimitive::Lines with @ref VertexFormat::Vector3 positions |
||||||
|
going from @p a to @p b and @ref MeshIndexType::UnsignedShort indices. The |
||||||
|
arrowhead has a constant size independent of the length. The @p tangent |
||||||
|
argument can be used to adjust orientation of the arrowhead, which is by |
||||||
|
default aligned with the XY plane. The returned instance references |
||||||
|
@ref Trade::DataFlag::Global index data --- pass the mesh through |
||||||
|
@ref MeshTools::copy() to get a mutable copy, if needed. |
||||||
|
|
||||||
|
@image html primitives-arrow3d.png width=256px |
||||||
|
|
||||||
|
@see @ref arrow3D(), @ref arrow2D(const Vector2&, const Vector2&), |
||||||
|
@ref line3D(const Vector3&, const Vector3&), @ref axis3D(), |
||||||
|
@ref crosshair3D() |
||||||
|
*/ |
||||||
|
MAGNUM_PRIMITIVES_EXPORT Trade::MeshData arrow3D(const Vector3& a, const Vector3& b, const Vector3& tangent = Vector3::zAxis()); |
||||||
|
|
||||||
|
/**
|
||||||
|
@brief 3D arrow in an identity transformation |
||||||
|
@m_since_latest |
||||||
|
|
||||||
|
Unit-size arrow in direction of positive X axis. Equivalent to calling |
||||||
|
@ref arrow3D(const Vector3&, const Vector3&, const Vector3&) as |
||||||
|
|
||||||
|
@snippet Primitives.cpp arrow3D-identity |
||||||
|
*/ |
||||||
|
MAGNUM_PRIMITIVES_EXPORT Trade::MeshData arrow3D(); |
||||||
|
|
||||||
|
}} |
||||||
|
|
||||||
|
#endif |
||||||
@ -0,0 +1,134 @@ |
|||||||
|
/*
|
||||||
|
This file is part of Magnum. |
||||||
|
|
||||||
|
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, |
||||||
|
2020, 2021, 2022, 2023, 2024, 2025, 2026 |
||||||
|
Vladimír Vondruš <mosra@centrum.cz> |
||||||
|
|
||||||
|
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 <Corrade/TestSuite/Tester.h> |
||||||
|
#include <Corrade/TestSuite/Compare/Container.h> |
||||||
|
|
||||||
|
#include "Magnum/Mesh.h" |
||||||
|
#include "Magnum/Math/Vector3.h" |
||||||
|
#include "Magnum/MeshTools/Transform.h" |
||||||
|
#include "Magnum/Primitives/Arrow.h" |
||||||
|
#include "Magnum/Trade/MeshData.h" |
||||||
|
|
||||||
|
namespace Magnum { namespace Primitives { namespace Test { namespace { |
||||||
|
|
||||||
|
struct ArrowTest: TestSuite::Tester { |
||||||
|
explicit ArrowTest(); |
||||||
|
|
||||||
|
void twoDimensions(); |
||||||
|
void twoDimensionsTransformed(); |
||||||
|
void threeDimensions(); |
||||||
|
void threeDimensionsTransformed(); |
||||||
|
void threeDimensionsTangent(); |
||||||
|
}; |
||||||
|
|
||||||
|
ArrowTest::ArrowTest() { |
||||||
|
addTests({&ArrowTest::twoDimensions, |
||||||
|
&ArrowTest::twoDimensionsTransformed, |
||||||
|
&ArrowTest::threeDimensions, |
||||||
|
&ArrowTest::threeDimensionsTransformed, |
||||||
|
&ArrowTest::threeDimensionsTangent}); |
||||||
|
} |
||||||
|
|
||||||
|
using namespace Math::Literals; |
||||||
|
|
||||||
|
void ArrowTest::twoDimensions() { |
||||||
|
Trade::MeshData mesh = Primitives::arrow2D(); |
||||||
|
CORRADE_COMPARE(mesh.primitive(), MeshPrimitive::Lines); |
||||||
|
CORRADE_VERIFY(mesh.isIndexed()); |
||||||
|
CORRADE_COMPARE_AS(mesh.indices<UnsignedShort>(), Containers::arrayView<UnsignedShort>({ |
||||||
|
0, 1, |
||||||
|
1, 2, |
||||||
|
1, 3 |
||||||
|
}), TestSuite::Compare::Container); |
||||||
|
CORRADE_COMPARE(mesh.attributeCount(), 1); |
||||||
|
CORRADE_COMPARE_AS(mesh.attribute<Vector2>(Trade::MeshAttribute::Position), Containers::arrayView<Vector2>({ |
||||||
|
{0.0f, 0.0f}, |
||||||
|
{1.0f, 0.0f}, |
||||||
|
{0.9f, -0.1f}, |
||||||
|
{0.9f, 0.1f} |
||||||
|
}), TestSuite::Compare::Container); |
||||||
|
} |
||||||
|
|
||||||
|
void ArrowTest::twoDimensionsTransformed() { |
||||||
|
/* The arrowhead should follow line direction, length shouldn't affect the
|
||||||
|
arrowhead size in any way */ |
||||||
|
|
||||||
|
Trade::MeshData mesh = Primitives::arrow2D({5.0f, 20.0f}, {5.0f, 10.0f}); |
||||||
|
CORRADE_COMPARE_AS(mesh.attribute<Vector2>(Trade::MeshAttribute::Position), Containers::arrayView<Vector2>({ |
||||||
|
{5.0f, 20.0f}, |
||||||
|
{5.0f, 10.0f}, |
||||||
|
{4.9f, 10.1f}, |
||||||
|
{5.1f, 10.1f} |
||||||
|
}), TestSuite::Compare::Container); |
||||||
|
} |
||||||
|
|
||||||
|
void ArrowTest::threeDimensions() { |
||||||
|
Trade::MeshData mesh = Primitives::arrow3D(); |
||||||
|
CORRADE_COMPARE(mesh.primitive(), MeshPrimitive::Lines); |
||||||
|
CORRADE_VERIFY(mesh.isIndexed()); |
||||||
|
CORRADE_COMPARE_AS(mesh.indices<UnsignedShort>(), Containers::arrayView<UnsignedShort>({ |
||||||
|
0, 1, |
||||||
|
1, 2, |
||||||
|
1, 3 |
||||||
|
}), TestSuite::Compare::Container); |
||||||
|
CORRADE_COMPARE(mesh.attributeCount(), 1); |
||||||
|
CORRADE_COMPARE_AS(mesh.attribute<Vector3>(Trade::MeshAttribute::Position), Containers::arrayView<Vector3>({ |
||||||
|
{0.0f, 0.0f, 0.0f}, |
||||||
|
{1.0f, 0.0f, 0.0f}, |
||||||
|
{0.9f, -0.1f, 0.0f}, |
||||||
|
{0.9f, 0.1f, 0.0f} |
||||||
|
}), TestSuite::Compare::Container); |
||||||
|
} |
||||||
|
|
||||||
|
void ArrowTest::threeDimensionsTransformed() { |
||||||
|
/* The arrowhead should follow line direction, length shouldn't affect the
|
||||||
|
arrowhead size in any way */ |
||||||
|
|
||||||
|
Trade::MeshData mesh = Primitives::arrow3D({5.0f, 20.0f, 3.0f}, {5.0f, 10.0f, 3.0f}); |
||||||
|
CORRADE_COMPARE_AS(mesh.attribute<Vector3>(Trade::MeshAttribute::Position), Containers::arrayView<Vector3>({ |
||||||
|
{5.0f, 20.0f, 3.0f}, |
||||||
|
{5.0f, 10.0f, 3.0f}, |
||||||
|
{4.9f, 10.1f, 3.0f}, |
||||||
|
{5.1f, 10.1f, 3.0f} |
||||||
|
}), TestSuite::Compare::Container); |
||||||
|
} |
||||||
|
|
||||||
|
void ArrowTest::threeDimensionsTangent() { |
||||||
|
/* Arrow on a -Z plane with a X tangent should be the same as the default
|
||||||
|
one rotated by 90° around Y */ |
||||||
|
|
||||||
|
Trade::MeshData mesh = Primitives::arrow3D({}, {0.0f, 0.0f, -1.0f}, {1.0f, 0.0f, 0.0f}); |
||||||
|
Trade::MeshData rotated = MeshTools::transform3D(Primitives::arrow3D(), Matrix4::rotationY(90.0_degf)); |
||||||
|
CORRADE_COMPARE_AS( |
||||||
|
mesh.attribute<Vector3>(Trade::MeshAttribute::Position), |
||||||
|
rotated.attribute<Vector3>(Trade::MeshAttribute::Position), |
||||||
|
TestSuite::Compare::Container); |
||||||
|
} |
||||||
|
|
||||||
|
}}}} |
||||||
|
|
||||||
|
CORRADE_TEST_MAIN(Magnum::Primitives::Test::ArrowTest) |
||||||
Loading…
Reference in new issue