Browse Source

Removed forgotten traces of debug draw from ShapedObject.

pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
6ae88e22c5
  1. 3
      src/Physics/ShapedObject.cpp
  2. 41
      src/Physics/ShapedObjectGroup.h

3
src/Physics/ShapedObject.cpp

@ -17,9 +17,6 @@
#include <algorithm>
#include "AbstractShaderProgram.h"
#include "Mesh.h"
#include "ResourceManager.h"
#include "AbstractShape.h"
#include "ShapedObjectGroup.h"

41
src/Physics/ShapedObjectGroup.h

@ -24,25 +24,10 @@
#include "magnumPhysicsVisibility.h"
namespace Magnum {
class AbstractShaderProgram;
template<class T, class U> class Resource;
namespace Physics {
namespace Magnum { namespace Physics {
template<std::uint8_t> 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<std::uint8_t dimensions> class PHYSICS_EXPORT ShapedObjectGroup {
friend class ShapedObject<dimensions>;
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<std::uint8_t dimensions> 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<std::uint8_t dimensions> class PHYSICS_EXPORT ShapedObjectGroup {
void setClean();
private:
Resource<AbstractShaderProgram, AbstractShaderProgram>& shader();
DebugMode _debugMode;
std::vector<ShapedObject<dimensions>*> objects;
bool dirty;
};

Loading…
Cancel
Save