From 6ae88e22c5d38c4cf8ced14e0bf54282f0c1aa88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 11 Oct 2012 18:54:08 +0200 Subject: [PATCH] Removed forgotten traces of debug draw from ShapedObject. --- src/Physics/ShapedObject.cpp | 3 --- src/Physics/ShapedObjectGroup.h | 41 +-------------------------------- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/src/Physics/ShapedObject.cpp b/src/Physics/ShapedObject.cpp index aee0750a2..fb92ede11 100644 --- a/src/Physics/ShapedObject.cpp +++ b/src/Physics/ShapedObject.cpp @@ -17,9 +17,6 @@ #include -#include "AbstractShaderProgram.h" -#include "Mesh.h" -#include "ResourceManager.h" #include "AbstractShape.h" #include "ShapedObjectGroup.h" diff --git a/src/Physics/ShapedObjectGroup.h b/src/Physics/ShapedObjectGroup.h index 978e54e00..bf1f00f0c 100644 --- a/src/Physics/ShapedObjectGroup.h +++ b/src/Physics/ShapedObjectGroup.h @@ -24,25 +24,10 @@ #include "magnumPhysicsVisibility.h" -namespace Magnum { - -class AbstractShaderProgram; -template class Resource; - -namespace Physics { +namespace Magnum { namespace Physics { template class ShapedObject; -#ifndef DOXYGEN_GENERATING_OUTPUT -namespace Implementation { - enum class DebugMode { - None, - Wireframe, - SolidWireframe - }; -} -#endif - /** @brief Group of shaped objects @@ -55,21 +40,6 @@ template class PHYSICS_EXPORT ShapedObjectGroup { friend class ShapedObject; public: - #ifdef DOXYGEN_GENERATING_OUTPUT - /** - * @brief Debug mode - * - * @see setDebugMode() - */ - enum class DebugMode { - None, /**< @brief Nothing is rendered */ - Wireframe, /**< @brief Wireframe of the shape is rendered */ - SolidWireframe /**< @brief Solid with wireframe is rendered */ - }; - #else - typedef Implementation::DebugMode DebugMode; - #endif - /** * @brief Destructor * @@ -79,12 +49,6 @@ template class PHYSICS_EXPORT ShapedObjectGroup { for(auto i: objects) delete i; } - /** @brief Debug mode */ - inline DebugMode debugMode() const { return _debugMode; } - - /** @brief Set debug mode */ - inline void setDebugMode(DebugMode mode) { _debugMode = mode; } - /** * @brief Whether the group is dirty * @return True if any object in the group is dirty, false otherwise. @@ -111,9 +75,6 @@ template class PHYSICS_EXPORT ShapedObjectGroup { void setClean(); private: - Resource& shader(); - - DebugMode _debugMode; std::vector*> objects; bool dirty; };