Fixed coding standard and build error

This commit is contained in:
barnold1953 2014-06-05 10:34:06 -07:00
parent 84cd200617
commit 4e699c0f84

View file

@ -19,7 +19,7 @@ class QOpenGLFramebufferObject;
class ApplicationOverlay { class ApplicationOverlay {
public: public:
static enum UITYPES { HEMISPHERE, SEMICIRCLE, CURVED_SEMICIRCLE }; enum UIType { HEMISPHERE, SEMICIRCLE, CURVED_SEMICIRCLE };
ApplicationOverlay(); ApplicationOverlay();
~ApplicationOverlay(); ~ApplicationOverlay();
@ -34,7 +34,7 @@ public:
// Setters // Setters
void setOculusAngle(float oculusAngle) { _oculusAngle = oculusAngle; } void setOculusAngle(float oculusAngle) { _oculusAngle = oculusAngle; }
void setUiType(UITYPES uiType) { _uiType = uiType; } void setUIType(UIType uiType) { _uiType = uiType; }
private: private:
// Interleaved vertex data // Interleaved vertex data
@ -51,7 +51,7 @@ private:
float _trailingAudioLoudness; float _trailingAudioLoudness;
float _oculusAngle; float _oculusAngle;
float _distance; float _distance;
int _uiType; UIType _uiType;
}; };
#endif // hifi_ApplicationOverlay_h #endif // hifi_ApplicationOverlay_h