Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:57:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removing quest-demo specific changes

Browse source
This commit is contained in:
amer cerkic 2019-02-28 10:54:30 -08:00
parent 22b18c0c3d
commit faedc61c37
5 changed files with 14 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
android/apps/questInterface/build.gradle
View file

@ -44,15 +44,10 @@ android {
} }
signingConfigs { signingConfigs {
release { release {
// Hack for Quest demo storeFile project.hasProperty("HIFI_ANDROID_KEYSTORE") ? file(HIFI_ANDROID_KEYSTORE) : null
storeFile file("keystore.jks") storePassword project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") ? HIFI_ANDROID_KEYSTORE_PASSWORD : ''
storePassword "password" keyAlias project.hasProperty("HIFI_ANDROID_KEY_ALIAS") ? HIFI_ANDROID_KEY_ALIAS : ''
keyAlias "key0" keyPassword project.hasProperty("HIFI_ANDROID_KEY_PASSWORD") ? HIFI_ANDROID_KEY_PASSWORD : ''
keyPassword "password"
// storeFile project.hasProperty("HIFI_ANDROID_KEYSTORE") ? file(HIFI_ANDROID_KEYSTORE) : null
// storePassword project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") ? HIFI_ANDROID_KEYSTORE_PASSWORD : ''
// keyAlias project.hasProperty("HIFI_ANDROID_KEY_ALIAS") ? HIFI_ANDROID_KEY_ALIAS : ''
// keyPassword project.hasProperty("HIFI_ANDROID_KEY_PASSWORD") ? HIFI_ANDROID_KEY_PASSWORD : ''
v2SigningEnabled false v2SigningEnabled false
} }
} }

6
android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
View file

@ -108,14 +108,14 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
@Override @Override
protected void onRestart() { protected void onRestart() {
super.onRestart(); super.onRestart();
Log.w(TAG, "QQQ_ onRestart called ****"); Log.w(TAG, "QQQ_ onRestart called");
questOnAppAfterLoad(); questOnAppAfterLoad();
questNativeAwayMode(); questNativeAwayMode();
} }
@Override @Override
public void surfaceCreated(SurfaceHolder holder) { public void surfaceCreated(SurfaceHolder holder) {
Log.w(TAG, "QQQ_ surfaceCreated ************************************"); Log.w(TAG, "QQQ_ surfaceCreated");
nativeOnSurfaceChanged(holder.getSurface()); nativeOnSurfaceChanged(holder.getSurface());
mSurfaceHolder = holder; mSurfaceHolder = holder;
} }
@ -129,7 +129,7 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
@Override @Override
public void surfaceDestroyed(SurfaceHolder holder) { public void surfaceDestroyed(SurfaceHolder holder) {
Log.w(TAG, "QQQ_ surfaceDestroyed ***************************************************"); Log.w(TAG, "QQQ_ surfaceDestroyed");
nativeOnSurfaceChanged(null); nativeOnSurfaceChanged(null);
mSurfaceHolder = null; mSurfaceHolder = null;
} }

6
interface/src/Application.cpp
View file

@ -2413,15 +2413,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground); connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground);
connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground); connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground);
connect(&AndroidHelper::instance(), &AndroidHelper::toggleAwayMode, this, &Application::toggleAwayMode); connect(&AndroidHelper::instance(), &AndroidHelper::toggleAwayMode, this, &Application::toggleAwayMode);
AndroidHelper::instance().notifyLoadComplete(); AndroidHelper::instance().notifyLoadComplete();
#endif #endif
pauseUntilLoginDetermined(); pauseUntilLoginDetermined();
#if defined(Q_OS_ANDROID)
const QString QUEST_DEV = "hifi://quest-dev";
DependencyManager::get<AddressManager>()->handleLookupString(QUEST_DEV);
#endif
} }
void Application::updateVerboseLogging() { void Application::updateVerboseLogging() {

6
libraries/animation/src/AnimInverseKinematics.cpp
View file

@ -865,12 +865,6 @@ const AnimPoseVec& AnimInverseKinematics::evaluate(const AnimVariantMap& animVar
//virtual //virtual
const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut, const AnimPoseVec& underPoses) { const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut, const AnimPoseVec& underPoses) {
#ifdef Q_OS_ANDROID
// disable IK on android
return underPoses;
#endif
// allows solutionSource to be overridden by an animVar // allows solutionSource to be overridden by an animVar
auto solutionSource = animVars.lookup(_solutionSourceVar, (int)_solutionSource); auto solutionSource = animVars.lookup(_solutionSourceVar, (int)_solutionSource);

14
libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
View file

@ -58,7 +58,7 @@ void OculusMobileDisplayPlugin::deinit() {
bool OculusMobileDisplayPlugin::internalActivate() { bool OculusMobileDisplayPlugin::internalActivate() {
_renderTargetSize = { 1024, 512 }; _renderTargetSize = { 1024, 512 };
_cullingProjection = ovr::toGlm(ovrMatrix4f_CreateProjectionFov(90.0f, 90.0f, 90.0f, 90.0f, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP)); _cullingProjection = ovr::toGlm(ovrMatrix4f_CreateProjectionFov(90.0f, 90.0f, 0.0f, 0.0f, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP));
withOvrJava([&](const ovrJava* java){ withOvrJava([&](const ovrJava* java){
@ -220,12 +220,12 @@ bool OculusMobileDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
}); });
} }
static uint32_t count = 0; // static uint32_t count = 0;
if ((++count % 1000) == 0) { // if ((++count % 1000) == 0) {
AbstractViewStateInterface::instance()->postLambdaEvent([] { // AbstractViewStateInterface::instance()->postLambdaEvent([] {
goToDevMobile(); // goToDevMobile();
}); // });
} // }
return result && Parent::beginFrameRender(frameIndex); return result && Parent::beginFrameRender(frameIndex);
} }