Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:02:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'android' into android_bubble_fix

Browse source
This commit is contained in:
Gabriel Calero 2018-03-06 19:03:53 -03:00
commit a2327ea0cf
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -2726,7 +2726,8 @@ void Application::onDesktopRootItemCreated(QQuickItem* rootItem) {
AvatarInputs::show(); AvatarInputs::show();
auto surfaceContext = DependencyManager::get<OffscreenUi>()->getSurfaceContext(); auto surfaceContext = DependencyManager::get<OffscreenUi>()->getSurfaceContext();
surfaceContext->setContextProperty("Stats", Stats::getInstance()); surfaceContext->setContextProperty("Stats", Stats::getInstance());
surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());} surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
}
void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) { void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {
PROFILE_RANGE(render, __FUNCTION__); PROFILE_RANGE(render, __FUNCTION__);