Browse Source

Physics shape rework #6: removed unneded overload, fixed the original.

pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
22a4ddfbd4
  1. 2
      src/Physics/AbstractShape.cpp
  2. 7
      src/Physics/Shape.h

2
src/Physics/AbstractShape.cpp

@ -52,7 +52,7 @@ template<UnsignedInt dimensions> bool AbstractShape<dimensions>::collides(const
}
template<UnsignedInt dimensions> void AbstractShape<dimensions>::markDirty() {
group()->setDirty();
if(group()) group()->setDirty();
}
#ifndef DOXYGEN_GENERATING_OUTPUT

7
src/Physics/Shape.h

@ -102,9 +102,6 @@ template<class T> class MAGNUM_PHYSICS_EXPORT Shape: public AbstractShape<T::Dim
const T& transformedShape();
protected:
/** Marks also the group as dirty */
void markDirty() override;
/** Applies transformation to associated shape. */
void clean(const typename DimensionTraits<T::Dimensions>::MatrixType& absoluteTransformationMatrix) override;
@ -127,10 +124,6 @@ template<class T> inline const T& Shape<T>::transformedShape() {
return _transformedShape.shape;
}
template<class T> void Shape<T>::markDirty() {
if(this->group()) this->group()->setDirty();
}
template<class T> void Shape<T>::clean(const typename DimensionTraits<T::Dimensions>::MatrixType& absoluteTransformationMatrix) {
Implementation::ShapeHelper<T>::transform(*this, absoluteTransformationMatrix);
}

Loading…
Cancel
Save