History

Merge branch 'master' of https://github.com/highfidelity/hifi into android

Atlante45 committed 11 years ago

Commit 4ef87b92 parents df96e02 347c74e113 files · +3501 −2168Browse files

Showing the changes to interface/src/ui/ApplicationOverlay.cpp (1 of 113 files). Show all

Unified · Split

interface/src/ui/ApplicationOverlay.cpp+2−1
@@ -16,6 +16,7 @@ · 15 unmodified lines
16#include <PathUtils.h>16#include <PathUtils.h>
17#include <PerfStat.h>17#include <PerfStat.h>
18 18
19#include "AudioClient.h"
19#include "audio/AudioIOStatsRenderer.h"20#include "audio/AudioIOStatsRenderer.h"
20#include "audio/AudioScope.h"21#include "audio/AudioScope.h"
21#include "audio/AudioToolBox.h"22#include "audio/AudioToolBox.h"
@@ -164,7 +165,7 @@ void ApplicationOverlay::renderOverlay(bool renderToTexture) { · 142 unmodified lines
164 Overlays& overlays = application->getOverlays();165 Overlays& overlays = application->getOverlays();
165 auto glCanvas = DependencyManager::get<GLCanvas>();166 auto glCanvas = DependencyManager::get<GLCanvas>();
166 167
167 _textureFov = glm::radians(Menu::getInstance()->getOculusUIAngularSize());168 _textureFov = glm::radians(_oculusUIAngularSize);
168 _textureAspectRatio = (float)glCanvas->getDeviceWidth() / (float)glCanvas->getDeviceHeight();169 _textureAspectRatio = (float)glCanvas->getDeviceWidth() / (float)glCanvas->getDeviceHeight();
169 170
170 //Handle fading and deactivation/activation of UI171 //Handle fading and deactivation/activation of UI

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t