DebugTools: added support for 2D spheres into ShapeRenderer.

src/DebugTools/CMakeLists.txt

@@ -33,7 +33,8 @@ set(MagnumDebugTools_SRCS
     Implementation/AbstractShapeRenderer.cpp
     Implementation/AxisAlignedBoxRenderer.cpp
     Implementation/BoxRenderer.cpp
-    Implementation/PointRenderer.cpp)
+    Implementation/PointRenderer.cpp
+    Implementation/SphereRenderer.cpp)
 
 set(MagnumDebugTools_HEADERS
     ForceRenderer.h

src/DebugTools/Implementation/SphereRenderer.cpp

@@ -0,0 +1,53 @@
+/*
+    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 "SphereRenderer.h"
+
+#include "Mesh.h"
+#include "DebugTools/ShapeRenderer.h"
+#include "Physics/Sphere.h"
+#include "Primitives/Circle.h"
+#include "Shaders/FlatShader.h"
+#include "Trade/MeshData2D.h"
+
+namespace Magnum { namespace DebugTools { namespace Implementation {
+
+AbstractSphereRenderer<2>::AbstractSphereRenderer(): AbstractShapeRenderer<2>("sphere2d", "sphere2d-vertices", {}) {
+    if(!mesh) this->createResources(Primitives::Circle::wireframe(40));
+}
+
+template<UnsignedInt dimensions> SphereRenderer<dimensions>::SphereRenderer(Physics::Sphere<dimensions>& sphere): sphere(sphere) {}
+
+template<UnsignedInt dimensions> void SphereRenderer<dimensions>::draw(Resource<ShapeRendererOptions>& options, const typename DimensionTraits<dimensions>::MatrixType& projectionMatrix) {
+    this->shader->setTransformationProjectionMatrix(projectionMatrix*
+        DimensionTraits<dimensions>::MatrixType::translation(sphere.position())*
+        DimensionTraits<dimensions>::MatrixType::scaling(typename DimensionTraits<dimensions>::VectorType(sphere.radius())))
+        ->setColor(options->color())
+        ->use();
+    this->mesh->draw();
+}
+
+template class SphereRenderer<2>;
+
+}}}

src/DebugTools/Implementation/SphereRenderer.h

@@ -0,0 +1,54 @@
+#ifndef Magnum_DebugTools_Implementation_SphereRenderer_h
+#define Magnum_DebugTools_Implementation_SphereRenderer_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 AbstractSphereRenderer;
+
+template<> class AbstractSphereRenderer<2>: public AbstractShapeRenderer<2> {
+    public:
+        AbstractSphereRenderer();
+};
+
+template<UnsignedInt dimensions> class SphereRenderer: public AbstractSphereRenderer<dimensions> {
+    public:
+        SphereRenderer(Physics::Sphere<dimensions>& sphere);
+
+        void draw(Resource<ShapeRendererOptions>& options, const typename DimensionTraits<dimensions>::MatrixType& projectionMatrix) override;
+
+    private:
+        Physics::Sphere<dimensions>& sphere;
+};
+
+}}}
+
+#endif

src/DebugTools/ShapeRenderer.cpp

@@ -31,11 +31,13 @@
 #include "Physics/ObjectShape.h"
 #include "Physics/Point.h"
 #include "Physics/ShapeGroup.h"
+#include "Physics/Sphere.h"
 #include "SceneGraph/AbstractCamera.h"
 
 #include "Implementation/AxisAlignedBoxRenderer.h"
 #include "Implementation/BoxRenderer.h"
 #include "Implementation/PointRenderer.h"
+#include "Implementation/SphereRenderer.h"
 
 namespace Magnum { namespace DebugTools {
 
@@ -58,6 +60,9 @@ template<> void createDebugMesh(ShapeRenderer<2>* renderer, Physics::AbstractSha
             if(group->first()) createDebugMesh(renderer, group->first());
             if(group->second()) createDebugMesh(renderer, group->second());
         } break;
+        case Physics::AbstractShape2D::Type::Sphere:
+            renderer->renderers.push_back(new Implementation::SphereRenderer<2>(*static_cast<Physics::Sphere2D*>(shape)));
+            break;
         default:
             Warning() << "DebugTools::ShapeRenderer2D::createShapeRenderer(): type" << shape->type() << "not implemented";
     }