Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 04:58:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for style conformance: tabs to spaces

Browse source
This commit is contained in:
matsukaze 2014-02-07 22:52:08 -05:00
parent f15ddff7e0
commit ab0b7bba00
4 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Menu.cpp
View file

@ -439,16 +439,16 @@ Menu::Menu() :
SLOT(trueColorize())); SLOT(trueColorize()));
addCheckableActionToQMenuAndActionHash(renderDebugMenu, addCheckableActionToQMenuAndActionHash(renderDebugMenu,
MenuOption::CullSharedFaces, MenuOption::CullSharedFaces,
Qt::CTRL | Qt::SHIFT | Qt::Key_C, Qt::CTRL | Qt::SHIFT | Qt::Key_C,
false, false,
appInstance->getVoxels(), appInstance->getVoxels(),
SLOT(cullSharedFaces())); SLOT(cullSharedFaces()));
addCheckableActionToQMenuAndActionHash(renderDebugMenu, addCheckableActionToQMenuAndActionHash(renderDebugMenu,
MenuOption::ShowCulledSharedFaces, MenuOption::ShowCulledSharedFaces,
Qt::CTRL | Qt::SHIFT | Qt::Key_X, Qt::CTRL | Qt::SHIFT | Qt::Key_X,
false, false,
appInstance->getVoxels(), appInstance->getVoxels(),
SLOT(showCulledSharedFaces())); SLOT(showCulledSharedFaces()));

22
libraries/octree/src/OctreeElement.h
View file

@ -199,18 +199,18 @@ public:
CHILD_UNKNOWN = -1 CHILD_UNKNOWN = -1
}; };
struct HalfSpace { struct HalfSpace {
enum { enum {
None = 0x00, None = 0x00,
Bottom = 0x01, Bottom = 0x01,
Top = 0x02, Top = 0x02,
Right = 0x04, Right = 0x04,
Left = 0x08, Left = 0x08,
Near = 0x10, Near = 0x10,
Far = 0x20, Far = 0x20,
All = 0x3f, All = 0x3f,
}; };
}; };
OctreeElement* getOrCreateChildElementAt(float x, float y, float z, float s); OctreeElement* getOrCreateChildElementAt(float x, float y, float z, float s);

8
libraries/voxels/src/VoxelTreeElement.cpp
View file

@ -14,10 +14,10 @@
#include "VoxelTree.h" #include "VoxelTree.h"
VoxelTreeElement::VoxelTreeElement(unsigned char* octalCode) : VoxelTreeElement::VoxelTreeElement(unsigned char* octalCode) :
OctreeElement(), OctreeElement(),
_primitiveIndex(0), _primitiveIndex(0),
_exteriorOcclusions(OctreeElement::HalfSpace::All), _exteriorOcclusions(OctreeElement::HalfSpace::All),
_interiorOcclusions(OctreeElement::HalfSpace::None) _interiorOcclusions(OctreeElement::HalfSpace::None)
{ {
init(octalCode); init(octalCode);
}; };

34
libraries/voxels/src/VoxelTreeElement.h
View file

@ -71,10 +71,10 @@ public:
void setDensity(float density) { _density = density; } void setDensity(float density) { _density = density; }
float getDensity() const { return _density; } float getDensity() const { return _density; }
void setInteriorOcclusions(unsigned char interiorExclusions); void setInteriorOcclusions(unsigned char interiorExclusions);
void setExteriorOcclusions(unsigned char exteriorOcclusions); void setExteriorOcclusions(unsigned char exteriorOcclusions);
unsigned char getExteriorOcclusions() const; unsigned char getExteriorOcclusions() const;
unsigned char getInteriorOcclusions() const; unsigned char getInteriorOcclusions() const;
// type safe versions of OctreeElement methods // type safe versions of OctreeElement methods
VoxelTreeElement* getChildAtIndex(int childIndex) { return (VoxelTreeElement*)OctreeElement::getChildAtIndex(childIndex); } 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 nodeColor _currentColor; /// Client only, false color of this voxel, 4 bytes
private: private:
int _primitiveIndex; int _primitiveIndex; ///< Unique identifier given by PrimitiveRenderer
unsigned char _exteriorOcclusions; /// exterior shared partition boundaries that are completely occupied unsigned char _exteriorOcclusions; ///< Exterior shared partition boundaries that are completely occupied
unsigned char _interiorOcclusions; /// interior shared partition boundaries with siblings unsigned char _interiorOcclusions; ///< Interior shared partition boundaries with siblings
}; };
inline void VoxelTreeElement::setExteriorOcclusions(unsigned char exteriorOcclusions) { inline void VoxelTreeElement::setExteriorOcclusions(unsigned char exteriorOcclusions) {
if (_exteriorOcclusions != exteriorOcclusions) { if (_exteriorOcclusions != exteriorOcclusions) {
_exteriorOcclusions = exteriorOcclusions; _exteriorOcclusions = exteriorOcclusions;
setDirtyBit(); setDirtyBit();
} }
} }
inline void VoxelTreeElement::setInteriorOcclusions(unsigned char interiorOcclusions) { inline void VoxelTreeElement::setInteriorOcclusions(unsigned char interiorOcclusions) {
if (_interiorOcclusions != interiorOcclusions) { if (_interiorOcclusions != interiorOcclusions) {
_interiorOcclusions = interiorOcclusions; _interiorOcclusions = interiorOcclusions;
setDirtyBit(); setDirtyBit();
} }
} }
inline unsigned char VoxelTreeElement::getInteriorOcclusions() const { inline unsigned char VoxelTreeElement::getInteriorOcclusions() const {
return _interiorOcclusions; return _interiorOcclusions;
} }
inline unsigned char VoxelTreeElement::getExteriorOcclusions() const { inline unsigned char VoxelTreeElement::getExteriorOcclusions() const {
return _exteriorOcclusions; return _exteriorOcclusions;
} }
#endif /* defined(__hifi__VoxelTreeElement__) */ #endif /* defined(__hifi__VoxelTreeElement__) */