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

New reticle for sixense and oculus mouse movement

Browse source
This commit is contained in:
barnold1953 2014-06-13 15:03:09 -07:00
parent 230af7f5a7
commit c593117ac5
3 changed files with 35 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/images/sixense-reticle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 26 KiB

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

@ -34,7 +34,10 @@ ApplicationOverlay::ApplicationOverlay() :
_oculusAngle(65.0f * RADIANS_PER_DEGREE), _oculusAngle(65.0f * RADIANS_PER_DEGREE),
_distance(0.5f), _distance(0.5f),
_textureFov(DEFAULT_OCULUS_UI_ANGULAR_SIZE * RADIANS_PER_DEGREE), _textureFov(DEFAULT_OCULUS_UI_ANGULAR_SIZE * RADIANS_PER_DEGREE),
_uiType(HEMISPHERE) { _uiType(HEMISPHERE),
_crosshairTexture(0) {
} }
@ -275,10 +278,22 @@ void ApplicationOverlay::renderPointers() {
int mouseX = application->getMouseX(); int mouseX = application->getMouseX();
int mouseY = application->getMouseY(); int mouseY = application->getMouseY();
//lazily load crosshair texture
if (_crosshairTexture == 0) {
_crosshairTexture = Application::getInstance()->getGLWidget()->bindTexture(QImage(Application::resourcesPath() + "images/sixense-reticle.png"));
}
glEnable(GL_TEXTURE_2D);
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, _crosshairTexture);
if (OculusManager::isConnected() && application->getLastMouseMoveType() == QEvent::MouseMove) { if (OculusManager::isConnected() && application->getLastMouseMoveType() == QEvent::MouseMove) {
const float pointerWidth = 10; const float pointerWidth = 10;
const float pointerHeight = 10; const float pointerHeight = 10;
const float crossPad = 4;
_numMagnifiers = 1; _numMagnifiers = 1;
_mouseX[0] = application->getMouseX(); _mouseX[0] = application->getMouseX();
@ -289,25 +304,22 @@ void ApplicationOverlay::renderPointers() {
glBegin(GL_QUADS); glBegin(GL_QUADS);
glColor3f(1, 0, 0); glColor3f(0.0f, 198.0f / 255.0f, 244.0f / 255.0f);
//Horizontal crosshair //Horizontal crosshair
glVertex2i(mouseX, mouseY - crossPad); glTexCoord2d(0.0f, 0.0f); glVertex2i(mouseX, mouseY);
glVertex2i(mouseX + pointerWidth, mouseY - crossPad); glTexCoord2d(1.0f, 0.0f); glVertex2i(mouseX + pointerWidth, mouseY);
glVertex2i(mouseX + pointerWidth, mouseY - pointerHeight + crossPad); glTexCoord2d(1.0f, 1.0f); glVertex2i(mouseX + pointerWidth, mouseY - pointerHeight);
glVertex2i(mouseX, mouseY - pointerHeight + crossPad); glTexCoord2d(0.0f, 1.0f); glVertex2i(mouseX, mouseY - pointerHeight);
//Vertical crosshair
glVertex2i(mouseX + crossPad, mouseY);
glVertex2i(mouseX + pointerWidth - crossPad, mouseY);
glVertex2i(mouseX + pointerWidth - crossPad, mouseY - pointerHeight);
glVertex2i(mouseX + crossPad, mouseY - pointerHeight);
glEnd(); glEnd();
} else if (application->getLastMouseMoveType() == CONTROLLER_MOVE_EVENT && Menu::getInstance()->isOptionChecked(MenuOption::SixenseMouseInput)) { } else if (application->getLastMouseMoveType() == CONTROLLER_MOVE_EVENT && Menu::getInstance()->isOptionChecked(MenuOption::SixenseMouseInput)) {
//only render controller pointer if we aren't already rendering a mouse pointer //only render controller pointer if we aren't already rendering a mouse pointer
renderControllerPointer(); renderControllerPointer();
} }
glDisable(GL_TEXTURE_2D);
} }
void ApplicationOverlay::renderControllerPointer() { void ApplicationOverlay::renderControllerPointer() {
@ -349,13 +361,12 @@ void ApplicationOverlay::renderControllerPointer() {
float pointerWidth = 40; float pointerWidth = 40;
float pointerHeight = 40; float pointerHeight = 40;
float crossPad = 16;
//if we have the oculus, we should make the cursor smaller since it will be //if we have the oculus, we should make the cursor smaller since it will be
//magnified //magnified
if (OculusManager::isConnected()) { if (OculusManager::isConnected()) {
pointerWidth /= 4; pointerWidth /= 2;
pointerHeight /= 4; pointerHeight /= 2;
crossPad /= 4;
_mouseX[_numMagnifiers] = mouseX; _mouseX[_numMagnifiers] = mouseX;
_mouseY[_numMagnifiers] = mouseY; _mouseY[_numMagnifiers] = mouseY;
@ -368,19 +379,12 @@ void ApplicationOverlay::renderControllerPointer() {
glBegin(GL_QUADS); glBegin(GL_QUADS);
glColor3f(0.0f, 0.0f, 1.0f); glColor3f(0.0f, 198.0f/255.0f, 244.0f/255.0f);
//Horizontal crosshair glTexCoord2d(0.0f, 0.0f); glVertex2i(mouseX, mouseY);
glVertex2i(mouseX, mouseY - crossPad); glTexCoord2d(1.0f, 0.0f); glVertex2i(mouseX + pointerWidth, mouseY);
glVertex2i(mouseX + pointerWidth, mouseY - crossPad); glTexCoord2d(1.0f, 1.0f); glVertex2i(mouseX + pointerWidth, mouseY - pointerHeight);
glVertex2i(mouseX + pointerWidth, mouseY - pointerHeight + crossPad); glTexCoord2d(0.0f, 1.0f); glVertex2i(mouseX, mouseY - pointerHeight);
glVertex2i(mouseX, mouseY - pointerHeight + crossPad);
//Vertical crosshair
glVertex2i(mouseX + crossPad, mouseY);
glVertex2i(mouseX + pointerWidth - crossPad, mouseY);
glVertex2i(mouseX + pointerWidth - crossPad, mouseY - pointerHeight);
glVertex2i(mouseX + crossPad, mouseY - pointerHeight);
glEnd(); glEnd();
} }

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

@ -59,6 +59,8 @@ private:
int _mouseX[2]; int _mouseX[2];
int _mouseY[2]; int _mouseY[2];
int _numMagnifiers; int _numMagnifiers;
GLuint _crosshairTexture;
}; };
#endif // hifi_ApplicationOverlay_h #endif // hifi_ApplicationOverlay_h