From 65f10cb99a7ccf077093b07a2da3f6c19ab32aba Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 28 May 2013 16:26:18 -0700 Subject: [PATCH] fix the enum in AABox, fix a warning in Head --- interface/src/Head.cpp | 6 +++--- libraries/voxels/src/AABox.h | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index e0a97db7e1..51d85db5ab 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -61,10 +61,10 @@ Head::Head(Avatar* owningAvatar) : _audioAttack(0.0f), _returnSpringScale(1.0f), _bodyRotation(0.0f, 0.0f, 0.0f), + _renderLookatVectors(false), _mohawkTriangleFan(NULL), - _mohawkColors(NULL), - _renderLookatVectors(false) { - + _mohawkColors(NULL) +{ if (USING_PHYSICAL_MOHAWK) { resetHairPhysics(); } diff --git a/libraries/voxels/src/AABox.h b/libraries/voxels/src/AABox.h index 591704d4a3..f0d8e005aa 100755 --- a/libraries/voxels/src/AABox.h +++ b/libraries/voxels/src/AABox.h @@ -19,10 +19,11 @@ enum BoxFace { MIN_Y_FACE, MAX_Y_FACE, MIN_Z_FACE, - MAX_Z_FACE, - FACE_COUNT + MAX_Z_FACE }; +const int FACE_COUNT = 6; + class AABox {