From 64681fa1e455e4507e240ec4e0bea145938309b3 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 15 Jul 2013 09:21:47 -0700 Subject: [PATCH] CR feedback --- libraries/voxels/src/AABox.cpp | 16 ++++++++++++++++ libraries/voxels/src/AABox.h | 8 ++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/libraries/voxels/src/AABox.cpp b/libraries/voxels/src/AABox.cpp index dc9deb21db..6a9dd68082 100644 --- a/libraries/voxels/src/AABox.cpp +++ b/libraries/voxels/src/AABox.cpp @@ -13,6 +13,22 @@ #include "AABox.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) { _corner = _corner * scale; diff --git a/libraries/voxels/src/AABox.h b/libraries/voxels/src/AABox.h index 5a9970f2c1..7bb203aaf4 100644 --- a/libraries/voxels/src/AABox.h +++ b/libraries/voxels/src/AABox.h @@ -41,10 +41,10 @@ class AABox public: - AABox(const glm::vec3& corner, float size) : _corner(corner), _size(size, size, size), _topFarLeft(_corner + _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, const glm::vec3& size) : _corner(corner), _size(size), _topFarLeft(_corner + _size){}; - AABox() : _corner(0,0,0), _size(0,0,0), _topFarLeft(0,0,0){}; + AABox(const glm::vec3& corner, float size); + AABox(const glm::vec3& corner, float x, float y, float z); + AABox(const glm::vec3& corner, const glm::vec3& size); + AABox(); ~AABox() {}; void setBox(const glm::vec3& corner, float x, float y, float z) { setBox(corner,glm::vec3(x,y,z)); };