diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 282905a6a8..1b6f3b1304 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -42,7 +42,7 @@ android:name=".HomeActivity" android:label="@string/home" android:screenOrientation="portrait" - android:theme="@style/AppTheme.NoActionBar"> + android:theme="@style/Theme.AppCompat.Translucent.NoActionBar"> { - startActivity(new Intent(this, HomeActivity.class)); - new Handler(getMainLooper()).postDelayed(() -> SplashActivity.this.finish(), 1000); - }, 500); + startActivity(new Intent(this, HomeActivity.class)); // + 2 sec + SplashActivity.this.finish(); } } diff --git a/android/app/src/main/res/layout/activity_home.xml b/android/app/src/main/res/layout/activity_home.xml index 0269672a29..91fb8603cd 100644 --- a/android/app/src/main/res/layout/activity_home.xml +++ b/android/app/src/main/res/layout/activity_home.xml @@ -18,7 +18,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimaryDark" + android:background="@color/colorPrimaryDark" android:elevation="4dp" /> @@ -33,6 +33,7 @@ android:layout_height="match_parent" android:layout_gravity="start" android:fitsSystemWindows="true" + android:background="@color/colorPrimaryDark" app:menu="@menu/menu_home" > diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 2852cb38c8..eda8b9bf12 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -8192,15 +8192,11 @@ void Application::openAndroidActivity(const QString& activityName) { void Application::enterBackground() { QMetaObject::invokeMethod(DependencyManager::get().data(), "stop", Qt::BlockingQueuedConnection); - getActiveDisplayPlugin()->deactivate(); } void Application::enterForeground() { QMetaObject::invokeMethod(DependencyManager::get().data(), "start", Qt::BlockingQueuedConnection); - if (!getActiveDisplayPlugin() || !getActiveDisplayPlugin()->activate()) { - qWarning() << "Could not re-activate display plugin"; - } } #endif diff --git a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp index 7c27fab591..09b9b7f8f9 100644 --- a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp @@ -131,44 +131,32 @@ void Basic2DWindowOpenGLDisplayPlugin::compositeExtra() { // render stick base auto stickBaseTransform = DependencyManager::get()->getPoint2DTransform(virtualPadManager.getLeftVirtualPad()->getFirstTouch(), _virtualPadPixelSize, _virtualPadPixelSize); - render([&](gpu::Batch& batch) { - batch.enableStereo(false); - batch.setProjectionTransform(mat4()); - batch.setPipeline(_cursorPipeline); - batch.setResourceTexture(0, _virtualPadStickBaseTexture); - batch.resetViewTransform(); - batch.setModelTransform(stickBaseTransform); - batch.setViewportTransform(ivec4(uvec2(0), getRecommendedRenderSize())); - batch.draw(gpu::TRIANGLE_STRIP, 4); - }); - // render stick head auto stickTransform = DependencyManager::get()->getPoint2DTransform(virtualPadManager.getLeftVirtualPad()->getCurrentTouch(), - _virtualPadPixelSize, _virtualPadPixelSize); + _virtualPadPixelSize, _virtualPadPixelSize); + auto jumpTransform = DependencyManager::get()->getPoint2DTransform(virtualPadManager.getJumpButtonPosition(), + _virtualPadJumpBtnPixelSize, _virtualPadJumpBtnPixelSize); + render([&](gpu::Batch& batch) { batch.enableStereo(false); + batch.setFramebuffer(_compositeFramebuffer); + batch.resetViewTransform(); batch.setProjectionTransform(mat4()); batch.setPipeline(_cursorPipeline); - batch.setResourceTexture(0, _virtualPadStickTexture); - batch.resetViewTransform(); - batch.setModelTransform(stickTransform); - batch.setViewportTransform(ivec4(uvec2(0), getRecommendedRenderSize())); + + batch.setResourceTexture(0, _virtualPadStickBaseTexture); + batch.setModelTransform(stickBaseTransform); batch.draw(gpu::TRIANGLE_STRIP, 4); - }); - if (!virtualPadManager.getLeftVirtualPad()->isBeingTouched()) { - // render stick head - auto jumpTransform = DependencyManager::get()->getPoint2DTransform(virtualPadManager.getJumpButtonPosition(), - _virtualPadJumpBtnPixelSize, _virtualPadJumpBtnPixelSize); - render([&](gpu::Batch& batch) { - batch.enableStereo(false); - batch.setProjectionTransform(mat4()); - batch.setPipeline(_cursorPipeline); + + batch.setResourceTexture(0, _virtualPadStickTexture); + batch.setModelTransform(stickTransform); + batch.draw(gpu::TRIANGLE_STRIP, 4); + + if (!virtualPadManager.getLeftVirtualPad()->isBeingTouched()) { batch.setResourceTexture(0, _virtualPadJumpBtnTexture); - batch.resetViewTransform(); batch.setModelTransform(jumpTransform); - batch.setViewportTransform(ivec4(uvec2(0), getRecommendedRenderSize())); batch.draw(gpu::TRIANGLE_STRIP, 4); - }); - } + } + }); } #endif Parent::compositeExtra();