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

Clickable 3D UI in 3DTV

Browse source
This commit is contained in:
barnold1953 2014-07-02 16:40:02 -07:00
parent 67ecde7d31
commit a859094d4a
3 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -1130,7 +1130,7 @@ void Application::mouseMoveEvent(QMouseEvent* event) {
_lastMouseMove = usecTimestampNow(); _lastMouseMove = usecTimestampNow();
if (_mouseHidden && showMouse && !OculusManager::isConnected()) { if (_mouseHidden && showMouse && !OculusManager::isConnected() && !TV3DManager::isConnected()) {
getGLWidget()->setCursor(Qt::ArrowCursor); getGLWidget()->setCursor(Qt::ArrowCursor);
_mouseHidden = false; _mouseHidden = false;
_seenMouseMove = true; _seenMouseMove = true;

5
interface/src/devices/TV3DManager.cpp
View file

@ -124,9 +124,6 @@ void TV3DManager::display(Camera& whichCamera) {
GLfloat fov = atan(1.0f / cotangent); GLfloat fov = atan(1.0f / cotangent);
glTranslatef(_leftEye.modelTranslation, 0.0, 0.0); // translate to cancel parallax glTranslatef(_leftEye.modelTranslation, 0.0, 0.0); // translate to cancel parallax
printf("FOV %f\n", fov);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); glLoadIdentity();
Application::getInstance()->displaySide(whichCamera); Application::getInstance()->displaySide(whichCamera);
@ -153,8 +150,6 @@ void TV3DManager::display(Camera& whichCamera) {
GLfloat fov = atan(1.0f / cotangent); GLfloat fov = atan(1.0f / cotangent);
glTranslatef(_rightEye.modelTranslation, 0.0, 0.0); // translate to cancel parallax glTranslatef(_rightEye.modelTranslation, 0.0, 0.0); // translate to cancel parallax
printf("FOV %f\n", fov);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); glLoadIdentity();
Application::getInstance()->displaySide(whichCamera); Application::getInstance()->displaySide(whichCamera);

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

@ -335,15 +335,17 @@ void ApplicationOverlay::displayOverlayTexture3DTV(Camera& whichCamera, float as
glColor4f(1.0f, 1.0f, 1.0f, _alpha); glColor4f(1.0f, 1.0f, 1.0f, _alpha);
//Render //Render
// fov -= RADIANS_PER_DEGREE * 2.5f; //reduce by 5 degrees so it fits in the view
const GLfloat distance = 1.0f; const GLfloat distance = 1.0f;
const GLfloat halfQuadHeight = atan(fov) * distance; const GLfloat halfQuadHeight = distance * tan(fov);
const GLfloat halfQuadWidth = halfQuadHeight * aspectRatio; const GLfloat halfQuadWidth = halfQuadHeight * aspectRatio;
const GLfloat quadWidth = halfQuadWidth * 2.0f; const GLfloat quadWidth = halfQuadWidth * 2.0f;
const GLfloat quadHeight = halfQuadHeight * 2.0f; const GLfloat quadHeight = halfQuadHeight * 2.0f;
const GLfloat x = -halfQuadWidth; GLfloat x = -halfQuadWidth;
const GLfloat y = -halfQuadHeight; GLfloat y = -halfQuadHeight;
glDisable(GL_DEPTH_TEST);
glBegin(GL_QUADS); glBegin(GL_QUADS);
@ -354,6 +356,32 @@ void ApplicationOverlay::displayOverlayTexture3DTV(Camera& whichCamera, float as
glEnd(); glEnd();
if (_crosshairTexture == 0) {
_crosshairTexture = Application::getInstance()->getGLWidget()->bindTexture(QImage(Application::resourcesPath() + "images/sixense-reticle.png"));
}
//draw the mouse pointer
glBindTexture(GL_TEXTURE_2D, _crosshairTexture);
const float reticleSize = 40.0f / application->getGLWidget()->width() * quadWidth;
x -= reticleSize / 2.0f;
y += reticleSize / 2.0f;
const float mouseX = (application->getMouseX() / (float)application->getGLWidget()->width()) * quadWidth;
const float mouseY = (1.0 - (application->getMouseY() / (float)application->getGLWidget()->height())) * quadHeight;
glBegin(GL_QUADS);
glColor3f(RETICLE_COLOR[0], RETICLE_COLOR[1], RETICLE_COLOR[2]);
glTexCoord2d(0.0f, 0.0f); glVertex3f(x + mouseX, y + mouseY, -distance);
glTexCoord2d(1.0f, 0.0f); glVertex3f(x + mouseX + reticleSize, y + mouseY, -distance);
glTexCoord2d(1.0f, 1.0f); glVertex3f(x + mouseX + reticleSize, y + mouseY - reticleSize, -distance);
glTexCoord2d(0.0f, 1.0f); glVertex3f(x + mouseX, y + mouseY - reticleSize, -distance);
glEnd();
glEnable(GL_DEPTH_TEST);
glPopMatrix(); glPopMatrix();
glDepthMask(GL_TRUE); glDepthMask(GL_TRUE);