Browse Source

Primitives: new axis2D() and axis3D() primitive.

Color-coded XY and XYZ axes, cut out of DebugTools::ObjectRender into a
better reusable piece of code. Using the new vertex color functionality
of mesh data.
pull/195/head
Vladimír Vondruš 9 years ago
parent
commit
bac4d579c2
  1. 109
      src/Magnum/Primitives/Axis.cpp
  2. 55
      src/Magnum/Primitives/Axis.h
  3. 2
      src/Magnum/Primitives/CMakeLists.txt

109
src/Magnum/Primitives/Axis.cpp

@ -0,0 +1,109 @@
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016
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 "Axis.h"
#include "Magnum/Mesh.h"
#include "Magnum/Math/Color.h"
#include "Magnum/Trade/MeshData2D.h"
#include "Magnum/Trade/MeshData3D.h"
namespace Magnum { namespace Primitives {
using namespace Math::Literals;
Trade::MeshData2D axis2D() {
return Trade::MeshData2D{MeshPrimitive::Lines,
{0, 1,
1, 2, /* X axis */
1, 3,
4, 5,
5, 6, /* Y axis */
5, 7},
{{{ 0.0f, 0.0f},
{ 1.0f, 0.0f}, /* X axis */
{ 0.9f, 0.1f},
{ 0.9f, -0.1f},
{ 0.0f, 0.0f},
{ 0.0f, 1.0f}, /* Y axis */
{ 0.1f, 0.9f},
{-0.1f, 0.9f}}}, {},
{{0xff0000_rgbf,
0xff0000_rgbf, /* X axis */
0xff0000_rgbf,
0xff0000_rgbf,
0x00ff00_rgbf,
0x00ff00_rgbf, /* Y axis */
0x00ff00_rgbf,
0x00ff00_rgbf}}};
}
Trade::MeshData3D axis3D() {
return Trade::MeshData3D{MeshPrimitive::Lines,
{0, 1,
1, 2, /* X axis */
1, 3,
4, 5,
5, 6, /* Y axis */
5, 7,
8, 9,
9, 10, /* Z axis */
9, 11},
{{{ 0.0f, 0.0f, 0.0f},
{ 1.0f, 0.0f, 0.0f}, /* X axis */
{ 0.9f, 0.1f, 0.0f},
{ 0.9f, -0.1f, 0.0f},
{ 0.0f, 0.0f, 0.0f},
{ 0.0f, 1.0f, 0.0f}, /* Y axis */
{ 0.1f, 0.9f, 0.0f},
{-0.1f, 0.9f, 0.0f},
{ 0.0f, 0.0f, 0.0f},
{ 0.0f, 0.0f, 1.0f}, /* Z axis */
{ 0.1f, 0.0f, 0.9f},
{-0.1f, 0.0f, 0.9f}}}, {}, {},
{{0xff0000_rgbf,
0xff0000_rgbf, /* X axis */
0xff0000_rgbf,
0xff0000_rgbf,
0x00ff00_rgbf,
0x00ff00_rgbf, /* Y axis */
0x00ff00_rgbf,
0x00ff00_rgbf,
0x0000ff_rgbf,
0x0000ff_rgbf, /* Z axis */
0x0000ff_rgbf,
0x0000ff_rgbf}}};
}
}}

55
src/Magnum/Primitives/Axis.h

@ -0,0 +1,55 @@
#ifndef Primitives_Axis_h
#define Primitives_Axis_h
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016
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::axis2D(), @ref Magnum::Primitives::axis3D()
*/
#include "Magnum/Primitives/visibility.h"
#include "Magnum/Trade/Trade.h"
namespace Magnum { namespace Primitives {
/**
@brief 2D axis
Two color-coded arrows for visualizing orientation (XY is RG). Indexed
@ref MeshPrimitive::Lines with vertex colors.
*/
MAGNUM_PRIMITIVES_EXPORT Trade::MeshData2D axis2D();
/**
@brief 3D axis
Three color-coded arrows for visualizing orientation (XYZ is RGB). Indexed
@ref MeshPrimitive::Lines with vertex colors.
*/
MAGNUM_PRIMITIVES_EXPORT Trade::MeshData3D axis3D();
}}
#endif

2
src/Magnum/Primitives/CMakeLists.txt

@ -24,6 +24,7 @@
#
set(MagnumPrimitives_SRCS
Axis.cpp
Capsule.cpp
Circle.cpp
Crosshair.cpp
@ -39,6 +40,7 @@ set(MagnumPrimitives_SRCS
Implementation/WireframeSpheroid.cpp)
set(MagnumPrimitives_HEADERS
Axis.h
Capsule.h
Circle.h
Crosshair.h

Loading…
Cancel
Save