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

_distance variable

Browse source
This commit is contained in:
barnold1953 2014-06-02 17:23:32 -07:00
parent 10d0b6af03
commit f4391bcdbe
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,8 @@
#include "ui/Stats.h" #include "ui/Stats.h"
ApplicationOverlay::ApplicationOverlay() : _framebufferObject(NULL), ApplicationOverlay::ApplicationOverlay() : _framebufferObject(NULL),
_oculusAngle(65.0f * RADIANS_PER_DEGREE) { _oculusAngle(65.0f * RADIANS_PER_DEGREE),
_distance(0.5f){
} }
@ -273,9 +274,8 @@ void ApplicationOverlay::displayOverlayTextureOculus(Camera& whichCamera) {
// Get vertical FoV of the displayed overlay texture // Get vertical FoV of the displayed overlay texture
const float halfVerticalAngle = _oculusAngle / 2.0f; const float halfVerticalAngle = _oculusAngle / 2.0f;
const float overlayDistance = 1.0;
const float overlayAspectRatio = glWidget->width() / (float)glWidget->height(); const float overlayAspectRatio = glWidget->width() / (float)glWidget->height();
const float halfOverlayHeight = overlayDistance * tan(halfVerticalAngle); const float halfOverlayHeight = _distance * tan(halfVerticalAngle);
// The more vertices, the better the curve // The more vertices, the better the curve
const int numHorizontalVertices = 20; const int numHorizontalVertices = 20;
@ -325,10 +325,10 @@ void ApplicationOverlay::displayOverlayTextureOculus(Camera& whichCamera) {
for (int i = 0; i < numHorizontalVertices-1; i++) { for (int i = 0; i < numHorizontalVertices-1; i++) {
// Calculate the X and Z coordinates from the angles and radius from camera // Calculate the X and Z coordinates from the angles and radius from camera
leftX = sin(angleIncrement * i - halfHorizontalAngle) * overlayDistance; leftX = sin(angleIncrement * i - halfHorizontalAngle) * _distance;
rightX = sin(angleIncrement * (i + 1) - halfHorizontalAngle) * overlayDistance; rightX = sin(angleIncrement * (i + 1) - halfHorizontalAngle) * _distance;
leftZ = -cos(angleIncrement * i - halfHorizontalAngle) * overlayDistance; leftZ = -cos(angleIncrement * i - halfHorizontalAngle) * _distance;
rightZ = -cos(angleIncrement * (i + 1) - halfHorizontalAngle) * overlayDistance; rightZ = -cos(angleIncrement * (i + 1) - halfHorizontalAngle) * _distance;
glTexCoord2f(quadTexWidth * i, 1); glVertex3f(leftX, halfOverlayHeight, leftZ); glTexCoord2f(quadTexWidth * i, 1); glVertex3f(leftX, halfOverlayHeight, leftZ);
glTexCoord2f(quadTexWidth * (i + 1), 1); glVertex3f(rightX, halfOverlayHeight, rightZ); glTexCoord2f(quadTexWidth * (i + 1), 1); glVertex3f(rightX, halfOverlayHeight, rightZ);

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

@ -38,6 +38,7 @@ private:
QOpenGLFramebufferObject* _framebufferObject; QOpenGLFramebufferObject* _framebufferObject;
float _trailingAudioLoudness; float _trailingAudioLoudness;
float _oculusAngle; float _oculusAngle;
float _distance;
}; };
#endif // hifi_ApplicationOverlay_h #endif // hifi_ApplicationOverlay_h