Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 06:18:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed compiler warnings

Browse source
This commit is contained in:
barnold1953 2014-06-17 10:45:59 -07:00
parent 3052996a9e
commit dc663dedf8
2 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/ui/ApplicationOverlay.cpp
View file

@ -33,8 +33,6 @@ inline float min(float a, float b) {
ApplicationOverlay::ApplicationOverlay() :
_framebufferObject(NULL),
_oculusAngle(65.0f * RADIANS_PER_DEGREE),
_distance(0.5f),
_textureFov(DEFAULT_OCULUS_UI_ANGULAR_SIZE * RADIANS_PER_DEGREE),
_crosshairTexture(0),
_alpha(1.0f),
@ -70,7 +68,6 @@ void ApplicationOverlay::renderOverlay(bool renderToTexture) {
MyAvatar* myAvatar = application->getAvatar();
//Handle fadeing and deactivation/activation of UI
printf("%f\n", _alpha);
if (_active) {
_alpha += FADE_SPEED;
if (_alpha > 1.0f) {
@ -213,7 +210,6 @@ void ApplicationOverlay::displayOverlayTextureOculus(Camera& whichCamera) {
Application* application = Application::getInstance();
QGLWidget* glWidget = application->getGLWidget();
MyAvatar* myAvatar = application->getAvatar();
const glm::vec3& viewMatrixTranslation = application->getViewMatrixTranslation();
@ -282,9 +278,6 @@ void ApplicationOverlay::displayOverlayTextureOculus(Camera& whichCamera) {
//Renders optional pointers
void ApplicationOverlay::renderPointers() {
Application* application = Application::getInstance();
// Render a crosshair over the mouse when in Oculus
int mouseX = application->getMouseX();
int mouseY = application->getMouseY();
//lazily load crosshair texture
if (_crosshairTexture == 0) {

2
interface/src/ui/ApplicationOverlay.h
View file

@ -57,8 +57,6 @@ private:
QOpenGLFramebufferObject* _framebufferObject;
float _trailingAudioLoudness;
float _oculusAngle;
float _distance;
float _textureFov;
// 0 = Mouse, 1 = Left Controller, 2 = Right Controller
bool _reticleActive[3];