made android instructions more general and added VS 2019 support

Author: annabrewer

BUILD_ANDROID.md

@@ -1,64 +1,118 @@
-Please read the [general build guide](BUILD.md) for information on building other platform. Only Android specific instructions are found in this file.
+Please read the [general build guide](BUILD.md) for information on building other platforms. Only Android specific instructions are found in this file. **Note that these instructions apply to building for Oculus Quest.**
 
 # Dependencies
 
-Building is currently supported on OSX, Windows and Linux platforms, but developers intending to do work on the library dependencies are strongly urged to use 64 bit Linux as a build platform
+Building is currently supported on Windows, OSX and Linux, but developers intending to do work on the library dependencies are strongly urged to use 64 bit Linux as a build platform.
 
-You will need the following tools to build Android targets.
+### OS specific dependencies
 
-* [Android Studio](https://developer.android.com/studio/index.html)
+Please install the dependencies for your OS using the [Windows](BUILD_WIN.md), [OSX](BUILD_OSX.md) or [Linux](BUILD_LINUX.md) build instructions before attempting to build for Android.
 
 ### Android Studio
 
-Download the Android Studio installer and run it.   Once installed, at the welcome screen, click configure in the lower right corner and select SDK manager
+Download the [Android Studio](https://developer.android.com/studio/index.html) installer and run it. Once installed, at the welcome screen, click _Configure_ in the lower right corner and select _SDK Manager_.
 
-From the SDK Platforms tab, select API levels 24 and 26.  
+From the _SDK Platforms_ tab, select API levels 26 and 28.  
 
-From the SDK Tools tab select the following
+From the _SDK Tools_ tab, select the following
 
 * Android SDK Build-Tools
 * GPU Debugging Tools
-* CMake (even if you have a separate CMake installation)
 * LLDB 
 * Android SDK Platform-Tools
 * Android SDK Tools
 * NDK (even if you have the NDK installed separately)
 
-Make sure the NDK installed version is 18 (or higher)
+Still in the _SDK Tools_ tab, click _Show Package Details_. Select CMake 3.6.4. Do this even if you have a separate CMake installation.
 
-# Environment 
+Also, make sure the NDK installed version is 18 (or higher).
 
-Setting up the environment for android builds requires some additional steps
+# Environment
 
-#### Set up machine specific Gradle properties
+### Create a keystore in Android Studio
+Follow the directions [here](https://developer.android.com/studio/publish/app-signing#generate-key) to create a keystore file. You can save it anywhere (preferably not in the `hifi` folder).
 
-Create a `gradle.properties` file in $HOME/.gradle.   Edit the file to contain the following
+### Set up machine specific Gradle properties
+
+Create a `gradle.properties` file in the `.gradle` folder (`$HOME/.gradle` on Unix, `Users/<yourname>/.gradle` on Windows). Edit the file to contain the following
 
     HIFI_ANDROID_PRECOMPILED=<your_home_directory>/Android/hifi_externals
+    HIFI_ANDROID_KEYSTORE=<key_store_directory>/<keystore_name>.jks
+    HIFI_ANDROID_KEYSTORE_PASSWORD=<password>
+    HIFI_ANDROID_KEY_ALIAS=<key_alias>
+    HIFI_ANDROID_KEY_PASSWORD=<key_passwords>
+
+Note, do not use $HOME for the path. It must be a fully qualified path name. Also, be sure to use forward slashes in your path.
 
-Note, do not use `$HOME` for the path.  It must be a fully qualified path name.
+#### If you are building for an Android phone
 
-### Setup the repository
+Add these lines to `gradle.properties`
 
-Clone the repository
+    SUPPRESS_QUEST_INTERFACE
+    SUPPRESS_QUEST_FRAME_PLAYER
 
-`git clone https://github.com/highfidelity/hifi.git`
+#### If you are building for an Oculus Quest
 
-Enter the repository `android` directory
+Add these lines to `gradle.properties`
 
-`cd hifi/android`
+    SUPPRESS_INTERFACE
+    SUPPRESS_FRAME_PLAYER
 
-Execute two gradle pre-build steps.  This steps should only need to be done once, unless you're working on the Android dependencies
+The above code to suppress modules is not necessary, but will speed up the build process.
 
-`./gradlew extractDependencies`
+### Clone the repository
 
-`./gradlew setupDependencies`
+`git clone https://github.com/highfidelity/hifi.git `
 
 # Building & Running
 
+### Building Modules
+
 * Open Android Studio
-* Choose _Open Existing Android Studio Project_
+* Choose _Open an existing Android Studio project_
 * Navigate to the `hifi` repository and choose the `android` folder and select _OK_
+* Wait for Gradle to sync (this should take around 20 minutes the first time)
 * From the _Build_ menu select _Make Project_
-* Once the build completes, from the _Run_ menu select _Run App_ 
 
+### Running a Module
+
+* In the toolbar at the top of Android Studio, next to the green hammer icon, you should see a dropdown menu.
+* You may already see a configuration for the module you are trying to build. If so, select it. 
+* Otherwise, select _Edit Configurations_.
+
+Your configuration should be as follows
+
+* Type: Android App
+* Module: <your module> (you probably want `interface` or `questInterface`)
+
+For the interface modules, you also need to select the activity to launch. 
+
+#### For the Android phone interface
+
+* From the _Launch_ drop down menu, select _Specified Activity_
+* In the _Activity_ field directly below, put `io.highfidelity.hifiinterface.PermissionChecker`
+
+#### For the Oculus Quest interface
+
+* From the _Launch_ drop down menu, select _Specified Activity_
+* In the _Activity_ field directly below, put `io.highfidelity.questInterface.PermissionsChecker`
+
+Note the 's' in Permission**s**Checker for the Quest.
+
+Now you are able to run your module! Click the green play button in the top toolbar of Android Studio
+r
+# Troubleshooting
+
+To view a more complete debug log,
+
+* Click the icon with the two overlapping squares in the upper left corner of the tab where the sync is running (hover text says _Toggle view_)
+* To change verbosity, click _File > Settings_. Under _Build, Execution, Deployment > Compiler_ you can add command-line flags, as per Gradle documentation
+
+Some things you can try if you want to do a clean build
+ 
+* Delete the `build` and `.externalNativeBuild` folders from the folder for each module you're building (for example, `hifi/android/apps/interface`)
+* If you have set your `HIFI_VCPKG_ROOT` environment variable, delete the contents of that directory; otherwise, delete `AppData/Local/Temp/hifi`
+* In Android Studio, click _File > Invalidate Caches / Restart_ and select _Invalidate and Restart_
+
+If you see lots of "couldn't acquire lock" errors,
+* Open Task Manager and close any running Clang / Gradle processes

BUILD_WIN.md

@@ -1,18 +1,29 @@
 This is a stand-alone guide for creating your first High Fidelity build for Windows 64-bit.  
 ## Building High Fidelity
-Note: We are now using Visual Studio 2017 and Qt 5.12.3.  
+Note: We are now using Visual Studio 2017 or 2019 and Qt 5.12.3.  
 If you are upgrading from previous versions, do a clean uninstall of those versions before going through this guide.  
 
 Note: The prerequisites will require about 10 GB of space on your drive. You will also need a system with at least 8GB of main memory.
 
-### Step 1. Visual Studio 2017 & Python
+### Step 1. Visual Studio & Python
 
-If you don’t have Community or Professional edition of Visual Studio 2017, download [Visual Studio Community 2017](https://www.visualstudio.com/downloads/).
+If you don’t have Community or Professional edition of Visual Studio, download [Visual Studio Community 2019](https://visualstudio.microsoft.com/vs/). If you have Visual Studio 2017, you are not required to download Visual Studio 2019.
 
-Leave default components.  
-If you do not already have a python development environment installed, also check  "Python Development" in this screen.
+When selecting components, check "Desktop development with C++". On the right on the Summary toolbar, select the following components.
 
-If you already have Visual Studio installed and need to add python, open the "Add or remove programs" control panel and find the "Microsoft Visual Studio Installer".  Select it and click "Modify".  In the installer, select "Modify" again, then check "Python Development" and allow the installer to apply the changes.
+#### If you're installing Visual Studio 2017,
+
+* Windows 8.1 SDK and UCRT SDK
+* VC++ 2015.3 v14.00 (v140) toolset for desktop
+
+#### If you're installing Visual Studio 2019,
+
+* MSVC v141 - VS 2017 C++ x64/x86 build tools
+* MSVC v140 - VS 2015 C++ build tools (v14.00)
+
+If you do not already have a Python development environment installed, also check "Python Development" in this screen.
+
+If you already have Visual Studio installed and need to add Python, open the "Add or remove programs" control panel and find the "Microsoft Visual Studio Installer".  Select it and click "Modify".  In the installer, select "Modify" again, then check "Python Development" and allow the installer to apply the changes.
 
 ### Step 1a.  Alternate Python
 
@@ -29,7 +40,12 @@ Run Command Prompt from Start and run the following commands:
 `cd "%HIFI_DIR%"`  
 `mkdir build`  
 `cd build`  
-`cmake .. -G "Visual Studio 15 Win64"`  
+
+#### If you're using Visual Studio 2017,
+Run `cmake .. -G "Visual Studio 15 Win64"`.
+
+#### If you're using Visual Studio 2019,
+Run `cmake .. -G "Visual Studio 16 2019" -A x64`.
 
 Where `%HIFI_DIR%` is the directory for the highfidelity repository.
 

interface/resources/meshes/defaultAvatar_full.fst

@@ -1,6 +1,6 @@
 name = mannequin
 type = body+head
-scale = 2
+scale = 1
 filename = mannequin/mannequin.baked.fbx
 joint = jointNeck = Neck
 joint = jointLean = Spine

interface/src/Application.cpp

@@ -7038,7 +7038,8 @@ void Application::updateWindowTitle() const {
         }
     }
 
-    QString title = "Anna was here :)";
+    QString title = QString() + (!username.isEmpty() ? username + " @ " : QString())
+        + currentPlaceName + connectionStatus + loginStatus + buildVersion;
 
 #ifndef WIN32
     // crashes with vs2013/win32