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

BUILD.md

@@ -10,14 +10,11 @@
 - [cmake](https://cmake.org/download/):  3.9
 - [Qt](https://www.qt.io/download-open-source):   5.10.1
 - [Python](https://www.python.org/downloads/): 3.6 or higher
-- [OpenSSL](https://www.openssl.org/): Use the latest available 1.0 version (**NOT** 1.1) of OpenSSL to avoid security vulnerabilities.
-- [VHACD](https://github.com/virneo/v-hacd)(clone this repository)(Optional)
 
 ### CMake External Project Dependencies
 
 These dependencies need not be installed manually. They are automatically downloaded on the platforms where they are required.  
 - [Bullet Physics Engine](https://github.com/bulletphysics/bullet3/releases):  2.83
-- [GLEW](http://glew.sourceforge.net/):   1.13
 - [glm](https://glm.g-truc.net/0.9.8/index.html):  0.9.8
 - [Oculus SDK](https://developer.oculus.com/downloads/):   1.11 (Win32) / 0.5 (Mac)
 - [OpenVR](https://github.com/ValveSoftware/openvr):   1.0.6 (Win32 only)
@@ -25,16 +22,15 @@ These dependencies need not be installed manually. They are automatically downlo
 - [QuaZip](https://sourceforge.net/projects/quazip/files/quazip/):   0.7.3
 - [SDL2](https://www.libsdl.org/download-2.0.php):   2.0.3
 - [Intel Threading Building Blocks](https://www.threadingbuildingblocks.org/):   4.3
-- [Sixense](http://sixense.com/):   071615
+- [vcpkg](https://github.com/highfidelity/vcpkg): 
+- [VHACD](https://github.com/virneo/v-hacd)
 - [zlib](http://www.zlib.net/):   1.28 (Win32 only)
-- nVidia Texture Tools:   2.1
+- [nvtt](https://github.com/highfidelity/nvidia-texture-tools):   2.1.1 (customized)
 
 The above dependencies will be downloaded, built, linked and included automatically by CMake where we require them. The CMakeLists files that handle grabbing each of the following external dependencies can be found in the [cmake/externals folder](cmake/externals). The resulting downloads, source files and binaries will be placed in the `build/ext` folder in each of the subfolders for each external project.
 
 These are not placed in your normal build tree when doing an out of source build so that they do not need to be re-downloaded and re-compiled every time the CMake build folder is cleared. Should you want to force a re-download and re-compile of a specific external, you can simply remove that directory from the appropriate subfolder in `build/ext`. Should you want to force a re-download and re-compile of all externals, just remove the `build/ext` folder.
 
-If you would like to use a specific install of a dependency instead of the version that would be grabbed as a CMake ExternalProject, you can pass -DUSE\_LOCAL\_$NAME=0 (where $NAME is the name of the subfolder in [cmake/externals](cmake/externals)) when you run CMake to tell it not to get that dependency as an external project.
-
 #### CMake
 
 Hifi uses CMake to generate build files and project files for your platform.
@@ -82,9 +78,22 @@ In the examples below the variable $NAME would be replaced by the name of the de
 * $NAME_ROOT_DIR - set this variable in your ENV
 * HIFI_LIB_DIR - set this variable in your ENV to your High Fidelity lib folder, should contain a folder '$name'
 
-
 ### Optional Components
 
+#### Build Options 
+
+The following build options can be used when running CMake
+
+* BUILD_CLIENT
+* BUILD_SERVER
+* BUILD_TESTS
+* BUILD_TOOLS
+
+#### Developer Build Options 
+
+* USE_GLES
+* DISABLE_UI
+
 #### Devices
 
 You can support external input/output devices such as Leap Motion, MIDI, and more by adding each individual SDK in the visible building path. Refer to the readme file available in each device folder in [interface/external/](interface/external) for the detailed explanation of the requirements to use the device.

CMakeLists.txt

@@ -7,22 +7,36 @@ else()
   cmake_minimum_required(VERSION 3.2)
 endif()
 
-# squelch the Policy CMP0074 warning without requiring an update to cmake 3.12.
-if ((${CMAKE_MAJOR_VERSION} EQUAL 3 AND ${CMAKE_MINOR_VERSION} GREATER 11) OR ${CMAKE_MAJOR_VERSION} GREATER 3)
-   cmake_policy(SET CMP0074 NEW)
+include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros/TargetPython.cmake")
+target_python()
+
+if (HIFI_ANDROID )
+    execute_process(
+        COMMAND ${HIFI_PYTHON_EXEC} ${CMAKE_CURRENT_SOURCE_DIR}/prebuild.py --android --build-root ${CMAKE_BINARY_DIR}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+else()
+    execute_process(
+        COMMAND ${HIFI_PYTHON_EXEC} ${CMAKE_CURRENT_SOURCE_DIR}/prebuild.py --build-root ${CMAKE_BINARY_DIR}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+    # squelch the Policy CMP0074 warning without requiring an update to cmake 3.12.
+    if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
+        cmake_policy(SET CMP0074 NEW)
+    endif()
 endif()
 
+if(NOT EXISTS "${CMAKE_BINARY_DIR}/vcpkg.cmake")
+    message(FATAL_ERROR "vcpkg configuration missing.")
+endif()
+
+include("${CMAKE_BINARY_DIR}/vcpkg.cmake")
 project(hifi)
-
 include("cmake/init.cmake")
-
 include("cmake/compiler.cmake")
 
-if (BUILD_SCRIBE_ONLY)
-  add_subdirectory(tools/scribe)
-  add_subdirectory(tools/shader_reflect)
-  return()
-endif()
+add_paths_to_fixup_libs(${VCPKG_INSTALL_ROOT}/bin)
+add_paths_to_fixup_libs(${VCPKG_INSTALL_ROOT}/debug/bin)
 
 if (NOT DEFINED CLIENT_ONLY)
   set(CLIENT_ONLY 0)
@@ -40,7 +54,8 @@ endif()
 
 set(BUILD_CLIENT_OPTION ON)
 set(BUILD_SERVER_OPTION ON)
-set(BUILD_TESTS_OPTION ON)
+set(BUILD_TESTS_OPTION OFF)
+set(BUILD_MANUAL_TESTS_OPTION ${BUILD_TESTS_OPTION})
 set(BUILD_TOOLS_OPTION ON)
 set(BUILD_INSTALLER_OPTION ON)
 set(GLES_OPTION OFF)
@@ -77,6 +92,7 @@ endif()
 option(BUILD_CLIENT "Build client components" ${BUILD_CLIENT_OPTION})
 option(BUILD_SERVER "Build server components" ${BUILD_SERVER_OPTION})
 option(BUILD_TESTS "Build tests" ${BUILD_TESTS_OPTION})
+option(BUILD_MANUAL_TESTS "Build manual tests" ${BUILD_MANUAL_TESTS_OPTION})
 option(BUILD_TOOLS "Build tools" ${BUILD_TOOLS_OPTION})
 option(BUILD_INSTALLER "Build installer" ${BUILD_INSTALLER_OPTION})
 option(USE_GLES "Use OpenGL ES" ${GLES_OPTION})
@@ -144,6 +160,8 @@ list(APPEND CMAKE_PREFIX_PATH "${QT_CMAKE_PREFIX_PATH}")
 find_package( Threads )
 
 add_definitions(-DGLM_FORCE_RADIANS)
+add_definitions(-DGLM_ENABLE_EXPERIMENTAL)
+add_definitions(-DGLM_FORCE_CTOR_INIT)
 set(HIFI_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries")
 
 set(EXTERNAL_PROJECT_PREFIX "project")
@@ -191,7 +209,9 @@ if (BUILD_TESTS)
   include(CTest)
   enable_testing()
   add_subdirectory(tests)
-  add_subdirectory(tests-manual)
+  if (BUILD_MANUAL_TESTS) 
+    add_subdirectory(tests-manual)
+  endif()
 endif()
 
 if (BUILD_INSTALLER)

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016, High Fidelity, Inc.
+Copyright (c) 2013-2018, High Fidelity, Inc.
 All rights reserved.
 licensing@highfidelity.io
 

VCPKG.md

@@ -0,0 +1,75 @@
+[VCPKG](https://github.com/Microsoft/vcpkg) is an open source package management system created by Microsoft, intially just for Windows based system, but eventually extended to cover Linux and OSX as well, and in theory extensible enough to cover additional operating systems.
+
+VCPKG is now our primary mechanism for managing the external libraries and tools on which we rely to build our applications.
+
+Conventional usage of VCPKG involves cloning the repository, running the bootstrapping script to build the vcpkg binary, and then calling the binary to install a set of libraries.  The libraries themselves are specified by a set of port files inside the [repository](https://github.com/Microsoft/vcpkg/tree/master/ports)
+
+Because the main VCPKG repository does not contain all the ports we want, and because we want to be able to manage the precise versions of our dependencies, rather than allow it to be outside of our control, instead of using the main vcpkg repository, we use a combination of a [fork](https://github.com/highfidelity/vcpkg) of the repository (which allows us to customize the vcpkg binary, currently necessary to deal with some out of date tools on our build hosts) and a set of [custom port files](./cmake/ports) stored in our own repository.
+
+## Adding new packages to vcpkg
+
+Note...  Android vcpkg usage is still experimental.  Contact Austin for more detailed information if you need to add a new package for use by Android.  
+
+### Setup development environment
+
+In order to add new packages, you will need to set up an environment for testing.  This assumes you already have the tools for normal Hifi development (git, cmake, a working C++ compiler, etc)
+
+* Clone our vcpkg [fork](https://github.com/highfidelity/vcpkg)
+* Remove the ports directory from the checkout and symlink to our own [custom port files](./cmake/ports)
+* Bootstrap the vcpkg binary with the `bootstrap-vcpkg.sh` or `bootstrap-vcpkg.bat` script
+
+### Add a new port skeleton
+
+Your new package will require, at minimum, a `CONTROL` file and a `portfile.cmake` file, located in a subdirectory of the ports folder.  Assuming you're creating a new dependency named `foo` it should be located in `ports/foo` under the vcpkg directory.  The `CONTROL` file will contain a small number of fields, such as the name, version, description and any other vcpkg ports on which you depend.  The `portfile.cmake` is a CMake script that will instruct vcpkg how to build the packages.  We'll cover that in more depth in a moment.  For now, just create one and leave it blank.
+
+### Add a reference to your package to one or more of the hifi meta-packages
+
+We have three meta-packages used to do our building.  When you modify one of these packages, make sure to bump the version number in the `CONTROL` file for the package
+
+#### hifi-deps
+
+This metapackage contains anything required for building the server or shared components.  For instance, the `glm`, `tbb` and `zlib` packages are declared here because they're used everywhere, not just in our client application code. 
+
+#### hifi-client-deps
+
+This metapackage contains anything required for building the client.  For example, `sdl2` is listed here because it's required for our joystick input, but not for the server or shared components.  Note that `hifi-client-deps` depends on `hifi-deps`, so you don't have to declare something twice if it's used in both he server and client.  Just declare it in `hifi-deps` and it will still be includeded transitively.
+
+#### hifi-host-tools
+
+This metapackage contains anything we use to create executables that will then be used in the build process.  The `hifi-deps` and `hifi-client-deps` packages are built for the target architecture, which may be different than the host architecture (for instance, when building for Android).  The `hifi-host-tools` packages are always build for the host architecture, because they're tools that are intended to be run as part of the build process.  Scribe for example is used at build time to generate shaders.  Building an arm64 version of Scribe is useless because we need to run it on the host machine.
+
+Note that packages can appear in both the `hifi-host-tools` and one of the other metapackages, indicating that the package both contains a library which we will use at runtime, and a tool which we will use at build time.  The `spirv-tools` package is an example.
+
+### Implement the portfile.cmake
+
+How the portfile is written depends on what kind of package you're working with.  It's basically still a CMake script, but there are a number of [functions](https://vcpkg.readthedocs.io/en/latest/maintainers/portfile-functions/) available to make fetching and building packages easier.
+
+Typically there are three areas you need to deal with
+
+* Getting the source
+* Building the source
+* Installing the artifacts
+
+#### Getting sources
+
+Getting sources from github, gitlab or bitbucket is easy.  There are special functions specifcially for those.  See the [etc2comp portfile](./cmake/ports/etc2comp/portfile.cmake) for an example of fetching source via github.
+
+If the project isn't available that way, you can still use the [vcpkg_download_distfile](https://vcpkg.readthedocs.io/en/latest/maintainers/vcpkg_download_distfile/) function to explicitly download an archive and then use [vcpkg_extract_source_archive](https://vcpkg.readthedocs.io/en/latest/maintainers/vcpkg_extract_source_archive/) to unpack it.  See the [zlib portfile](./cmake/ports/zlib/portfile.cmake) for an example there.
+
+#### Building
+
+If your package uses CMake, you'll be able to use the [vcpkg_configure_cmake](https://vcpkg.readthedocs.io/en/latest/maintainers/vcpkg_configure_cmake/) and [vcpkg_build_cmake](https://vcpkg.readthedocs.io/en/latest/maintainers/vcpkg_build_cmake/) commands to configure and build the package.  If you're going to be relying on the CMake installation functionality, you can just call [vcpkg_install_cmake](https://vcpkg.readthedocs.io/en/latest/maintainers/vcpkg_install_cmake/), since it will implicitly run the build before the install.
+
+If your package is not binary, but doesn't use CMake, you're just going to have to figure it out.
+
+If your package is binary, then you can just skip this step
+
+#### Installing
+
+Once you've built the package, you need to install the artifacts in the target directory.  Ideally, your package's CMake INSTALL commands will do the right thing.  However, there are usually some things you have to do manually.  Since VCPKG will build both the release and debug versions for all packages, you need to make sure if your package installed headers that you remove the _debug_ versions of these headers.  This is typically done with the `file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)`.  Additionally, if your package creates any standalone executables, you need to make sure they're installed in the destination `tools` directory, not the `bin` or `lib` directories, which are specifically for shared library binaries (like .so or .dll files) and link library files (like .a or .lib files) respectively.
+
+If you're dealing with a binary package, then you'll need to explicitly perform all the required copies from the location where you extracted the archive to the installation directory.  An example of this is available in the [openssl-android portfile](./cmake/ports/openssl-android/portfile.cmake)
+
+### Commit and test
+
+Once you've tested building your new package locally, you'll need to commit and push the changes and additions to the portfiles you've made and then monitor the build hosts to verify that the new package successfully built on all the target environments.

android/app/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET_NAME native-lib)
 setup_hifi_library()
-link_hifi_libraries(shared task networking gl gpu qml image fbx render-utils physics entities octree ${PLATFORM_GL_BACKEND})
+link_hifi_libraries(shared task networking gl gpu qml image fbx hfm render-utils physics entities octree ${PLATFORM_GL_BACKEND})
 target_opengl()
 target_bullet()
 

android/app/build.gradle

@@ -23,7 +23,6 @@ android {
                     '-DANDROID_TOOLCHAIN=clang',
                     '-DANDROID_STL=c++_shared',
                     '-DQT_CMAKE_PREFIX_PATH=' + HIFI_ANDROID_PRECOMPILED + '/qt/lib/cmake',
-                    '-DNATIVE_SCRIBE=' + HIFI_ANDROID_PRECOMPILED + '/scribe' + EXEC_SUFFIX,
                     '-DHIFI_ANDROID_PRECOMPILED=' + HIFI_ANDROID_PRECOMPILED,
                     '-DRELEASE_NUMBER=' + RELEASE_NUMBER,
                     '-DRELEASE_TYPE=' + RELEASE_TYPE,
@@ -52,6 +51,9 @@ android {
         debug {
             buildConfigField "String", "BACKTRACE_URL", "\"" + (System.getenv("CMAKE_BACKTRACE_URL") ? System.getenv("CMAKE_BACKTRACE_URL") : '') + "\""
             buildConfigField "String", "BACKTRACE_TOKEN", "\"" + (System.getenv("CMAKE_BACKTRACE_TOKEN") ? System.getenv("CMAKE_BACKTRACE_TOKEN") : '') + "\""
+            buildConfigField "String", "OAUTH_CLIENT_ID", "\"" + (System.getenv("OAUTH_CLIENT_ID") ? System.getenv("OAUTH_CLIENT_ID") : '') + "\""
+            buildConfigField "String", "OAUTH_CLIENT_SECRET", "\"" + (System.getenv("OAUTH_CLIENT_SECRET") ? System.getenv("OAUTH_CLIENT_SECRET") : '') + "\""
+            buildConfigField "String", "OAUTH_REDIRECT_URI", "\"" + (System.getenv("OAUTH_REDIRECT_URI") ? System.getenv("OAUTH_REDIRECT_URI") : '') + "\""
         }
         release {
             minifyEnabled false
@@ -62,6 +64,9 @@ android {
                     project.hasProperty("HIFI_ANDROID_KEY_PASSWORD")? signingConfigs.release : null
             buildConfigField "String", "BACKTRACE_URL", "\"" + (System.getenv("CMAKE_BACKTRACE_URL") ? System.getenv("CMAKE_BACKTRACE_URL") : '') + "\""
             buildConfigField "String", "BACKTRACE_TOKEN", "\"" + (System.getenv("CMAKE_BACKTRACE_TOKEN") ? System.getenv("CMAKE_BACKTRACE_TOKEN") : '') + "\""
+            buildConfigField "String", "OAUTH_CLIENT_ID", "\"" + (System.getenv("OAUTH_CLIENT_ID") ? System.getenv("OAUTH_CLIENT_ID") : '') + "\""
+            buildConfigField "String", "OAUTH_CLIENT_SECRET", "\"" + (System.getenv("OAUTH_CLIENT_SECRET") ? System.getenv("OAUTH_CLIENT_SECRET") : '') + "\""
+            buildConfigField "String", "OAUTH_REDIRECT_URI", "\"" + (System.getenv("OAUTH_REDIRECT_URI") ? System.getenv("OAUTH_REDIRECT_URI") : '') + "\""
         }
     }
 

android/app/src/main/AndroidManifest.xml

@@ -71,6 +71,10 @@
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Translucent.NoActionBar" />
 
+        <activity android:name=".LoginMenuActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Translucent.NoActionBar" />
+
         <service
             android:name=".BreakpadUploaderService"
             android:enabled="true"

android/app/src/main/cpp/native.cpp

@@ -24,6 +24,9 @@
 #include <udt/PacketHeaders.h>
 #include <SettingHandle.h>
 
+#define AUTO_LOGOUT_SETTING_NAME "wallet/autoLogout"
+#define WALLET_USERNAME_SETTING_NAME "wallet/savedUsername"
+
 QAndroidJniObject __interfaceActivity;
 QAndroidJniObject __loginCompletedListener;
 QAndroidJniObject __signupCompletedListener;
@@ -210,11 +213,13 @@ JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeOnDest
 JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeGotoUrl(JNIEnv* env, jobject obj, jstring url) {
     QAndroidJniObject jniUrl("java/lang/String", "(Ljava/lang/String;)V", url);
     DependencyManager::get<AddressManager>()->loadSettings(jniUrl.toString());
+    AndroidHelper::instance().muteMic();
 }
 
 JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeGoToUser(JNIEnv* env, jobject obj, jstring username) {
     QAndroidJniObject jniUsername("java/lang/String", "(Ljava/lang/String;)V", username);
     DependencyManager::get<AddressManager>()->goToUser(jniUsername.toString(), false);
+    AndroidHelper::instance().muteMic();
 }
 
 JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeOnPause(JNIEnv* env, jobject obj) {
@@ -259,7 +264,56 @@ JNIEXPORT jstring JNICALL Java_io_highfidelity_hifiinterface_fragment_HomeFragme
 }
 
 JNIEXPORT void JNICALL
-Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeCancelLogin(JNIEnv *env, jobject instance) {
+Java_io_highfidelity_hifiinterface_HifiUtils_updateHifiSetting(JNIEnv *env, jobject instance,
+                                                               jstring group_, jstring key_,
+                                                               jboolean value_) {
+    const char *c_group = env->GetStringUTFChars(group_, 0);
+    const char *c_key = env->GetStringUTFChars(key_, 0);
+
+    const QString group = QString::fromUtf8(c_group);
+    const QString key = QString::fromUtf8(c_key);
+
+    env->ReleaseStringUTFChars(group_, c_group);
+    env->ReleaseStringUTFChars(key_, c_key);
+
+    bool value = value_;
+
+    Setting::Handle<bool> setting { QStringList() << group << key , !value };
+    setting.set(value);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_io_highfidelity_hifiinterface_HifiUtils_getHifiSettingBoolean(JNIEnv *env,
+                                                                   jobject instance,
+                                                                   jstring group_,
+                                                                   jstring key_,
+                                                                   jboolean defaultValue) {
+    const char *c_group = env->GetStringUTFChars(group_, 0);
+    const char *c_key = env->GetStringUTFChars(key_, 0);
+
+    const QString group = QString::fromUtf8(c_group);
+    const QString key = QString::fromUtf8(c_key);
+
+    env->ReleaseStringUTFChars(group_, c_group);
+    env->ReleaseStringUTFChars(key_, c_key);
+
+    Setting::Handle<bool> setting { QStringList() << group << key , defaultValue};
+    return setting.get();
+}
+
+JNIEXPORT jboolean JNICALL
+Java_io_highfidelity_hifiinterface_HifiUtils_isUserLoggedIn(JNIEnv *env, jobject instance) {
+    return DependencyManager::get<AccountManager>()->isLoggedIn();
+}
+
+JNIEXPORT jboolean JNICALL
+Java_io_highfidelity_hifiinterface_HifiUtils_isKeepingLoggedIn(JNIEnv *env, jobject instance) {
+    Setting::Handle<bool> setting(AUTO_LOGOUT_SETTING_NAME, true);
+    return !setting.get();
+}
+
+JNIEXPORT void JNICALL
+Java_io_highfidelity_hifiinterface_fragment_LoginFragment_cancelLogin(JNIEnv *env, jobject instance) {
 
     auto accountManager = DependencyManager::get<AccountManager>();
 
@@ -269,17 +323,16 @@ Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeCancelLogin(JNIE
 }
 
 JNIEXPORT void JNICALL
-Java_io_highfidelity_hifiinterface_fragment_SignupFragment_nativeCancelLogin(JNIEnv *env,
+Java_io_highfidelity_hifiinterface_fragment_SignupFragment_cancelLogin(JNIEnv *env,
                                                                              jobject instance) {
 
-    Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeCancelLogin(env, instance);
+    Java_io_highfidelity_hifiinterface_fragment_LoginFragment_cancelLogin(env, instance);
 }
 
-
 JNIEXPORT void JNICALL
-Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeLogin(JNIEnv *env, jobject instance,
+Java_io_highfidelity_hifiinterface_fragment_LoginFragment_login(JNIEnv *env, jobject instance,
                                                             jstring username_, jstring password_,
-                                                            jobject usernameChangedListener) {
+                                                            jboolean keepLoggedIn) {
     const char *c_username = env->GetStringUTFChars(username_, 0);
     const char *c_password = env->GetStringUTFChars(password_, 0);
     QString username = QString(c_username);
@@ -290,7 +343,53 @@ Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeLogin(JNIEnv *en
     auto accountManager = DependencyManager::get<AccountManager>();
 
     __loginCompletedListener = QAndroidJniObject(instance);
-    __usernameChangedListener = QAndroidJniObject(usernameChangedListener);
+
+    QObject::connect(accountManager.data(), &AccountManager::loginComplete, [username, keepLoggedIn](const QUrl& authURL) {
+        jboolean jSuccess = (jboolean) true;
+        if (__loginCompletedListener.isValid()) {
+            __loginCompletedListener.callMethod<void>("handleLoginCompleted", "(Z)V", jSuccess);
+        }
+        Setting::Handle<QVariant>(AUTO_LOGOUT_SETTING_NAME).set(!keepLoggedIn);
+        QString usernameToSave = keepLoggedIn ? username : "";
+        Setting::Handle<QVariant>(WALLET_USERNAME_SETTING_NAME).set(usernameToSave);
+    });
+
+    QObject::connect(accountManager.data(), &AccountManager::loginFailed, []() {
+        jboolean jSuccess = (jboolean) false;
+        if (__loginCompletedListener.isValid()) {
+            __loginCompletedListener.callMethod<void>("handleLoginCompleted", "(Z)V", jSuccess);
+        }
+    });
+
+    QMetaObject::invokeMethod(accountManager.data(), "requestAccessToken",
+                              Q_ARG(const QString&, username), Q_ARG(const QString&, password));
+}
+
+JNIEXPORT void JNICALL
+Java_io_highfidelity_hifiinterface_fragment_LoginFragment_retrieveAccessToken(JNIEnv *env,
+                                                                                  jobject instance,
+                                                                                  jstring authCode_,
+                                                                                  jstring clientId_,
+                                                                                  jstring clientSecret_,
+                                                                                  jstring redirectUri_) {
+    const char *c_authCode = env->GetStringUTFChars(authCode_, 0);
+    const char *c_clientId = env->GetStringUTFChars(clientId_, 0);
+    const char *c_clientSecret = env->GetStringUTFChars(clientSecret_, 0);
+    const char *c_redirectUri = env->GetStringUTFChars(redirectUri_, 0);
+
+    QString authCode = QString(c_authCode);
+    QString clientId = QString(c_clientId);
+    QString clientSecret = QString(c_clientSecret);
+    QString redirectUri = QString(c_redirectUri);
+
+    env->ReleaseStringUTFChars(authCode_, c_authCode);
+    env->ReleaseStringUTFChars(clientId_, c_clientId);
+    env->ReleaseStringUTFChars(clientSecret_, c_clientSecret);
+    env->ReleaseStringUTFChars(redirectUri_, c_redirectUri);
+
+    auto accountManager = DependencyManager::get<AccountManager>();
+
+    __loginCompletedListener = QAndroidJniObject(instance); // TODO: use a different listener?
 
     QObject::connect(accountManager.data(), &AccountManager::loginComplete, [](const QUrl& authURL) {
         jboolean jSuccess = (jboolean) true;
@@ -306,24 +405,19 @@ Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeLogin(JNIEnv *en
         }
     });
 
-    QObject::connect(accountManager.data(), &AccountManager::usernameChanged, [](const QString& username) {
-        QAndroidJniObject string = QAndroidJniObject::fromString(username);
-        if (__usernameChangedListener.isValid()) {
-            __usernameChangedListener.callMethod<void>("handleUsernameChanged", "(Ljava/lang/String;)V", string.object<jstring>());
-        }
-    });
+    QMetaObject::invokeMethod(accountManager.data(), "requestAccessTokenWithAuthCode",
+                              Q_ARG(const QString&, authCode), Q_ARG(const QString&, clientId),
+                              Q_ARG(const QString&, clientSecret), Q_ARG(const QString&, redirectUri));
 
-    QMetaObject::invokeMethod(accountManager.data(), "requestAccessToken",
-                              Q_ARG(const QString&, username), Q_ARG(const QString&, password));
 }
 
 JNIEXPORT void JNICALL
-Java_io_highfidelity_hifiinterface_fragment_SignupFragment_nativeLogin(JNIEnv *env,
+Java_io_highfidelity_hifiinterface_fragment_SignupFragment_login(JNIEnv *env,
                                                                        jobject instance,
                                                                        jstring username_,
                                                                        jstring password_,
-                                                                       jobject usernameChangedListener) {
-    Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeLogin(env, instance, username_, password_, usernameChangedListener);
+                                                                       jboolean keepLoggedIn) {
+    Java_io_highfidelity_hifiinterface_fragment_LoginFragment_login(env, instance, username_, password_, keepLoggedIn);
 }
 
 JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeInitAfterAppLoaded(JNIEnv* env, jobject obj) {
@@ -331,7 +425,7 @@ JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeInitAf
 }
 
 JNIEXPORT void JNICALL
-Java_io_highfidelity_hifiinterface_fragment_SignupFragment_nativeSignup(JNIEnv *env, jobject instance,
+Java_io_highfidelity_hifiinterface_fragment_SignupFragment_signup(JNIEnv *env, jobject instance,
                                                                        jstring email_, jstring username_,
                                                                        jstring password_) {
 
@@ -359,8 +453,6 @@ Java_io_highfidelity_hifiinterface_fragment_SignupFragment_nativeSignup(JNIEnv *
     });
 
     QObject::connect(&AndroidHelper::instance(), &AndroidHelper::handleSignupFailed, [](QString errorString) {
-        jboolean jSuccess = (jboolean) false;
-        jstring jError = QAndroidJniObject::fromString(errorString).object<jstring>();
         if (__signupCompletedListener.isValid()) {
             QAndroidJniObject string = QAndroidJniObject::fromString(errorString);
             __signupCompletedListener.callMethod<void>("handleSignupFailed", "(Ljava/lang/String;)V", string.object<jstring>());
@@ -371,19 +463,13 @@ Java_io_highfidelity_hifiinterface_fragment_SignupFragment_nativeSignup(JNIEnv *
 }
 
 JNIEXPORT void JNICALL
-Java_io_highfidelity_hifiinterface_fragment_SignupFragment_nativeCancelSignup(JNIEnv *env, jobject instance) {
+Java_io_highfidelity_hifiinterface_fragment_SignupFragment_cancelSignup(JNIEnv *env, jobject instance) {
     QObject::disconnect(&AndroidHelper::instance(), &AndroidHelper::handleSignupCompleted, nullptr, nullptr);
     QObject::disconnect(&AndroidHelper::instance(), &AndroidHelper::handleSignupFailed, nullptr, nullptr);
 
     __signupCompletedListener = nullptr;
 }
 
-JNIEXPORT jboolean JNICALL
-Java_io_highfidelity_hifiinterface_fragment_FriendsFragment_nativeIsLoggedIn(JNIEnv *env, jobject instance) {
-    auto accountManager = DependencyManager::get<AccountManager>();
-    return accountManager->isLoggedIn();
-}
-
 JNIEXPORT jstring JNICALL
 Java_io_highfidelity_hifiinterface_fragment_FriendsFragment_nativeGetAccessToken(JNIEnv *env, jobject instance) {
     auto accountManager = DependencyManager::get<AccountManager>();
@@ -406,23 +492,40 @@ Java_io_highfidelity_hifiinterface_SplashActivity_registerLoadCompleteListener(J
     });
 
 }
-JNIEXPORT jboolean JNICALL
-Java_io_highfidelity_hifiinterface_MainActivity_nativeIsLoggedIn(JNIEnv *env, jobject instance) {
-    return DependencyManager::get<AccountManager>()->isLoggedIn();
-}
 
 JNIEXPORT void JNICALL
-Java_io_highfidelity_hifiinterface_MainActivity_nativeLogout(JNIEnv *env, jobject instance) {
+Java_io_highfidelity_hifiinterface_MainActivity_logout(JNIEnv *env, jobject instance) {
     DependencyManager::get<AccountManager>()->logout();
 }
 
 JNIEXPORT jstring JNICALL
-Java_io_highfidelity_hifiinterface_MainActivity_nativeGetDisplayName(JNIEnv *env,
+Java_io_highfidelity_hifiinterface_MainActivity_getUsername(JNIEnv *env,
                                                                      jobject instance) {
     QString username = DependencyManager::get<AccountManager>()->getAccountInfo().getUsername();
     return env->NewStringUTF(username.toLatin1().data());
 }
 
+JNIEXPORT void JNICALL
+Java_io_highfidelity_hifiinterface_MainActivity_setUsernameChangedListener(JNIEnv *env,
+                                                                           jobject instance,
+                                                                           jobject usernameChangedListener) {
+    __usernameChangedListener = QAndroidJniObject(usernameChangedListener);
+
+    if (!__usernameChangedListener.isValid()) {
+        return;
+    }
+
+    auto accountManager = DependencyManager::get<AccountManager>();
+
+    QObject::connect(accountManager.data(), &AccountManager::usernameChanged, [](const QString& username) {
+        QAndroidJniObject string = QAndroidJniObject::fromString(username);
+        if (__usernameChangedListener.isValid()) {
+            __usernameChangedListener.callMethod<void>("handleUsernameChanged", "(Ljava/lang/String;)V", string.object<jstring>());
+        }
+    });
+
+}
+
 JNIEXPORT void JNICALL
 Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeBeforeEnterBackground(JNIEnv *env, jobject obj) {
     AndroidHelper::instance().notifyBeforeEnterBackground();
@@ -443,46 +546,6 @@ JNIEXPORT void Java_io_highfidelity_hifiinterface_WebViewActivity_nativeProcessU
     AndroidHelper::instance().processURL(QString::fromUtf8(nativeString));
 }
 
-JNIEXPORT void JNICALL
-Java_io_highfidelity_hifiinterface_fragment_SettingsFragment_updateHifiSetting(JNIEnv *env,
-                                                                               jobject instance,
-                                                                               jstring group_,
-                                                                               jstring key_,
-                                                                               jboolean value_) {
-    const char *c_group = env->GetStringUTFChars(group_, 0);
-    const char *c_key = env->GetStringUTFChars(key_, 0);
-
-    const QString group = QString::fromUtf8(c_group);
-    const QString key = QString::fromUtf8(c_key);
-
-    env->ReleaseStringUTFChars(group_, c_group);
-    env->ReleaseStringUTFChars(key_, c_key);
-
-    bool value = value_;
-
-    Setting::Handle<bool> setting { QStringList() << group << key , !value };
-    setting.set(value);
-}
-
-JNIEXPORT jboolean JNICALL
-Java_io_highfidelity_hifiinterface_fragment_SettingsFragment_getHifiSettingBoolean(JNIEnv *env,
-                                                                                   jobject instance,
-                                                                                   jstring group_,
-                                                                                   jstring key_,
-                                                                                   jboolean defaultValue) {
-    const char *c_group = env->GetStringUTFChars(group_, 0);
-    const char *c_key = env->GetStringUTFChars(key_, 0);
-
-    const QString group = QString::fromUtf8(c_group);
-    const QString key = QString::fromUtf8(c_key);
-
-    env->ReleaseStringUTFChars(group_, c_group);
-    env->ReleaseStringUTFChars(key_, c_key);
-
-    Setting::Handle<bool> setting { QStringList() << group << key , defaultValue};
-    return setting.get();
-}
-
 JNIEXPORT void JNICALL
 Java_io_highfidelity_hifiinterface_receiver_HeadsetStateReceiver_notifyHeadsetOn(JNIEnv *env,
                                                                                  jobject instance,

android/app/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java

@@ -64,4 +64,10 @@ public class HifiUtils {
 
     public native String protocolVersionSignature();
 
+    public native boolean isUserLoggedIn();
+
+    public native void updateHifiSetting(String group, String key, boolean value);
+    public native boolean getHifiSettingBoolean(String group, String key, boolean defaultValue);
+
+    public native boolean isKeepingLoggedIn();
 }

android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java

@@ -76,7 +76,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
     private static boolean inVrMode;
 
     private boolean nativeEnterBackgroundCallEnqueued = false;
-    private SlidingDrawer webSlidingDrawer;
+    private SlidingDrawer mWebSlidingDrawer;
 //    private GvrApi gvrApi;
     // Opaque native pointer to the Application C++ object.
     // This object is owned by the InterfaceActivity instance and passed to the native methods.
@@ -116,17 +116,6 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
         //nativeGvrApi =
             nativeOnCreate(this, assetManager /*, gvrApi.getNativeGvrContext()*/);
 
-        Point size = new Point();
-        getWindowManager().getDefaultDisplay().getRealSize(size);
-
-        try {
-            PackageInfo pInfo = this.getPackageManager().getPackageInfo(getPackageName(), 0);
-            String version = pInfo.versionName;
-//            setAppVersion(version);
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.e("GVR", "Error getting application version", e);
-        }
-
         final View rootView = getWindow().getDecorView().findViewById(android.R.id.content);
 
         // This is a workaround to hide the menu bar when the virtual keyboard is shown from Qt
@@ -137,26 +126,6 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
         });
         startActivity(new Intent(this, SplashActivity.class));
         mVibrator = (Vibrator) this.getSystemService(VIBRATOR_SERVICE);
-
-        FrameLayout mainLayout = findViewById(android.R.id.content);
-        LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        webSlidingDrawer = (SlidingDrawer) inflater.inflate(R.layout.web_drawer, mainLayout, false);
-        QtLayout qtLayout = (QtLayout) mainLayout.getChildAt(0);
-        QtLayout.LayoutParams layoutParams = new QtLayout.LayoutParams(webSlidingDrawer.getLayoutParams());
-        webSlidingDrawer.setOnDrawerCloseListener(() -> {
-            WebViewFragment webViewFragment = (WebViewFragment) getFragmentManager().findFragmentByTag("webViewFragment");
-            webViewFragment.close();
-        });
-        int widthPx = Math.max(size.x, size.y);
-        int heightPx = Math.min(size.x, size.y);
-
-        layoutParams.x = (int) (widthPx - WEB_DRAWER_RIGHT_MARGIN * getResources().getDisplayMetrics().xdpi / NORMAL_DPI);
-        layoutParams.y = (int) (heightPx - WEB_DRAWER_BOTTOM_MARGIN * getResources().getDisplayMetrics().ydpi / NORMAL_DPI);
-
-        layoutParams.resolveLayoutDirection(View.LAYOUT_DIRECTION_RTL);
-        qtLayout.addView(webSlidingDrawer, layoutParams);
-        webSlidingDrawer.setVisibility(View.GONE);
-
         headsetStateReceiver = new HeadsetStateReceiver();
     }
 
@@ -289,14 +258,47 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         if (intent.hasExtra(DOMAIN_URL)) {
-            webSlidingDrawer.setVisibility(View.GONE);
+            hideWebDrawer();
             nativeGotoUrl(intent.getStringExtra(DOMAIN_URL));
         } else if (intent.hasExtra(EXTRA_GOTO_USERNAME)) {
-            webSlidingDrawer.setVisibility(View.GONE);
+            hideWebDrawer();
             nativeGoToUser(intent.getStringExtra(EXTRA_GOTO_USERNAME));
         }
     }
 
+    private void hideWebDrawer() {
+        if (mWebSlidingDrawer != null) {
+            mWebSlidingDrawer.setVisibility(View.GONE);
+        }
+    }
+
+    public void showWebDrawer() {
+        if (mWebSlidingDrawer == null) {
+            FrameLayout mainLayout = findViewById(android.R.id.content);
+            LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            QtLayout qtLayout = (QtLayout) mainLayout.getChildAt(0);
+            mWebSlidingDrawer = (SlidingDrawer) inflater.inflate(R.layout.web_drawer, mainLayout, false);
+
+            QtLayout.LayoutParams layoutParams = new QtLayout.LayoutParams(mWebSlidingDrawer.getLayoutParams());
+            mWebSlidingDrawer.setOnDrawerCloseListener(() -> {
+                WebViewFragment webViewFragment = (WebViewFragment) getFragmentManager().findFragmentByTag("webViewFragment");
+                webViewFragment.close();
+            });
+
+            Point size = new Point();
+            getWindowManager().getDefaultDisplay().getRealSize(size);
+            int widthPx = Math.max(size.x, size.y);
+            int heightPx = Math.min(size.x, size.y);
+
+            layoutParams.x = (int) (widthPx - WEB_DRAWER_RIGHT_MARGIN * getResources().getDisplayMetrics().xdpi / NORMAL_DPI);
+            layoutParams.y = (int) (heightPx - WEB_DRAWER_BOTTOM_MARGIN * getResources().getDisplayMetrics().ydpi / NORMAL_DPI);
+
+            layoutParams.resolveLayoutDirection(View.LAYOUT_DIRECTION_RTL);
+            qtLayout.addView(mWebSlidingDrawer, layoutParams);
+        }
+        mWebSlidingDrawer.setVisibility(View.VISIBLE);
+    }
+
     public void openAndroidActivity(String activityName, boolean backToScene) {
         openAndroidActivity(activityName, backToScene, null);
     }
@@ -313,29 +315,29 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
                 break;
             case "Login":
                 nativeBeforeEnterBackground();
-                Intent loginIntent = new Intent(this, MainActivity.class);
-                loginIntent.putExtra(MainActivity.EXTRA_FRAGMENT, activityName);
-                loginIntent.putExtra(MainActivity.EXTRA_BACK_TO_SCENE, backToScene);
+                Intent loginIntent = new Intent(this, LoginMenuActivity.class);
+                loginIntent.putExtra(LoginMenuActivity.EXTRA_BACK_TO_SCENE, backToScene);
+                loginIntent.putExtra(LoginMenuActivity.EXTRA_BACK_ON_SKIP, true);
                 if (args != null && args.containsKey(DOMAIN_URL)) {
-                    loginIntent.putExtra(DOMAIN_URL, (String) args.get(DOMAIN_URL));
+                    loginIntent.putExtra(LoginMenuActivity.EXTRA_DOMAIN_URL, (String) args.get(DOMAIN_URL));
                 }
                 startActivity(loginIntent);
                 break;
             case "WebView":
                 runOnUiThread(() -> {
-                    webSlidingDrawer.setVisibility(View.VISIBLE);
-                    if (!webSlidingDrawer.isOpened()) {
-                        webSlidingDrawer.animateOpen();
+                    showWebDrawer();
+                    if (!mWebSlidingDrawer.isOpened()) {
+                        mWebSlidingDrawer.animateOpen();
                     }
                     if (args != null && args.containsKey(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL)) {
                         WebViewFragment webViewFragment = (WebViewFragment) getFragmentManager().findFragmentByTag("webViewFragment");
                         webViewFragment.loadUrl((String) args.get(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL), true);
                         webViewFragment.setToolbarVisible(true);
                         webViewFragment.setCloseAction(() -> {
-                            if (webSlidingDrawer.isOpened()) {
-                                webSlidingDrawer.animateClose();
+                            if (mWebSlidingDrawer.isOpened()) {
+                                mWebSlidingDrawer.animateClose();
                             }
-                            webSlidingDrawer.setVisibility(View.GONE);
+                            hideWebDrawer();
                         });
                     }
                 });
@@ -381,4 +383,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
     public void onExpand() {
         keepInterfaceRunning = true;
     }
+
+    @Override
+    public void onOAuthAuthorizeCallback(Uri uri) { }
 }

android/app/src/main/java/io/highfidelity/hifiinterface/LoginMenuActivity.java

@@ -0,0 +1,210 @@
+package io.highfidelity.hifiinterface;
+
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import io.highfidelity.hifiinterface.fragment.LoginFragment;
+import io.highfidelity.hifiinterface.fragment.OnBackPressedListener;
+import io.highfidelity.hifiinterface.fragment.SignupFragment;
+import io.highfidelity.hifiinterface.fragment.StartMenuFragment;
+
+public class LoginMenuActivity extends AppCompatActivity
+                                implements StartMenuFragment.StartMenuInteractionListener,
+                                                LoginFragment.OnLoginInteractionListener,
+                                                SignupFragment.OnSignupInteractionListener {
+
+    /**
+     * Set EXTRA_FINISH_ON_BACK to finish the app when back button is pressed
+     */
+    public static final String EXTRA_FINISH_ON_BACK = "finishOnBack";
+
+    /**
+     * Set EXTRA_BACK_TO_SCENE to back to the scene
+     */
+    public static final String EXTRA_BACK_TO_SCENE = "backToScene";
+
+    /**
+     * Set EXTRA_BACK_ON_SKIP to finish this activity when skip button is pressed
+     */
+    public static final String EXTRA_BACK_ON_SKIP = "backOnSkip";
+
+    public static final String EXTRA_DOMAIN_URL = "url";
+
+    private boolean finishOnBack;
+    private boolean backToScene;
+    private boolean backOnSkip;
+    private String domainUrlToBack;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_encourage_login);
+
+        finishOnBack = getIntent().getBooleanExtra(EXTRA_FINISH_ON_BACK, false);
+        backToScene = getIntent().getBooleanExtra(EXTRA_BACK_TO_SCENE, false);
+        domainUrlToBack =  getIntent().getStringExtra(EXTRA_DOMAIN_URL);
+        backOnSkip = getIntent().getBooleanExtra(EXTRA_BACK_ON_SKIP, false);
+
+        if (savedInstanceState != null) {
+            finishOnBack = savedInstanceState.getBoolean(EXTRA_FINISH_ON_BACK, false);
+            backToScene = savedInstanceState.getBoolean(EXTRA_BACK_TO_SCENE, false);
+            backOnSkip = savedInstanceState.getBoolean(EXTRA_BACK_ON_SKIP, false);
+            domainUrlToBack = savedInstanceState.getString(EXTRA_DOMAIN_URL);
+        }
+
+        loadMenuFragment();
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(EXTRA_FINISH_ON_BACK, finishOnBack);
+        outState.putBoolean(EXTRA_BACK_TO_SCENE, backToScene);
+        outState.putString(EXTRA_DOMAIN_URL, domainUrlToBack);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        finishOnBack = savedInstanceState.getBoolean(EXTRA_FINISH_ON_BACK, false);
+        backToScene = savedInstanceState.getBoolean(EXTRA_BACK_TO_SCENE, false);
+        backOnSkip = savedInstanceState.getBoolean(EXTRA_BACK_ON_SKIP, false);
+        domainUrlToBack = savedInstanceState.getString(EXTRA_DOMAIN_URL);
+    }
+
+    private void loadMenuFragment() {
+        FragmentManager fragmentManager = getFragmentManager();
+        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+        Fragment fragment = StartMenuFragment.newInstance();
+        fragmentTransaction.replace(R.id.content_frame, fragment);
+        fragmentTransaction.addToBackStack(fragment.toString());
+        fragmentTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
+        fragmentTransaction.commit();
+        hideStatusBar();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        hideStatusBar();
+    }
+
+    private void hideStatusBar() {
+        View decorView = getWindow().getDecorView();
+        // Hide the status bar.
+        int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
+        decorView.setSystemUiVisibility(uiOptions);
+    }
+
+    @Override
+    public void onSignupButtonClicked() {
+        loadSignupFragment();
+    }
+
+    @Override
+    public void onLoginButtonClicked() {
+        loadLoginFragment(false);
+    }
+
+    @Override
+    public void onSkipLoginClicked() {
+        if (backOnSkip) {
+            onBackPressed();
+        } else {
+            loadMainActivity();
+        }
+    }
+
+    @Override
+    public void onSteamLoginButtonClicked() {
+        loadLoginFragment(true);
+    }
+
+    private void loadSignupFragment() {
+        FragmentManager fragmentManager = getFragmentManager();
+        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+        Fragment fragment = SignupFragment.newInstance();
+        String tag = getString(R.string.tagFragmentSignup);
+        fragmentTransaction.replace(R.id.content_frame, fragment, tag);
+        fragmentTransaction.addToBackStack(tag);
+        fragmentTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
+        fragmentTransaction.commit();
+        hideStatusBar();
+    }
+
+    private void loadLoginFragment(boolean useOauth) {
+        FragmentManager fragmentManager = getFragmentManager();
+        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+        Fragment fragment = LoginFragment.newInstance(useOauth);
+        String tag = getString(R.string.tagFragmentLogin);
+        fragmentTransaction.replace(R.id.content_frame, fragment, tag);
+        fragmentTransaction.addToBackStack(tag);
+        fragmentTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
+        fragmentTransaction.commit();
+        hideStatusBar();
+    }
+
+    @Override
+    public void onLoginCompleted() {
+        loadMainActivity();
+    }
+
+    @Override
+    public void onCancelLogin() {
+        getFragmentManager().popBackStack();
+    }
+
+    @Override
+    public void onCancelSignup() {
+        getFragmentManager().popBackStack();
+    }
+
+    private void loadMainActivity() {
+        finish();
+        if (backToScene) {
+            backToScene = false;
+            goToDomain(domainUrlToBack != null? domainUrlToBack : "");
+        } else {
+            startActivity(new Intent(this, MainActivity.class));
+        }
+    }
+
+    private void goToDomain(String domainUrl) {
+        Intent intent = new Intent(this, InterfaceActivity.class);
+        intent.putExtra(InterfaceActivity.DOMAIN_URL, domainUrl);
+        finish();
+        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        startActivity(intent);
+    }
+
+
+    @Override
+    public void onSignupCompleted() {
+        loadMainActivity();
+    }
+
+    @Override
+    public void onBackPressed() {
+        FragmentManager fm = getFragmentManager();
+        int index = fm.getBackStackEntryCount() - 1;
+        if (index > 0) {
+            FragmentManager.BackStackEntry backEntry = fm.getBackStackEntryAt(index);
+            String tag = backEntry.getName();
+            Fragment topFragment = getFragmentManager().findFragmentByTag(tag);
+            if (!(topFragment instanceof OnBackPressedListener) ||
+                    !((OnBackPressedListener) topFragment).doBack()) {
+                super.onBackPressed();
+            }
+        } else if (finishOnBack){
+            finishAffinity();
+        } else {
+            finish();
+        }
+    }
+}

android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java

@@ -1,5 +1,6 @@
 package io.highfidelity.hifiinterface;
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
@@ -29,23 +30,16 @@ import android.widget.TextView;
 import com.squareup.picasso.Callback;
 import com.squareup.picasso.Picasso;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import io.highfidelity.hifiinterface.fragment.FriendsFragment;
 import io.highfidelity.hifiinterface.fragment.HomeFragment;
-import io.highfidelity.hifiinterface.fragment.LoginFragment;
 import io.highfidelity.hifiinterface.fragment.PolicyFragment;
 import io.highfidelity.hifiinterface.fragment.SettingsFragment;
-import io.highfidelity.hifiinterface.fragment.SignedInFragment;
-import io.highfidelity.hifiinterface.fragment.SignupFragment;import io.highfidelity.hifiinterface.task.DownloadProfileImageTask;
+import io.highfidelity.hifiinterface.fragment.SignupFragment;
+import io.highfidelity.hifiinterface.task.DownloadProfileImageTask;
 
 public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener,
-                                                                LoginFragment.OnLoginInteractionListener,
                                                                 HomeFragment.OnHomeInteractionListener,
-                                                                FriendsFragment.OnHomeInteractionListener,
-                                                                SignupFragment.OnSignupInteractionListener,
-                                                                SignedInFragment.OnSignedInInteractionListener {
+                                                                FriendsFragment.OnHomeInteractionListener {
 
     private static final int PROFILE_PICTURE_PLACEHOLDER = R.drawable.default_profile_avatar;
     public static final String DEFAULT_FRAGMENT = "Home";
@@ -55,9 +49,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     private String TAG = "HighFidelity";
 
-    public native boolean nativeIsLoggedIn();
-    public native void nativeLogout();
-    public native String nativeGetDisplayName();
+    public native void logout();
+    public native void setUsernameChangedListener(Activity usernameChangedListener);
+    public native String getUsername();
 
     private DrawerLayout mDrawerLayout;
     private NavigationView mNavigationView;
@@ -130,9 +124,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     private void loadFragment(String fragment) {
         switch (fragment) {
-            case "Login":
-                loadLoginFragment();
-                break;
             case "Home":
                 loadHomeFragment(true);
                 break;
@@ -153,19 +144,10 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         loadFragment(fragment, getString(R.string.home), getString(R.string.tagFragmentHome), addToBackStack, true);
     }
 
-    private void loadLoginFragment() {
-        Fragment fragment = LoginFragment.newInstance();
-        loadFragment(fragment, getString(R.string.login), getString(R.string.tagFragmentLogin), true, true);
-    }
-
-    private void loadSignedInFragment() {
-        Fragment fragment = SignedInFragment.newInstance();
-        loadFragment(fragment, getString(R.string.welcome), getString(R.string.tagFragmentSignedIn), true, true);
-    }
-
-    private void loadSignupFragment() {
-        Fragment fragment = SignupFragment.newInstance();
-        loadFragment(fragment, getString(R.string.signup), getString(R.string.tagFragmentSignup), true, false);
+    private void startLoginMenuActivity() {
+        Intent intent = new Intent(this, LoginMenuActivity.class);
+        intent.putExtra(LoginMenuActivity.EXTRA_BACK_ON_SKIP, true);
+        startActivity(intent);
     }
 
     private void loadPrivacyPolicyFragment() {
@@ -223,7 +205,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     
     private void updateLoginMenu() {
-        if (nativeIsLoggedIn()) {
+        if (HifiUtils.getInstance().isUserLoggedIn()) {
             mLoginPanel.setVisibility(View.GONE);
             mProfilePanel.setVisibility(View.VISIBLE);
             mLogoutOption.setVisibility(View.VISIBLE);
@@ -239,7 +221,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     }
 
     private void updateProfileHeader() {
-        updateProfileHeader(nativeGetDisplayName());
+        updateProfileHeader(getUsername());
     }
     private void updateProfileHeader(String username) {
         if (!username.isEmpty()) {
@@ -289,15 +271,22 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     @Override
     protected void onStart() {
         super.onStart();
+        setUsernameChangedListener(this);
         updateLoginMenu();
     }
 
+    @Override
+    protected void onStop() {
+        super.onStop();
+        setUsernameChangedListener(null);
+    }
+
     public void onLoginClicked(View view) {
-        loadLoginFragment();
+        startLoginMenuActivity();
     }
 
     public void onLogoutClicked(View view) {
-        nativeLogout();
+        logout();
         updateLoginMenu();
         exitLoggedInFragment();
 
@@ -338,42 +327,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         startActivity(intent);
     }
 
-    @Override
-    public void onLoginCompleted() {
-        loadHomeFragment(false);
-        updateLoginMenu();
-        if (backToScene) {
-            backToScene = false;
-            goToLastLocation();
-        }
-    }
-
-    @Override
-    public void onGettingStarted() {
-        loadHomeFragment(false);
-        if (backToScene) {
-            backToScene = false;
-            goToLastLocation();
-        }
-    }
-
-    @Override
-    public void onLoginRequested() {
-        // go back from signup to login
-        onBackPressed();
-    }
-
-    @Override
-    public void onSignupRequested() {
-        loadSignupFragment();
-    }
-
-    @Override
-    public void onSignupCompleted() {
-        loadSignedInFragment();
-        updateLoginMenu();
-    }
-
     public void handleUsernameChanged(String username) {
         runOnUiThread(() -> updateProfileHeader(username));
     }
@@ -418,7 +371,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     public void onBackPressed() {
         // if a fragment needs to internally manage back presses..
         FragmentManager fm = getFragmentManager();
-        Log.d("[BACK]", "getBackStackEntryCount " + fm.getBackStackEntryCount());
         Fragment friendsFragment = fm.findFragmentByTag(getString(R.string.tagFragmentPeople));
         if (friendsFragment != null && friendsFragment instanceof FriendsFragment) {
             if (((FriendsFragment) friendsFragment).onBackPressed()) {

android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java

@@ -3,7 +3,6 @@ package io.highfidelity.hifiinterface;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
 import android.view.View;
 
 public class SplashActivity extends Activity {
@@ -37,7 +36,13 @@ public class SplashActivity extends Activity {
     }
 
     public void onAppLoadedComplete() {
-        startActivity(new Intent(this, MainActivity.class));
+        if (HifiUtils.getInstance().isUserLoggedIn()) {
+            startActivity(new Intent(this, MainActivity.class));
+        } else {
+            Intent menuIntent =  new Intent(this, LoginMenuActivity.class);
+            menuIntent.putExtra(LoginMenuActivity.EXTRA_FINISH_ON_BACK, true);
+            startActivity(menuIntent);
+        }
         SplashActivity.this.finish();
     }
 }

android/app/src/main/java/io/highfidelity/hifiinterface/WebViewActivity.java

@@ -28,11 +28,18 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 import io.highfidelity.hifiinterface.fragment.WebViewFragment;
+import io.highfidelity.hifiinterface.fragment.WebViewFragment.OnWebViewInteractionListener;
 
-public class WebViewActivity extends Activity implements WebViewFragment.OnWebViewInteractionListener {
+public class WebViewActivity extends Activity implements OnWebViewInteractionListener {
 
     public static final String WEB_VIEW_ACTIVITY_EXTRA_URL = "url";
+    public static final String WEB_VIEW_ACTIVITY_EXTRA_CLEAR_COOKIES = "clear_cookies";
+    public static final String RESULT_OAUTH_CODE = "code";
+    public static final String RESULT_OAUTH_STATE = "state";
+
     private static final String FRAGMENT_TAG = "WebViewActivity_WebFragment";
+    private static final String OAUTH_CODE = "code";
+    private static final String OAUTH_STATE = "state";
 
     private native void nativeProcessURL(String url);
 
@@ -47,14 +54,15 @@ public class WebViewActivity extends Activity implements WebViewFragment.OnWebVi
         mActionBar = getActionBar();
         mActionBar.setDisplayHomeAsUpEnabled(true);
 
-        loadWebViewFragment(getIntent().getStringExtra(WEB_VIEW_ACTIVITY_EXTRA_URL));
+        loadWebViewFragment(getIntent().getStringExtra(WEB_VIEW_ACTIVITY_EXTRA_URL), getIntent().getBooleanExtra(WEB_VIEW_ACTIVITY_EXTRA_CLEAR_COOKIES, false));
     }
 
-    private void loadWebViewFragment(String url) {
+    private void loadWebViewFragment(String url, boolean clearCookies) {
         WebViewFragment fragment = WebViewFragment.newInstance();
         Bundle bundle = new Bundle();
         bundle.putString(WebViewFragment.URL, url);
         bundle.putBoolean(WebViewFragment.TOOLBAR_VISIBLE, false);
+        bundle.putBoolean(WebViewFragment.CLEAR_COOKIES, clearCookies);
         fragment.setArguments(bundle);
         FragmentManager fragmentManager = getFragmentManager();
         FragmentTransaction ft = fragmentManager.beginTransaction();
@@ -131,4 +139,13 @@ public class WebViewActivity extends Activity implements WebViewFragment.OnWebVi
     @Override
     public void onExpand() { }
 
+    @Override
+    public void onOAuthAuthorizeCallback(Uri uri) {
+        Intent result = new Intent();
+        result.putExtra(RESULT_OAUTH_CODE, uri.getQueryParameter(OAUTH_CODE));
+        result.putExtra(RESULT_OAUTH_STATE, uri.getQueryParameter(OAUTH_STATE));
+        setResult(Activity.RESULT_OK, result);
+        finish();
+    }
+
 }

android/app/src/main/java/io/highfidelity/hifiinterface/fragment/FriendsFragment.java

@@ -23,8 +23,6 @@ import io.highfidelity.hifiinterface.view.UserListAdapter;
 
 public class FriendsFragment extends Fragment {
 
-    public native boolean nativeIsLoggedIn();
-
     public native String nativeGetAccessToken();
 
     private RecyclerView mUsersView;

android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java

@@ -2,41 +2,65 @@ package io.highfidelity.hifiinterface.fragment;
 
 import android.app.Activity;
 import android.app.Fragment;
-import android.app.ProgressDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.util.Log;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 
 import org.qtproject.qt5.android.QtNative;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Random;
+
+import io.highfidelity.hifiinterface.BuildConfig;
+import io.highfidelity.hifiinterface.HifiUtils;
 import io.highfidelity.hifiinterface.R;
+import io.highfidelity.hifiinterface.WebViewActivity;
 
 import static org.qtproject.qt5.android.QtActivityDelegate.ApplicationActive;
 import static org.qtproject.qt5.android.QtActivityDelegate.ApplicationInactive;
 
-public class LoginFragment extends Fragment {
+public class LoginFragment extends Fragment
+                            implements  OnBackPressedListener {
+
+    private static final String ARG_USE_OAUTH = "use_oauth";
+    private static final String TAG = "Interface";
+
+    private final String OAUTH_CLIENT_ID = BuildConfig.OAUTH_CLIENT_ID;
+    private final String OAUTH_REDIRECT_URI = BuildConfig.OAUTH_REDIRECT_URI;
+    private final String OAUTH_AUTHORIZE_BASE_URL = "https://highfidelity.com/oauth/authorize";
+    private static final int OAUTH_AUTHORIZE_REQUEST = 1;
 
     private EditText mUsername;
     private EditText mPassword;
     private TextView mError;
-    private TextView mForgotPassword;
-    private TextView mSignup;
     private Button mLoginButton;
+    private CheckBox mKeepMeLoggedInCheckbox;
+    private ViewGroup mLoginForm;
+    private ViewGroup mLoggingInFrame;
+    private ViewGroup mLoggedInFrame;
+    private boolean mLoginInProgress;
+    private boolean mLoginSuccess;
+    private boolean mUseOauth;
+    private String mOauthState;
 
-    private ProgressDialog mDialog;
+    public native void login(String username, String password, boolean keepLoggedIn);
+    private native void retrieveAccessToken(String authCode, String clientId, String clientSecret, String redirectUri);
 
-    public native void nativeLogin(String username, String password, Activity usernameChangedListener);
-    public native void nativeCancelLogin();
+    public native void cancelLogin();
 
     private LoginFragment.OnLoginInteractionListener mListener;
 
@@ -44,11 +68,22 @@ public class LoginFragment extends Fragment {
         // Required empty public constructor
     }
 
-    public static LoginFragment newInstance() {
+    public static LoginFragment newInstance(boolean useOauth) {
         LoginFragment fragment = new LoginFragment();
+        Bundle args = new Bundle();
+        args.putBoolean(ARG_USE_OAUTH, useOauth);
+        fragment.setArguments(args);
         return fragment;
     }
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            mUseOauth = getArguments().getBoolean(ARG_USE_OAUTH, false);
+        }
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -58,22 +93,29 @@ public class LoginFragment extends Fragment {
         mPassword = rootView.findViewById(R.id.password);
         mError = rootView.findViewById(R.id.error);
         mLoginButton = rootView.findViewById(R.id.loginButton);
-        mForgotPassword = rootView.findViewById(R.id.forgotPassword);
-        mSignup = rootView.findViewById(R.id.signupButton);
+        mLoginForm = rootView.findViewById(R.id.loginForm);
+        mLoggingInFrame = rootView.findViewById(R.id.loggingInFrame);
+        mLoggedInFrame = rootView.findViewById(R.id.loggedInFrame);
+        mKeepMeLoggedInCheckbox = rootView.findViewById(R.id.keepMeLoggedIn);
 
-        mLoginButton.setOnClickListener(view -> login());
+        rootView.findViewById(R.id.forgotPassword).setOnClickListener(view -> onForgotPasswordClicked());
 
-        mForgotPassword.setOnClickListener(view -> forgotPassword());
-        mSignup.setOnClickListener(view -> signup());
+        rootView.findViewById(R.id.cancel).setOnClickListener(view -> onCancelLogin());
 
-        mPassword.setOnEditorActionListener(
-                (textView, actionId, keyEvent) -> {
-                    if (actionId == EditorInfo.IME_ACTION_DONE) {
-                        mLoginButton.performClick();
-                        return true;
-                    }
-                    return false;
-                });
+        rootView.findViewById(R.id.getStarted).setOnClickListener(view -> onGetStartedClicked());
+
+        mLoginButton.setOnClickListener(view -> onLoginButtonClicked());
+
+        rootView.findViewById(R.id.takeMeInWorld).setOnClickListener(view -> skipLogin());
+        mPassword.setOnEditorActionListener((textView, actionId, keyEvent) -> onPasswordEditorAction(textView, actionId, keyEvent));
+
+        mKeepMeLoggedInCheckbox.setChecked(HifiUtils.getInstance().isKeepingLoggedIn());
+
+        if (mUseOauth) {
+            openWebForAuthorization();
+        } else {
+            showLoginForm();
+        }
         return rootView;
     }
 
@@ -104,13 +146,57 @@ public class LoginFragment extends Fragment {
     @Override
     public void onStop() {
         super.onStop();
-        cancelActivityIndicator();
         // Leave the Qt app paused
         QtNative.setApplicationState(ApplicationInactive);
         hideKeyboard();
     }
 
-    public void login() {
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == OAUTH_AUTHORIZE_REQUEST) {
+            if (resultCode == Activity.RESULT_OK) {
+                String authCode = data.getStringExtra(WebViewActivity.RESULT_OAUTH_CODE);
+                String state = data.getStringExtra(WebViewActivity.RESULT_OAUTH_STATE);
+                if (state != null && state.equals(mOauthState) && mListener != null) {
+                    mOauthState = null;
+                    showActivityIndicator();
+                    mLoginInProgress = true;
+                    retrieveAccessToken(authCode, BuildConfig.OAUTH_CLIENT_ID, BuildConfig.OAUTH_CLIENT_SECRET, BuildConfig.OAUTH_REDIRECT_URI);
+                }
+            } else {
+                onCancelLogin();
+            }
+        }
+
+    }
+
+    private void onCancelLogin() {
+        if (mListener != null) {
+            mListener.onCancelLogin();
+        }
+    }
+
+    private boolean onPasswordEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
+        if (actionId == EditorInfo.IME_ACTION_DONE) {
+            mLoginButton.performClick();
+            return true;
+        }
+        return false;
+    }
+
+    private void skipLogin() {
+        if (mListener != null) {
+            mListener.onSkipLoginClicked();
+        }
+    }
+
+    private void onGetStartedClicked() {
+        if (mListener != null) {
+            mListener.onLoginCompleted();
+        }
+    }
+
+    public void onLoginButtonClicked() {
         String username = mUsername.getText().toString().trim();
         String password = mPassword.getText().toString();
         hideKeyboard();
@@ -120,13 +206,10 @@ public class LoginFragment extends Fragment {
             mLoginButton.setEnabled(false);
             hideError();
             showActivityIndicator();
-            nativeLogin(username, password, getActivity());
-        }
-    }
-
-    public void signup() {
-        if (mListener != null) {
-            mListener.onSignupRequested();
+            mLoginInProgress = true;
+            mLoginSuccess = false;
+            boolean keepUserLoggedIn = mKeepMeLoggedInCheckbox.isChecked();
+            login(username, password, keepUserLoggedIn);
         }
     }
 
@@ -138,33 +221,32 @@ public class LoginFragment extends Fragment {
         }
     }
 
-    private void forgotPassword() {
+    private void onForgotPasswordClicked() {
         Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://highfidelity.com/users/password/new"));
         startActivity(intent);
     }
 
     private void showActivityIndicator() {
-        if (mDialog == null) {
-            mDialog = new ProgressDialog(getContext());
-        }
-        mDialog.setMessage(getString(R.string.logging_in));
-        mDialog.setCancelable(true);
-        mDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
-            @Override
-            public void onCancel(DialogInterface dialogInterface) {
-                nativeCancelLogin();
-                cancelActivityIndicator();
-                mLoginButton.setEnabled(true);
-            }
-        });
-        mDialog.show();
+        mLoginForm.setVisibility(View.GONE);
+        mLoggedInFrame.setVisibility(View.GONE);
+        mLoggingInFrame.setVisibility(View.VISIBLE);
+        mLoggingInFrame.bringToFront();
     }
 
-    private void cancelActivityIndicator() {
-        if (mDialog != null) {
-            mDialog.cancel();
-        }
+    private void showLoginForm() {
+        mLoggingInFrame.setVisibility(View.GONE);
+        mLoggedInFrame.setVisibility(View.GONE);
+        mLoginForm.setVisibility(View.VISIBLE);
+        mLoginForm.bringToFront();
     }
+
+    private void showLoggedInMessage() {
+        mLoginForm.setVisibility(View.GONE);
+        mLoggingInFrame.setVisibility(View.GONE);
+        mLoggedInFrame.setVisibility(View.VISIBLE);
+        mLoggedInFrame.bringToFront();
+    }
+
     private void showError(String error) {
         mError.setText(error);
         mError.setVisibility(View.VISIBLE);
@@ -176,22 +258,71 @@ public class LoginFragment extends Fragment {
     }
 
     public void handleLoginCompleted(boolean success) {
+        mLoginInProgress = false;
         getActivity().runOnUiThread(() -> {
             mLoginButton.setEnabled(true);
-            cancelActivityIndicator();
             if (success) {
-                if (mListener != null) {
-                    mListener.onLoginCompleted();
-                }
+                mLoginSuccess = true;
+                showLoggedInMessage();
             } else {
-                showError(getString(R.string.login_username_or_password_incorrect));
+                if (!mUseOauth) {
+                    showLoginForm();
+                    showError(getString(R.string.login_username_or_password_incorrect));
+                } else {
+                    openWebForAuthorization();
+                }
             }
         });
     }
 
+    @Override
+    public boolean doBack() {
+        if (mLoginInProgress) {
+            cancelLogin();
+            showLoginForm();
+            mLoginInProgress = false;
+            mLoginButton.setEnabled(true);
+            return true;
+        } else if (mLoginSuccess) {
+            onGetStartedClicked();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private void updateOauthState() {
+        // as we only use oauth for steam that's ok for now
+        mOauthState = "steam-" + Long.toString(new Random().nextLong());
+    }
+
+    private String buildAuthorizeUrl() {
+        StringBuilder sb = new StringBuilder(OAUTH_AUTHORIZE_BASE_URL);
+        sb.append("?client_id=").append(OAUTH_CLIENT_ID);
+        try {
+            String redirectUri = URLEncoder.encode(OAUTH_REDIRECT_URI, "utf-8");
+            sb.append("&redirect_uri=").append(redirectUri);
+        } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "Cannot build oauth autorization url", e);
+        }
+        sb.append("&response_type=code&scope=owner");
+        sb.append("&state=").append(mOauthState);
+        return sb.toString();
+    }
+
+    private void openWebForAuthorization() {
+        Intent openUrlIntent = new Intent(getActivity(), WebViewActivity.class);
+        updateOauthState();
+        openUrlIntent.putExtra(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL, buildAuthorizeUrl());
+        openUrlIntent.putExtra(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_CLEAR_COOKIES, true);
+        startActivityForResult(openUrlIntent, OAUTH_AUTHORIZE_REQUEST);
+    }
+
+
     public interface OnLoginInteractionListener {
         void onLoginCompleted();
-        void onSignupRequested();
+        void onCancelLogin();
+        void onSkipLoginClicked();
     }
 
 }

android/app/src/main/java/io/highfidelity/hifiinterface/fragment/OnBackPressedListener.java

@@ -0,0 +1,11 @@
+package io.highfidelity.hifiinterface.fragment;
+
+public interface OnBackPressedListener {
+
+    /**
+     * Processes the back pressed event and returns true if it was managed by this Fragment
+     * @return
+     */
+    boolean doBack();
+
+}

android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SettingsFragment.java

@@ -3,32 +3,35 @@ package io.highfidelity.hifiinterface.fragment;
 import android.content.SharedPreferences;
 import android.media.audiofx.AcousticEchoCanceler;
 import android.os.Bundle;
-import android.preference.Preference;
 import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 
+import io.highfidelity.hifiinterface.HifiUtils;
 import io.highfidelity.hifiinterface.R;
 
 public class SettingsFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
 
-    public native void updateHifiSetting(String group, String key, boolean value);
-    public native boolean getHifiSettingBoolean(String group, String key, boolean defaultValue);
-
     private final String HIFI_SETTINGS_ANDROID_GROUP = "Android";
     private final String HIFI_SETTINGS_AEC_KEY = "aec";
     private final String PREFERENCE_KEY_AEC = "aec";
 
+    private final boolean DEFAULT_AEC_ENABLED = true;
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.settings);
+        boolean aecAvailable = AcousticEchoCanceler.isAvailable();
+        PreferenceManager.setDefaultValues(getContext(), R.xml.settings, false);
 
-        if (!AcousticEchoCanceler.isAvailable()) {
-            getPreferenceScreen().getPreferenceManager().findPreference("aec").setEnabled(false);
+        if (!aecAvailable) {
+            findPreference(PREFERENCE_KEY_AEC).setEnabled(false);
+            HifiUtils.getInstance().updateHifiSetting(HIFI_SETTINGS_ANDROID_GROUP, HIFI_SETTINGS_AEC_KEY, false);
         }
 
         getPreferenceScreen().getSharedPreferences().edit().putBoolean(PREFERENCE_KEY_AEC,
-                getHifiSettingBoolean(HIFI_SETTINGS_ANDROID_GROUP, HIFI_SETTINGS_AEC_KEY, false));
+                aecAvailable && HifiUtils.getInstance().getHifiSettingBoolean(HIFI_SETTINGS_ANDROID_GROUP, HIFI_SETTINGS_AEC_KEY, DEFAULT_AEC_ENABLED)).commit();
     }
 
     public static SettingsFragment newInstance() {
@@ -46,15 +49,13 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
     public void onPause() {
         super.onPause();
         getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
-
     }
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        Preference pref = findPreference(key);
         switch (key) {
             case "aec":
-                updateHifiSetting(HIFI_SETTINGS_ANDROID_GROUP, HIFI_SETTINGS_AEC_KEY, sharedPreferences.getBoolean(key, false));
+                HifiUtils.getInstance().updateHifiSetting(HIFI_SETTINGS_ANDROID_GROUP, HIFI_SETTINGS_AEC_KEY, sharedPreferences.getBoolean(key, false));
                 break;
             default:
                 break;

android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java

@@ -1,73 +0,0 @@
-package io.highfidelity.hifiinterface.fragment;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.os.Bundle;
-import android.text.Html;
-import android.text.Spanned;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import io.highfidelity.hifiinterface.R;
-
-public class SignedInFragment extends Fragment {
-
-    private Button mGetStartedButton;
-    private OnSignedInInteractionListener mListener;
-
-    public SignedInFragment() {
-        // Required empty public constructor
-    }
-
-    public static SignedInFragment newInstance() {
-        SignedInFragment fragment = new SignedInFragment();
-        return fragment;
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.fragment_signedin, container, false);
-        mGetStartedButton = rootView.findViewById(R.id.getStarted);
-
-        mGetStartedButton.setOnClickListener(view -> {
-            getStarted();
-        });
-
-        return rootView;
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (context instanceof SignedInFragment.OnSignedInInteractionListener) {
-            mListener = (SignedInFragment.OnSignedInInteractionListener) context;
-        } else {
-            throw new RuntimeException(context.toString()
-                    + " must implement OnSignedInInteractionListener");
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mListener = null;
-    }
-
-    public void getStarted() {
-        if (mListener != null) {
-            mListener.onGettingStarted();
-        }
-    }
-
-    public interface OnSignedInInteractionListener {
-        void onGettingStarted();
-    }
-
-}

android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java

@@ -1,42 +1,50 @@
 package io.highfidelity.hifiinterface.fragment;
 
-import android.app.Activity;
 import android.app.Fragment;
-import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.Bundle;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 
 import org.qtproject.qt5.android.QtNative;
 
+import io.highfidelity.hifiinterface.HifiUtils;
 import io.highfidelity.hifiinterface.R;
 
 import static org.qtproject.qt5.android.QtActivityDelegate.ApplicationActive;
 import static org.qtproject.qt5.android.QtActivityDelegate.ApplicationInactive;
 
-public class SignupFragment extends Fragment {
+public class SignupFragment extends Fragment
+                            implements  OnBackPressedListener {
 
     private EditText mEmail;
     private EditText mUsername;
     private EditText mPassword;
     private TextView mError;
-    private TextView mCancelButton;
-
+    private TextView mActivityText;
     private Button mSignupButton;
+    private CheckBox mKeepMeLoggedInCheckbox;
 
-    private ProgressDialog mDialog;
+    private ViewGroup mSignupForm;
+    private ViewGroup mLoggingInFrame;
+    private ViewGroup mLoggedInFrame;
 
-    public native void nativeSignup(String email, String username, String password); // move to SignupFragment
-    public native void nativeCancelSignup();
-    public native void nativeLogin(String username, String password, Activity usernameChangedListener);
-    public native void nativeCancelLogin();
+    private boolean mLoginInProgress;
+    private boolean mSignupInProgress;
+    private boolean mSignupSuccess;
+
+    public native void signup(String email, String username, String password); // move to SignupFragment
+    public native void cancelSignup();
+    public native void login(String username, String password, boolean keepLoggedIn);
+    public native void cancelLogin();
 
     private SignupFragment.OnSignupInteractionListener mListener;
 
@@ -59,18 +67,23 @@ public class SignupFragment extends Fragment {
         mPassword = rootView.findViewById(R.id.password);
         mError = rootView.findViewById(R.id.error);
         mSignupButton = rootView.findViewById(R.id.signupButton);
-        mCancelButton = rootView.findViewById(R.id.cancelButton);
+        mActivityText = rootView.findViewById(R.id.activityText);
+        mKeepMeLoggedInCheckbox = rootView.findViewById(R.id.keepMeLoggedIn);
+
+        mSignupForm = rootView.findViewById(R.id.signupForm);
+        mLoggedInFrame = rootView.findViewById(R.id.loggedInFrame);
+        mLoggingInFrame = rootView.findViewById(R.id.loggingInFrame);
+
+        rootView.findViewById(R.id.cancel).setOnClickListener(view -> onCancelSignup());
 
         mSignupButton.setOnClickListener(view -> signup());
-        mCancelButton.setOnClickListener(view -> login());
-        mPassword.setOnEditorActionListener(
-                (textView, actionId, keyEvent) -> {
-                    if (actionId == EditorInfo.IME_ACTION_DONE) {
-                        mSignupButton.performClick();
-                        return true;
-                    }
-                    return false;
-                });
+
+        rootView.findViewById(R.id.getStarted).setOnClickListener(view -> onGetStartedClicked());
+
+        mPassword.setOnEditorActionListener((textView, actionId, keyEvent) -> onPasswordEditorAction(textView, actionId, keyEvent));
+
+        mKeepMeLoggedInCheckbox.setChecked(HifiUtils.getInstance().isKeepingLoggedIn());
+
         return rootView;
     }
 
@@ -101,15 +114,22 @@ public class SignupFragment extends Fragment {
     @Override
     public void onStop() {
         super.onStop();
-        cancelActivityIndicator();
         // Leave the Qt app paused
         QtNative.setApplicationState(ApplicationInactive);
         hideKeyboard();
     }
 
-    private void login() {
+    private boolean onPasswordEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
+        if (actionId == EditorInfo.IME_ACTION_DONE) {
+            mSignupButton.performClick();
+            return true;
+        }
+        return false;
+    }
+
+    private void onCancelSignup() {
         if (mListener != null) {
-            mListener.onLoginRequested();
+            mListener.onCancelSignup();
         }
     }
 
@@ -123,8 +143,11 @@ public class SignupFragment extends Fragment {
         } else {
             mSignupButton.setEnabled(false);
             hideError();
+            mActivityText.setText(R.string.creating_account);
             showActivityIndicator();
-            nativeSignup(email, username, password);
+            mSignupInProgress = true;
+            mSignupSuccess = false;
+            signup(email, username, password);
         }
     }
 
@@ -137,23 +160,21 @@ public class SignupFragment extends Fragment {
     }
 
     private void showActivityIndicator() {
-        if (mDialog == null) {
-            mDialog = new ProgressDialog(getContext());
-        }
-        mDialog.setMessage(getString(R.string.creating_account));
-        mDialog.setCancelable(true);
-        mDialog.setOnCancelListener(dialogInterface -> {
-            nativeCancelSignup();
-            cancelActivityIndicator();
-            mSignupButton.setEnabled(true);
-        });
-        mDialog.show();
+        mSignupForm.setVisibility(View.GONE);
+        mLoggedInFrame.setVisibility(View.GONE);
+        mLoggingInFrame.setVisibility(View.VISIBLE);
     }
 
-    private void cancelActivityIndicator() {
-        if (mDialog != null) {
-            mDialog.cancel();
-        }
+    private void showLoggedInMessage() {
+        mSignupForm.setVisibility(View.GONE);
+        mLoggingInFrame.setVisibility(View.GONE);
+        mLoggedInFrame.setVisibility(View.VISIBLE);
+    }
+
+    private void showSignupForm() {
+        mLoggingInFrame.setVisibility(View.GONE);
+        mLoggedInFrame.setVisibility(View.GONE);
+        mSignupForm.setVisibility(View.VISIBLE);
     }
     private void showError(String error) {
         mError.setText(error);
@@ -167,51 +188,73 @@ public class SignupFragment extends Fragment {
 
     public interface OnSignupInteractionListener {
         void onSignupCompleted();
-        void onLoginRequested();
+        void onCancelSignup();
     }
 
+    private void onGetStartedClicked() {
+        if (mListener != null) {
+            mListener.onSignupCompleted();
+        }
+    }
+
+
     public void handleSignupCompleted() {
+        mSignupInProgress = false;
         String username = mUsername.getText().toString().trim();
         String password = mPassword.getText().toString();
-        mDialog.setMessage(getString(R.string.logging_in));
-        mDialog.setCancelable(true);
-        mDialog.setOnCancelListener(dialogInterface -> {
-            nativeCancelLogin();
-            cancelActivityIndicator();
-            if (mListener != null) {
-                mListener.onLoginRequested();
-            }
+        getActivity().runOnUiThread(() -> {
+            mActivityText.setText(R.string.logging_in);
         });
-        mDialog.show();
-        nativeLogin(username, password, getActivity());
+        mLoginInProgress = true;
+        boolean keepUserLoggedIn = mKeepMeLoggedInCheckbox.isChecked();
+        login(username, password, keepUserLoggedIn);
     }
 
     public void handleSignupFailed(String error) {
+        mSignupInProgress = false;
         getActivity().runOnUiThread(() -> {
             mSignupButton.setEnabled(true);
-            cancelActivityIndicator();
+            showSignupForm();
             mError.setText(error);
             mError.setVisibility(View.VISIBLE);
         });
     }
 
     public void handleLoginCompleted(boolean success) {
+        mLoginInProgress = false;
         getActivity().runOnUiThread(() -> {
             mSignupButton.setEnabled(true);
-            cancelActivityIndicator();
-
             if (success) {
-                if (mListener != null) {
-                    mListener.onSignupCompleted();
-                }
+                mSignupSuccess = true;
+                showLoggedInMessage();
             } else {
                 // Registration was successful but login failed.
                 // Let the user to login manually
-                mListener.onLoginRequested();
+                mListener.onCancelSignup();
+                showSignupForm();
             }
         });
     }
 
+    @Override
+    public boolean doBack() {
+        if (mSignupInProgress) {
+           cancelSignup();
+        } else if (mLoginInProgress) {
+            cancelLogin();
+        }
 
-
+        if (mSignupInProgress || mLoginInProgress) {
+            showSignupForm();
+            mLoginInProgress = false;
+            mSignupInProgress = false;
+            mSignupButton.setEnabled(true);
+            return true;
+        } else if (mSignupSuccess) {
+            onGetStartedClicked();
+            return true;
+        } else {
+            return false;
+        }
+    }
 }

android/app/src/main/java/io/highfidelity/hifiinterface/fragment/StartMenuFragment.java

@@ -0,0 +1,93 @@
+package io.highfidelity.hifiinterface.fragment;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import io.highfidelity.hifiinterface.R;
+
+public class StartMenuFragment extends Fragment {
+
+    private String TAG = "HighFidelity";
+    private StartMenuInteractionListener mListener;
+
+    public StartMenuFragment() {
+        // Required empty public constructor
+    }
+
+    public static StartMenuFragment newInstance() {
+        StartMenuFragment fragment = new StartMenuFragment();
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View rootView = inflater.inflate(R.layout.fragment_login_menu, container, false);
+        rootView.findViewById(R.id.signupButton).setOnClickListener(view -> {
+            if (mListener != null) {
+                mListener.onSignupButtonClicked();
+            }
+        });
+
+        rootView.findViewById(R.id.loginButton).setOnClickListener(view -> {
+            if (mListener != null) {
+                mListener.onLoginButtonClicked();
+            }
+        });
+
+        rootView.findViewById(R.id.steamLoginButton).setOnClickListener(view -> {
+            if (mListener != null) {
+                mListener.onSteamLoginButtonClicked();
+            }
+        });
+
+        rootView.findViewById(R.id.takeMeInWorld).setOnClickListener(view -> {
+            if (mListener != null) {
+                mListener.onSkipLoginClicked();
+            }
+        });
+
+
+
+        return rootView;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof StartMenuInteractionListener) {
+            mListener = (StartMenuInteractionListener) context;
+        } else {
+            throw new RuntimeException(context.toString()
+                    + " must implement StartMenuInteractionListener");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
+
+    /**
+     * This interface must be implemented by activities that contain this
+     * fragment to allow an interaction in this fragment to be communicated
+     * to the activity and potentially other fragments contained in that
+     * activity.
+     * <p>
+     * See the Android Training lesson <a href=
+     * "http://developer.android.com/training/basics/fragments/communicating.html"
+     * >Communicating with Other Fragments</a> for more information.
+     */
+    public interface StartMenuInteractionListener {
+        void onSignupButtonClicked();
+        void onLoginButtonClicked();
+        void onSkipLoginClicked();
+        void onSteamLoginButtonClicked();
+    }
+}

android/app/src/main/java/io/highfidelity/hifiinterface/fragment/WebViewFragment.java

@@ -4,9 +4,11 @@ import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.net.Uri;
 import android.net.http.SslError;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.view.GestureDetector;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -14,6 +16,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AlphaAnimation;
+import android.webkit.CookieManager;
 import android.webkit.SslErrorHandler;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceError;
@@ -25,6 +28,7 @@ import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
+import io.highfidelity.hifiinterface.BuildConfig;
 import io.highfidelity.hifiinterface.R;
 import io.highfidelity.hifiinterface.WebViewActivity;
 
@@ -32,6 +36,7 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
 
     public static final String URL = "url";
     public static final String TOOLBAR_VISIBLE = "toolbar_visible";
+    public static final String CLEAR_COOKIES = "clear_cookies";
     private static final long DELAY_HIDE_TOOLBAR_MILLIS = 3000;
     private static final long FADE_OUT_DURATION = 2000;
 
@@ -41,6 +46,7 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
     private ProgressBar mProgressBar;
     private String mUrl;
     private boolean mToolbarVisible;
+    private boolean mClearCookies;
 
     private OnWebViewInteractionListener mListener;
     private Runnable mCloseAction;
@@ -170,6 +176,7 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
         if (getArguments() != null) {
             mUrl = getArguments().getString(URL);
             mToolbarVisible = getArguments().getBoolean(TOOLBAR_VISIBLE);
+            mClearCookies = getArguments().getBoolean(CLEAR_COOKIES);
         }
     }
 
@@ -179,6 +186,10 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
         View rootView = inflater.inflate(R.layout.fragment_web_view, container, false);
         mProgressBar = rootView.findViewById(R.id.toolbarProgressBar);
         myWebView = rootView.findViewById(R.id.web_view);
+        if (mClearCookies) {
+            CookieManager.getInstance().removeAllCookies(null);
+        }
+
         mHandler = new Handler();
         gestureDetector = new GestureDetector(this);
         gestureDetector.setOnDoubleTapListener(new GestureDetector.OnDoubleTapListener() {
@@ -251,6 +262,7 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
         void onWebLoaded(String url, SafenessLevel safenessLevel);
         void onTitleReceived(String title);
         void onExpand();
+        void onOAuthAuthorizeCallback(Uri uri);
     }
 
 
@@ -320,6 +332,18 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
                 super.onLoadResource(view, url);
             }
         }
+
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+            if (!TextUtils.isEmpty(BuildConfig.OAUTH_REDIRECT_URI) &&
+                    request.getUrl().toString().startsWith(BuildConfig.OAUTH_REDIRECT_URI)) {
+                if (mListener != null) {
+                    mListener.onOAuthAuthorizeCallback(request.getUrl());
+                }
+                return true;
+            }
+            return super.shouldOverrideUrlLoading(view, request);
+        }
     }
 
     class HiFiWebChromeClient extends WebChromeClient {

android/app/src/main/res/drawable/hifi_header.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="350dp"
+    android:width="340dp"
     android:height="100dp"
     android:viewportWidth="350"
     android:viewportHeight="100">

android/app/src/main/res/drawable/ic_right_arrow.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="11dp"
+    android:height="14dp"
+    android:viewportWidth="11"
+    android:viewportHeight="14">
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M2.98427,0.868092 C2.35913,0.324495,1.41169,0.390596,0.868092,1.01573 C0.324495,1.64087,0.390596,2.58831,1.01573,3.13191 L2.98427,0.868092 Z M8,7.21739 L8.93497,8.39035 L10.3436,7.26752 L8.98427,6.08548 L8,7.21739 Z M1.06503,10.827 C0.417224,11.3434,0.310672,12.2872,0.82704,12.935 C1.34341,13.5828,2.28716,13.6893,2.93497,13.173 L1.06503,10.827 Z M1.01573,3.13191 L7.01573,8.3493 L8.98427,6.08548 L2.98427,0.868092 L1.01573,3.13191 Z M7.06503,6.04443 L1.06503,10.827 L2.93497,13.173 L8.93497,8.39035 L7.06503,6.04443 Z" />
+</vector>

android/app/src/main/res/drawable/ic_steam.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="21dp"
+    android:height="21dp"
+    android:viewportWidth="21"
+    android:viewportHeight="21">
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M10.4866,0 C4.92045,0,0.367395,4.32104,0,9.78734 L5.45262,11.9841 C5.93184,11.651,6.51333,11.4545,7.14145,11.4545 C7.27641,11.4545,7.4083,11.4666,7.53829,11.4841 L10.1047,7.72495 C10.1083,5.56672,11.861,3.81818,14.0229,3.81818 C16.1872,3.81818,17.9416,5.57035,17.9416,7.73182 C17.9416,9.89329,16.1872,11.6455,14.0229,11.6455 C14.021,11.6455,14.0189,11.6453,14.017,11.6453 L10.0936,14.2008 C10.0986,14.2712,10.1043,14.3419,10.1043,14.4136 C10.1043,16.048,8.77791,17.3727,7.14145,17.3727 C5.69539,17.3727,4.49304,16.3376,4.2325,14.969 L0.378099,13.3841 C1.6334,17.7801,5.6822,21,10.4866,21 C16.2931,21,21,16.2991,21,10.5 C21,4.70114,16.2931,0,10.4866,0 Z M7.14145,16.0364 C6.96655,16.0364,6.79833,16.0081,6.64044,15.9569 L6.63968,15.9589 L6.59151,15.939 C6.54506,15.9224,6.49975,15.9037,6.45541,15.8831 L5.15462,15.3483 C5.50614,16.0927,6.26253,16.6091,7.14145,16.6091 C8.35546,16.6091,9.33971,15.6263,9.33971,14.4136 C9.33971,13.201,8.35546,12.2182,7.14145,12.2182 C6.87269,12.2182,6.61636,12.2688,6.37818,12.357 L7.75448,12.9114 C7.76404,12.9154,7.77359,12.9188,7.78296,12.923 L7.89001,12.9662 L7.88714,12.9732 C8.40898,13.243,8.76625,13.7861,8.76625,14.4136 C8.76625,15.3098,8.03872,16.0364,7.14145,16.0364 Z M16.7946,7.73182 C16.7946,6.20302,15.5537,4.96364,14.0229,4.96364 C12.4922,4.96364,11.2512,6.20302,11.2512,7.73182 C11.2512,9.26062,12.4922,10.5,14.0229,10.5 C15.5537,10.5,16.7946,9.26062,16.7946,7.73182 Z M12.0158,7.73182 C12.0158,6.62474,12.9144,5.72727,14.0229,5.72727 C15.1314,5.72727,16.03,6.62474,16.03,7.73182 C16.03,8.8389,15.1314,9.73636,14.0229,9.73636 C12.9144,9.73636,12.0158,8.8389,12.0158,7.73182 Z" />
+</vector>

android/app/src/main/res/drawable/rounded_button_color3.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dip" />
+            <stroke android:width="1dip" android:color="@color/colorButton2" />
+            <solid android:color="@color/colorButton2"/>
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dip" />
+            <stroke android:width="1dip" android:color="@color/colorButton2" />
+            <solid android:color="@color/colorButton2"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dip" />
+            <stroke android:width="1dip" android:color="@color/colorButton2" />
+            <solid android:color="@color/colorButton2"/>
+        </shape>
+    </item>
+</selector>

android/app/src/main/res/drawable/rounded_button_color4.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dip" />
+            <stroke android:width="1dip" android:color="@color/colorButton4" />
+            <solid android:color="@color/colorButton4"/>
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dip" />
+            <stroke android:width="1dip" android:color="@color/colorButton4" />
+            <solid android:color="@color/colorButton4"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dip" />
+            <stroke android:width="1dip" android:color="@color/colorButton4" />
+            <solid android:color="@color/colorButton4"/>
+        </shape>
+    </item>
+</selector>

android/app/src/main/res/drawable/rounded_edit.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" android:padding="9dp">
-        <corners android:radius="4dip" />
-        <stroke android:width="1dip" android:color="@android:color/black" />
-        <solid android:color="@color/backgroundEditText"/>
-</shape>

android/app/src/main/res/layout/activity_encourage_login.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".LoginMenuActivity">
+
+    <FrameLayout
+        android:id="@+id/content_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</android.support.constraint.ConstraintLayout>

android/app/src/main/res/layout/fragment_login.xml

@@ -6,6 +6,17 @@
     android:layout_height="match_parent"
     android:background="@color/backgroundLight">
 
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/encourage_login_background"
+        android:scaleType="fitXY" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#B2000000" />
+
     <ImageView
         android:id="@+id/header"
         android:layout_width="@dimen/header_hifi_width"
@@ -17,126 +28,246 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/hifi_header" />
 
-    <TextView
-        android:id="@+id/error"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="25dp"
-        android:layout_marginLeft="9dp"
-        android:layout_marginRight="9dp"
-        android:fontFamily="@font/raleway"
-        android:textColor="@color/colorLoginError"
-        android:textSize="14sp"
-        app:layout_constraintBottom_toTopOf="@id/username"
-        app:layout_constraintLeft_toLeftOf="@id/username"
-        android:visibility="invisible"/>
-
-    <EditText
-        android:id="@+id/username"
-        android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:layout_marginLeft="46dp"
-        android:layout_marginRight="46dp"
-        android:background="@drawable/rounded_edit"
-        android:padding="7dp"
-        android:paddingRight="12dp"
-        android:paddingTop="14dp"
-        android:ems="10"
-        android:fontFamily="@font/raleway"
-        android:textSize="17sp"
-        android:inputType="textEmailAddress"
-        android:textStyle="italic"
-        android:textColor="@color/editTextColor"
-        android:textColorHint="@color/editTextColor"
-        android:gravity="left|center_vertical"
-        app:layout_constraintTop_toBottomOf="@id/header"
-        android:layout_marginTop="70dp"
-        android:hint="@string/username_or_email" />
-
-
-    <android.support.design.widget.TextInputLayout
-        android:id="@+id/passwordLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="46dp"
-        android:layout_marginRight="46dp"
-        app:passwordToggleTint="@color/showPasswordColor"
-        app:passwordToggleEnabled="true"
-        app:hintAnimationEnabled="false"
-        app:passwordToggleDrawable="@drawable/selector_show_password"
-        app:hintEnabled="false"
-        app:layout_constraintTop_toBottomOf="@id/username"
-        android:layout_marginTop="13dp"
-        >
-    <android.support.design.widget.TextInputEditText
-        android:id="@+id/password"
-        android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:background="@drawable/rounded_edit"
-        android:padding="7dp"
-        android:drawablePadding="55dp"
-        android:paddingTop="14dp"
-        android:drawableEnd="@drawable/ic_eye_noshow"
-        android:ems="10"
-        android:fontFamily="@font/raleway"
-        android:textSize="17sp"
-        android:textStyle="italic"
-        android:textColor="@color/editTextColor"
-        android:textColorHint="@color/editTextColor"
-        android:gravity="left|center_vertical"
-        android:imeOptions="actionDone"
-        android:hint="@string/password"
-        android:inputType="textPassword" />
-    </android.support.design.widget.TextInputLayout>
-
-    <Button
-        android:id="@+id/loginButton"
-        android:layout_width="154dp"
-        android:layout_height="38dp"
-        android:background="@drawable/rounded_button"
-        android:fontFamily="@font/raleway_semibold"
-        android:paddingBottom="0dp"
-        android:paddingTop="0dp"
-        android:text="@string/login"
-        android:textColor="@color/white_opaque"
-        android:textAllCaps="false"
-        android:textSize="18sp"
-        app:layout_constraintRight_toRightOf="@id/username"
-        app:layout_constraintTop_toBottomOf="@id/forgotPassword"
-        app:layout_goneMarginTop="4dp"/>
-
-    <TextView
-        android:id="@+id/forgotPassword"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="9dp"
-        android:paddingBottom="16dp"
-        android:fontFamily="@font/raleway_semibold"
-        android:textSize="14dp"
-        android:text="@string/forgot_password"
-        android:textStyle="italic"
-        app:layout_constraintRight_toRightOf="@id/passwordLayout"
-        app:layout_constraintTop_toBottomOf="@id/passwordLayout"
-        android:textColor="@color/colorButton1"/>
-
-    <Button
-        android:id="@+id/signupButton"
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/loggingInFrame"
         android:layout_width="0dp"
-        app:layout_constraintWidth_default="spread"
-        android:layout_height="38dp"
-        android:background="@drawable/rounded_secondary_button"
-        android:fontFamily="@font/raleway_semibold"
-        android:paddingBottom="0dp"
-        android:paddingTop="0dp"
-        android:layout_marginRight="15dp"
-        android:text="@string/signup"
-        android:textColor="@color/white_opaque"
-        android:textAllCaps="false"
-        android:textSize="18sp"
-        app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
-        app:layout_constraintTop_toTopOf="@id/loginButton"
-        app:layout_constraintRight_toLeftOf="@id/loginButton"
-        app:layout_goneMarginTop="4dp"/>
+        android:layout_height="0dp"
+        android:layout_marginTop="@dimen/login_form_margin_top"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:visibility="gone">
+        <TextView
+            android:id="@+id/loggingInText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/logging_in"
+            android:fontFamily="@font/raleway_bold"
+            android:textSize="24sp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            android:layout_marginTop="83dp"
+            />
+        <ProgressBar
+            android:layout_width="101dp"
+            android:layout_height="101dp"
+            android:layout_marginTop="20dp"
+            app:layout_constraintTop_toBottomOf="@id/loggingInText"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            android:indeterminateTint="#00B4EF"
+            />
+    </android.support.constraint.ConstraintLayout>
+
+
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/loggedInFrame"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="@dimen/login_form_margin_top"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:visibility="gone">
+        <TextView
+            android:id="@+id/loggedInText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/logged_in_welcome"
+            android:fontFamily="@font/raleway_bold"
+            android:textSize="24sp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            android:layout_marginTop="115dp"
+            />
+        <Button
+            android:id="@+id/getStarted"
+            android:layout_width="@dimen/button_medium_width"
+            android:layout_height="@dimen/button_medium_height"
+            android:layout_marginTop="22dp"
+            android:background="@drawable/rounded_button_color1"
+            android:fontFamily="@font/raleway_bold"
+            android:text="@string/get_started"
+            android:textColor="@color/white_opaque"
+            android:textAllCaps="false"
+            android:textSize="@dimen/button_medium_text_size"
+            app:layout_constraintTop_toBottomOf="@id/loggedInText"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_goneMarginTop="4dp"/>
+
+    </android.support.constraint.ConstraintLayout>
+
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/loginForm"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="@dimen/login_form_margin_top"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:visibility="gone">
+        <TextView
+            android:id="@+id/error"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="25dp"
+            android:layout_marginLeft="9dp"
+            android:layout_marginRight="9dp"
+            android:fontFamily="sans-serif"
+            android:textColor="@color/colorLoginError"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toTopOf="@id/username"
+            app:layout_constraintLeft_toLeftOf="@id/username"
+            android:visibility="invisible"/>
+
+        <EditText
+            android:id="@+id/username"
+            android:layout_width="match_parent"
+            android:layout_height="27dp"
+            android:layout_marginLeft="@dimen/login_margin"
+            android:layout_marginRight="@dimen/login_margin"
+            android:background="@color/white_opaque"
+            android:paddingLeft="@dimen/edit_text_padding"
+            android:ems="10"
+            android:fontFamily="sans-serif"
+            android:textSize="@dimen/login_edit_text_size"
+            android:inputType="textEmailAddress"
+            android:textColor="@color/editTextColor"
+            android:textColorHint="@color/editTextColor"
+            android:gravity="left|center_vertical"
+            android:hint="@string/username_or_email"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="83dp"/>
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/passwordLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/login_margin"
+            android:layout_marginRight="@dimen/login_margin"
+            android:background="@color/white_opaque"
+            app:passwordToggleTint="@color/showPasswordColor"
+            app:passwordToggleEnabled="true"
+            app:hintAnimationEnabled="false"
+            app:passwordToggleDrawable="@drawable/selector_show_password"
+            app:hintEnabled="false"
+            app:layout_constraintTop_toBottomOf="@id/username"
+            android:layout_marginTop="15dp"
+            >
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/password"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/login_edit_text_height"
+                android:background="@color/white_opaque"
+                android:paddingLeft="@dimen/edit_text_padding"
+                android:drawablePadding="45dp"
+                android:drawableEnd="@drawable/ic_eye_noshow"
+                android:ems="10"
+                android:fontFamily="sans-serif"
+                android:textSize="@dimen/login_edit_text_size"
+                android:textColor="@color/editTextColor"
+                android:textColorHint="@color/editTextColor"
+                android:gravity="left|center_vertical"
+                android:imeOptions="actionDone"
+                android:hint="@string/password"
+                android:inputType="textPassword" />
+        </android.support.design.widget.TextInputLayout>
+
+        <CheckBox
+            android:id="@+id/keepMeLoggedIn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="13dp"
+            android:layout_marginRight="66dp"
+            app:layout_constraintTop_toBottomOf="@id/passwordLayout"
+            app:layout_constraintRight_toRightOf="parent"
+            android:padding="0dp" />
+
+        <TextView
+            android:id="@+id/keepMeLoggedInLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/raleway_bold"
+            android:textSize="12sp"
+            android:text="@string/keep_me_logged_in"
+            app:layout_constraintRight_toLeftOf="@id/keepMeLoggedIn"
+            app:layout_constraintTop_toTopOf="@id/keepMeLoggedIn"
+            app:layout_constraintBottom_toBottomOf="@id/keepMeLoggedIn"
+            android:textColor="@color/white_opaque"/>
+
+        <Button
+            android:id="@+id/loginButton"
+            android:layout_width="@dimen/button_medium_width"
+            android:layout_height="@dimen/button_medium_height"
+            android:background="@drawable/rounded_button_color3"
+            android:fontFamily="@font/raleway_bold"
+            android:layout_marginTop="@dimen/button_medium_margin"
+            android:text="@string/log_in"
+            android:textColor="@color/white_opaque"
+            android:textAllCaps="false"
+            android:textSize="@dimen/button_medium_text_size"
+            app:layout_constraintRight_toRightOf="@id/username"
+            app:layout_constraintTop_toBottomOf="@id/keepMeLoggedIn" />
+
+        <TextView
+            android:id="@+id/cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="8dp"
+            app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
+            app:layout_constraintTop_toTopOf="@id/loginButton"
+            app:layout_constraintBottom_toBottomOf="@id/loginButton"
+            app:layout_constraintRight_toLeftOf="@id/loginButton"
+            android:textColor="@color/white_opaque"
+            android:fontFamily="@font/raleway_bold"
+            android:textSize="@dimen/button_medium_text_size"
+            android:text="@string/cancel_uppercase" />
+
+        <TextView
+            android:id="@+id/forgotPassword"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif"
+            android:textSize="14sp"
+            android:layout_marginTop="18dp"
+            android:text="@string/cant_access_your_account"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/loginButton"
+            android:textColor="@color/colorButton1"/>
+
+        <TextView
+            android:id="@+id/takeMeInWorld"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/raleway_bold"
+            android:textSize="14sp"
+            android:layout_marginBottom="11dp"
+            android:padding="5dp"
+            android:text="@string/take_me_in_world"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:textColor="@color/white_opaque"/>
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_right_arrow"
+            android:layout_marginLeft="4dp"
+            app:layout_constraintLeft_toRightOf="@id/takeMeInWorld"
+            app:layout_constraintTop_toTopOf="@id/takeMeInWorld"
+            app:layout_constraintBottom_toBottomOf="@id/takeMeInWorld"
+            />
+
+    </android.support.constraint.ConstraintLayout>
+
 
 
 

android/app/src/main/res/layout/fragment_login_menu.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+xmlns:app="http://schemas.android.com/apk/res-auto"
+xmlns:tools="http://schemas.android.com/tools"
+android:layout_width="match_parent"
+android:layout_height="match_parent"
+tools:context=".fragment.StartMenuFragment">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/encourage_login_background"
+        android:scaleType="fitXY"
+        />
+
+    <ImageView
+        android:id="@+id/header"
+        android:layout_width="@dimen/header_hifi_width"
+        android:layout_height="@dimen/header_hifi_height"
+        android:layout_marginTop="@dimen/header_hifi_margin_top"
+        android:contentDescription="HighFidelity"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/hifi_header" />
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/raleway_bold"
+        android:textSize="@dimen/login_menu_text_size"
+        android:layout_marginTop="37dp"
+        android:text="@string/be_anywere"
+        android:gravity="center"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header"
+        />
+
+    <Button
+        android:id="@+id/signupButton"
+        android:layout_width="@dimen/button_large_width"
+        android:layout_height="@dimen/button_large_height"
+        android:layout_marginTop="48dp"
+        android:background="@drawable/rounded_button_color1"
+        android:fontFamily="@font/raleway_bold"
+        android:text="@string/signup_uppercase"
+        android:textColor="@color/white_opaque"
+        android:textAllCaps="false"
+        android:textSize="@dimen/button_large_text_size"
+        app:layout_constraintTop_toBottomOf="@id/text"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/login_menu_translucent_rectangle_height"
+        app:layout_constraintBottom_toBottomOf="parent" android:background="#B2000000">
+
+
+        <Button
+            android:id="@+id/loginButton"
+            android:layout_width="@dimen/button_large_width"
+            android:layout_height="@dimen/button_large_height"
+            android:background="@drawable/rounded_button_color3"
+            android:fontFamily="@font/raleway_bold"
+            android:layout_marginTop="@dimen/login_menu_button_margin_top"
+            android:text="@string/log_in"
+            android:textColor="@color/white_opaque"
+            android:textAllCaps="false"
+            android:textSize="@dimen/button_large_text_size"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"/>
+
+        <Button
+            android:id="@+id/steamLoginButton"
+            android:layout_width="@dimen/button_large_width"
+            android:layout_height="@dimen/button_large_height"
+            android:background="@drawable/rounded_button_color4"
+            android:fontFamily="@font/raleway_bold"
+            android:layout_marginTop="10dp"
+            android:text="@string/steam_log_in"
+            android:textAlignment="center"
+            android:textColor="@color/white_opaque"
+            android:textAllCaps="false"
+            android:textSize="@dimen/button_large_text_size"
+            android:drawableLeft="@drawable/ic_steam"
+            android:paddingLeft="38dp"
+            android:paddingRight="38dp"
+            app:layout_constraintTop_toBottomOf="@id/loginButton"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"/>
+
+        <TextView
+            android:id="@+id/takeMeInWorld"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/raleway_bold"
+            android:textSize="14sp"
+            android:layout_marginBottom="11dp"
+            android:padding="5dp"
+            android:text="@string/take_me_in_world"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:textColor="@color/white_opaque"/>
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_right_arrow"
+            android:layout_marginLeft="4dp"
+            app:layout_constraintLeft_toRightOf="@id/takeMeInWorld"
+            app:layout_constraintTop_toTopOf="@id/takeMeInWorld"
+            app:layout_constraintBottom_toBottomOf="@id/takeMeInWorld"
+            />
+
+    </android.support.constraint.ConstraintLayout>
+
+</android.support.constraint.ConstraintLayout>

android/app/src/main/res/layout/fragment_signedin.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundLight">
-
-    <ImageView
-        android:id="@+id/header"
-        android:layout_width="@dimen/header_hifi_width"
-        android:layout_height="@dimen/header_hifi_height"
-        android:layout_marginTop="@dimen/header_hifi_margin_top"
-        android:contentDescription="HighFidelity"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/hifi_header" />
-
-    <TextView
-        android:id="@+id/welcome"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:paddingLeft="86dp"
-        android:paddingRight="86dp"
-        android:fontFamily="@font/raleway"
-        android:textColor="@color/clearText"
-        android:textSize="24sp"
-        android:text="@string/signedin_welcome"
-        app:layout_constraintTop_toBottomOf="@id/header"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        android:gravity="center"
-
-        />
-
-    <Button
-        android:id="@+id/getStarted"
-        android:layout_width="217dp"
-        android:layout_height="38dp"
-        android:layout_marginTop="30dp"
-        android:background="@drawable/rounded_button"
-        android:fontFamily="@font/raleway_semibold"
-        android:paddingBottom="0dp"
-        android:paddingLeft="25dp"
-        android:paddingRight="25dp"
-        android:paddingTop="0dp"
-        android:text="@string/get_started"
-        android:textColor="@color/white_opaque"
-        android:textAllCaps="false"
-        android:textSize="18sp"
-        app:layout_constraintTop_toBottomOf="@id/welcome"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-
-        app:layout_goneMarginTop="4dp"/>
-
-
-
-
-
-</android.support.constraint.ConstraintLayout>

android/app/src/main/res/layout/fragment_signup.xml

@@ -6,6 +6,18 @@
     android:layout_height="match_parent"
     android:background="@color/backgroundLight">
 
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/encourage_login_background"
+        android:scaleType="fitXY" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#B2000000" />
+
     <ImageView
         android:id="@+id/header"
         android:layout_width="@dimen/header_hifi_width"
@@ -17,93 +29,168 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/hifi_header" />
 
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/loggingInFrame"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="100dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:visibility="gone">
+        <TextView
+            android:id="@+id/activityText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/logging_in"
+            android:fontFamily="@font/raleway_bold"
+            android:textSize="24sp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            android:layout_marginTop="83dp"
+            />
+        <ProgressBar
+            android:layout_width="101dp"
+            android:layout_height="101dp"
+            android:layout_marginTop="20dp"
+            app:layout_constraintTop_toBottomOf="@id/activityText"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            android:indeterminateTint="#00B4EF"
+            />
+    </android.support.constraint.ConstraintLayout>
+
+
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/loggedInFrame"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="100dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:visibility="gone">
+        <TextView
+            android:id="@+id/loggedInText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/logged_in_welcome"
+            android:fontFamily="@font/raleway_bold"
+            android:textSize="24sp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            android:layout_marginTop="115dp"
+            />
+        <Button
+            android:id="@+id/getStarted"
+            android:layout_width="@dimen/button_medium_width"
+            android:layout_height="@dimen/button_medium_height"
+            android:layout_marginTop="22dp"
+            android:background="@drawable/rounded_button_color1"
+            android:fontFamily="@font/raleway_bold"
+            android:text="@string/get_started"
+            android:textColor="@color/white_opaque"
+            android:textAllCaps="false"
+            android:textSize="@dimen/button_medium_text_size"
+            app:layout_constraintTop_toBottomOf="@id/loggedInText"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent" />
+
+    </android.support.constraint.ConstraintLayout>
+
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/signupForm"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="100dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:visibility="visible">
+
     <TextView
         android:id="@+id/error"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:layout_marginLeft="9dp"
-        android:layout_marginRight="9dp"
-        android:fontFamily="@font/raleway"
+        android:fontFamily="sans-serif"
         android:textColor="@color/colorLoginError"
         android:textSize="14sp"
-        app:layout_constraintBottom_toTopOf="@id/email"
-        app:layout_constraintLeft_toLeftOf="@id/email"
-        app:layout_constraintRight_toRightOf="@id/email"
+        app:layout_constraintBottom_toTopOf="@id/username"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="@id/username"
+        app:layout_constraintRight_toRightOf="@id/username"
         android:visibility="invisible"/>
 
-    <EditText
-        android:id="@+id/email"
-        android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:layout_marginLeft="46dp"
-        android:layout_marginRight="46dp"
-        android:background="@drawable/rounded_edit"
-        android:padding="7dp"
-        android:paddingRight="12dp"
-        android:paddingTop="14dp"
-        android:ems="10"
-        android:fontFamily="@font/raleway"
-        android:textSize="17sp"
-        android:inputType="textEmailAddress"
-        android:textStyle="italic"
-        android:textColor="@color/editTextColor"
-        android:textColorHint="@color/editTextColor"
-        android:gravity="left|center_vertical"
-        app:layout_constraintTop_toBottomOf="@id/header"
-        android:layout_marginTop="70dp"
-        android:hint="@string/email" />
-
     <EditText
         android:id="@+id/username"
         android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:layout_marginLeft="46dp"
-        android:layout_marginRight="46dp"
-        android:background="@drawable/rounded_edit"
-        android:padding="7dp"
-        android:paddingRight="12dp"
-        android:paddingTop="14dp"
+        android:layout_height="@dimen/login_edit_text_height"
+        android:layout_marginLeft="@dimen/signup_margin"
+        android:layout_marginRight="@dimen/signup_margin"
+        android:background="@color/white_opaque"
+        android:paddingLeft="@dimen/edit_text_padding"
         android:ems="10"
-        android:fontFamily="@font/raleway"
-        android:textSize="17sp"
+        android:fontFamily="sans-serif"
+        android:textSize="@dimen/login_edit_text_size"
         android:inputType="text"
-        android:textStyle="italic"
         android:textColor="@color/editTextColor"
         android:textColorHint="@color/editTextColor"
         android:gravity="left|center_vertical"
-        app:layout_constraintTop_toBottomOf="@id/email"
-        android:layout_marginTop="7dp"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="70dp"
         android:hint="@string/username" />
 
+    <EditText
+        android:id="@+id/email"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/login_edit_text_height"
+        android:layout_marginLeft="@dimen/signup_margin"
+        android:layout_marginRight="@dimen/signup_margin"
+        android:background="@color/white_opaque"
+        android:paddingLeft="@dimen/edit_text_padding"
+        android:ems="10"
+        android:fontFamily="sans-serif"
+        android:textSize="@dimen/login_edit_text_size"
+        android:inputType="textEmailAddress"
+        android:textColor="@color/editTextColor"
+        android:textColorHint="@color/editTextColor"
+        android:gravity="left|center_vertical"
+        app:layout_constraintTop_toBottomOf="@id/username"
+        android:layout_marginTop="14dp"
+        android:hint="@string/email" />
+
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/passwordLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="46dp"
-        android:layout_marginRight="46dp"
+        android:layout_marginLeft="@dimen/signup_margin"
+        android:layout_marginRight="@dimen/signup_margin"
         app:passwordToggleTint="@color/showPasswordColor"
         app:passwordToggleEnabled="true"
         app:hintAnimationEnabled="false"
         app:passwordToggleDrawable="@drawable/selector_show_password"
         app:hintEnabled="false"
-        app:layout_constraintTop_toBottomOf="@id/username"
-        android:layout_marginTop="7dp"
+        app:layout_constraintTop_toBottomOf="@id/email"
+        android:layout_marginTop="15dp"
         >
     <android.support.design.widget.TextInputEditText
         android:id="@+id/password"
         android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:background="@drawable/rounded_edit"
-        android:padding="7dp"
+        android:layout_height="27dp"
+        android:background="@color/white_opaque"
+        android:paddingLeft="@dimen/edit_text_padding"
         android:drawablePadding="55dp"
-        android:paddingTop="14dp"
         android:drawableEnd="@drawable/ic_eye_noshow"
         android:ems="10"
-        android:fontFamily="@font/raleway"
-        android:textSize="17sp"
-        android:textStyle="italic"
+        android:fontFamily="sans-serif"
+        android:textSize="@dimen/login_edit_text_size"
         android:textColor="@color/editTextColor"
         android:textColorHint="@color/editTextColor"
         android:gravity="left|center_vertical"
@@ -112,40 +199,54 @@
         android:inputType="textPassword" />
     </android.support.design.widget.TextInputLayout>
 
+    <CheckBox
+        android:id="@+id/keepMeLoggedIn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="13dp"
+        android:layout_marginRight="66dp"
+        app:layout_constraintTop_toBottomOf="@id/passwordLayout"
+        app:layout_constraintRight_toRightOf="parent"
+        android:padding="0dp" />
+
+    <TextView
+        android:id="@+id/keepMeLoggedInLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/raleway_bold"
+        android:textSize="12sp"
+        android:text="@string/keep_me_logged_in"
+        app:layout_constraintRight_toLeftOf="@id/keepMeLoggedIn"
+        app:layout_constraintTop_toTopOf="@id/keepMeLoggedIn"
+        app:layout_constraintBottom_toBottomOf="@id/keepMeLoggedIn"
+        android:textColor="@color/white_opaque"/>
+
     <Button
         android:id="@+id/signupButton"
-        android:layout_width="154dp"
-        android:layout_height="38dp"
-        android:layout_marginTop="44dp"
-        android:background="@drawable/rounded_button"
-        android:fontFamily="@font/raleway_semibold"
-        android:paddingBottom="0dp"
-        android:paddingTop="0dp"
-        android:text="@string/signup"
+        android:layout_width="@dimen/button_medium_width"
+        android:layout_height="@dimen/button_medium_height"
+        android:layout_marginTop="10dp"
+        android:background="@drawable/rounded_button_color1"
+        android:fontFamily="@font/raleway_bold"
+        android:text="@string/signup_uppercase"
         android:textColor="@color/white_opaque"
         android:textAllCaps="false"
-        android:textSize="18sp"
+        android:textSize="@dimen/button_medium_text_size"
         app:layout_constraintRight_toRightOf="@id/username"
-        app:layout_constraintTop_toBottomOf="@id/passwordLayout"
-        app:layout_goneMarginTop="4dp"/>
+        app:layout_constraintTop_toBottomOf="@id/keepMeLoggedIn" />
 
-    <Button
-        android:id="@+id/cancelButton"
-        android:layout_width="0dp"
-        app:layout_constraintWidth_default="spread"
-        android:layout_height="38dp"
-        android:background="@drawable/rounded_secondary_button"
-        android:fontFamily="@font/raleway_semibold"
-        android:paddingBottom="0dp"
-        android:paddingTop="0dp"
-        android:layout_marginRight="15dp"
-        android:text="@string/cancel"
-        android:textColor="@color/white_opaque"
-        android:textAllCaps="false"
-        android:textSize="18sp"
+    <TextView
+        android:id="@+id/cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
         app:layout_constraintTop_toTopOf="@id/signupButton"
+        app:layout_constraintBottom_toBottomOf="@id/signupButton"
         app:layout_constraintRight_toLeftOf="@id/signupButton"
-        app:layout_goneMarginTop="4dp"/>
+        android:textColor="@color/white_opaque"
+        android:fontFamily="@font/raleway_bold"
+        android:textSize="@dimen/button_medium_text_size"
+        android:text="@string/cancel_uppercase" />
+    </android.support.constraint.ConstraintLayout>
 
 </android.support.constraint.ConstraintLayout>

android/app/src/main/res/values-w385dp/dimens.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="header_hifi_margin_top">35dp</dimen>
+    <dimen name="header_hifi_height">84dp</dimen>
+    <dimen name="header_hifi_width">340dp</dimen>
+    <dimen name="button_medium_width">171dp</dimen>
+    <dimen name="button_medium_height">42dp</dimen>
+    <dimen name="button_medium_margin">10dp</dimen>
+    <dimen name="login_edit_text_size">14sp</dimen>
+    <dimen name="button_large_text_size">18sp</dimen>
+    <dimen name="button_medium_text_size">18sp</dimen>
+    <dimen name="login_margin">72dp</dimen>
+    <dimen name="signup_margin">76dp</dimen>
+    <dimen name="login_form_margin_top">100dp</dimen>
+    <dimen name="login_edit_text_height">27dp</dimen>
+    <dimen name="button_large_width">238dp</dimen>
+    <dimen name="button_large_height">42dp</dimen>
+    <dimen name="login_menu_translucent_rectangle_height">270dp</dimen>
+    <dimen name="login_menu_button_margin_top">86dp</dimen>
+    <dimen name="login_menu_text_size">22sp</dimen>
+    <dimen name="login_edit_text_padding">16dp</dimen>
+</resources>

android/app/src/main/res/values/colors.xml

@@ -10,6 +10,8 @@
     <color name="tabs">#1EB5EC</color>
     <color name="colorButton1">#00B4EF</color>
     <color name="colorButton2">#828282</color>
+    <color name="colorButton3">#8F8F8F</color>
+    <color name="colorButton4">#434343</color>
     <color name="backgroundDark">#333333</color>
     <color name="backgroundLight">#4F4F4F</color>
     <color name="backgroundSearch">#33999999</color>

android/app/src/main/res/values/dimens.xml

@@ -33,10 +33,26 @@
     <dimen name="domainMarginBottom">6dp</dimen>
     <dimen name="domainNameHeight">64dp</dimen>
 
-    <dimen name="header_hifi_margin_top">56dp</dimen>
-    <dimen name="header_hifi_height">101dp</dimen>
-    <dimen name="header_hifi_width">425dp</dimen>
+    <dimen name="header_hifi_margin_top">32dp</dimen>
+    <dimen name="header_hifi_height">76dp</dimen>
+    <dimen name="header_hifi_width">306dp</dimen>
 
     <dimen name="list_vertical_padding">8dp</dimen>
+    <dimen name="button_medium_width">150dp</dimen>
+    <dimen name="button_medium_height">38dp</dimen>
+    <dimen name="login_margin">65dp</dimen>
+    <dimen name="signup_margin">68dp</dimen>
+    <dimen name="login_form_margin_top">90dp</dimen>
+    <dimen name="button_medium_margin">9dp</dimen>
+    <dimen name="button_medium_text_size">16sp</dimen>
+    <dimen name="button_large_text_size">16sp</dimen>
+    <dimen name="login_edit_text_size">13sp</dimen>
+    <dimen name="login_edit_text_height">24dp</dimen>
+    <dimen name="button_large_width">214dp</dimen>
+    <dimen name="button_large_height">38dp</dimen>
+    <dimen name="login_menu_translucent_rectangle_height">300dp</dimen>
+    <dimen name="login_menu_button_margin_top">77dp</dimen>
+    <dimen name="login_menu_text_size">20sp</dimen>
+    <dimen name="login_edit_text_padding">14dp</dimen>
 
 </resources>

android/app/src/main/res/values/strings.xml

@@ -16,9 +16,9 @@
     <string name="password">Password</string>
     <string name="login">Login</string>
     <string name="logout">Logout</string>
-    <string name="forgot_password"><u>Forgot password?</u>\u00A0</string>
+    <string name="cant_access_your_account"><u>Can\u0027t access your account?</u></string>
     <string name="login_username_or_password_incorrect">Username or password incorrect.</string>
-    <string name="logging_in">Logging into High Fidelity</string>
+    <string name="logging_in">Logging in</string>
     <string name="search_hint"><i>Search for a place by name</i>\u00A0</string>
     <string name="search_loading">Loading places…</string>
     <string name="search_no_results">No places exist with that name</string>
@@ -26,16 +26,20 @@
     <string name="your_last_location">Your Last Location</string>
     <string name="online">Online</string>
     <string name="signup">Sign Up</string>
+    <string name="signup_uppercase">SIGN UP</string>
     <string name="creating_account">Creating your High Fidelity account</string>
     <string name="signup_email_username_or_password_incorrect">Email, username or password incorrect.</string>
     <string name="signedin_welcome">You are now signed into High Fidelity</string>
+    <string name="logged_in_welcome">You are now logged in!</string>
     <string name="welcome">Welcome</string>
     <string name="cancel">Cancel</string>
-    <string name="get_started">Get Started</string>
+    <string name="cancel_uppercase">CANCEL</string>
+    <string name="get_started">GET STARTED</string>
 
     <!-- tags -->
     <string name="tagFragmentHome">tagFragmentHome</string>
     <string name="tagFragmentLogin">tagFragmentLogin</string>
+    <string name="tagFragmentLoggingIn">tagFragmentLogginIn</string>
     <string name="tagFragmentSignup">tagFragmentSignup</string>
     <string name="tagFragmentPolicy">tagFragmentPolicy</string>
     <string name="tagFragmentPeople">tagFragmentPeople</string>
@@ -45,4 +49,9 @@
     <string name="AEC">AEC</string>
     <string name="acoustic_echo_cancellation">Acoustic Echo Cancellation</string>
     <string name="settings_developer">Developer</string>
+    <string name="log_in">LOG IN</string>
+    <string name="keep_me_logged_in">Keep Me Logged In</string>
+    <string name="take_me_in_world">No thanks, take me in-world!</string>
+    <string name="be_anywere">BE ANYWHERE, WITH ANYONE \nRIGHT NOW</string>
+    <string name="steam_log_in">STEAM LOG IN</string>
 </resources>

android/app/src/main/res/xml/settings.xml

@@ -6,6 +6,7 @@
         <SwitchPreference
             android:key="aec"
             android:title="@string/AEC"
-            android:summary="@string/acoustic_echo_cancellation" />
+            android:summary="@string/acoustic_echo_cancellation"
+            android:defaultValue="true" />
     </PreferenceCategory>
 </PreferenceScreen>

android/build.gradle

@@ -106,11 +106,6 @@ def packages = [
         versionId: 'r5Zran.JSCtvrrB6Q4KaqfIoALPw3lYY',
         checksum: 'a8ee8584cf1ccd34766c7ddd9d5e5449',
     ],
-    glm: [
-        file: 'glm-0.9.8.5-patched.tgz',
-        versionId: 'cskfMoJrFlAeqI3WPxemyO_Cxt7rT9EJ',
-        checksum: '067b5fe16b220b5b1a1039ba51b062ae',
-    ],
     gvr: [
         file: 'gvrsdk_v1.101.0.tgz',
         versionId: 'nqBV_j81Uc31rC7bKIrlya_Hah4v3y5r',
@@ -161,21 +156,6 @@ def packages = [
     ]
 ]
 
-def scribeLocalFile='scribe' + EXEC_SUFFIX
-def scribeFile='scribe_linux_x86_64'
-def scribeChecksum='4635c28192724281d2367ce9e94380ab'
-def scribeVersion='mPAY_N846oZH1tPY1bwChB_hzqkiYyoC'
-
-if (Os.isFamily(Os.FAMILY_MAC)) {
-    scribeFile = 'scribe_osx_x86_64'
-    scribeChecksum='1ead61c285d265eba9a5ef91ae3b7c26'
-    scribeVersion='4TAXWdo9fviw60N2wUA8HNyQ9TabjZa3'
-} else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-    scribeFile = 'scribe_win32_x86_64.exe'
-    scribeChecksum='9c29a62595daf4844f95f6744d568c15'
-    scribeVersion='DUoxjufeX8ZAIVRBKRczWTuZwT13enTv'
-}
-
 def options = [
     files: new TreeSet<File>(),
     features: new HashSet<String>(),
@@ -434,28 +414,6 @@ task copyDependencies(dependsOn: [ extractDependencies ]) {
     }
 }
 
-task downloadScribe(type: Download) {
-    src baseUrl + scribeFile + '?versionId=' + scribeVersion
-    dest new File(baseFolder, scribeLocalFile)
-    onlyIfNewer true
-}
-
-task verifyScribe (type: Verify, dependsOn: downloadScribe) {
-    src new File(baseFolder, scribeLocalFile);
-    checksum scribeChecksum
-}
-
-task fixScribePermissions(type: Exec, dependsOn: verifyScribe) {
-    commandLine 'chmod', 'a+x', HIFI_ANDROID_PRECOMPILED + '/' + scribeLocalFile
-}
-
-task setupScribe(dependsOn: [verifyScribe]) { }
-
-// On Windows, we don't need to set the executable bit, but on OSX and Unix we do
-if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
-    setupScribe.dependsOn fixScribePermissions
-}
-
 task extractGvrBinaries(dependsOn: extractDependencies) {
     doLast {
         def gvrLibFolder = new File(HIFI_ANDROID_PRECOMPILED, 'gvr/gvr-android-sdk-1.101.0/libraries');
@@ -542,7 +500,7 @@ task qtBundle {
    }
 }
 
-task setupDependencies(dependsOn: [setupScribe, copyDependencies, extractGvrBinaries, qtBundle]) { }
+task setupDependencies(dependsOn: [copyDependencies, extractGvrBinaries, qtBundle]) { }
 
 task cleanDependencies(type: Delete) {
     delete HIFI_ANDROID_PRECOMPILED

assignment-client/CMakeLists.txt

@@ -11,7 +11,7 @@ setup_memory_debugger()
 
 # link in the shared libraries
 link_hifi_libraries(
-  audio avatars octree gpu graphics fbx entities
+  audio avatars octree gpu graphics fbx hfm entities
   networking animation recording shared script-engine embedded-webserver
   controllers physics plugins midi image
 )

assignment-client/src/Agent.cpp

@@ -216,7 +216,7 @@ void Agent::requestScript() {
     }
 
     // make sure this is not a script request for the file scheme
-    if (scriptURL.scheme() == URL_SCHEME_FILE) {
+    if (scriptURL.scheme() == HIFI_URL_SCHEME_FILE) {
         qWarning() << "Cannot load script for Agent from local filesystem.";
         scriptRequestFinished();
         return;
@@ -754,13 +754,13 @@ void Agent::processAgentAvatarAudio() {
         const int16_t* nextSoundOutput = NULL;
 
         if (_avatarSound) {
-            const QByteArray& soundByteArray = _avatarSound->getByteArray();
-            nextSoundOutput = reinterpret_cast<const int16_t*>(soundByteArray.data()
+            auto audioData = _avatarSound->getAudioData();
+            nextSoundOutput = reinterpret_cast<const int16_t*>(audioData->rawData()
                     + _numAvatarSoundSentBytes);
 
-            int numAvailableBytes = (soundByteArray.size() - _numAvatarSoundSentBytes) > AudioConstants::NETWORK_FRAME_BYTES_PER_CHANNEL
+            int numAvailableBytes = (audioData->getNumBytes() - _numAvatarSoundSentBytes) > AudioConstants::NETWORK_FRAME_BYTES_PER_CHANNEL
                 ? AudioConstants::NETWORK_FRAME_BYTES_PER_CHANNEL
-                : soundByteArray.size() - _numAvatarSoundSentBytes;
+                : audioData->getNumBytes() - _numAvatarSoundSentBytes;
             numAvailableSamples = (int16_t)numAvailableBytes / sizeof(int16_t);
 
 
@@ -773,7 +773,7 @@ void Agent::processAgentAvatarAudio() {
             }
 
             _numAvatarSoundSentBytes += numAvailableBytes;
-            if (_numAvatarSoundSentBytes == soundByteArray.size()) {
+            if (_numAvatarSoundSentBytes == (int)audioData->getNumBytes()) {
                 // we're done with this sound object - so set our pointer back to NULL
                 // and our sent bytes back to zero
                 _avatarSound.clear();

assignment-client/src/audio/AudioMixer.cpp

@@ -89,7 +89,8 @@ AudioMixer::AudioMixer(ReceivedMessage& message) :
             PacketType::NodeIgnoreRequest,
             PacketType::RadiusIgnoreRequest,
             PacketType::RequestsDomainListData,
-            PacketType::PerAvatarGainSet },
+            PacketType::PerAvatarGainSet,
+            PacketType::AudioSoloRequest },
             this, "queueAudioPacket");
 
     // packets whose consequences are global should be processed on the main thread
@@ -487,11 +488,8 @@ void AudioMixer::throttle(chrono::microseconds duration, int frame) {
 
     // target different mix and backoff ratios (they also have different backoff rates)
     // this is to prevent oscillation, and encourage throttling to find a steady state
-    const float TARGET = 0.9f;
-    // on a "regular" machine with 100 avatars, this is the largest value where
-    // - overthrottling can be recovered
-    // - oscillations will not occur after the recovery
-    const float BACKOFF_TARGET = 0.44f;
+    const float TARGET = _throttleStartTarget;
+    const float BACKOFF_TARGET = _throttleBackoffTarget;
 
     // the mixer is known to struggle at about 80 on a "regular" machine
     // so throttle 2/80 the streams to ensure smooth audio (throttling is linear)
@@ -550,6 +548,24 @@ void AudioMixer::parseSettingsObject(const QJsonObject& settingsObject) {
                 _slavePool.setNumThreads(numThreads);
             }
         }
+
+        const QString THROTTLE_START_KEY = "throttle_start";
+        const QString THROTTLE_BACKOFF_KEY = "throttle_backoff";
+
+        float settingsThrottleStart = audioThreadingGroupObject[THROTTLE_START_KEY].toDouble(_throttleStartTarget);
+        float settingsThrottleBackoff = audioThreadingGroupObject[THROTTLE_BACKOFF_KEY].toDouble(_throttleBackoffTarget);
+
+        if (settingsThrottleBackoff > settingsThrottleStart) {
+            qCWarning(audio) << "Throttle backoff target cannot be higher than throttle start target. Using default values.";
+        } else if (settingsThrottleBackoff < 0.0f || settingsThrottleStart > 1.0f) {
+            qCWarning(audio) << "Throttle start and backoff targets must be greater than or equal to 0.0"
+                << "and lesser than or equal to 1.0. Using default values.";
+        } else {
+            _throttleStartTarget = settingsThrottleStart;
+            _throttleBackoffTarget = settingsThrottleBackoff;
+        }
+
+        qCDebug(audio) << "Throttle Start:" << _throttleStartTarget << "Throttle Backoff:" << _throttleBackoffTarget;
     }
 
     if (settingsObject.contains(AUDIO_BUFFER_GROUP_KEY)) {

assignment-client/src/audio/AudioMixer.h

@@ -144,11 +144,13 @@ private:
     static std::map<QString, CodecPluginPointer> _availableCodecs;
     static QStringList _codecPreferenceOrder;
 
-
     static std::vector<ZoneDescription> _audioZones;
     static std::vector<ZoneSettings> _zoneSettings;
     static std::vector<ReverbSettings> _zoneReverbSettings;
 
+    float _throttleStartTarget = 0.9f;
+    float _throttleBackoffTarget = 0.44f;
+
     AudioMixerSlave::SharedData _workerSharedData;
 };
 

assignment-client/src/audio/AudioMixerClientData.cpp

@@ -13,7 +13,7 @@
 
 #include <random>
 
-#include <glm/detail/func_common.hpp>
+#include <glm/common.hpp>
 
 #include <QtCore/QDebug>
 #include <QtCore/QJsonArray>
@@ -98,6 +98,9 @@ int AudioMixerClientData::processPackets(ConcurrentAddedStreams& addedStreams) {
             case PacketType::RadiusIgnoreRequest:
                 parseRadiusIgnoreRequest(packet, node);
                 break;
+            case PacketType::AudioSoloRequest:
+                parseSoloRequest(packet, node);
+                break;
             default:
                 Q_UNREACHABLE();
         }
@@ -202,7 +205,7 @@ void AudioMixerClientData::parsePerAvatarGainSet(ReceivedMessage& message, const
     }
 }
 
-void AudioMixerClientData::setGainForAvatar(QUuid nodeID, uint8_t gain) {
+void AudioMixerClientData::setGainForAvatar(QUuid nodeID, float gain) {
     auto it = std::find_if(_streams.active.cbegin(), _streams.active.cend(), [nodeID](const MixableStream& mixableStream){
         return mixableStream.nodeStreamID.nodeID == nodeID && mixableStream.nodeStreamID.streamID.isNull();
     });
@@ -295,6 +298,25 @@ void AudioMixerClientData::parseRadiusIgnoreRequest(QSharedPointer<ReceivedMessa
     }
 }
 
+
+void AudioMixerClientData::parseSoloRequest(QSharedPointer<ReceivedMessage> message, const SharedNodePointer& node) {
+
+    uint8_t addToSolo;
+    message->readPrimitive(&addToSolo);
+
+    while (message->getBytesLeftToRead()) {
+        // parse out the UUID being soloed from the packet
+        QUuid soloedUUID = QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID));
+
+        if (addToSolo) {
+            _soloedNodes.push_back(soloedUUID);
+        } else {
+            auto it = std::remove(std::begin(_soloedNodes), std::end(_soloedNodes), soloedUUID);
+            _soloedNodes.erase(it, std::end(_soloedNodes));
+        }
+    }
+}
+
 AvatarAudioStream* AudioMixerClientData::getAvatarAudioStream() {
     auto it = std::find_if(_audioStreams.begin(), _audioStreams.end(), [](const SharedStreamPointer& stream){
         return stream->getStreamIdentifier().isNull();

assignment-client/src/audio/AudioMixerClientData.h

@@ -65,6 +65,7 @@ public:
     void parsePerAvatarGainSet(ReceivedMessage& message, const SharedNodePointer& node);
     void parseNodeIgnoreRequest(QSharedPointer<ReceivedMessage> message, const SharedNodePointer& node);
     void parseRadiusIgnoreRequest(QSharedPointer<ReceivedMessage> message, const SharedNodePointer& node);
+    void parseSoloRequest(QSharedPointer<ReceivedMessage> message, const SharedNodePointer& node);
 
     // attempt to pop a frame from each audio stream, and return the number of streams from this client
     int checkBuffersBeforeFrameSend();
@@ -150,6 +151,9 @@ public:
 
     const Node::IgnoredNodeIDs& getIgnoringNodeIDs() const { return _ignoringNodeIDs; }
 
+
+    const std::vector<QUuid>& getSoloedNodes() const { return _soloedNodes; }
+
     bool getHasReceivedFirstMix() const { return _hasReceivedFirstMix; }
     void setHasReceivedFirstMix(bool hasReceivedFirstMix) { _hasReceivedFirstMix = hasReceivedFirstMix; }
 
@@ -172,7 +176,7 @@ private:
 
     void optionallyReplicatePacket(ReceivedMessage& packet, const Node& node);
 
-    void setGainForAvatar(QUuid nodeID, uint8_t gain);
+    void setGainForAvatar(QUuid nodeID, float gain);
 
     bool containsValidPosition(ReceivedMessage& message) const;
 
@@ -209,6 +213,8 @@ private:
 
     std::atomic_bool _isIgnoreRadiusEnabled { false };
 
+    std::vector<QUuid> _soloedNodes;
+
     bool _hasReceivedFirstMix { false };
 };
 

assignment-client/src/audio/AudioMixerSlave.cpp

@@ -272,6 +272,10 @@ bool shouldBeSkipped(MixableStream& stream, const Node& listener,
         return true;
     }
 
+    if (!listenerData.getSoloedNodes().empty()) {
+        return !contains(listenerData.getSoloedNodes(), stream.nodeStreamID.nodeID);
+    }
+
     bool shouldCheckIgnoreBox = (listenerAudioStream.isIgnoreBoxEnabled() ||
                                  stream.positionalStream->isIgnoreBoxEnabled());
     if (shouldCheckIgnoreBox &&
@@ -310,6 +314,7 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& listener) {
     memset(_mixSamples, 0, sizeof(_mixSamples));
 
     bool isThrottling = _numToRetain != -1;
+    bool isSoloing = !listenerData->getSoloedNodes().empty();
 
     auto& streams = listenerData->getStreams();
 
@@ -376,13 +381,14 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& listener) {
             stream.approximateVolume = approximateVolume(stream, listenerAudioStream);
         } else {
             if (shouldBeSkipped(stream, *listener, *listenerAudioStream, *listenerData)) {
-                addStream(stream, *listenerAudioStream, 0.0f);
+                addStream(stream, *listenerAudioStream, 0.0f, isSoloing);
                 streams.skipped.push_back(move(stream));
                 ++stats.activeToSkipped;
                 return true;
             }
 
-            addStream(stream, *listenerAudioStream, listenerData->getMasterAvatarGain());
+            addStream(stream, *listenerAudioStream, listenerData->getMasterAvatarGain(),
+                      isSoloing);
 
             if (shouldBeInactive(stream)) {
                 // To reduce artifacts we still call render to flush the HRTF for every silent
@@ -417,7 +423,8 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& listener) {
                 return true;
             }
 
-            addStream(stream, *listenerAudioStream, listenerData->getMasterAvatarGain());
+            addStream(stream, *listenerAudioStream, listenerData->getMasterAvatarGain(),
+                      isSoloing);
 
             if (shouldBeInactive(stream)) {
                 // To reduce artifacts we still call render to flush the HRTF for every silent
@@ -484,7 +491,7 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& listener) {
 
 void AudioMixerSlave::addStream(AudioMixerClientData::MixableStream& mixableStream,
                                 AvatarAudioStream& listeningNodeStream,
-                                float masterListenerGain) {
+                                float masterListenerGain, bool isSoloing) {
     ++stats.totalMixes;
 
     auto streamToAdd = mixableStream.positionalStream;
@@ -495,9 +502,13 @@ void AudioMixerSlave::addStream(AudioMixerClientData::MixableStream& mixableStre
     glm::vec3 relativePosition = streamToAdd->getPosition() - listeningNodeStream.getPosition();
 
     float distance = glm::max(glm::length(relativePosition), EPSILON);
-    float gain = computeGain(masterListenerGain, listeningNodeStream, *streamToAdd, relativePosition, distance, isEcho);
     float azimuth = isEcho ? 0.0f : computeAzimuth(listeningNodeStream, listeningNodeStream, relativePosition);
 
+    float gain = 1.0f;
+    if (!isSoloing) {
+        gain = computeGain(masterListenerGain, listeningNodeStream, *streamToAdd, relativePosition, distance, isEcho);
+    }
+
     const int HRTF_DATASET_INDEX = 1;
 
     if (!streamToAdd->lastPopSucceeded()) {

assignment-client/src/audio/AudioMixerSlave.h

@@ -57,7 +57,7 @@ private:
     bool prepareMix(const SharedNodePointer& listener);
     void addStream(AudioMixerClientData::MixableStream& mixableStream,
                    AvatarAudioStream& listeningNodeStream,
-                   float masterListenerGain);
+                   float masterListenerGain, bool isSoloing);
     void updateHRTFParameters(AudioMixerClientData::MixableStream& mixableStream,
                               AvatarAudioStream& listeningNodeStream,
                               float masterListenerGain);

assignment-client/src/avatars/ScriptableAvatar.cpp

@@ -69,10 +69,10 @@ void ScriptableAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     AvatarData::setSkeletonModelURL(skeletonModelURL);
 }
 
-static AnimPose composeAnimPose(const FBXJoint& fbxJoint, const glm::quat rotation, const glm::vec3 translation) {
+static AnimPose composeAnimPose(const HFMJoint& joint, const glm::quat rotation, const glm::vec3 translation) {
     glm::mat4 translationMat = glm::translate(translation);
-    glm::mat4 rotationMat = glm::mat4_cast(fbxJoint.preRotation * rotation * fbxJoint.postRotation);
-    glm::mat4 finalMat = translationMat * fbxJoint.preTransform * rotationMat * fbxJoint.postTransform;
+    glm::mat4 rotationMat = glm::mat4_cast(joint.preRotation * rotation * joint.postRotation);
+    glm::mat4 finalMat = translationMat * joint.preTransform * rotationMat * joint.postTransform;
     return AnimPose(finalMat);
 }
 
@@ -84,7 +84,7 @@ void ScriptableAvatar::update(float deltatime) {
     // Run animation
     if (_animation && _animation->isLoaded() && _animation->getFrames().size() > 0 && !_bind.isNull() && _bind->isLoaded()) {
         if (!_animSkeleton) {
-            _animSkeleton = std::make_shared<AnimSkeleton>(_bind->getGeometry());
+            _animSkeleton = std::make_shared<AnimSkeleton>(_bind->getHFMModel());
         }
         float currentFrame = _animationDetails.currentFrame + deltatime * _animationDetails.fps;
         if (_animationDetails.loop || currentFrame < _animationDetails.lastFrame) {
@@ -93,7 +93,7 @@ void ScriptableAvatar::update(float deltatime) {
             }
             _animationDetails.currentFrame = currentFrame;
 
-            const QVector<FBXJoint>& modelJoints = _bind->getGeometry().joints;
+            const QVector<HFMJoint>& modelJoints = _bind->getHFMModel().joints;
             QStringList animationJointNames = _animation->getJointNames();
 
             const int nJoints = modelJoints.size();
@@ -102,8 +102,8 @@ void ScriptableAvatar::update(float deltatime) {
             }
 
             const int frameCount = _animation->getFrames().size();
-            const FBXAnimationFrame& floorFrame = _animation->getFrames().at((int)glm::floor(currentFrame) % frameCount);
-            const FBXAnimationFrame& ceilFrame = _animation->getFrames().at((int)glm::ceil(currentFrame) % frameCount);
+            const HFMAnimationFrame& floorFrame = _animation->getFrames().at((int)glm::floor(currentFrame) % frameCount);
+            const HFMAnimationFrame& ceilFrame = _animation->getFrames().at((int)glm::ceil(currentFrame) % frameCount);
             const float frameFraction = glm::fract(currentFrame);
             std::vector<AnimPose> poses = _animSkeleton->getRelativeDefaultPoses();
 
@@ -113,7 +113,7 @@ void ScriptableAvatar::update(float deltatime) {
                 const QString& name = animationJointNames[i];
                 // As long as we need the model preRotations anyway, let's get the jointIndex from the bind skeleton rather than
                 // trusting the .fst (which is sometimes not updated to match changes to .fbx).
-                int mapping = _bind->getGeometry().getJointIndex(name);
+                int mapping = _bind->getHFMModel().getJointIndex(name);
                 if (mapping != -1 && !_maskedJoints.contains(name)) {
 
                     AnimPose floorPose = composeAnimPose(modelJoints[mapping], floorFrame.rotations[i], floorFrame.translations[i] * UNIT_SCALE);

cmake/externals/boostconfig/CMakeLists.txt

@@ -1,20 +0,0 @@
-set(EXTERNAL_NAME boostconfig)
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-
-include(ExternalProject)
-ExternalProject_Add(
-    ${EXTERNAL_NAME}
-    #URL https://github.com/boostorg/config/archive/boost-1.58.0.zip
-    URL https://public.highfidelity.com/dependencies/config-boost-1.58.0.zip
-    URL_MD5 42fa673bae2b7645a22736445e80eb8d
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-    LOG_DOWNLOAD 1
-)
-
-ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
-
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL)
-
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")

cmake/externals/bullet/CMakeLists.txt

@@ -1,85 +0,0 @@
-set(EXTERNAL_NAME bullet)
-
-if (WIN32)
-  set(PLATFORM_CMAKE_ARGS "-DUSE_MSVC_RUNTIME_LIBRARY_DLL=1")
-else ()
-  set(PLATFORM_CMAKE_ARGS "-DBUILD_SHARED_LIBS=1")
-
-  if (ANDROID)
-    list(APPEND PLATFORM_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
-  elseif (APPLE)
-    list(APPEND PLATFORM_CMAKE_ARGS "-DCMAKE_INSTALL_NAME_DIR=<INSTALL_DIR>/lib")
-  endif()
-endif ()
-
-include(ExternalProject)
-
-if (WIN32)
-  ExternalProject_Add(
-    ${EXTERNAL_NAME}
-    URL https://public.highfidelity.com/dependencies/bullet-2.88.tgz
-    URL_MD5 0a6876607ebe83e227427215f15946fd
-    CMAKE_ARGS ${PLATFORM_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DBUILD_EXTRAS=0 -DINSTALL_LIBS=1 -DBUILD_BULLET3=0 -DBUILD_OPENGL3_DEMOS=0 -DBUILD_BULLET2_DEMOS=0 -DBUILD_UNIT_TESTS=0 -DUSE_GLUT=0 -DUSE_DX11=0
-    LOG_DOWNLOAD 1
-    LOG_CONFIGURE 1
-    LOG_BUILD 1
-    BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
-  )
-else ()
-  ExternalProject_Add(
-    ${EXTERNAL_NAME}
-    URL https://public.highfidelity.com/dependencies/bullet-2.88.tgz
-    URL_MD5 0a6876607ebe83e227427215f15946fd
-    CMAKE_ARGS ${PLATFORM_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DBUILD_EXTRAS=0 -DINSTALL_LIBS=1 -DBUILD_BULLET3=0 -DBUILD_OPENGL3_DEMOS=0 -DBUILD_BULLET2_DEMOS=0 -DBUILD_UNIT_TESTS=0 -DUSE_GLUT=0
-    LOG_DOWNLOAD 1
-    LOG_CONFIGURE 1
-    LOG_BUILD 1
-    BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
-  )
-endif ()
-
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-
-ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
-
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-
-set(BULLET_LIB_DIR "${INSTALL_DIR}/lib")
-
-if (APPLE OR UNIX OR ANDROID)
-  if (APPLE)
-    set(BULLET_LIB_EXT "dylib")
-  else ()
-    set(BULLET_LIB_EXT "so")
-  endif ()
-
-  set(LIB_PREFIX "lib")
-elseif (WIN32)
-  set(BULLET_LIB_EXT "lib")
-endif ()
-
-if (DEFINED BULLET_LIB_EXT)
-  set(_BULLET_LIB_PAIRS "DYNAMICS_LIBRARY\;BulletDynamics" "COLLISION_LIBRARY\;BulletCollision" "MATH_LIBRARY\;LinearMath" "SOFTBODY_LIBRARY\;BulletSoftBody")
-
-  foreach(_LIB_PAIR ${_BULLET_LIB_PAIRS})
-    list(GET _LIB_PAIR 0 _LIB_VAR_NAME)
-    list(GET _LIB_PAIR 1 _LIB_NAME)
-
-
-
-    if (WIN32)
-      # on windows, we might end up with a library that ends with RelWithDebInfo if Visual Studio is building for that configuration
-      set(${EXTERNAL_NAME_UPPER}_${_LIB_VAR_NAME}_RELEASE "${BULLET_LIB_DIR}/${LIB_PREFIX}${_LIB_NAME}$<$<CONFIG:RelWithDebInfo>:_RelWithDebugInfo>$<$<CONFIG:MinSizeRel>:_MinsizeRel>.${BULLET_LIB_EXT}" CACHE FILEPATH "${_LIB_NAME} release library location")
-
-      set(${EXTERNAL_NAME_UPPER}_${_LIB_VAR_NAME}_DEBUG ${BULLET_LIB_DIR}/${LIB_PREFIX}${_LIB_NAME}_Debug.${BULLET_LIB_EXT} CACHE FILEPATH "${_LIB_NAME} debug library location")
-    else ()
-      set(${EXTERNAL_NAME_UPPER}_${_LIB_VAR_NAME}_RELEASE ${BULLET_LIB_DIR}/${LIB_PREFIX}${_LIB_NAME}.${BULLET_LIB_EXT} CACHE FILEPATH "${_LIB_NAME} release library location")
-      set(${EXTERNAL_NAME_UPPER}_${_LIB_VAR_NAME}_DEBUG "" CACHE FILEPATH "${_LIB_NAME} debug library location")
-    endif ()
-  endforeach()
-endif ()
-
-if (DEFINED ${EXTERNAL_NAME_UPPER}_DYNAMICS_LIBRARY_RELEASE)
-  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${INSTALL_DIR}/include/bullet CACHE PATH "Path to bullet include directory")
-endif ()

cmake/externals/draco/CMakeLists.txt

@@ -1,41 +0,0 @@
-set(EXTERNAL_NAME draco)
-
-if (ANDROID)
-  set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
-endif ()
-
-if (APPLE)
-  set(EXTRA_CMAKE_FLAGS -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-stdlib=libc++)
-endif ()
-
-include(ExternalProject)
-ExternalProject_Add(
-  ${EXTERNAL_NAME}
-  URL https://public.highfidelity.com/dependencies/draco-1.1.0.zip
-  URL_MD5 208f8b04c91d5f1c73d731a3ea37c5bb
-  CONFIGURE_COMMAND CMAKE_ARGS  ${ANDROID_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>-$<CONFIG> ${EXTRA_CMAKE_FLAGS}
-  LOG_DOWNLOAD 1
-  LOG_CONFIGURE 1
-  LOG_BUILD 1
-)
-
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-
-ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
-set(SUFFIXED_INSTALL_DIR "${INSTALL_DIR}-$<CONFIG>")
-
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SUFFIXED_INSTALL_DIR}/include CACHE PATH "List of Draco include directories")
-
-if (UNIX)
-  set(LIB_PREFIX "lib")
-  set(LIB_EXT "a")
-elseif (WIN32)
-  set(LIB_EXT "lib")
-endif ()
-
-set(${EXTERNAL_NAME_UPPER}_LIBRARY ${SUFFIXED_INSTALL_DIR}/lib/${LIB_PREFIX}draco.${LIB_EXT} CACHE FILEPATH "Path to Draco release library")
-set(${EXTERNAL_NAME_UPPER}_ENCODER_LIBRARY ${SUFFIXED_INSTALL_DIR}/lib/${LIB_PREFIX}dracoenc.${LIB_EXT} CACHE FILEPATH "Path to Draco encoder release library")
-set(${EXTERNAL_NAME_UPPER}_DECODER_LIBRARY ${SUFFIXED_INSTALL_DIR}/lib/${LIB_PREFIX}dracodec.${LIB_EXT} CACHE FILEPATH "Path to Draco decoder release library")

cmake/externals/etc2comp/CMakeLists.txt

@@ -1,58 +0,0 @@
-set(EXTERNAL_NAME etc2comp)
-
-if (ANDROID)
-  set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
-endif ()
-
-if (APPLE)
-  set(EXTRA_CMAKE_FLAGS -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-stdlib=libc++)
-endif ()
-
-include(ExternalProject)
-# We use a patched version of etc2comp that properly generates all the necessary mips
-# See https://github.com/google/etc2comp/pull/29
-# We also use part of https://github.com/google/etc2comp/pull/1, which fixes a bug
-# that would override CMAKE_CXX_FLAGS
-ExternalProject_Add(
-  ${EXTERNAL_NAME}
-  URL https://public.highfidelity.com/dependencies/etc2comp-patched.zip
-  URL_MD5 4c96153eb179acbe619e3d99d3330595
-  CMAKE_ARGS ${ANDROID_CMAKE_ARGS} ${EXTRA_CMAKE_FLAGS}
-  BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
-  INSTALL_COMMAND ""
-  LOG_DOWNLOAD 1
-  LOG_CONFIGURE 1
-  LOG_BUILD 1
-)
-
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-
-ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
-ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
-
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-
-if (WIN32 OR APPLE)
-  if (WIN32)
-    set(_LIB_FILE "EtcLib.lib")
-  else ()
-    set(_LIB_FILE "libEtcLib.a")
-  endif ()
-
-  set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/build/EtcLib/Debug/${_LIB_FILE} CACHE FILEPATH "Path to Etc2Comp debug library")
-
-  # use generator expression to ensure the correct library is found when building different configurations in VS
-  set(_LIB_FOLDER "$<$<CONFIG:RelWithDebInfo>:build/EtcLib/RelWithDebInfo>")
-  set(_LIB_FOLDER "${_LIB_FOLDER}$<$<CONFIG:MinSizeRel>:build/EtcLib/MinSizeRel>")
-  set(_LIB_FOLDER "${_LIB_FOLDER}$<$<OR:$<CONFIG:Release>,$<CONFIG:Debug>>:build/EtcLib/Release>")
-  set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/${_LIB_FOLDER}/${_LIB_FILE} CACHE FILEPATH "Path to Etc2Comp release library")
-else ()
-  set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG "" CACHE FILEPATH "Path to EtcLib debug library")
-  set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/build/EtcLib/libEtcLib.a CACHE FILEPATH "Path to EtcLib release library")
-
-endif ()
-
-set(ETC_INCLUDE_DIR ${SOURCE_DIR}/EtcLib/Etc CACHE FILEPATH "Path to Etc2Comp/Etc include directory")
-set(ETCCODEC_INCLUDE_DIR ${SOURCE_DIR}/EtcLib/EtcCodec CACHE FILEPATH "Path to Etc2Comp/EtcCodec include directory")
-# ETC2COMP_INCLUDE_DIRS will be set later by FindEtc2Comp

cmake/externals/gli/CMakeLists.txt

@@ -1,21 +0,0 @@
-set(EXTERNAL_NAME gli)
-
-include(ExternalProject)
-ExternalProject_Add(
-  ${EXTERNAL_NAME}
-  URL https://public.highfidelity.com/dependencies/gli-0.8.1.0.zip
-  URL_MD5 00c990f59c12bbf367956ef399d6f798
-  BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  INSTALL_COMMAND ""
-  LOG_DOWNLOAD 1
-)
-
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-
-ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
-
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR} CACHE PATH "List of gli include directories")

cmake/externals/glm/CMakeLists.txt

@@ -1,21 +0,0 @@
-set(EXTERNAL_NAME glm)
-
-include(ExternalProject)
-ExternalProject_Add(
-  ${EXTERNAL_NAME}
-  URL https://public.highfidelity.com/dependencies/glm-0.9.8.5-patched.zip
-  URL_MD5 7d39ecc1cea275427534c3cfd6dd63f0
-  BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> ${EXTERNAL_ARGS}
-  LOG_DOWNLOAD 1
-  LOG_CONFIGURE 1
-  LOG_BUILD 1
-)
-
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-
-ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
-
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE PATH "List of glm include directories")

cmake/externals/glslang/CMakeLists.txt

@@ -1,42 +0,0 @@
-set(EXTERNAL_NAME glslang)
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-
-include(ExternalProject)
-
-ExternalProject_Add(
-  ${EXTERNAL_NAME}
-  URL https://github.com/KhronosGroup/glslang/archive/7.8.2853.zip
-  URL_MD5 4f93e3818528176c622c137fba05cbf8
-  CMAKE_ARGS  -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>-$<CONFIG> 
-  LOG_DOWNLOAD 1
-  LOG_CONFIGURE 1
-  LOG_BUILD 1
-)
-
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-
-# includes
-ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
-set(SUFFIXED_INSTALL_DIR "${INSTALL_DIR}-$<CONFIG>")
-
-list(APPEND INCLUDE_DIRS ${SUFFIXED_INSTALL_DIR}/include)
-#list(APPEND INCLUDE_DIRS ${INSTALL_DIR}/include)
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${INCLUDE_DIRS} CACHE PATH "List of glslang include directories")
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${${EXTERNAL_NAME_UPPER}_INCLUDE_DIR} CACHE PATH "List of glslang include directories")
-
-
-set(LIB_DIR ${SUFFIXED_INSTALL_DIR}/lib)
-list(APPEND LIB_NAMES glslang HLSL OGLCompiler OSDependent SPIRV SPVRemapper)
-include(SelectLibraryConfigurations)
-
-foreach(BASE_LIB ${LIB_NAMES})
-    string(TOUPPER ${BASE_LIB} BASE_LIB_UPPER)
-    list(APPEND ${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE "${LIB_DIR}/${BASE_LIB}.lib")
-    list(APPEND ${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG "${LIB_DIR}/${BASE_LIB}d.lib")
-endforeach()
-
-select_library_configurations(${EXTERNAL_NAME_UPPER})
-
-set(${EXTERNAL_NAME_UPPER}_LIBRARY ${${EXTERNAL_NAME_UPPER}_LIBRARY} CACHE FILEPATH "Location of glslang libraries")
-set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${${EXTERNAL_NAME_UPPER}_LIBRARIES} CACHE FILEPATH "Location of glslang libraries")

cmake/externals/json/CMakeLists.txt

@@ -1,22 +0,0 @@
-set(EXTERNAL_NAME json)
-
-include(ExternalProject)
-ExternalProject_Add(
-  ${EXTERNAL_NAME}
-  URL https://hifi-public.s3.amazonaws.com/dependencies/json_3.1.2.zip
-  URL_MD5 94dbf6ea25a7569ddc0ab6e20862cf16
-  BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> ${EXTERNAL_ARGS}
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  INSTALL_COMMAND ""
-  LOG_DOWNLOAD 1
-)
-
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-
-ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
-
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR} CACHE PATH "List of json include directories")

cmake/externals/nvtt/CMakeLists.txt

@@ -1,87 +0,0 @@
-include(ExternalProject)
-include(SelectLibraryConfigurations)
-
-set(EXTERNAL_NAME nvtt)
-
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-
-if (WIN32)
-  ExternalProject_Add(
-    ${EXTERNAL_NAME}
-    URL https://public.highfidelity.com/dependencies/nvtt-win-2.1.0.hifi.zip
-    URL_MD5 10da01cf601f88f6dc12a6bc13c89136
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-    LOG_DOWNLOAD 1
-  )
-
-  ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
-
-  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE PATH "Location of NVTT include directory")
-  set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${SOURCE_DIR}/Release/x64/nvtt.lib CACHE FILEPATH "Path to NVTT release library")
-  set(${EXTERNAL_NAME_UPPER}_DLL_PATH "${SOURCE_DIR}/Release>/x64" CACHE PATH "Location of NVTT release DLL")
-else ()
-
-  if (ANDROID)
-    set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
-  endif ()
-  
-  ExternalProject_Add(
-    ${EXTERNAL_NAME}
-    URL https://public.highfidelity.com/dependencies/nvidia-texture-tools-2.1.0.hifi-83462e4.zip
-    URL_MD5 602776e08515b54bfa1b8dc455003f0f
-    CONFIGURE_COMMAND CMAKE_ARGS  ${ANDROID_CMAKE_ARGS} -DNVTT_SHARED=1 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-    LOG_DOWNLOAD 1
-    LOG_CONFIGURE 1
-    LOG_BUILD 1
-  )
-
-  ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
-
-  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE PATH "Location of NVTT include directory")
-
-  if (APPLE)
-    set(_LIB_EXT "dylib")
-  else ()
-    set(_LIB_EXT "so")
-  endif ()
-
-  set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/libnvtt.${_LIB_EXT} CACHE FILEPATH "Path to NVTT library")
-
-  if (APPLE)
-    # on OS X we have to use install_name_tool to fix the paths found in the NVTT shared libraries
-    # so that they can be found and linked during the linking phase
-    set(_NVTT_LIB_DIR "${INSTALL_DIR}/lib")
-
-    # first fix the install names of all present libraries
-    ExternalProject_Add_Step(
-      ${EXTERNAL_NAME}
-      change-install-name
-      COMMENT "Calling install_name_tool on NVTT libraries to fix install name for dylib linking"
-      COMMAND ${CMAKE_COMMAND} -DINSTALL_NAME_LIBRARY_DIR=${_NVTT_LIB_DIR} -P ${EXTERNAL_PROJECT_DIR}/OSXInstallNameChange.cmake
-      DEPENDEES install
-      WORKING_DIRECTORY <INSTALL_DIR>
-      LOG 1
-    )
-
-    # then, for the main library (libnvtt) fix the paths to the dependency libraries (core, image, math)
-    ExternalProject_Add_Step(
-      ${EXTERNAL_NAME}
-      change-dependency-paths
-      COMMENT "Calling install_name_tool on NVTT libraries to fix paths for dependency libraries"
-      COMMAND install_name_tool -change libnvimage.dylib ${INSTALL_DIR}/lib/libnvimage.dylib libnvtt.dylib
-      COMMAND install_name_tool -change libnvcore.dylib  ${INSTALL_DIR}/lib/libnvcore.dylib libnvtt.dylib
-      COMMAND install_name_tool -change libnvmath.dylib  ${INSTALL_DIR}/lib/libnvmath.dylib libnvtt.dylib
-      COMMAND install_name_tool -change libnvcore.dylib  ${INSTALL_DIR}/lib/libnvcore.dylib libnvimage.dylib
-      COMMAND install_name_tool -change libnvmath.dylib  ${INSTALL_DIR}/lib/libnvmath.dylib libnvimage.dylib
-      COMMAND install_name_tool -change libnvcore.dylib  ${INSTALL_DIR}/lib/libnvcore.dylib libnvmath.dylib
-      DEPENDEES install
-      WORKING_DIRECTORY <INSTALL_DIR>/lib
-      LOG 1
-    )
-  endif ()
-endif ()
-
-# Hide this external target (for IDE users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")

cmake/externals/openvr/CMakeLists.txt

@@ -1,49 +0,0 @@
-include(ExternalProject)
-include(SelectLibraryConfigurations)
-
-set(EXTERNAL_NAME OpenVR)
-
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-
-ExternalProject_Add(
-  ${EXTERNAL_NAME}
-  URL https://public.highfidelity.com/dependencies/openvr-1.0.6.zip
-  URL_MD5 f6892cd3a3078f505d03b4297f5a1951
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  INSTALL_COMMAND ""
-  LOG_DOWNLOAD 1
-)
-
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-
-ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
-
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/headers CACHE TYPE INTERNAL)
-
-if (WIN32)
-
-  # FIXME need to account for different architectures
-  if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/win64/openvr_api.lib CACHE TYPE INTERNAL)
-    add_paths_to_fixup_libs(${SOURCE_DIR}/bin/win64)
-  else()
-    set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/win32/openvr_api.lib CACHE TYPE INTERNAL)
-    add_paths_to_fixup_libs(${SOURCE_DIR}/bin/win32)
-  endif()
-
-elseif(APPLE)
-
-  # FIXME need to account for different architectures 
-  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/osx32/libopenvr_api.dylib CACHE TYPE INTERNAL)
-  add_paths_to_fixup_libs(${SOURCE_DIR}/bin/osx32)
-
-elseif(NOT ANDROID)
-
-  # FIXME need to account for different architectures 
-  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/linux64/libopenvr_api.so CACHE TYPE INTERNAL)
-  add_paths_to_fixup_libs(${SOURCE_DIR}/bin/linux64)
-  
-endif()
-

cmake/externals/quazip/CMakeLists.txt

@@ -3,7 +3,14 @@ string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 
 include(ExternalProject)
 
-set(QUAZIP_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${QT_CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib -DZLIB_ROOT=${ZLIB_ROOT} -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
+set(QUAZIP_CMAKE_ARGS 
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} 
+    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
+    -DCMAKE_PREFIX_PATH=${QT_CMAKE_PREFIX_PATH} 
+    -DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib 
+    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+    -DZLIB_ROOT=${VCPKG_INSTALL_ROOT}
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
 
 if (NOT APPLE)
   set(QUAZIP_CMAKE_ARGS ${QUAZIP_CMAKE_ARGS} -DCMAKE_CXX_STANDARD=11)
@@ -20,10 +27,6 @@ ExternalProject_Add(
   LOG_BUILD 1
 )
 
-if (WIN32)
-  add_dependencies(quazip zlib)
-endif ()
-
 # Hide this external target (for ide users)
 set_target_properties(${EXTERNAL_NAME} PROPERTIES
     FOLDER "hidden/externals"

cmake/externals/sdl2/CMakeLists.txt

@@ -1,90 +0,0 @@
-set(EXTERNAL_NAME sdl2)
-
-include(ExternalProject)
-
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-
-if (WIN32)
-  ExternalProject_Add(
-    ${EXTERNAL_NAME}
-    URL https://public.highfidelity.com/dependencies/SDL2-devel-2.0.3-VC.zip
-    URL_MD5 30a333bcbe94bc5016e8799c73e86233
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-    LOG_DOWNLOAD 1
-  )
-elseif (APPLE)
-
-    ExternalProject_Add(
-      ${EXTERNAL_NAME}
-      URL https://public.highfidelity.com/dependencies/SDL2-2.0.3.zip
-      URL_MD5 55f1eae5142d20db11c844d8d4d6deed
-      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DVIDEO_OPENGL=OFF
-      BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
-      LOG_DOWNLOAD 1
-      LOG_CONFIGURE 1
-      LOG_BUILD 1
-    )
-
-    ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
-    set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${INSTALL_DIR}/include/SDL2 CACHE PATH "Location of SDL2 include directory")
-    set(${EXTERNAL_NAME_UPPER}_LIBRARY "${INSTALL_DIR}/lib/libSDL2-2.0.dylib" CACHE STRING "Path to SDL2 library")
-
-    set(_SDL2_LIB_DIR "${INSTALL_DIR}/lib")
-
-    ExternalProject_Add_Step(
-      ${EXTERNAL_NAME}
-      change-install-name
-      COMMENT "Calling install_name_tool on SDL2 libraries to fix install name for dylib linking"
-      COMMAND ${CMAKE_COMMAND} -DINSTALL_NAME_LIBRARY_DIR=${_SDL2_LIB_DIR} -P ${EXTERNAL_PROJECT_DIR}/OSXInstallNameChange.cmake
-      DEPENDEES install
-      WORKING_DIRECTORY <INSTALL_DIR>
-      LOG 1
-    )
-
-else ()
-  if (ANDROID)
-    set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
-  endif ()
-
-  ExternalProject_Add(
-    ${EXTERNAL_NAME}
-    URL https://public.highfidelity.com/dependencies/SDL2-2.0.3.tar.gz
-    URL_MD5 fe6c61d2e9df9ef570e7e80c6e822537
-    CMAKE_ARGS ${ANDROID_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-    LOG_DOWNLOAD 1
-    LOG_CONFIGURE 1
-    LOG_BUILD 1
-  )
-endif ()
-
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-
-if (APPLE)
-
-# NOOP
-
-elseif (WIN32)
-
-  ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
-  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${SOURCE_DIR}/include CACHE PATH "Location of SDL2 include directory")
-
-  if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(${EXTERNAL_NAME_UPPER}_LIBRARY_TEMP ${SOURCE_DIR}/lib/x64/SDL2.lib CACHE FILEPATH "Path to SDL2 library")
-    set(${EXTERNAL_NAME_UPPER}_DLL_PATH ${SOURCE_DIR}/lib/x64 CACHE PATH "Location of SDL2 DLL")
-  else()
-    set(${EXTERNAL_NAME_UPPER}_LIBRARY_TEMP ${SOURCE_DIR}/lib/x86/SDL2.lib CACHE FILEPATH "Path to SDL2 library")
-    set(${EXTERNAL_NAME_UPPER}_DLL_PATH ${SOURCE_DIR}/lib/x86 CACHE PATH "Location of SDL2 DLL")
-  endif()
-
-  add_paths_to_fixup_libs(${${EXTERNAL_NAME_UPPER}_DLL_PATH})
-
-else ()
-
-  ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
-  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${INSTALL_DIR}/include/SDL2 CACHE PATH "Location of SDL2 include directory")
-  set(${EXTERNAL_NAME_UPPER}_LIBRARY_TEMP ${INSTALL_DIR}/lib/libSDL2.so CACHE FILEPATH "Path to SDL2 library")
-
-endif ()

cmake/externals/spirv_binaries/CMakeLists.txt

@@ -1,34 +0,0 @@
-set(EXTERNAL_NAME spirv_binaries)
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-
-include(ExternalProject)
-if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
-  set(DOWNLOAD_URL https://public.highfidelity.com/dependencies/vulkan/vulkansdk-win32-1.1.82.1.tar.gz)
-  set(DOWNLOAD_MD5 3a83ef490bce248b1a4d6726a3e5893e)
-  set(BIN_DIR "Bin")
-elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
-  set(DOWNLOAD_URL https://public.highfidelity.com/dependencies/vulkan/vulkansdk-macos-1.1.82.1.tar.gz)
-  set(DOWNLOAD_MD5 a57d37275b2c5db023ba8e84a63461ff)
-  set(BIN_DIR "macOS/bin")
-else ()
-  set(DOWNLOAD_URL https://public.highfidelity.com/dependencies/vulkan/vulkansdk-linux-x86_64-1.1.82.1.tar.gz)
-  set(DOWNLOAD_MD5 5a7c9eeda8cee6b36724da7f7cbe5ec6)
-  set(BIN_DIR "x86_64/bin")
-endif ()
-
-ExternalProject_Add(
-  ${EXTERNAL_NAME}
-  URL ${DOWNLOAD_URL}
-  URL_MD5 ${DOWNLOAD_MD5}
-  BUILD_COMMAND ""
-  CONFIGURE_COMMAND ""
-  INSTALL_COMMAND ""
-  LOG_DOWNLOAD ON
-)
-
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
-
-set(${EXTERNAL_NAME_UPPER}_DIR "${SOURCE_DIR}/${BIN_DIR}" CACHE FILEPATH "SPIRV binary tools location")
-

cmake/externals/spirv_cross/CMakeLists.txt

@@ -1,35 +0,0 @@
-set(EXTERNAL_NAME spirv_cross)
-
-include(ExternalProject)
-ExternalProject_Add(
-  ${EXTERNAL_NAME}
-  URL https://github.com/KhronosGroup/SPIRV-Cross/archive/2018-08-07.zip
-  URL_MD5 11198e4dc6a815ffbdb7a0a56d2d9261
-  CONFIGURE_COMMAND CMAKE_ARGS  ${ANDROID_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>-$<CONFIG> ${EXTRA_CMAKE_FLAGS}
-  LOG_DOWNLOAD 1
-  LOG_CONFIGURE 1
-  LOG_BUILD 1
-)
-
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-
-ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
-set(SUFFIXED_INSTALL_DIR "${INSTALL_DIR}-$<CONFIG>")
-
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SUFFIXED_INSTALL_DIR}/include CACHE PATH "List of Draco include directories")
-
-if (UNIX)
-  set(LIB_PREFIX "lib")
-  set(LIB_EXT "a")
-elseif (WIN32)
-  set(LIB_EXT "lib")
-endif ()
-
-foreach(lib glsl msl cpp hlsl reflect util core)
-    list(APPEND ${EXTERNAL_NAME_UPPER}_LIBRARIES ${SUFFIXED_INSTALL_DIR}/lib/spirv-cross-${lib}.${LIB_EXT})
-endforeach()
-
-set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${${EXTERNAL_NAME_UPPER}_LIBRARIES} CACHE FILEPATH "Path to SPIRV-Cross libraries")

cmake/externals/spirv_headers/CMakeLists.txt

@@ -1,18 +0,0 @@
-set(EXTERNAL_NAME spirv_headers)
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-
-include(ExternalProject)
-ExternalProject_Add(
-  ${EXTERNAL_NAME}
-  URL https://github.com/KhronosGroup/SPIRV-Headers/archive/2c512180ca03b5d4f56283efc85745775b45fdc4.zip
-  URL_MD5 83e652221b5f21d5fdb61c45f5b4d9f9
-  CONFIGURE_COMMAND CMAKE_ARGS  ${ANDROID_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> ${EXTRA_CMAKE_FLAGS}
-  LOG_DOWNLOAD 1
-  LOG_CONFIGURE 1
-  LOG_BUILD 1
-)
-
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
-set(${EXTERNAL_NAME_UPPER}_ROOT ${INSTALL_DIR} CACHE PATH "List of  include directories")

cmake/externals/spirv_tools/CMakeLists.txt

@@ -1,33 +0,0 @@
-set(EXTERNAL_NAME spirv_tools)
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-
-include(ExternalProject)
-ExternalProject_Add(
-  ${EXTERNAL_NAME}
-  URL https://github.com/KhronosGroup/SPIRV-Tools/archive/v2018.4.zip
-  URL_MD5 7a7c69cf6ff0318910b4bfbdf30bcfc9
-  CONFIGURE_COMMAND CMAKE_ARGS  ${ANDROID_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DSPIRV-Headers_SOURCE_DIR=${SPIRV_HEADERS_ROOT} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>-$<CONFIG> ${EXTRA_CMAKE_FLAGS} 
-  LOG_DOWNLOAD 1
-  LOG_CONFIGURE 1
-  LOG_BUILD 1
-)
-
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-
-ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
-set(SUFFIXED_INSTALL_DIR "${INSTALL_DIR}-$<CONFIG>")
-
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SUFFIXED_INSTALL_DIR}/include CACHE PATH "List of SPIRV-Tools include directories")
-
-if (UNIX)
-  set(LIB_PREFIX "lib")
-  set(LIB_EXT "a")
-elseif (WIN32)
-  set(LIB_EXT "lib")
-endif ()
-
-list(APPEND ${EXTERNAL_NAME_UPPER}_LIBRARIES ${SUFFIXED_INSTALL_DIR}/lib/SPIRV-Tools-opt.${LIB_EXT})
-list(APPEND ${EXTERNAL_NAME_UPPER}_LIBRARIES ${SUFFIXED_INSTALL_DIR}/lib/SPIRV-Tools-link.${LIB_EXT})
-list(APPEND ${EXTERNAL_NAME_UPPER}_LIBRARIES ${SUFFIXED_INSTALL_DIR}/lib/SPIRV-Tools.${LIB_EXT})
-set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${${EXTERNAL_NAME_UPPER}_LIBRARIES} CACHE FILEPATH "Path to SPIRV-Tool libraries")

cmake/externals/zlib/CMakeLists.txt

@@ -1,33 +0,0 @@
-set(EXTERNAL_NAME zlib)
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-
-include(ExternalProject)
-
-ExternalProject_Add(
-  ${EXTERNAL_NAME}
-  URL https://public.highfidelity.com/dependencies/zlib128.zip
-  URL_MD5 126f8676442ffbd97884eb4d6f32afb4
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-  BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
-  LOG_DOWNLOAD 1
-  LOG_CONFIGURE 1
-  LOG_BUILD 1
-)
-
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-
-ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
-set(${EXTERNAL_NAME_UPPER}_ROOT ${INSTALL_DIR} CACHE PATH "Path for Zlib install root")
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${INSTALL_DIR}/include CACHE PATH "List of zlib include directories")
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${${EXTERNAL_NAME_UPPER}_INCLUDE_DIR} CACHE PATH "List of zlib include directories")
-set(${EXTERNAL_NAME_UPPER}_DLL_PATH ${INSTALL_DIR}/bin CACHE FILEPATH "Location of ZLib DLL")
-set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/zlib.lib CACHE FILEPATH "Location of zlib release library")
-set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/zlibd.lib CACHE FILEPATH "Location of zlib debug library")
-
-include(SelectLibraryConfigurations)
-select_library_configurations(${EXTERNAL_NAME_UPPER})
-
-# Force selected libraries into the cache
-set(${EXTERNAL_NAME_UPPER}_LIBRARY ${${EXTERNAL_NAME_UPPER}_LIBRARY} CACHE FILEPATH "Location of zlib libraries")
-set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${${EXTERNAL_NAME_UPPER}_LIBRARIES} CACHE FILEPATH "Location of zlib libraries")

cmake/macros/AutoScribeShader.cmake

@@ -14,13 +14,6 @@ macro(AUTOSCRIBE_APPEND_QRC)
     string(CONCAT SHADER_QRC "${SHADER_QRC}" "<file alias=\"${ARGV0}\">${ARGV1}</file>\n")
 endmacro()
 
-set(VULKAN_DIR $ENV{VULKAN_SDK})
-set(GLSLANG_EXEC  "${VULKAN_DIR}/Bin/glslangValidator.exe")
-set(SPIRV_CROSS_EXEC  "${VULKAN_DIR}/Bin/spirv-cross.exe")
-set(SPIRV_OPT_EXEC  "${VULKAN_DIR}/Bin/spirv-opt.exe")
-set(GLSLC_EXEC  "${VULKAN_DIR}/Bin/glslc.exe")
-set(SCRIBE_EXEC "D:/scribe.exe")
-
 macro(AUTOSCRIBE_PLATFORM_SHADER)
     set(AUTOSCRIBE_PLATFORM_PATH "${ARGV0}")
     string(REGEX MATCH "([0-9]+(es)?)(/stereo)?" PLATFORM_PATH_REGEX ${AUTOSCRIBE_PLATFORM_PATH})
@@ -75,36 +68,6 @@ macro(AUTOSCRIBE_PLATFORM_SHADER)
     list(APPEND SHADER_GEN_LINE ${TEMP_PATH})
     list(APPEND SHADER_GEN_LINE ${AUTOSCRIBE_SHADER_SEEN_LIBS})
     string(CONCAT AUTOSCRIBE_SHADERGEN_COMMANDS "${AUTOSCRIBE_SHADERGEN_COMMANDS}" "${SHADER_GEN_LINE}\n")
-
-    # # FIXME need better mechanism for determining the include files
-    # add_custom_command(
-    #     OUTPUT ${AUTOSCRIBE_OUTPUT_FILE}
-    #     COMMAND ${SCRIBE_COMMAND} ${SHADER_FILE} ${SCRIBE_ARGS} -o ${AUTOSCRIBE_OUTPUT_FILE} -h ${AUTOSCRIBE_DIALECT_HEADER} -h ${AUTOSCRIBE_VARIANT_HEADER}
-    #     DEPENDS ${SCRIBE_COMMAND} ${SHADER_FILE} ${AUTOSCRIBE_DIALECT_HEADER} ${AUTOSCRIBE_VARIANT_HEADER})
-
-    # # Generate the spirv file
-    # add_custom_command(
-    #     OUTPUT ${AUTOSCRIBE_SPIRV_FILE}
-    #     COMMAND ${GLSLANG_EXEC} -V110 -o ${AUTOSCRIBE_SPIRV_FILE} ${AUTOSCRIBE_OUTPUT_FILE}
-    #     DEPENDS ${AUTOSCRIBE_OUTPUT_FILE} ${GLSLANG_EXEC})
-
-    # # Generate the optimized spirv file
-    # add_custom_command(
-    #     OUTPUT ${AUTOSCRIBE_SPIRV_OPT_FILE}
-    #     COMMAND ${SPIRV_OPT_EXEC} -O ${AUTOSCRIBE_SPIRV_FILE} -o ${AUTOSCRIBE_SPIRV_OPT_FILE} 
-    #     DEPENDS ${AUTOSCRIBE_SPIRV_FILE} ${SPIRV_OPT_EXEC})
-
-    # # Generate the optimized GLSL file
-    # add_custom_command(
-    #     OUTPUT ${AUTOSCRIBE_SPIRV_GLSL_FILE}
-    #     COMMAND ${SPIRV_CROSS_EXEC} ${SPIRV_CROSS_ARGS} ${AUTOSCRIBE_SPIRV_OPT_FILE} --output ${AUTOSCRIBE_SPIRV_GLSL_FILE} 
-    #     DEPENDS ${AUTOSCRIBE_SPIRV_OPT_FILE} ${SPIRV_CROSS_EXEC})
-
-    # # Generate the optimized spirv file
-    # add_custom_command(
-    #     OUTPUT ${AUTOSCRIBE_SPIRV_JSON_FILE}
-    #     COMMAND ${SPIRV_CROSS_EXEC} --reflect json ${AUTOSCRIBE_SPIRV_OPT_FILE} --output ${AUTOSCRIBE_SPIRV_JSON_FILE} 
-    #     DEPENDS ${AUTOSCRIBE_SPIRV_OPT_FILE} ${SPIRV_CROSS_EXEC})
 endmacro()
 
 macro(AUTOSCRIBE_SHADER)
@@ -307,38 +270,16 @@ macro(AUTOSCRIBE_SHADER_LIBS)
     set(AUTOSCRIBE_SHADERGEN_COMMANDS_FILE ${CMAKE_CURRENT_BINARY_DIR}/shadergen.txt)
     file(WRITE ${AUTOSCRIBE_SHADERGEN_COMMANDS_FILE} "${AUTOSCRIBE_SHADERGEN_COMMANDS}")
 
-    # grab the SPIRV binaries we require
-    # note we don't use the normal ADD_DEPENDENCY_EXTERNAL_PROJECTS macro because only a custom command 
-    # depends on these, not any of our build artifacts, so there's no valid target for the add_dependencies
-    # call in ADD_DEPENDENCY_EXTERNAL_PROJECTS to use
-    add_subdirectory(${EXTERNAL_PROJECT_DIR}/spirv_binaries ${EXTERNALS_BINARY_DIR}/spirv_binaries)
-
-    target_python()
-
-    # A custom python script which will generate 
-    if (ANDROID)
-        add_custom_command(
-            OUTPUT ${SCRIBED_SHADERS} ${SPIRV_SHADERS} ${REFLECTED_SHADERS}
-            COMMENT "Generating/updating shaders"
-            COMMAND ${HIFI_PYTHON_EXEC} ${CMAKE_SOURCE_DIR}/tools/shadergen.py 
-                --commands ${AUTOSCRIBE_SHADERGEN_COMMANDS_FILE} 
-                --spirv-binaries ${SPIRV_BINARIES_DIR} 
-                --scribe ${NATIVE_SCRIBE}
-                --build-dir ${CMAKE_CURRENT_BINARY_DIR}
-                --source-dir ${CMAKE_SOURCE_DIR}
-            DEPENDS ${AUTOSCRIBE_SHADER_HEADERS} spirv_binaries ${CMAKE_SOURCE_DIR}/tools/shadergen.py ${ALL_SCRIBE_SHADERS})
-    else() 
-        add_custom_command(
-            OUTPUT ${SCRIBED_SHADERS} ${SPIRV_SHADERS} ${REFLECTED_SHADERS}
-            COMMENT "Generating/updating shaders"
-            COMMAND ${HIFI_PYTHON_EXEC} ${CMAKE_SOURCE_DIR}/tools/shadergen.py 
-                --commands ${AUTOSCRIBE_SHADERGEN_COMMANDS_FILE} 
-                --spirv-binaries ${SPIRV_BINARIES_DIR} 
-                --scribe $<TARGET_FILE:scribe>
-                --build-dir ${CMAKE_CURRENT_BINARY_DIR}
-                --source-dir ${CMAKE_SOURCE_DIR}
-            DEPENDS ${AUTOSCRIBE_SHADER_HEADERS} scribe spirv_binaries ${CMAKE_SOURCE_DIR}/tools/shadergen.py ${ALL_SCRIBE_SHADERS})
-    endif()
+    # A custom python script which will generate all our shader artifacts
+    add_custom_command(
+        OUTPUT ${SCRIBED_SHADERS} ${SPIRV_SHADERS} ${REFLECTED_SHADERS}
+        COMMENT "Generating/updating shaders"
+        COMMAND ${HIFI_PYTHON_EXEC} ${CMAKE_SOURCE_DIR}/tools/shadergen.py 
+            --commands ${AUTOSCRIBE_SHADERGEN_COMMANDS_FILE} 
+            --tools-dir ${VCPKG_TOOLS_DIR}
+            --build-dir ${CMAKE_CURRENT_BINARY_DIR}
+            --source-dir ${CMAKE_SOURCE_DIR}
+        DEPENDS ${AUTOSCRIBE_SHADER_HEADERS} ${CMAKE_SOURCE_DIR}/tools/shadergen.py ${ALL_SCRIBE_SHADERS})
 
     add_custom_target(shadergen DEPENDS ${SCRIBED_SHADERS} ${SPIRV_SHADERS} ${REFLECTED_SHADERS})
     set_target_properties(shadergen PROPERTIES FOLDER "Shaders")

cmake/macros/ManuallyInstallOpenSSLForQt.cmake

@@ -19,13 +19,13 @@ macro(manually_install_openssl_for_qt)
     find_package(OpenSSL REQUIRED)
 
     install(
-      FILES "${OPENSSL_DLL_PATH}/ssleay32.dll"
+      FILES "${VCPKG_INSTALL_ROOT}/bin/ssleay32.dll"
       DESTINATION ${TARGET_INSTALL_DIR}
       COMPONENT ${TARGET_INSTALL_COMPONENT}
     )
 
     install(
-      FILES "${OPENSSL_DLL_PATH}/libeay32.dll"
+      FILES "${VCPKG_INSTALL_ROOT}/bin/libeay32.dll"
       DESTINATION ${TARGET_INSTALL_DIR}
       COMPONENT ${TARGET_INSTALL_COMPONENT}
     )

cmake/macros/TargetBullet.cmake

@@ -16,7 +16,6 @@ macro(TARGET_BULLET)
         list(APPEND BULLET_LIBRARIES ${LIB_DIR}/libLinearMath.a)
         list(APPEND BULLET_LIBRARIES ${LIB_DIR}/libBulletSoftBody.a)
     else()
-        add_dependency_external_projects(bullet)
         find_package(Bullet REQUIRED)
    endif()
     # perform the system include hack for OS X to ignore warnings

cmake/macros/TargetDraco.cmake

@@ -1,18 +1,24 @@
 macro(TARGET_DRACO)
+    set(LIBS draco dracodec dracoenc)
+    find_library(LIBPATH ${LIB} PATHS )
     if (ANDROID)
         set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/draco)
         set(DRACO_INCLUDE_DIRS "${INSTALL_DIR}/include" CACHE TYPE INTERNAL)
-
         set(LIB_DIR ${INSTALL_DIR}/lib)
         list(APPEND DRACO_LIBRARIES ${LIB_DIR}/libdraco.a)
         list(APPEND DRACO_LIBRARIES ${LIB_DIR}/libdracodec.a)
         list(APPEND DRACO_LIBRARIES ${LIB_DIR}/libdracoenc.a)
+        target_link_libraries(${TARGET_NAME} ${DRACO_LIBRARIES})
     else()
-        add_dependency_external_projects(draco)
-        find_package(Draco REQUIRED)
-        list(APPEND DRACO_LIBRARIES ${DRACO_LIBRARY})
-        list(APPEND DRACO_LIBRARIES ${DRACO_ENCODER_LIBRARY})
+        set(LIB_SEARCH_PATH_RELEASE ${VCPKG_INSTALL_ROOT}/lib/)
+        set(LIB_SEARCH_PATH_DEBUG ${VCPKG_INSTALL_ROOT}/debug/lib/)
+        foreach(LIB ${LIBS}) 
+            find_library(${LIB}_LIBPATH ${LIB} PATHS ${LIB_SEARCH_PATH_RELEASE} NO_DEFAULT_PATH)
+            list(APPEND DRACO_LIBRARY_RELEASE ${${LIB}_LIBPATH})
+            find_library(${LIB}D_LIBPATH ${LIB} PATHS ${LIB_SEARCH_PATH_DEBUG} NO_DEFAULT_PATH)
+            list(APPEND DRACO_LIBRARY_DEBUG ${${LIB}D_LIBPATH})
+        endforeach()
+        select_library_configurations(DRACO)
+        target_link_libraries(${TARGET_NAME} ${DRACO_LIBRARY})
     endif()
-    target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${DRACO_INCLUDE_DIRS})
-    target_link_libraries(${TARGET_NAME} ${DRACO_LIBRARIES})
-endmacro()
+endmacro()

cmake/macros/TargetEtc2Comp.cmake

@@ -8,15 +8,16 @@
 macro(TARGET_ETC2COMP)
     if (ANDROID)
         set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/etc2comp)
-        set(ETC2COMP_INCLUDE_DIRS "${INSTALL_DIR}/include/Etc" "${INSTALL_DIR}/include/EtcCodec")
+        set(ETC2COMP_INCLUDE_DIRS "${INSTALL_DIR}/include" "${INSTALL_DIR}/include/Etc" "${INSTALL_DIR}/include/EtcCodec")
         set(ETC2COMP_LIBRARY_DEBUG ${INSTALL_DIR}/lib/libEtcLib.a)
         set(ETC2COMP_LIBRARY_RELEASE ${INSTALL_DIR}/lib/libEtcLib.a)
-        select_library_configurations(ETC2COMP)
+        target_include_directories(${TARGET_NAME} PRIVATE ${ETC2COMP_INCLUDE_DIRS})
     else()
-        add_dependency_external_projects(etc2comp)
-        find_package(Etc2Comp REQUIRED)
+        find_library(ETC2COMP_LIBRARY_DEBUG EtcLib PATHS ${VCPKG_INSTALL_ROOT}/debug/lib/ NO_DEFAULT_PATH)
+        find_library(ETC2COMP_LIBRARY_RELEASE EtcLib PATHS ${VCPKG_INSTALL_ROOT}/lib/ NO_DEFAULT_PATH)
     endif()
 
-    target_include_directories(${TARGET_NAME} PRIVATE ${ETC2COMP_INCLUDE_DIRS})
+    select_library_configurations(ETC2COMP)
     target_link_libraries(${TARGET_NAME} ${ETC2COMP_LIBRARIES})
 endmacro()
+

cmake/macros/TargetGli.cmake

@@ -6,7 +6,6 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 # 
 macro(TARGET_GLI)
-  add_dependency_external_projects(gli)
-  find_package(GLI REQUIRED)
-  target_include_directories(${TARGET_NAME} PUBLIC ${GLI_INCLUDE_DIRS})
+	# We use vcpkg for both gli and glm, so we just re-use the target_glm macro here
+	target_glm()
 endmacro()

cmake/macros/TargetGlm.cmake

@@ -7,10 +7,12 @@
 # 
 macro(TARGET_GLM)
     if (ANDROID)
-        set(GLM_INCLUDE_DIRS "${HIFI_ANDROID_PRECOMPILED}/glm/include")
+        target_include_directories(${TARGET_NAME} PUBLIC "${VCPKG_INSTALL_ROOT}/include")
     else()
-        add_dependency_external_projects(glm)
-        find_package(GLM REQUIRED)
+        find_package(glm CONFIG REQUIRED)
+        target_link_libraries(${TARGET_NAME} glm)
     endif()
-    target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
+    target_compile_definitions(${TARGET_NAME} PUBLIC GLM_FORCE_RADIANS)
+    target_compile_definitions(${TARGET_NAME} PUBLIC GLM_ENABLE_EXPERIMENTAL)
+    target_compile_definitions(${TARGET_NAME} PUBLIC GLM_FORCE_CTOR_INIT)
 endmacro()

cmake/macros/TargetJson.cmake

@@ -6,7 +6,6 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 # 
 macro(TARGET_JSON)
-    add_dependency_external_projects(json)
-    find_package(JSON REQUIRED)
-    target_include_directories(${TARGET_NAME} PUBLIC ${JSON_INCLUDE_DIRS})
+	# We use vcpkg for both json and glm, so we just re-use the target_glm macro here
+    target_glm()
 endmacro()

cmake/macros/TargetNvtt.cmake

@@ -15,12 +15,17 @@ macro(TARGET_NVTT)
         list(APPEND NVTT_LIBS "${NVTT_LIB_DIR}/libnvimage.so")
         list(APPEND NVTT_LIBS "${NVTT_LIB_DIR}/libnvtt.so")
         set(NVTT_LIBRARIES ${NVTT_LIBS} CACHE TYPE INTERNAL)
+        target_include_directories(${TARGET_NAME} PRIVATE ${NVTT_INCLUDE_DIRS})
     else()
-        add_dependency_external_projects(nvtt)
-        find_package(NVTT REQUIRED)
-        add_paths_to_fixup_libs(${NVTT_DLL_PATH})
+        find_library(NVTT_LIBRARY_RELEASE nvtt PATHS ${VCPKG_INSTALL_ROOT}/lib NO_DEFAULT_PATH)
+        find_library(NVTT_LIBRARY_DEBUG nvtt PATHS ${VCPKG_INSTALL_ROOT}/debug/lib NO_DEFAULT_PATH)
+        select_library_configurations(NVTT)
     endif()
 
-    target_include_directories(${TARGET_NAME} PRIVATE ${NVTT_INCLUDE_DIRS})
     target_link_libraries(${TARGET_NAME} ${NVTT_LIBRARIES})
+    if ((NOT WIN32) AND (NOT ANDROID) AND (NOT APPLE))
+        find_package(OpenMP)
+        target_link_libraries(${TARGET_NAME} OpenMP::OpenMP_C OpenMP::OpenMP_CXX)
+    endif()
+
 endmacro()

cmake/macros/TargetOpenSSL.cmake

@@ -11,15 +11,8 @@ macro(TARGET_OPENSSL)
         set(OPENSSL_INCLUDE_DIR "${OPENSSL_INSTALL_DIR}/include" CACHE TYPE INTERNAL)
         set(OPENSSL_LIBRARIES "${OPENSSL_INSTALL_DIR}/lib/libcrypto.a;${OPENSSL_INSTALL_DIR}/lib/libssl.a" CACHE TYPE INTERNAL)
     else()
-
+    	# using VCPKG for OpenSSL
         find_package(OpenSSL REQUIRED)
-
-        if (APPLE AND ${OPENSSL_INCLUDE_DIR} STREQUAL "/usr/include")
-            # this is a user on OS X using system OpenSSL, which is going to throw warnings since they're deprecating for their common crypto
-            message(WARNING "The found version of OpenSSL is the OS X system version. This will produce deprecation warnings."
-            "\nWe recommend you install a newer version (at least 1.0.1h) in a different directory and set OPENSSL_ROOT_DIR in your env so Cmake can find it.")
-        endif()
-
     endif()
 
     include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")

cmake/macros/TargetOpenVR.cmake

@@ -0,0 +1,13 @@
+#
+#  Created by Bradley Austin Davis on 2018/10/24
+#  Copyright 2013-2018 High Fidelity, Inc.
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+#
+macro(TARGET_OPENVR)
+    find_library(OPENVR_LIBRARY_RELEASE NAMES openvr_api PATHS ${VCPKG_INSTALL_ROOT}/lib)
+    find_library(OPENVR_LIBRARY_DEBUG NAMES openvr_api PATHS ${VCPKG_INSTALL_ROOT}/debug/lib)
+    select_library_configurations(OPENVR)
+    target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARY})
+endmacro()

cmake/macros/TargetSDL2.cmake

@@ -6,9 +6,12 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 # 
 macro(TARGET_SDL2)
-    add_dependency_external_projects(sdl2)
-    find_package(SDL2 REQUIRED)
-    target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${SDL2_INCLUDE_DIR})
-    target_link_libraries(${TARGET_NAME} ${SDL2_LIBRARY})
+   	# using VCPKG for SDL2
+    find_package(SDL2 CONFIG REQUIRED)
+    if (WIN32)
+        target_link_libraries(${TARGET_NAME} SDL2::SDL2)
+    else()
+        target_link_libraries(${TARGET_NAME} SDL2::SDL2-static)
+    endif()
     add_definitions(-DHAVE_SDL2)
-endmacro()
+endmacro()

cmake/macros/TargetTBB.cmake

@@ -13,12 +13,17 @@ if (ANDROID)
     set(TBB_LIBRARY ${TBB_INSTALL_DIR}/lib/release/libtbb.so CACHE FILEPATH "TBB library location")
     set(TBB_MALLOC_LIBRARY ${TBB_INSTALL_DIR}/lib/release/libtbbmalloc.so CACHE FILEPATH "TBB malloc library location")
     set(TBB_LIBRARIES ${TBB_LIBRARY} ${TBB_MALLOC_LIBRARY})
-else()
+    target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${TBB_INCLUDE_DIRS})
+    target_link_libraries(${TARGET_NAME} ${TBB_LIBRARIES})
+elseif(APPLE)
     add_dependency_external_projects(tbb)
     find_package(TBB REQUIRED)
+    target_link_libraries(${TARGET_NAME} ${TBB_LIBRARIES})
+    target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${TBB_INCLUDE_DIRS})
+else()
+   	# using VCPKG for TBB
+    find_package(TBB CONFIG REQUIRED)
+    target_link_libraries(${TARGET_NAME} TBB::tbb)
 endif()
 
-target_link_libraries(${TARGET_NAME} ${TBB_LIBRARIES})
-target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${TBB_INCLUDE_DIRS})
-
 endmacro()

cmake/macros/TargetVulkan.cmake

@@ -5,15 +5,7 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 # 
 macro(TARGET_VULKAN)
-    find_package(Vulkan)
-
-    if (Vulkan_FOUND)
-        add_definitions(-DHAVE_VULKAN) 
-        target_include_directories(${TARGET_NAME} PRIVATE ${Vulkan_INCLUDE_DIRS})
-        target_link_libraries(${TARGET_NAME} ${Vulkan_LIBRARIES})
-
-        add_dependency_external_projects(glslang)
-        target_include_directories(${TARGET_NAME} PRIVATE ${GLSLANG_INCLUDE_DIRS})
-        target_link_libraries(${TARGET_NAME} ${GLSLANG_LIBRARIES})
-    endif()
+    find_package(Vulkan REQUIRED)
+    target_include_directories(${TARGET_NAME} PRIVATE ${VULKAN_INCLUDE_DIR})
+    target_link_libraries(${TARGET_NAME} ${VULKAN_LIBRARY})
 endmacro()

cmake/macros/TargetZlib.cmake

@@ -6,17 +6,8 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 #
 macro(TARGET_ZLIB)
-
-    if (WIN32)
-        add_dependency_external_projects(zlib)
-    endif()
-
+   	# using VCPKG for zlib
     find_package(ZLIB REQUIRED)
-
-    if (WIN32)
-        add_paths_to_fixup_libs(${ZLIB_DLL_PATH})
-    endif()
-
     target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${ZLIB_INCLUDE_DIRS})
     target_link_libraries(${TARGET_NAME} ${ZLIB_LIBRARIES})
 endmacro()

cmake/modules/FindDraco.cmake

@@ -1,30 +0,0 @@
-#
-#  FindDraco.cmake
-#
-#  Try to find Draco libraries and include path.
-#  Once done this will define
-#
-#  DRACO_FOUND
-#  DRACO_INCLUDE_DIRS
-#  DRACO_LIBRARY
-#  DRACO_ENCODER_LIBRARY
-#  DRACO_DECODER_LIBRARY
-#
-#  Created on 8/8/2017 by Stephen Birarda
-#  Copyright 2017 High Fidelity, Inc.
-#
-#  Distributed under the Apache License, Version 2.0.
-#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-#
-
-include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
-hifi_library_search_hints("draco")
-
-find_path(DRACO_INCLUDE_DIRS draco/core/draco_types.h PATH_SUFFIXES include/draco/src include HINTS ${DRACO_SEARCH_DIRS})
-
-find_library(DRACO_LIBRARY draco PATH_SUFFIXES "lib" HINTS ${DRACO_SEARCH_DIRS})
-find_library(DRACO_ENCODER_LIBRARY draco PATH_SUFFIXES "lib" HINTS ${DRACO_SEARCH_DIRS})
-find_library(DRACO_DECODER_LIBRARY draco PATH_SUFFIXES "lib" HINTS ${DRACO_SEARCH_DIRS})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(DRACO DEFAULT_MSG DRACO_INCLUDE_DIRS DRACO_LIBRARY DRACO_ENCODER_LIBRARY DRACO_DECODER_LIBRARY)

cmake/modules/FindEtc2Comp.cmake

@@ -1,37 +0,0 @@
-#
-#  FindEtc2Comp.cmake
-#
-#  Try to find the Etc2Comp compression library.
-#
-#  Once done this will define
-#
-#  ETC2COMP_FOUND - system found Etc2Comp
-#  ETC2COMP_INCLUDE_DIRS - the Etc2Comp include directory
-#  ETC2COMP_LIBRARIES - link to this to use Etc2Comp
-#
-#  Created on 5/2/2018 by Sam Gondelman
-#  Copyright 2018 High Fidelity, Inc.
-#
-#  Distributed under the Apache License, Version 2.0.
-#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-#
-
-include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
-hifi_library_search_hints("etc2comp")
-
-find_path(ETC_INCLUDE_DIR NAMES Etc.h HINTS ${ETC2COMP_SEARCH_DIRS})
-find_path(ETCCODEC_INCLUDE_DIR NAMES EtcBlock4x4.h HINTS ${ETC2COMP_SEARCH_DIRS})
-set(ETC2COMP_INCLUDE_DIRS "${ETC_INCLUDE_DIR}" "${ETCCODEC_INCLUDE_DIR}")
-
-find_library(ETC2COMP_LIBRARY_DEBUG NAMES ETC2COMP ETC2COMP_LIB PATH_SUFFIXES EtcLib/Debug HINTS ${ETC2COMP_SEARCH_DIRS})
-find_library(ETC2COMP_LIBRARY_RELEASE NAMES ETC2COMP ETC2COMP_LIB PATH_SUFFIXES EtcLib/Release EtcLib HINTS ${ETC2COMP_SEARCH_DIRS})
-
-include(SelectLibraryConfigurations)
-select_library_configurations(ETC2COMP)
-
-set(ETC2COMP_LIBRARIES ${ETC2COMP_LIBRARY})
-
-find_package_handle_standard_args(ETC2COMP "Could NOT find ETC2COMP, try to set the path to ETC2COMP root folder in the system variable ETC2COMP_ROOT_DIR or create a directory etc2comp in HIFI_LIB_DIR and paste the necessary files there"
- ETC2COMP_INCLUDE_DIRS ETC2COMP_LIBRARIES)
-
-mark_as_advanced(ETC2COMP_INCLUDE_DIRS ETC2COMP_LIBRARIES ETC2COMP_SEARCH_DIRS)

cmake/modules/FindGLEW.cmake

@@ -1,33 +0,0 @@
-#
-#  FindGLEW.cmake
-# 
-#  Try to find GLEW library and include path. Note that this only handles static GLEW.
-#  Once done this will define
-#
-#  GLEW_FOUND
-#  GLEW_INCLUDE_DIRS
-#  GLEW_LIBRARIES
-# 
-#  Created on 2/6/2014 by Stephen Birarda
-#  Copyright 2014 High Fidelity, Inc.
-#
-#  Adapted from FindGLEW.cmake available in the nvidia-texture-tools repository
-#  (https://code.google.com/p/nvidia-texture-tools/source/browse/trunk/cmake/FindGLEW.cmake?r=96)
-# 
-#  Distributed under the Apache License, Version 2.0.
-#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-# 
-
-include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
-hifi_library_search_hints("glew")
-
-find_path(GLEW_INCLUDE_DIRS GL/glew.h PATH_SUFFIXES include HINTS ${GLEW_SEARCH_DIRS})
-
-find_library(GLEW_LIBRARY_RELEASE glew32 PATH_SUFFIXES "lib/Release/Win32" "lib" HINTS ${GLEW_SEARCH_DIRS})
-find_library(GLEW_LIBRARY_DEBUG glew32d PATH_SUFFIXES "lib/Debug/Win32" "lib" HINTS ${GLEW_SEARCH_DIRS})
-
-include(SelectLibraryConfigurations)
-select_library_configurations(GLEW)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GLEW DEFAULT_MSG GLEW_INCLUDE_DIRS GLEW_LIBRARIES)

cmake/modules/FindJSON.cmake

@@ -1,19 +0,0 @@
-#
-#  Created by Bradley Austin Davis on 2018/07/22
-#  Copyright 2013-2018 High Fidelity, Inc.
-# 
-#  Distributed under the Apache License, Version 2.0.
-#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-# 
-
-# setup hints for JSON search
-include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
-hifi_library_search_hints("json")
-
-# locate header
-find_path(JSON_INCLUDE_DIRS "json/json.hpp" HINTS ${JSON_SEARCH_DIRS})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(JSON DEFAULT_MSG JSON_INCLUDE_DIRS)
-
-mark_as_advanced(JSON_INCLUDE_DIRS JSON_SEARCH_DIRS)

cmake/modules/FindOpenSSL.cmake

@@ -1,174 +0,0 @@
-# - Try to find the OpenSSL encryption library
-# Once done this will define
-#
-#  OPENSSL_ROOT_DIR - Set this variable to the root installation of OpenSSL
-#
-# Read-Only variables:
-#  OPENSSL_FOUND - system has the OpenSSL library
-#  OPENSSL_INCLUDE_DIR - the OpenSSL include directory
-#  OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
-#  OPENSSL_VERSION - This is set to $major.$minor.$revision$path (eg. 0.9.8s)
-#
-# Modified on 7/16/2014 by Stephen Birarda
-# This is an adapted version of the FindOpenSSL.cmake module distributed with Cmake 2.8.12.2
-# The original license for that file is displayed below.
-#
-#=============================================================================
-# Copyright 2006-2009 Kitware, Inc.
-# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
-# Copyright 2009-2011 Mathieu Malaterre <mathieu.malaterre@gmail.com>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-if (UNIX)
-  find_package(PkgConfig QUIET)
-  pkg_check_modules(_OPENSSL QUIET openssl)
-endif ()
-
-if (WIN32)
-  if (("${CMAKE_SIZEOF_VOID_P}" EQUAL "8"))
-    set(_OPENSSL_ROOT_HINTS_AND_PATHS $ENV{VCPKG_ROOT}/installed/x64-windows)
-  else()
-    set(_OPENSSL_ROOT_HINTS_AND_PATHS $ENV{VCPKG_ROOT}/installed/x86-windows)
-  endif()
-else ()
-  include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
-  hifi_library_search_hints("openssl")
-
-  set(_OPENSSL_ROOT_HINTS_AND_PATHS ${OPENSSL_SEARCH_DIRS})
-endif ()
-
-find_path(OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_INCLUDEDIR}
-  PATH_SUFFIXES include
-)
-
-if (WIN32 AND NOT CYGWIN)
-  if (MSVC)
-    # Using vcpkg builds of openssl
-    find_library(LIB_EAY_LIBRARY_RELEASE NAMES libeay32 HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib")
-    find_library(SSL_EAY_LIBRARY_RELEASE NAMES ssleay32 HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib")
-
-    include(SelectLibraryConfigurations)
-    select_library_configurations(LIB_EAY)
-    select_library_configurations(SSL_EAY)
-    set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY})
-    find_path(OPENSSL_DLL_PATH NAMES ssleay32.dll PATH_SUFFIXES "bin" HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} NO_DEFAULT_PATH)
-  endif()
-else()
-
-  find_library(OPENSSL_SSL_LIBRARY NAMES ssl ssleay32 ssleay32MD HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_LIBDIR}
-    PATH_SUFFIXES lib
-  )
-
-  find_library(OPENSSL_CRYPTO_LIBRARY NAMES crypto HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_LIBDIR}
-    PATH_SUFFIXES lib
-  )
-
-  mark_as_advanced(OPENSSL_CRYPTO_LIBRARY OPENSSL_SSL_LIBRARY)
-
-  # compat defines
-  set(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY})
-  set(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
-
-  set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
-
-endif ()
-
-function(from_hex HEX DEC)
-  string(TOUPPER "${HEX}" HEX)
-  set(_res 0)
-  string(LENGTH "${HEX}" _strlen)
-
-  while (_strlen GREATER 0)
-    math(EXPR _res "${_res} * 16")
-    string(SUBSTRING "${HEX}" 0 1 NIBBLE)
-    string(SUBSTRING "${HEX}" 1 -1 HEX)
-    if (NIBBLE STREQUAL "A")
-      math(EXPR _res "${_res} + 10")
-    elseif (NIBBLE STREQUAL "B")
-      math(EXPR _res "${_res} + 11")
-    elseif (NIBBLE STREQUAL "C")
-      math(EXPR _res "${_res} + 12")
-    elseif (NIBBLE STREQUAL "D")
-      math(EXPR _res "${_res} + 13")
-    elseif (NIBBLE STREQUAL "E")
-      math(EXPR _res "${_res} + 14")
-    elseif (NIBBLE STREQUAL "F")
-      math(EXPR _res "${_res} + 15")
-    else()
-      math(EXPR _res "${_res} + ${NIBBLE}")
-    endif()
-
-    string(LENGTH "${HEX}" _strlen)
-  endwhile()
-
-  set(${DEC} ${_res} PARENT_SCOPE)
-endfunction()
-
-if (OPENSSL_INCLUDE_DIR)
-  if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
-    file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
-         REGEX "^#[ ]?define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
-
-    # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
-    # The status gives if this is a developer or prerelease and is ignored here.
-    # Major, minor, and fix directly translate into the version numbers shown in
-    # the string. The patch field translates to the single character suffix that
-    # indicates the bug fix state, which 00 -> nothing, 01 -> a, 02 -> b and so
-    # on.
-
-    string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F]).*$"
-           "\\1;\\2;\\3;\\4;\\5" OPENSSL_VERSION_LIST "${openssl_version_str}")
-    list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
-    list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
-    from_hex("${OPENSSL_VERSION_MINOR}" OPENSSL_VERSION_MINOR)
-    list(GET OPENSSL_VERSION_LIST 2 OPENSSL_VERSION_FIX)
-    from_hex("${OPENSSL_VERSION_FIX}" OPENSSL_VERSION_FIX)
-    list(GET OPENSSL_VERSION_LIST 3 OPENSSL_VERSION_PATCH)
-
-    if (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
-      from_hex("${OPENSSL_VERSION_PATCH}" _tmp)
-      # 96 is the ASCII code of 'a' minus 1
-      math(EXPR OPENSSL_VERSION_PATCH_ASCII "${_tmp} + 96")
-      unset(_tmp)
-      # Once anyone knows how OpenSSL would call the patch versions beyond 'z'
-      # this should be updated to handle that, too. This has not happened yet
-      # so it is simply ignored here for now.
-      string(ASCII "${OPENSSL_VERSION_PATCH_ASCII}" OPENSSL_VERSION_PATCH_STRING)
-    endif ()
-
-    set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
-  endif ()
-endif ()
-
-include(FindPackageHandleStandardArgs)
-
-set(OPENSSL_REQUIREMENTS OPENSSL_LIBRARIES OPENSSL_INCLUDE_DIR)
-if (WIN32)
-  list(APPEND OPENSSL_REQUIREMENTS OPENSSL_DLL_PATH)
-endif ()
-
-if (OPENSSL_VERSION)
-  find_package_handle_standard_args(OpenSSL
-    REQUIRED_VARS
-      ${OPENSSL_REQUIREMENTS}
-    VERSION_VAR
-      OPENSSL_VERSION
-    FAIL_MESSAGE
-      "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
-  )
-else ()
-  find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
-    ${OPENSSL_REQUIREMENTS}
-  )
-endif ()
-
-mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES OPENSSL_SEARCH_DIRS)

cmake/modules/FindOpenVR.cmake

@@ -1,21 +0,0 @@
-# 
-#  FindLibOVR.cmake
-# 
-#  Try to find the LibOVR library to use the Oculus
-
-#  Once done this will define
-#
-#  OPENVR_FOUND - system found LibOVR
-#  OPENVR_INCLUDE_DIRS - the LibOVR include directory
-#  OPENVR_LIBRARIES - Link this to use LibOVR
-#
-#  Distributed under the Apache License, Version 2.0.
-#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-# 
-
-if (NOT ANDROID)
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(OPENVR DEFAULT_MSG OPENVR_INCLUDE_DIRS OPENVR_LIBRARIES)
-endif()
-
-mark_as_advanced(OPENVR_INCLUDE_DIRS OPENVR_LIBRARIES OPENVR_SEARCH_DIRS)

cmake/modules/FindSDL2.cmake

@@ -1,224 +0,0 @@
-# Locate SDL2 library
-# This module defines
-# SDL2_LIBRARY, the name of the library to link against
-# SDL2_FOUND, if false, do not try to link to SDL2
-# SDL2_INCLUDE_DIR, where to find SDL.h
-#
-# This module responds to the the flag:
-# SDL2_BUILDING_LIBRARY
-# If this is defined, then no SDL2_main will be linked in because
-# only applications need main().
-# Otherwise, it is assumed you are building an application and this
-# module will attempt to locate and set the the proper link flags
-# as part of the returned SDL2_LIBRARY variable.
-#
-# Don't forget to include SDL2main.h and SDL2main.m your project for the
-# OS X framework based version. (Other versions link to -lSDL2main which
-# this module will try to find on your behalf.) Also for OS X, this
-# module will automatically add the -framework Cocoa on your behalf.
-#
-#
-# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
-# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
-# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
-# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
-# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
-# as appropriate. These values are used to generate the final SDL2_LIBRARY
-# variable, but when these values are unset, SDL2_LIBRARY does not get created.
-#
-#
-# $SDL2 is an environment variable that would
-# correspond to the ./configure --prefix=$SDL2
-# used in building SDL2.
-# l.e.galup 9-20-02
-#
-# Modified by Eric Wing.
-# Added code to assist with automated building by using environmental variables
-# and providing a more controlled/consistent search behavior.
-# Added new modifications to recognize OS X frameworks and
-# additional Unix paths (FreeBSD, etc).
-# Also corrected the header search path to follow "proper" SDL2 guidelines.
-# Added a search for SDL2main which is needed by some platforms.
-# Added a search for threads which is needed by some platforms.
-# Added needed compile switches for MinGW.
-#
-# On OSX, this will prefer the Framework version (if found) over others.
-# People will have to manually change the cache values of
-# SDL2_LIBRARY to override this selection or set the CMake environment
-# CMAKE_INCLUDE_PATH to modify the search paths.
-#
-# Note that the header path has changed from SDL2/SDL.h to just SDL.h
-# This needed to change because "proper" SDL2 convention
-# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
-# reasons because not all systems place things in SDL2/ (see FreeBSD).
-#
-# Ported by Johnny Patterson. This is a literal port for SDL2 of the FindSDL.cmake
-# module with the minor edit of changing "SDL" to "SDL2" where necessary. This
-# was not created for redistribution, and exists temporarily pending official
-# SDL2 CMake modules.
-#
-# Note that on windows this will only search for the 32bit libraries, to search
-# for 64bit change x86/i686-w64 to x64/x86_64-w64
-
-#=============================================================================
-# Copyright 2003-2009 Kitware, Inc.
-#
-# CMake - Cross Platform Makefile Generator
-# Copyright 2000-2014 Kitware, Inc.
-# Copyright 2000-2011 Insight Software Consortium
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# * Neither the names of Kitware, Inc., the Insight Software Consortium,
-# nor the names of their contributors may be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
-include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
-hifi_library_search_hints("sdl2")
-
-FIND_PATH(SDL2_INCLUDE_DIR SDL.h
-	HINTS
-	${SDL2_SEARCH_DIRS}
-	$ENV{SDL2}
-	PATH_SUFFIXES include/SDL2 include SDL2
-	i686-w64-mingw32/include/SDL2
-	x86_64-w64-mingw32/include/SDL2
-	PATHS
-	~/Library/Frameworks
-	/Library/Frameworks
-	/usr/local/include/SDL2
-	/usr/include/SDL2
-	/sw # Fink
-	/opt/local # DarwinPorts
-	/opt/csw # Blastwave
-	/opt
-)
-
-# Lookup the 64 bit libs on x64
-IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	FIND_LIBRARY(SDL2_LIBRARY_TEMP SDL2
-		HINTS
-		${SDL2_SEARCH_DIRS}
-		$ENV{SDL2}
-		PATH_SUFFIXES lib64 lib
-		lib/x64
-		x86_64-w64-mingw32/lib
-		PATHS
-		/sw
-		/opt/local
-		/opt/csw
-		/opt
-	)
-  
-  if (WIN32)
-    find_path(SDL2_DLL_PATH SDL2.dll PATH_SUFFIXES lib/x64 HINTS ${SDL2_SEARCH_DIRS})
-  endif ()
-# On 32bit build find the 32bit libs
-ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	FIND_LIBRARY(SDL2_LIBRARY_TEMP SDL2
-		HINTS
-		${SDL2_SEARCH_DIRS}
-		$ENV{SDL2}
-		PATH_SUFFIXES lib
-		lib/x86
-		i686-w64-mingw32/lib
-		PATHS
-		/sw
-		/opt/local
-		/opt/csw
-		/opt
-	)
-  
-  if (WIN32)
-    find_path(SDL2_DLL_PATH SDL2.dll PATH_SUFFIXES lib/x86 HINTS ${SDL2_SEARCH_DIRS})
-  endif ()
-ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-
-# SDL2 may require threads on your system.
-# The Apple build may not need an explicit flag because one of the
-# frameworks may already provide it.
-# But for non-OSX systems, I will use the CMake Threads package.
-IF(NOT APPLE)
-	FIND_PACKAGE(Threads)
-ENDIF(NOT APPLE)
-
-# MinGW needs an additional library, mwindows
-# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
-# (Actually on second look, I think it only needs one of the m* libraries.)
-IF(MINGW)
-	SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
-ENDIF(MINGW)
-
-SET(SDL2_FOUND "NO")
-	IF(SDL2_LIBRARY_TEMP)
-		# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
-		# CMake doesn't display the -framework Cocoa string in the UI even
-		# though it actually is there if I modify a pre-used variable.
-		# I think it has something to do with the CACHE STRING.
-		# So I use a temporary variable until the end so I can set the
-		# "real" variable in one-shot.
-		IF(APPLE)
-			SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
-		ENDIF(APPLE)
-
-		# For threads, as mentioned Apple doesn't need this.
-		# In fact, there seems to be a problem if I used the Threads package
-		# and try using this line, so I'm just skipping it entirely for OS X.
-		IF(NOT APPLE)
-			SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
-		ENDIF(NOT APPLE)
-
-		# For MinGW library
-		IF(MINGW)
-			SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
-		ENDIF(MINGW)
-
-		# Set the final string here so the GUI reflects the final state.
-		SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
-		# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
-		SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
-
-		SET(SDL2_FOUND "YES")
-ENDIF(SDL2_LIBRARY_TEMP)
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-set(SDL2_REQUIREMENTS SDL2_LIBRARY SDL2_INCLUDE_DIR)
-if (WIN32)
-  list(APPEND SDL2_REQUIREMENTS SDL2_DLL_PATH)
-endif ()
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS ${SDL2_REQUIREMENTS})
-
-if (WIN32)
-  add_paths_to_fixup_libs(${SDL2_DLL_PATH})
-endif ()

cmake/ports/bullet3/CONTROL

@@ -0,0 +1,3 @@
+Source: bullet3
+Version: ab8f16961e19a86ee20c6a1d61f662392524cc77
+Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library

cmake/ports/bullet3/portfile.cmake

@@ -0,0 +1,57 @@
+# Common Ambient Variables:
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
+include(vcpkg_common_functions)
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    message(WARNING "Dynamic not supported, building static")
+    set(VCPKG_LIBRARY_LINKAGE static)
+    set(VCPKG_CRT_LINKAGE dynamic)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO bulletphysics/bullet3
+    REF ab8f16961e19a86ee20c6a1d61f662392524cc77
+    SHA512 927742db29867517283d45e475f0c534a9a57e165cae221f26e08e88057253a1682ac9919b2dc547b9cf388ba0b931b175623461d44f28c9184796ba90b1ed55
+    HEAD_REF master
+)
+
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
+        -DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON
+        -DUSE_GLUT=0 
+        -DUSE_DX11=0	
+        -DBUILD_DEMOS=OFF
+        -DBUILD_OPENGL3_DEMOS=OFF
+        -DBUILD_BULLET3=OFF
+        -DBUILD_BULLET2_DEMOS=OFF
+        -DBUILD_CPU_DEMOS=OFF
+        -DBUILD_EXTRAS=OFF
+        -DBUILD_UNIT_TESTS=OFF
+        -DBUILD_SHARED_LIBS=ON
+        -DINSTALL_LIBS=ON
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bullet/BulletInverseDynamics/details)
+
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bullet3 RENAME copyright)

cmake/ports/draco/CONTROL

@@ -0,0 +1,4 @@
+Source: draco
+Version: 1.3.3
+Description: A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.
+Build-Depends:

cmake/ports/draco/portfile.cmake

@@ -0,0 +1,56 @@
+# Common Ambient Variables:
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
+    set(VCPKG_LIBRARY_LINKAGE static)
+endif()
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/draco
+    REF 1.3.3
+    SHA512 80ed5a623046822f5bb26b2454c8ee8cc93ffe9eb3012e8461cefdfc577b26d69a92ea0f0c5e14f5f48c1ef99f9a7263b01710df376792e74358ae14e49c3897
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/draco/cmake)
+
+# Install tools and plugins
+file(GLOB TOOLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.exe")
+if(TOOLS)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/draco)
+    file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/draco)
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/draco)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/draco)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/draco)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/draco/LICENSE ${CURRENT_PACKAGES_DIR}/share/draco/copyright)

cmake/ports/etc2comp/CONTROL

@@ -0,0 +1,3 @@
+Source: etc2comp
+Version: 7f1843bf07825c21cab711360c1ddbad04641036
+Description: ETC2 image compression library

cmake/ports/etc2comp/portfile.cmake

@@ -0,0 +1,39 @@
+# Common Ambient Variables:
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
+    set(VCPKG_LIBRARY_LINKAGE static)
+    set(VCPKG_CRT_LINKAGE dynamic)
+endif()
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO highfidelity/etc2comp
+    REF 7f1843bf07825c21cab711360c1ddbad04641036
+    SHA512 d747076acda8537d39585858c793a35c3dcc9ef283d723619a47f8c81ec1454c95b3340ad35f0655a939eae5b8271c801c48a9a7568311a01903a344c44af25b
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/etc2comp)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/etc2comp/LICENSE ${CURRENT_PACKAGES_DIR}/share/etc2comp/copyright)
+
+vcpkg_copy_pdbs()
+

cmake/ports/gli/CONTROL

@@ -0,0 +1,4 @@
+Source: gli
+Version: 0.8.2-1
+Build-Depends: glm
+Description: OpenGL Image (GLI) https://gli.g-truc.net

cmake/ports/gli/portfile.cmake

@@ -0,0 +1,19 @@
+#header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO g-truc/gli
+    REF 0.8.2.0
+    SHA512 c254a4e1497d0add985e4a882c552db99c512cc0e9cc72145d51a6e7deada817d624d9818099a47136a8a3ef1223a26a34e355e3c713166f0bb062e506059834
+    HEAD_REF master
+)
+
+# Put the license file where vcpkg expects it
+# manual.md contains the "licenses" section for the project
+file(COPY ${SOURCE_PATH}/manual.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/gli/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/gli/manual.md ${CURRENT_PACKAGES_DIR}/share/gli/copyright)
+
+# Copy the glm header files
+file(GLOB HEADER_FILES "${SOURCE_PATH}/gli/*.hpp" "${SOURCE_PATH}/gli/core")
+file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/gli)

cmake/ports/glm/CONTROL

@@ -0,0 +1,3 @@
+Source: glm
+Version: 0.9.9.3
+Description: OpenGL Mathematics (GLM) https://glm.g-truc.net

cmake/ports/glm/disable_warnings_as_error.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 756673a3..5fbc8906 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -216,7 +216,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+ 		message("GLM: Visual C++ - ${CMAKE_CXX_COMPILER_ID} compiler")
+ 	endif()
+ 
+-	add_compile_options(/W4 /WX)
++	add_compile_options(/W4)
+ 	add_compile_options(/wd4309 /wd4324 /wd4389 /wd4127 /wd4267 /wd4146 /wd4201 /wd4464 /wd4514 /wd4701 /wd4820 /wd4365)
+ 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+ endif()

cmake/ports/glm/portfile.cmake

@@ -0,0 +1,32 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO g-truc/glm
+    REF 0.9.9.3
+    SHA512 44152ea6438763feda3b78813287fd59d3574a9630a41647a157825bf5ce4a18fbbecae5a5ccd94acc118ed3d42cbce53d3a67f25632d0c00ab77e7de2bb4650
+    HEAD_REF master
+)
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable_warnings_as_error.patch"
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS -DGLM_TEST_ENABLE=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/glm")
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# Put the license file where vcpkg expects it
+file(COPY ${SOURCE_PATH}/manual.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/glm/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/glm/manual.md ${CURRENT_PACKAGES_DIR}/share/glm/copyright)