mirror of https://github.com/mosra/magnum.git
Vladimír Vondruš
13 years ago
38 changed files with 678 additions and 77 deletions
@ -0,0 +1,68 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013 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 "LineSegmentRenderer.h" |
||||
|
||||
#include "Mesh.h" |
||||
#include "DebugTools/ShapeRenderer.h" |
||||
#include "Physics/Line.h" |
||||
#include "Primitives/Line.h" |
||||
#include "Shaders/FlatShader.h" |
||||
#include "Trade/MeshData2D.h" |
||||
#include "Trade/MeshData3D.h" |
||||
|
||||
#include "DebugTools/Implementation/LineSegmentRendererTransformation.h" |
||||
|
||||
namespace Magnum { namespace DebugTools { namespace Implementation { |
||||
|
||||
namespace { |
||||
template<UnsignedInt dimensions> ResourceKey meshKey(); |
||||
template<> inline ResourceKey meshKey<2>() { return ResourceKey("line2d"); } |
||||
template<> inline ResourceKey meshKey<3>() { return ResourceKey("line3d"); } |
||||
|
||||
template<UnsignedInt dimensions> ResourceKey vertexBufferKey(); |
||||
template<> inline ResourceKey vertexBufferKey<2>() { return ResourceKey("line2d-vertices"); } |
||||
template<> inline ResourceKey vertexBufferKey<3>() { return ResourceKey("line3d-vertices"); } |
||||
|
||||
template<UnsignedInt dimensions> typename MeshData<dimensions>::Type meshData(); |
||||
template<> inline Trade::MeshData2D meshData<2>() { return Primitives::Line2D::wireframe(); } |
||||
template<> inline Trade::MeshData3D meshData<3>() { return Primitives::Line3D::wireframe(); } |
||||
} |
||||
|
||||
template<UnsignedInt dimensions> LineSegmentRenderer<dimensions>::LineSegmentRenderer(Physics::Line<dimensions>& line): AbstractShapeRenderer<dimensions>(meshKey<dimensions>(), vertexBufferKey<dimensions>(), {}), line(line) { |
||||
if(!this->mesh) this->createResources(meshData<dimensions>()); |
||||
} |
||||
|
||||
template<UnsignedInt dimensions> void LineSegmentRenderer<dimensions>::draw(Resource<ShapeRendererOptions>& options, const typename DimensionTraits<dimensions>::MatrixType& projectionMatrix) { |
||||
this->shader->setTransformationProjectionMatrix(projectionMatrix* |
||||
Implementation::lineSegmentRendererTransformation<dimensions>(line.transformedA(), line.transformedB())) |
||||
->setColor(options->color()) |
||||
->use(); |
||||
this->mesh->draw(); |
||||
} |
||||
|
||||
template class LineSegmentRenderer<2>; |
||||
template class LineSegmentRenderer<3>; |
||||
|
||||
}}} |
||||
@ -0,0 +1,47 @@
|
||||
#ifndef Magnum_DebugTools_Implementation_LineSegmentRenderer_h |
||||
#define Magnum_DebugTools_Implementation_LineSegmentRenderer_h |
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013 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 "AbstractShapeRenderer.h" |
||||
|
||||
#include "Physics/Physics.h" |
||||
|
||||
#include "corradeCompatibility.h" |
||||
|
||||
namespace Magnum { namespace DebugTools { namespace Implementation { |
||||
|
||||
template<UnsignedInt dimensions> class LineSegmentRenderer: public AbstractShapeRenderer<dimensions> { |
||||
public: |
||||
LineSegmentRenderer(Physics::Line<dimensions>& line); |
||||
|
||||
void draw(Resource<ShapeRendererOptions>& options, const typename DimensionTraits<dimensions>::MatrixType& projectionMatrix) override; |
||||
|
||||
private: |
||||
Physics::Line<dimensions>& line; |
||||
}; |
||||
|
||||
}}} |
||||
|
||||
#endif |
||||
@ -0,0 +1,39 @@
|
||||
#ifndef Magnum_DebugTools_Implementation_LineSegmentRendererTransformation_h |
||||
#define Magnum_DebugTools_Implementation_LineSegmentRendererTransformation_h |
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013 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 "DimensionTraits.h" |
||||
|
||||
namespace Magnum { namespace DebugTools { namespace Implementation { |
||||
|
||||
template<UnsignedInt dimensions> typename DimensionTraits<dimensions>::MatrixType lineSegmentRendererTransformation(const typename DimensionTraits<dimensions>::VectorType& a, const typename DimensionTraits<dimensions>::VectorType& b) { |
||||
auto transformation = DimensionTraits<dimensions>::MatrixType::translation(a); |
||||
transformation.right() = b - a; |
||||
return transformation; |
||||
} |
||||
|
||||
}}} |
||||
|
||||
#endif |
||||
@ -0,0 +1,67 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013 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 <TestSuite/Tester.h> |
||||
|
||||
#include "Math/Matrix3.h" |
||||
#include "Math/Matrix4.h" |
||||
#include "Magnum.h" |
||||
#include "DebugTools/Implementation/LineSegmentRendererTransformation.h" |
||||
|
||||
namespace Magnum { namespace DebugTools { namespace Test { |
||||
|
||||
class LineSegmentRendererTest: public Corrade::TestSuite::Tester { |
||||
public: |
||||
explicit LineSegmentRendererTest(); |
||||
|
||||
void line2D(); |
||||
void line3D(); |
||||
}; |
||||
|
||||
LineSegmentRendererTest::LineSegmentRendererTest() { |
||||
addTests({&LineSegmentRendererTest::line2D, |
||||
&LineSegmentRendererTest::line3D}); |
||||
} |
||||
|
||||
void LineSegmentRendererTest::line2D() { |
||||
const Vector2 a(-2.0f, 3.0f); |
||||
const Vector2 b(3.4f, -1.5f); |
||||
const Matrix3 matrix = Implementation::lineSegmentRendererTransformation<2>(a, b); |
||||
|
||||
CORRADE_COMPARE(matrix.transformPoint({0.0f, 0.0f}), a); |
||||
CORRADE_COMPARE(matrix.transformPoint({1.0f, 0.0f}), b); |
||||
} |
||||
|
||||
void LineSegmentRendererTest::line3D() { |
||||
const Vector3 a(-2.0f, 3.0f, 1.5f); |
||||
const Vector3 b(3.4f, -1.5f, 0.5f); |
||||
const Matrix4 matrix = Implementation::lineSegmentRendererTransformation<3>(a, b); |
||||
|
||||
CORRADE_COMPARE(matrix.transformPoint({0.0f, 0.0f, 0.0f}), a); |
||||
CORRADE_COMPARE(matrix.transformPoint({1.0f, 0.0f, 0.0f}), b); |
||||
} |
||||
|
||||
}}} |
||||
|
||||
CORRADE_TEST_MAIN(Magnum::DebugTools::Test::LineSegmentRendererTest) |
||||
@ -0,0 +1,45 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013 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 "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<Vector2>{ |
||||
{0.0f, 0.0f}, {1.0f, 0.0f} |
||||
}}, {}); |
||||
} |
||||
|
||||
Trade::MeshData3D Line3D::wireframe() { |
||||
return Trade::MeshData3D(Mesh::Primitive::Lines, nullptr, {new std::vector<Vector3>{ |
||||
{0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 0.0f}, |
||||
}}, {}, {}); |
||||
} |
||||
|
||||
}} |
||||
@ -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š <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 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 |
||||
Loading…
Reference in new issue