From 35659a6d15ef0bc49092e16d4453f8ce6d5199a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 18 Jan 2020 19:40:44 +0100 Subject: [PATCH] DebugTools: port away from MeshDataXD. --- src/Magnum/DebugTools/ObjectRenderer.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Magnum/DebugTools/ObjectRenderer.cpp b/src/Magnum/DebugTools/ObjectRenderer.cpp index 018ff2055..276ffd268 100644 --- a/src/Magnum/DebugTools/ObjectRenderer.cpp +++ b/src/Magnum/DebugTools/ObjectRenderer.cpp @@ -31,8 +31,7 @@ #include "Magnum/Primitives/Axis.h" #include "Magnum/SceneGraph/Camera.h" #include "Magnum/Shaders/VertexColor.h" -#include "Magnum/Trade/MeshData2D.h" -#include "Magnum/Trade/MeshData3D.h" +#include "Magnum/Trade/MeshData.h" namespace Magnum { namespace DebugTools { @@ -43,13 +42,13 @@ template struct Renderer; template<> struct Renderer<2> { static ResourceKey shader() { return {"VertexColorShader2D"}; } static ResourceKey mesh() { return {"object2d"}; } - static Trade::MeshData2D meshData() { return Primitives::axis2D(); } + static Trade::MeshData meshData() { return Primitives::axis2D(); } }; template<> struct Renderer<3> { static ResourceKey shader() { return {"VertexColorShader3D"}; } static ResourceKey mesh() { return {"object3d"}; } - static Trade::MeshData3D meshData() { return Primitives::axis3D(); } + static Trade::MeshData meshData() { return Primitives::axis3D(); } }; }