Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 14:03:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Switched time query method and fixed horrifying bug

Browse source
This commit is contained in:
barnold1953 2014-06-17 16:38:19 -07:00
parent 6c74650552
commit 7cbb19551a
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,6 @@
#include <QOpenGLFramebufferObject>
#include <PerfStat.h>
#include <SDL_timer.h>
#include "Application.h"
#include "ApplicationOverlay.h"
@ -116,6 +115,7 @@ void ApplicationOverlay::renderOverlay(bool renderToTexture) {
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glEnable(GL_DEPTH_TEST);
glEnable(GL_LIGHTING);
@ -210,6 +210,7 @@ void ApplicationOverlay::displayOverlayTextureOculus(Camera& whichCamera) {
return;
}
Application* application = Application::getInstance();
MyAvatar* myAvatar = application->getAvatar();
@ -333,11 +334,11 @@ void ApplicationOverlay::renderControllerPointers() {
MyAvatar* myAvatar = application->getAvatar();
//Static variables used for storing controller state
static unsigned int pressedTime[2] = { 0, 0 };
static bool isPressed[2] = { false, false };
static bool stateWhenPressed[2] = { false, false };
static bool triggerPressed[2] = { false, false };
static bool bumperPressed[2] = { false, false };
static quint64 pressedTime[3] = { 0, 0, 0 };
static bool isPressed[3] = { false, false, false };
static bool stateWhenPressed[3] = { false, false, false };
static bool triggerPressed[3] = { false, false, false };
static bool bumperPressed[3] = { false, false, false };
const HandData* handData = Application::getInstance()->getAvatar()->getHandData();
@ -363,15 +364,15 @@ void ApplicationOverlay::renderControllerPointers() {
if (isPressed[index] == false) {
//We are now dragging the window
isPressed[index] = true;
//set the pressed time in ms
pressedTime[index] = SDL_GetTicks();
//set the pressed time in us
pressedTime[index] = usecTimestampNow();
stateWhenPressed[index] = _magActive[index];
}
} else if (isPressed[index]) {
isPressed[index] = false;
//If the button has been pressed for less than 250 ms
isPressed[index] = false;
//If the button was only pressed for < 250 ms
//then disable it.
if (SDL_GetTicks() - pressedTime[index] < 250) {
if (usecTimestampNow() - pressedTime[index] < 250000) {
_magActive[index] = !stateWhenPressed[index];
}
}