Browse Source

Removed constexpr from non-constexpr constructors.

Physics::AbstractShape can not be constructed using constant expression
because it has virtual destructor.
pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
6762d3adcd
  1. 2
      src/Physics/AxisAlignedBox.h
  2. 2
      src/Physics/Box.h
  3. 2
      src/Physics/Capsule.h
  4. 2
      src/Physics/LineSegment.h
  5. 2
      src/Physics/Plane.h
  6. 2
      src/Physics/Point.h
  7. 2
      src/Physics/ShapeGroup.h
  8. 2
      src/Physics/Sphere.h

2
src/Physics/AxisAlignedBox.h

@ -27,7 +27,7 @@ namespace Magnum { namespace Physics {
class PHYSICS_EXPORT AxisAlignedBox: public AbstractShape { class PHYSICS_EXPORT AxisAlignedBox: public AbstractShape {
public: public:
/** @brief Constructor */ /** @brief Constructor */
inline constexpr AxisAlignedBox(const Vector3& position, const Vector3& size): _position(position), _transformedPosition(position), _size(size), _transformedSize(size) {} inline AxisAlignedBox(const Vector3& position, const Vector3& size): _position(position), _transformedPosition(position), _size(size), _transformedSize(size) {}
void applyTransformation(const Matrix4& transformation); void applyTransformation(const Matrix4& transformation);

2
src/Physics/Box.h

@ -27,7 +27,7 @@ namespace Magnum { namespace Physics {
class Box: public AbstractShape { class Box: public AbstractShape {
public: public:
/** @brief Constructor */ /** @brief Constructor */
inline constexpr Box(const Matrix4& transformation): _transformation(transformation), _transformedTransformation(transformation) {} inline Box(const Matrix4& transformation): _transformation(transformation), _transformedTransformation(transformation) {}
inline void applyTransformation(const Matrix4& transformation) { inline void applyTransformation(const Matrix4& transformation) {
_transformedTransformation = transformation*_transformation; _transformedTransformation = transformation*_transformation;

2
src/Physics/Capsule.h

@ -34,7 +34,7 @@ applying transformation, the scale factor is averaged from all axes.
class PHYSICS_EXPORT Capsule: public AbstractShape { class PHYSICS_EXPORT Capsule: public AbstractShape {
public: public:
/** @brief Constructor */ /** @brief Constructor */
inline constexpr Capsule(const Vector3& a, const Vector3& b, float radius): _a(a), _transformedA(a), _b(b), _transformedB(b), _radius(radius), _transformedRadius(radius) {} inline Capsule(const Vector3& a, const Vector3& b, float radius): _a(a), _transformedA(a), _b(b), _transformedB(b), _radius(radius), _transformedRadius(radius) {}
void applyTransformation(const Matrix4& transformation); void applyTransformation(const Matrix4& transformation);

2
src/Physics/LineSegment.h

@ -27,7 +27,7 @@ namespace Magnum { namespace Physics {
class LineSegment: public Line { class LineSegment: public Line {
public: public:
/** @brief Constructor */ /** @brief Constructor */
LineSegment(const Vector3& a, const Vector3& b): Line(a, b) {} inline LineSegment(const Vector3& a, const Vector3& b): Line(a, b) {}
protected: protected:
inline Type type() const { return Type::LineSegment; } inline Type type() const { return Type::LineSegment; }

2
src/Physics/Plane.h

@ -30,7 +30,7 @@ namespace Magnum { namespace Physics {
class PHYSICS_EXPORT Plane: public AbstractShape { class PHYSICS_EXPORT Plane: public AbstractShape {
public: public:
/** @brief Constructor */ /** @brief Constructor */
inline constexpr Plane(const Vector3& position, const Vector3& normal): _position(position), _transformedPosition(position), _normal(normal), _transformedNormal(normal) {} inline Plane(const Vector3& position, const Vector3& normal): _position(position), _transformedPosition(position), _normal(normal), _transformedNormal(normal) {}
void applyTransformation(const Matrix4& transformation); void applyTransformation(const Matrix4& transformation);

2
src/Physics/Point.h

@ -27,7 +27,7 @@ namespace Magnum { namespace Physics {
class Point: public AbstractShape { class Point: public AbstractShape {
public: public:
/** @brief Constructor */ /** @brief Constructor */
inline constexpr Point(const Vector3& position): _position(position), _transformedPosition(position) {} inline Point(const Vector3& position): _position(position), _transformedPosition(position) {}
inline void applyTransformation(const Matrix4& transformation) { inline void applyTransformation(const Matrix4& transformation) {
_transformedPosition = (transformation*Vector4(_position)).xyz(); _transformedPosition = (transformation*Vector4(_position)).xyz();

2
src/Physics/ShapeGroup.h

@ -95,7 +95,7 @@ class PHYSICS_EXPORT ShapeGroup: public AbstractShape {
virtual Type type() const { return Type::ShapeGroup; } virtual Type type() const { return Type::ShapeGroup; }
private: private:
inline constexpr ShapeGroup(int operation, AbstractShape* a, AbstractShape* b): operation(operation), a(a), b(b) {} inline ShapeGroup(int operation, AbstractShape* a, AbstractShape* b): operation(operation), a(a), b(b) {}
int operation; int operation;
AbstractShape* a; AbstractShape* a;

2
src/Physics/Sphere.h

@ -35,7 +35,7 @@ applying transformation, the scale factor is averaged from all axes.
class PHYSICS_EXPORT Sphere: public AbstractShape { class PHYSICS_EXPORT Sphere: public AbstractShape {
public: public:
/** @brief Constructor */ /** @brief Constructor */
inline constexpr Sphere(const Vector3& position, float radius): _position(position), _transformedPosition(position), _radius(radius), _transformedRadius(radius) {} inline Sphere(const Vector3& position, float radius): _position(position), _transformedPosition(position), _radius(radius), _transformedRadius(radius) {}
void applyTransformation(const Matrix4& transformation); void applyTransformation(const Matrix4& transformation);

Loading…
Cancel
Save