diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index d10ad66741..e27704fc30 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -439,16 +439,16 @@ Menu::Menu() : SLOT(trueColorize())); addCheckableActionToQMenuAndActionHash(renderDebugMenu, - MenuOption::CullSharedFaces, - Qt::CTRL | Qt::SHIFT | Qt::Key_C, - false, + MenuOption::CullSharedFaces, + Qt::CTRL | Qt::SHIFT | Qt::Key_C, + false, appInstance->getVoxels(), SLOT(cullSharedFaces())); addCheckableActionToQMenuAndActionHash(renderDebugMenu, - MenuOption::ShowCulledSharedFaces, - Qt::CTRL | Qt::SHIFT | Qt::Key_X, - false, + MenuOption::ShowCulledSharedFaces, + Qt::CTRL | Qt::SHIFT | Qt::Key_X, + false, appInstance->getVoxels(), SLOT(showCulledSharedFaces())); diff --git a/libraries/octree/src/OctreeElement.h b/libraries/octree/src/OctreeElement.h index 9e5c62c0c3..1785307696 100644 --- a/libraries/octree/src/OctreeElement.h +++ b/libraries/octree/src/OctreeElement.h @@ -199,18 +199,18 @@ public: CHILD_UNKNOWN = -1 }; - struct HalfSpace { - enum { + struct HalfSpace { + enum { None = 0x00, - Bottom = 0x01, - Top = 0x02, - Right = 0x04, - Left = 0x08, - Near = 0x10, - Far = 0x20, - All = 0x3f, - }; - }; + Bottom = 0x01, + Top = 0x02, + Right = 0x04, + Left = 0x08, + Near = 0x10, + Far = 0x20, + All = 0x3f, + }; + }; OctreeElement* getOrCreateChildElementAt(float x, float y, float z, float s); diff --git a/libraries/voxels/src/VoxelTreeElement.cpp b/libraries/voxels/src/VoxelTreeElement.cpp index 0a577417ec..4470c47b5e 100644 --- a/libraries/voxels/src/VoxelTreeElement.cpp +++ b/libraries/voxels/src/VoxelTreeElement.cpp @@ -14,10 +14,10 @@ #include "VoxelTree.h" VoxelTreeElement::VoxelTreeElement(unsigned char* octalCode) : - OctreeElement(), - _primitiveIndex(0), - _exteriorOcclusions(OctreeElement::HalfSpace::All), - _interiorOcclusions(OctreeElement::HalfSpace::None) + OctreeElement(), + _primitiveIndex(0), + _exteriorOcclusions(OctreeElement::HalfSpace::All), + _interiorOcclusions(OctreeElement::HalfSpace::None) { init(octalCode); }; diff --git a/libraries/voxels/src/VoxelTreeElement.h b/libraries/voxels/src/VoxelTreeElement.h index a3c112fcde..15ee5c7c76 100644 --- a/libraries/voxels/src/VoxelTreeElement.h +++ b/libraries/voxels/src/VoxelTreeElement.h @@ -71,10 +71,10 @@ public: void setDensity(float density) { _density = density; } float getDensity() const { return _density; } - void setInteriorOcclusions(unsigned char interiorExclusions); - void setExteriorOcclusions(unsigned char exteriorOcclusions); - unsigned char getExteriorOcclusions() const; - unsigned char getInteriorOcclusions() const; + void setInteriorOcclusions(unsigned char interiorExclusions); + void setExteriorOcclusions(unsigned char exteriorOcclusions); + unsigned char getExteriorOcclusions() const; + unsigned char getInteriorOcclusions() const; // type safe versions of OctreeElement methods VoxelTreeElement* getChildAtIndex(int childIndex) { return (VoxelTreeElement*)OctreeElement::getChildAtIndex(childIndex); } @@ -98,31 +98,31 @@ protected: nodeColor _currentColor; /// Client only, false color of this voxel, 4 bytes private: - int _primitiveIndex; - unsigned char _exteriorOcclusions; /// exterior shared partition boundaries that are completely occupied - unsigned char _interiorOcclusions; /// interior shared partition boundaries with siblings + int _primitiveIndex; ///< Unique identifier given by PrimitiveRenderer + unsigned char _exteriorOcclusions; ///< Exterior shared partition boundaries that are completely occupied + unsigned char _interiorOcclusions; ///< Interior shared partition boundaries with siblings }; inline void VoxelTreeElement::setExteriorOcclusions(unsigned char exteriorOcclusions) { - if (_exteriorOcclusions != exteriorOcclusions) { - _exteriorOcclusions = exteriorOcclusions; - setDirtyBit(); - } + if (_exteriorOcclusions != exteriorOcclusions) { + _exteriorOcclusions = exteriorOcclusions; + setDirtyBit(); + } } inline void VoxelTreeElement::setInteriorOcclusions(unsigned char interiorOcclusions) { - if (_interiorOcclusions != interiorOcclusions) { - _interiorOcclusions = interiorOcclusions; - setDirtyBit(); - } + if (_interiorOcclusions != interiorOcclusions) { + _interiorOcclusions = interiorOcclusions; + setDirtyBit(); + } } inline unsigned char VoxelTreeElement::getInteriorOcclusions() const { - return _interiorOcclusions; + return _interiorOcclusions; } inline unsigned char VoxelTreeElement::getExteriorOcclusions() const { - return _exteriorOcclusions; + return _exteriorOcclusions; } #endif /* defined(__hifi__VoxelTreeElement__) */