CR feedback

This commit is contained in:
ZappoMan 2013-07-15 09:21:47 -07:00
parent 133bbd81fe
commit 64681fa1e4
2 changed files with 20 additions and 4 deletions

View file

@ -13,6 +13,22 @@
#include "AABox.h" #include "AABox.h"
#include "GeometryUtil.h" #include "GeometryUtil.h"
AABox::AABox(const glm::vec3& corner, float size) : _corner(corner), _size(size, size, size), _topFarLeft(_corner + _size)
{
};
AABox::AABox(const glm::vec3& corner, float x, float y, float z) : _corner(corner), _size(x, y, z), _topFarLeft(_corner + _size)
{
};
AABox::AABox(const glm::vec3& corner, const glm::vec3& size) : _corner(corner), _size(size), _topFarLeft(_corner + _size)
{
};
AABox::AABox() : _corner(0,0,0), _size(0,0,0), _topFarLeft(0,0,0)
{
};
void AABox::scale(float scale) { void AABox::scale(float scale) {
_corner = _corner * scale; _corner = _corner * scale;

View file

@ -41,10 +41,10 @@ class AABox
public: public:
AABox(const glm::vec3& corner, float size) : _corner(corner), _size(size, size, size), _topFarLeft(_corner + _size){}; AABox(const glm::vec3& corner, float size);
AABox(const glm::vec3& corner, float x, float y, float z) : _corner(corner), _size(x, y, z), _topFarLeft(_corner + _size){}; AABox(const glm::vec3& corner, float x, float y, float z);
AABox(const glm::vec3& corner, const glm::vec3& size) : _corner(corner), _size(size), _topFarLeft(_corner + _size){}; AABox(const glm::vec3& corner, const glm::vec3& size);
AABox() : _corner(0,0,0), _size(0,0,0), _topFarLeft(0,0,0){}; AABox();
~AABox() {}; ~AABox() {};
void setBox(const glm::vec3& corner, float x, float y, float z) { setBox(corner,glm::vec3(x,y,z)); }; void setBox(const glm::vec3& corner, float x, float y, float z) { setBox(corner,glm::vec3(x,y,z)); };