Merge branch 'master' into hazeOnTransparent

.eslintrc.js

@@ -68,7 +68,7 @@ module.exports = {
         "eqeqeq": ["error", "always"],
         "indent": ["error", 4, { "SwitchCase": 1 }],
         "keyword-spacing": ["error", { "before": true, "after": true }],
-        "max-len": ["error", 192, 4],
+        "max-len": ["error", 128, 4],
         "new-cap": ["error"],
         "no-floating-decimal": ["error"],
         //"no-magic-numbers": ["error", { "ignore": [0, 1], "ignoreArrayIndexes": true }],

.gitignore

@@ -15,7 +15,9 @@ Makefile
 # Android Studio
 *.iml
 local.properties
-android/libraries
+android/gradle*
+android/.gradle
+android/app/src/main/jniLibs
 
 # VSCode
 # List taken from Github Global Ignores master@435c4d92 
@@ -64,6 +66,10 @@ gvr-interface/libs/*
 # ignore files for various dev environments
 TAGS
 *.sw[po]
+*.qmlc
+
+# ignore QML compilation output
+*.qmlc
 
 # ignore node files for the console
 node_modules

BUILD_ANDROID.md

@@ -1,25 +1,23 @@
-Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only Android specific instructions are found in this file.
+Please read the [general build guide](BUILD.md) for information on building other platform. Only Android specific instructions are found in this file.
 
-# Android Dependencies
+# Dependencies
+
+*Currently Android building is only supported on 64 bit Linux host environments*
 
 You will need the following tools to build our Android targets.
 
-* [Qt](http://www.qt.io/download-open-source/#) ~> 5.9.1
+* [Gradle](https://gradle.org/install/)
 * [Android Studio](https://developer.android.com/studio/index.html)
-* [Google VR SDK](https://github.com/googlevr/gvr-android-sdk/releases)
-* [Gradle](https://gradle.org/releases/)
 
-### Qt
+### Gradle
 
-Download the Qt online installer.  Run the installer and select the android_armv7 binaries.  Installing to the default path is recommended
+Install gradle version 4.1 or higher.  Following the instructions to install via [SDKMAN!](http://sdkman.io/install.html) is recommended.  
 
 ### 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
 
-From the SDK Platforms tab, select API level 26.  
-
-* Install the ARM EABI v7a System Image if you want to run an emulator.
+From the SDK Platforms tab, select API levels 24 and 26.  
 
 From the SDK Tools tab select the following
 
@@ -29,123 +27,41 @@ From the SDK Tools tab select the following
 * LLDB 
 * Android SDK Platform-Tools
 * Android SDK Tools
-* Android SDK Tools
 * NDK (even if you have the NDK installed separately)
 
-### Google VR SDK
+# Environment 
 
-Download the 1.8 Google VR SDK [release](https://github.com/googlevr/gvr-android-sdk/archive/v1.80.0.zip).  Unzip the archive to a location on your drive.  
-
-### Gradle
-
-Download [Gradle 4.1](https://services.gradle.org/distributions/gradle-4.1-all.zip) and unzip it on your local drive.  You may wish to add the location of the bin directory within the archive to your path 
+Setting up the environment for android builds requires some additional steps
 
 #### Set up machine specific Gradle properties
 
-Create a `gradle.properties` file in ~/.gradle.   Edit the file to contain the following
+Create a `gradle.properties` file in $HOME/.gradle.   Edit the file to contain the following
 
-    QT5_ROOT=C\:\\Qt\\5.9.1\\android_armv7
-    GVR_ROOT=C\:\\Android\\gvr-android-sdk
+    HIFI_ANDROID_PRECOMPILED=<your_home_directory>/Android/hifi_externals
 
-Replace the paths with your local installations of Qt5 and the Google VR SDK
+Note, do not use `$HOME` for the path.  It must be a fully qualified path name.
+
+### Setup the repository
+
+Clone the repository
+
+`git clone https://github.com/highfidelity/hifi.git`
+
+Enter the repository `android` directory
+
+`cd hifi/android`
+
+Execute a gradle pre-build setup.  This step should only need to be done once
+
+`gradle setupDepedencies`
 
 
-# TODO fix the rest
+# Building & Running
 
-You will also need to cross-compile the dependencies required for all platforms for Android, and help CMake find these compiled libraries on your machine.
+* Open Android Studio
+* Choose _Open Existing Android Studio Project_
+* Navigate to the `hifi` repository and choose the `android` folder and select _OK_
+* If Android Studio asks you if you want to use the Gradle wrapper, select cancel and tell it where your local gradle installation is.  If you used SDKMAN to install gradle it will be located in `$HOME/.sdkman/candidates/gradle/current/`
+* From the _Build_ menu select _Make Project_
+* Once the build completes, from the _Run_ menu select _Run App_ 
 
-#### Scribe
-
-High Fidelity has a shader pre-processing tool called `scribe` that various libraries will call on during the build process. You must compile scribe using your native toolchain (following the build instructions for your platform) and then pass a CMake variable or set an ENV variable `SCRIBE_PATH` that is a path to the scribe executable.
-
-CMake will fatally error if it does not find the scribe executable while using the android toolchain.
-
-#### Optional Components
-
-* [Oculus Mobile SDK](https://developer.oculus.com/downloads/#sdk=mobile) ~> 0.4.2
-
-#### ANDROID_LIB_DIR
-
-Since you won't be installing Android dependencies to system paths on your development machine, CMake will need a little help tracking down your Android dependencies.
-
-This is most easily accomplished by installing all Android dependencies in the same folder. You can place this folder wherever you like on your machine. In this build guide and across our CMakeLists files this folder is referred to as `ANDROID_LIB_DIR`. You can set `ANDROID_LIB_DIR` in your environment or by passing when you run CMake.
-
-#### Qt
-
-Install Qt 5.5.1 for Android for your host environment from the [Qt downloads page](http://www.qt.io/download/). Install Qt to ``$ANDROID_LIB_DIR/Qt``. This is required so that our root CMakeLists file can help CMake find your Android Qt installation.
-
-The component required for the Android build is the `Android armv7` component.
-
-If you would like to install Qt to a different location, or attempt to build with a different Qt version, you can pass `ANDROID_QT_CMAKE_PREFIX_PATH` to CMake. Point to the `cmake` folder inside `$VERSION_NUMBER/android_armv7/lib`. Otherwise, our root CMakeLists will set it to `$ANDROID_LIB_DIR/Qt/5.5/android_armv7/lib/cmake`.
-
-#### OpenSSL
-
-Cross-compilation of OpenSSL has been tested from an OS X machine running 10.10 compiling OpenSSL 1.0.2. It is likely that the steps below will work for other OpenSSL versions than 1.0.2.
-
-The original instructions to compile OpenSSL for Android from your host environment can be found [here](http://wiki.openssl.org/index.php/Android). We required some tweaks to get OpenSSL to successfully compile, those tweaks are explained below.
-
-Download the [OpenSSL source](https://www.openssl.org/source/) and extract the tarball inside your `ANDROID_LIB_DIR`. Rename the extracted folder to `openssl`.
-
-You will need the [setenv-android.sh script](http://wiki.openssl.org/index.php/File:Setenv-android.sh) from the OpenSSL wiki.
-
-You must change three values at the top of the `setenv-android.sh` script - `_ANDROID_NDK`, `_ANDROID_EABI` and `_ANDROID_API`.
-`_ANDROID_NDK` should be `android-ndk-r10`, `_ANDROID_EABI` should be `arm-linux-androidebi-4.9` and `_ANDROID_API` should be `19`.
-
-First, make sure `ANDROID_NDK_ROOT` is set in your env. This should be the path to the root of your Android NDK install. `setenv-android.sh` needs `ANDROID_NDK_ROOT` to set the environment variables required for building OpenSSL.
-
-Source the `setenv-android.sh` script so it can set environment variables that OpenSSL will use while compiling. If you use zsh as your shell you may need to modify the `setenv-android.sh` for it to set the correct variables in your env.
-
-```
-export ANDROID_NDK_ROOT=YOUR_NDK_ROOT
-source setenv-android.sh
-```
-
-Then, from the OpenSSL directory, run the following commands.
-
-```
-perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org
-./config shared -no-ssl2 -no-ssl3 -no-comp -no-hw -no-engine --openssldir=/usr/local/ssl/$ANDROID_API
-make depend
-make all
-```
-
-This should generate libcrypto and libssl in the root of the OpenSSL directory. YOU MUST remove the `libssl.so` and `libcrypto.so` files that are generated. They are symlinks to `libssl.so.VER` and `libcrypto.so.VER` which Android does not know how to handle. By removing `libssl.so` and `libcrypto.so` the FindOpenSSL module will find the static libs and use those instead.
-
-If you have been building other components it is possible that the OpenSSL compile will fail based on the values other cross-compilations (tbb, bullet) have set. Ensure that you are in a new terminal window to avoid compilation errors from previously set environment variables.
-
-#### Oculus Mobile SDK
-
-The Oculus Mobile SDK is optional, for Gear VR support. It is not required to compile gvr-interface.
-
-Download the [Oculus Mobile SDK](https://developer.oculus.com/downloads/#sdk=mobile) and extract the archive inside your `ANDROID_LIB_DIR` folder. Rename the extracted folder to `libovr`.
-
-From the VRLib directory, use ndk-build to build VrLib.
-
-```
-cd VRLib
-ndk-build
-```
-
-This will create the liboculus.a archive that our FindLibOVR module will look for when cmake is run.
-
-##### Hybrid testing
-
-Currently the 'vr_dual' mode that would allow us to run a hybrid app has limited support in the Oculus Mobile SDK. The best way to have an application we can launch without having to connect to the GearVR is to put the Gear VR Service into developer mode. This stops Oculus Home from taking over the device when it is plugged into the Gear VR headset, and allows the application to be launched from the Applications page.
-
-To put the Gear VR Service into developer mode you need an application with an Oculus Signature File on your device. Generate an Oculus Signature File for your device on the [Oculus osig tool page](https://developer.oculus.com/tools/osig/). Place this file in the gvr-interface/assets directory. Cmake will automatically copy it into your apk in the right place when you execute `make gvr-interface-apk`.
-
-Once the application is on your device, go to `Settings->Application Manager->Gear VR Service->Manage Storage`. Tap on `VR Service Version` six times. It will scan your device to verify that you have an osig file in an application on your device, and then it will let you enable Developer mode.
-
-### CMake
-
-We use CMake to generate the makefiles that compile and deploy the Android APKs to your device. In order to create Makefiles for the Android targets, CMake requires that some environment variables are set, and that other variables are passed to it when it is run.
-
-The following must be set in your environment:
-
-* ANDROID_NDK - the root of your Android NDK install
-* ANDROID_HOME - the root of your Android SDK install
-* ANDROID_LIB_DIR - the directory containing cross-compiled versions of dependencies
-
-The following must be passed to CMake when it is run:
-
-* USE_ANDROID_TOOLCHAIN - set to true to build for Android

README.md

@@ -19,6 +19,10 @@ Documentation is available at [docs.highfidelity.com](https://docs.highfidelity.
 
 There is also detailed [documentation on our coding standards](https://wiki.highfidelity.com/wiki/Coding_Standards).
 
+Contributor License Agreement (CLA)
+=========
+Technology companies frequently receive and use code from contributors outside the company's development team. Outside code can be a tremendous resource, but it also carries responsibility. Best practice for accepting outside contributions consists of an Apache-type Contributor License Agreement (CLA). We have modeled the High Fidelity CLA after the CLA that Google presents to developers for contributions to their projects. This CLA does not transfer ownership of code, instead simply granting a non-exclusive right for High Fidelity to use the code you’ve contributed. In that regard, you should be sure you have permission if the work relates to or uses the resources of a company that you work for. You will be asked to sign our CLA when you create your first PR or when the CLA is updated. You can also [review it here](https://gist.githubusercontent.com/hifi-gustavo/fef8f06a8233d42a0040d45c3efb97a9/raw/9981827eb94f0b18666083670b6f6a02929fb402/High%2520Fidelity%2520CLA). We sincerely appreciate your contribution and efforts toward the success of the platform.
+
 Build Instructions 
 =========
 All information required to build is found in the [build guide](BUILD.md).

android/app/CMakeLists.txt

@@ -1,8 +1,10 @@
 set(TARGET_NAME native-lib)
 setup_hifi_library()
-link_hifi_libraries(shared networking gl gpu gpu-gles render-utils)
-autoscribe_shader_lib(gpu model render render-utils)
-target_opengl()
+link_hifi_libraries(shared networking gl gpu gpu-gles image fbx render-utils physics)
+
 target_link_libraries(native-lib android log m)
-target_include_directories(native-lib PRIVATE  "${GVR_ROOT}/libraries/headers")
-target_link_libraries(native-lib "C:/Users/bdavis/Git/hifi/android/libraries/jni/armeabi-v7a/libgvr.so")
+
+target_opengl()
+target_googlevr()
+
+

android/app/build.gradle

@@ -1,27 +1,32 @@
 apply plugin: 'com.android.application'
 
+ext.RELEASE_NUMBER = project.hasProperty('RELEASE_NUMBER') ? project.getProperty('RELEASE_NUMBER') : '0'
+ext.RELEASE_TYPE = project.hasProperty('RELEASE_TYPE') ? project.getProperty('RELEASE_TYPE') : 'DEV'
+ext.BUILD_BRANCH = project.hasProperty('BUILD_BRANCH') ? project.getProperty('BUILD_BRANCH') : ''
+
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.1"
     defaultConfig {
         applicationId "org.saintandreas.testapp"
         minSdkVersion 24
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"
-        ndk { abiFilters 'armeabi-v7a' }
+        ndk { abiFilters 'arm64-v8a' }
         externalNativeBuild {
             cmake {
                 arguments '-DHIFI_ANDROID=1',
                     '-DANDROID_PLATFORM=android-24',
                     '-DANDROID_TOOLCHAIN=clang',
-                    '-DANDROID_STL=gnustl_shared',
-                    '-DGVR_ROOT=' + GVR_ROOT,
-                    '-DNATIVE_SCRIBE=c:/bin/scribe.exe',
-                    "-DHIFI_ANDROID_PRECOMPILED=${project.rootDir}/libraries/jni/armeabi-v7a"
+                    '-DANDROID_STL=c++_shared',
+                    '-DQT_CMAKE_PREFIX_PATH=' + HIFI_ANDROID_PRECOMPILED + '/qt/lib/cmake',
+                    '-DNATIVE_SCRIBE=' + HIFI_ANDROID_PRECOMPILED + '/scribe',
+                    '-DHIFI_ANDROID_PRECOMPILED=' + HIFI_ANDROID_PRECOMPILED,
+                    '-DRELEASE_NUMBER=' + RELEASE_NUMBER,
+                    '-DRELEASE_TYPE=' + RELEASE_TYPE,
+                    '-DBUILD_BRANCH=' + BUILD_BRANCH
             }
         }
-        jackOptions { enabled true }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -29,17 +34,20 @@ android {
     }
 
     buildTypes {
+        applicationVariants.all { variant ->
+            variant.outputs.all {
+                if (RELEASE_NUMBER != '0') {
+                    outputFileName = "app_" + RELEASE_NUMBER + "_" + RELEASE_TYPE + ".apk"
+                }
+            }
+        }
+
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
-    sourceSets {
-        main {
-            jniLibs.srcDirs += '../libraries/jni';
-        }
-    }
     externalNativeBuild {
         cmake {
             path '../../CMakeLists.txt'
@@ -53,5 +61,3 @@ dependencies {
     compile 'com.google.vr:sdk-audio:1.80.0'
     compile 'com.google.vr:sdk-base:1.80.0'
 }
-
-build.dependsOn(':extractQt5')

android/app/src/main/AndroidManifest.xml

@@ -7,12 +7,10 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true"/>
     <uses-feature android:name="android.hardware.sensor.gyroscope" android:required="true"/>
-    <uses-feature android:name="android.software.vr.mode" android:required="false"/>
-    <uses-feature android:name="android.hardware.vr.high_performance" android:required="false"/>
 
     <application
         android:allowBackup="true"
-        android:theme="@style/VrActivityTheme"
+        android:theme="@style/NoSystemUI"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round">
         <activity
@@ -20,17 +18,10 @@
             android:label="@string/app_name"
             android:screenOrientation="landscape"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:enableVrMode="@string/gvr_vr_mode_component"
             android:resizeableActivity="false">
             <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
-               <category android:name="com.google.intent.category.DAYDREAM"/>
-            </intent-filter>
-            <intent-filter>
-               <action android:name="android.intent.action.MAIN" />
-               <category android:name="android.intent.category.LAUNCHER" />
-               <category android:name="com.google.intent.category.CARDBOARD" />
             </intent-filter>
         </activity>
     </application>

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

@@ -37,12 +37,7 @@ extern "C" {
 JNI_METHOD(jlong, nativeCreateRenderer)
 (JNIEnv *env, jclass clazz, jobject class_loader, jobject android_context, jlong native_gvr_api) {
     qInstallMessageHandler(messageHandler);
-#if defined(GVR)
-    auto gvrContext = reinterpret_cast<gvr_context *>(native_gvr_api);
-    return toJni(new NativeRenderer(gvrContext));
-#else
-    return toJni(new NativeRenderer(nullptr));
-#endif
+    return toJni(new NativeRenderer());
 }
 
 JNI_METHOD(void, nativeDestroyRenderer)

android/app/src/main/cpp/renderer.cpp

@@ -1,138 +1,14 @@
 #include "renderer.h"
 
 #include <mutex>
+#include <glm/gtc/matrix_transform.hpp>
 
 #include <QtCore/QDebug>
+
 #include <gl/Config.h>
-
-#include "GoogleVRHelpers.h"
-
 #include <gl/GLShaders.h>
-#include <shared/Bilateral.h>
 
-#include <gpu/DrawTransformUnitQuad_vert.h>
-#include <gpu/DrawTexcoordRectTransformUnitQuad_vert.h>
-#include <gpu/DrawViewportQuadTransformTexcoord_vert.h>
-#include <gpu/DrawTexture_frag.h>
-#include <gpu/DrawTextureOpaque_frag.h>
-#include <gpu/DrawColoredTexture_frag.h>
-
-#include <render-utils/simple_vert.h>
-#include <render-utils/simple_frag.h>
-#include <render-utils/simple_textured_frag.h>
-#include <render-utils/simple_textured_unlit_frag.h>
-
-#include <render-utils/deferred_light_vert.h>
-#include <render-utils/deferred_light_point_vert.h>
-#include <render-utils/deferred_light_spot_vert.h>
-
-#include <render-utils/directional_ambient_light_frag.h>
-#include <render-utils/directional_skybox_light_frag.h>
-
-#include <render-utils/standardTransformPNTC_vert.h>
-#include <render-utils/standardDrawTexture_frag.h>
-
-#include <render-utils/model_vert.h>
-#include <render-utils/model_shadow_vert.h>
-#include <render-utils/model_normal_map_vert.h>
-#include <render-utils/model_lightmap_vert.h>
-#include <render-utils/model_lightmap_normal_map_vert.h>
-#include <render-utils/skin_model_vert.h>
-#include <render-utils/skin_model_shadow_vert.h>
-#include <render-utils/skin_model_normal_map_vert.h>
-
-#include <render-utils/model_frag.h>
-#include <render-utils/model_shadow_frag.h>
-#include <render-utils/model_normal_map_frag.h>
-#include <render-utils/model_normal_specular_map_frag.h>
-#include <render-utils/model_specular_map_frag.h>
-#include <render-utils/model_lightmap_frag.h>
-#include <render-utils/model_lightmap_normal_map_frag.h>
-#include <render-utils/model_lightmap_normal_specular_map_frag.h>
-#include <render-utils/model_lightmap_specular_map_frag.h>
-#include <render-utils/model_translucent_frag.h>
-#include <render-utils/overlay3D_vert.h>
-#include <render-utils/overlay3D_frag.h>
-
-#include <render-utils/sdf_text3D_vert.h>
-#include <render-utils/sdf_text3D_frag.h>
-
-#if 0
-#include <model/skybox_vert.h>
-#include <model/skybox_frag.h>
-#include <entities-renderer/textured_particle_frag.h>
-#include <entities-renderer/textured_particle_vert.h>
-#include <entities-renderer/paintStroke_vert.h>
-#include <entities-renderer/paintStroke_frag.h>
-#include <entities-renderer/polyvox_vert.h>
-#include <entities-renderer/polyvox_frag.h>
-#endif
-
-
-template <typename F>
-void withFrameBuffer(gvr::Frame& frame, int32_t index, F f) {
-    frame.BindBuffer(index);
-    f();
-    frame.Unbind();
-}
-
-
-static const uint64_t kPredictionTimeWithoutVsyncNanos = 50000000;
-
-// Each shader has two variants: a single-eye ES 2.0 variant, and a multiview
-// ES 3.0 variant.  The multiview vertex shaders use transforms defined by
-// arrays of mat4 uniforms, using gl_ViewID_OVR to determine the array index.
-
-#define UNIFORM_LIGHT_POS 20
-#define UNIFORM_M 16
-#define UNIFORM_MV 8
-#define UNIFORM_MVP 0
-
-#if 0
-uniform Transform { // API uses “Transform[2]” to refer to instance 2
- mat4 u_MVP[2];
- mat4 u_MVMatrix[2];
- mat4 u_Model;
- vec3 u_LightPos[2];
-};
-static const char *kDiffuseLightingVertexShader = R"glsl(
-#version 300 es
-#extension GL_OVR_multiview2 : enable
-
-layout(num_views=2) in;
-
-layout(location = 0) uniform mat4 u_MVP[2];
-layout(location = 8) uniform mat4 u_MVMatrix[2];
-layout(location = 16) uniform mat4 u_Model;
-layout(location = 20) uniform vec3 u_LightPos[2];
-
-layout(location = 0) in vec4 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 2) in vec3 a_Normal;
-
-out vec4 v_Color;
-out vec3 v_Grid;
-
-void main() {
-    mat4 mvp = u_MVP[gl_ViewID_OVR];
-    mat4 modelview = u_MVMatrix[gl_ViewID_OVR];
-    vec3 lightpos = u_LightPos[gl_ViewID_OVR];
-    v_Grid = vec3(u_Model * a_Position);
-    vec3 modelViewVertex = vec3(modelview * a_Position);
-    vec3 modelViewNormal = vec3(modelview * vec4(a_Normal, 0.0));
-    float distance = length(lightpos - modelViewVertex);
-    vec3 lightVector = normalize(lightpos - modelViewVertex);
-    float diffuse = max(dot(modelViewNormal, lightVector), 0.5);
-    diffuse = diffuse * (1.0 / (1.0 + (0.00001 * distance * distance)));
-    v_Color = vec4(a_Color.rgb * diffuse, a_Color.a);
-    gl_Position = mvp * a_Position;
-}
-)glsl";
-#endif
-
-
-static const char *kSimepleVertexShader = R"glsl(
-#version 300 es
+static const char *kSimepleVertexShader = R"glsl(#version 300 es
 #extension GL_OVR_multiview2 : enable
 
 layout(num_views=2) in;
@@ -147,9 +23,7 @@ void main() {
 }
 )glsl";
 
-
-static const char *kPassthroughFragmentShader = R"glsl(
-#version 300 es
+static const char *kPassthroughFragmentShader = R"glsl(#version 300 es
 precision mediump float;
 in vec4 v_Color;
 out vec4 FragColor;
@@ -157,6 +31,17 @@ out vec4 FragColor;
 void main() { FragColor = v_Color; }
 )glsl";
 
+
+int LoadGLShader(int type, const char *shadercode) {
+    GLuint result = 0;
+    std::string shaderError;
+    static const std::string SHADER_DEFINES;
+    if (!gl::compileShader(type, shadercode, SHADER_DEFINES, result, shaderError)) {
+        qWarning() << "QQQ" << __FUNCTION__ << "Shader compile failure" << shaderError.c_str();
+    }
+    return result;
+}
+
 static void CheckGLError(const char* label) {
     int gl_error = glGetError();
     if (gl_error != GL_NO_ERROR) {
@@ -167,158 +52,6 @@ static void CheckGLError(const char* label) {
 }
 
 // Contains vertex, normal and other data.
-namespace cube {
-    const std::array<float, 108> CUBE_COORDS{{
-                                                 // Front face
-                                                 -1.0f, 1.0f, 1.0f,
-                                                 -1.0f, -1.0f, 1.0f,
-                                                 1.0f, 1.0f, 1.0f,
-                                                 -1.0f, -1.0f, 1.0f,
-                                                 1.0f, -1.0f, 1.0f,
-                                                 1.0f, 1.0f, 1.0f,
-
-                                                 // Right face
-                                                 1.0f, 1.0f, 1.0f,
-                                                 1.0f, -1.0f, 1.0f,
-                                                 1.0f, 1.0f, -1.0f,
-                                                 1.0f, -1.0f, 1.0f,
-                                                 1.0f, -1.0f, -1.0f,
-                                                 1.0f, 1.0f, -1.0f,
-
-                                                 // Back face
-                                                 1.0f, 1.0f, -1.0f,
-                                                 1.0f, -1.0f, -1.0f,
-                                                 -1.0f, 1.0f, -1.0f,
-                                                 1.0f, -1.0f, -1.0f,
-                                                 -1.0f, -1.0f, -1.0f,
-                                                 -1.0f, 1.0f, -1.0f,
-
-                                                 // Left face
-                                                 -1.0f, 1.0f, -1.0f,
-                                                 -1.0f, -1.0f, -1.0f,
-                                                 -1.0f, 1.0f, 1.0f,
-                                                 -1.0f, -1.0f, -1.0f,
-                                                 -1.0f, -1.0f, 1.0f,
-                                                 -1.0f, 1.0f, 1.0f,
-
-                                                 // Top face
-                                                 -1.0f, 1.0f, -1.0f,
-                                                 -1.0f, 1.0f, 1.0f,
-                                                 1.0f, 1.0f, -1.0f,
-                                                 -1.0f, 1.0f, 1.0f,
-                                                 1.0f, 1.0f, 1.0f,
-                                                 1.0f, 1.0f, -1.0f,
-
-                                                 // Bottom face
-                                                 1.0f, -1.0f, -1.0f,
-                                                 1.0f, -1.0f, 1.0f,
-                                                 -1.0f, -1.0f, -1.0f,
-                                                 1.0f, -1.0f, 1.0f,
-                                                 -1.0f, -1.0f, 1.0f,
-                                                 -1.0f, -1.0f, -1.0f
-                                             }};
-
-    const std::array<float, 108> CUBE_COLORS{{
-                                                 // front, green
-                                                 0.0f, 0.5273f, 0.2656f,
-                                                 0.0f, 0.5273f, 0.2656f,
-                                                 0.0f, 0.5273f, 0.2656f,
-                                                 0.0f, 0.5273f, 0.2656f,
-                                                 0.0f, 0.5273f, 0.2656f,
-                                                 0.0f, 0.5273f, 0.2656f,
-
-                                                 // right, blue
-                                                 0.0f, 0.3398f, 0.9023f,
-                                                 0.0f, 0.3398f, 0.9023f,
-                                                 0.0f, 0.3398f, 0.9023f,
-                                                 0.0f, 0.3398f, 0.9023f,
-                                                 0.0f, 0.3398f, 0.9023f,
-                                                 0.0f, 0.3398f, 0.9023f,
-
-                                                 // back, also green
-                                                 0.0f, 0.5273f, 0.2656f,
-                                                 0.0f, 0.5273f, 0.2656f,
-                                                 0.0f, 0.5273f, 0.2656f,
-                                                 0.0f, 0.5273f, 0.2656f,
-                                                 0.0f, 0.5273f, 0.2656f,
-                                                 0.0f, 0.5273f, 0.2656f,
-
-                                                 // left, also blue
-                                                 0.0f, 0.3398f, 0.9023f,
-                                                 0.0f, 0.3398f, 0.9023f,
-                                                 0.0f, 0.3398f, 0.9023f,
-                                                 0.0f, 0.3398f, 0.9023f,
-                                                 0.0f, 0.3398f, 0.9023f,
-                                                 0.0f, 0.3398f, 0.9023f,
-
-                                                 // top, red
-                                                 0.8359375f, 0.17578125f, 0.125f,
-                                                 0.8359375f, 0.17578125f, 0.125f,
-                                                 0.8359375f, 0.17578125f, 0.125f,
-                                                 0.8359375f, 0.17578125f, 0.125f,
-                                                 0.8359375f, 0.17578125f, 0.125f,
-                                                 0.8359375f, 0.17578125f, 0.125f,
-
-                                                 // bottom, also red
-                                                 0.8359375f, 0.17578125f, 0.125f,
-                                                 0.8359375f, 0.17578125f, 0.125f,
-                                                 0.8359375f, 0.17578125f, 0.125f,
-                                                 0.8359375f, 0.17578125f, 0.125f,
-                                                 0.8359375f, 0.17578125f, 0.125f,
-                                                 0.8359375f, 0.17578125f, 0.125f
-                                             }};
-
-    const std::array<float, 108> CUBE_NORMALS{{
-                                                  // Front face
-                                                  0.0f, 0.0f, 1.0f,
-                                                  0.0f, 0.0f, 1.0f,
-                                                  0.0f, 0.0f, 1.0f,
-                                                  0.0f, 0.0f, 1.0f,
-                                                  0.0f, 0.0f, 1.0f,
-                                                  0.0f, 0.0f, 1.0f,
-
-                                                  // Right face
-                                                  1.0f, 0.0f, 0.0f,
-                                                  1.0f, 0.0f, 0.0f,
-                                                  1.0f, 0.0f, 0.0f,
-                                                  1.0f, 0.0f, 0.0f,
-                                                  1.0f, 0.0f, 0.0f,
-                                                  1.0f, 0.0f, 0.0f,
-
-                                                  // Back face
-                                                  0.0f, 0.0f, -1.0f,
-                                                  0.0f, 0.0f, -1.0f,
-                                                  0.0f, 0.0f, -1.0f,
-                                                  0.0f, 0.0f, -1.0f,
-                                                  0.0f, 0.0f, -1.0f,
-                                                  0.0f, 0.0f, -1.0f,
-
-                                                  // Left face
-                                                  -1.0f, 0.0f, 0.0f,
-                                                  -1.0f, 0.0f, 0.0f,
-                                                  -1.0f, 0.0f, 0.0f,
-                                                  -1.0f, 0.0f, 0.0f,
-                                                  -1.0f, 0.0f, 0.0f,
-                                                  -1.0f, 0.0f, 0.0f,
-
-                                                  // Top face
-                                                  0.0f, 1.0f, 0.0f,
-                                                  0.0f, 1.0f, 0.0f,
-                                                  0.0f, 1.0f, 0.0f,
-                                                  0.0f, 1.0f, 0.0f,
-                                                  0.0f, 1.0f, 0.0f,
-                                                  0.0f, 1.0f, 0.0f,
-
-                                                  // Bottom face
-                                                  0.0f, -1.0f, 0.0f,
-                                                  0.0f, -1.0f, 0.0f,
-                                                  0.0f, -1.0f, 0.0f,
-                                                  0.0f, -1.0f, 0.0f,
-                                                  0.0f, -1.0f, 0.0f,
-                                                  0.0f, -1.0f, 0.0f
-                                              }};
-}
-
 namespace triangle {
     static std::array<float, 9> TRIANGLE_VERTS {{
                                               -0.5f, -0.5f, 0.0f,
@@ -327,229 +60,36 @@ namespace triangle {
                                           }};
 }
 
-std::array<gvr::BufferViewport, 2> buildViewports(const std::unique_ptr<gvr::GvrApi> &gvrapi) {
-    return { {gvrapi->CreateBufferViewport(), gvrapi->CreateBufferViewport()} };
-};
-
-const std::string VERTEX_SHADER_DEFINES{ R"GLSL(
-#version 300 es
-#extension GL_EXT_clip_cull_distance : enable
-#define GPU_VERTEX_SHADER
-#define GPU_SSBO_TRANSFORM_OBJECT 1
-#define GPU_TRANSFORM_IS_STEREO
-#define GPU_TRANSFORM_STEREO_CAMERA
-#define GPU_TRANSFORM_STEREO_CAMERA_INSTANCED
-#define GPU_TRANSFORM_STEREO_SPLIT_SCREEN
-)GLSL" };
-
-const std::string PIXEL_SHADER_DEFINES{ R"GLSL(
-#version 300 es
-precision mediump float;
-#define GPU_PIXEL_SHADER
-#define GPU_TRANSFORM_IS_STEREO
-#define GPU_TRANSFORM_STEREO_CAMERA
-#define GPU_TRANSFORM_STEREO_CAMERA_INSTANCED
-#define GPU_TRANSFORM_STEREO_SPLIT_SCREEN
-)GLSL" };
-
-
-#if defined(GVR)
-NativeRenderer::NativeRenderer(gvr_context *vrContext) :
-    _gvrapi(new gvr::GvrApi(vrContext, false)),
-    _viewports(buildViewports(_gvrapi)),
-    _gvr_viewer_type(_gvrapi->GetViewerType())
-#else
-NativeRenderer::NativeRenderer(void *vrContext)
-#endif
-{
-    start = std::chrono::system_clock::now();
-    qDebug() << "QQQ" << __FUNCTION__;
-}
-
-
-/**
- * Converts a raw text file, saved as a resource, into an OpenGL ES shader.
- *
- * @param type  The type of shader we will be creating.
- * @param resId The resource ID of the raw text file.
- * @return The shader object handler.
- */
-int LoadGLShader(int type, const char *shadercode) {
-    GLuint result = 0;
-    std::string shaderError;
-    static const std::string SHADER_DEFINES;
-    if (!gl::compileShader(type, shadercode, SHADER_DEFINES, result, shaderError)) {
-        qWarning() << "QQQ" << __FUNCTION__ << "Shader compile failure" << shaderError.c_str();
-    }
-    return result;
-}
-
-// Computes a texture size that has approximately half as many pixels. This is
-// equivalent to scaling each dimension by approximately sqrt(2)/2.
-static gvr::Sizei HalfPixelCount(const gvr::Sizei &in) {
-    // Scale each dimension by sqrt(2)/2 ~= 7/10ths.
-    gvr::Sizei out;
-    out.width = (7 * in.width) / 10;
-    out.height = (7 * in.height) / 10;
-    return out;
-}
-
-
-#if defined(GVR)
-void NativeRenderer::InitializeVR() {
-    _gvrapi->InitializeGl();
-    bool multiviewEnabled = _gvrapi->IsFeatureSupported(GVR_FEATURE_MULTIVIEW);
-    qWarning() << "QQQ" << __FUNCTION__ << "Multiview enabled " << multiviewEnabled;
-    // Because we are using 2X MSAA, we can render to half as many pixels and
-    // achieve similar quality.
-    _renderSize = HalfPixelCount(_gvrapi->GetMaximumEffectiveRenderTargetSize());
-
-    std::vector<gvr::BufferSpec> specs;
-    specs.push_back(_gvrapi->CreateBufferSpec());
-    specs[0].SetColorFormat(GVR_COLOR_FORMAT_RGBA_8888);
-    specs[0].SetDepthStencilFormat(GVR_DEPTH_STENCIL_FORMAT_DEPTH_16);
-    specs[0].SetSamples(2);
-    gvr::Sizei half_size = {_renderSize.width / 2, _renderSize.height};
-    specs[0].SetMultiviewLayers(2);
-    specs[0].SetSize(half_size);
-
-    _swapchain.reset(new gvr::SwapChain(_gvrapi->CreateSwapChain(specs)));
-    _viewportlist.reset(new gvr::BufferViewportList(_gvrapi->CreateEmptyBufferViewportList()));
-}
-void NativeRenderer::PrepareFramebuffer() {
-    const gvr::Sizei recommended_size = HalfPixelCount(
-        _gvrapi->GetMaximumEffectiveRenderTargetSize());
-    if (_renderSize.width != recommended_size.width ||
-        _renderSize.height != recommended_size.height) {
-        // We need to resize the framebuffer. Note that multiview uses two texture
-        // layers, each with half the render width.
-        gvr::Sizei framebuffer_size = recommended_size;
-        framebuffer_size.width /= 2;
-        _swapchain->ResizeBuffer(0, framebuffer_size);
-        _renderSize = recommended_size;
-    }
-}
-#endif
-
-void testShaderBuild(const char* vs_src, const char * fs_src) {
-    std::string error;
-    GLuint vs, fs;
-    if (!gl::compileShader(GL_VERTEX_SHADER, vs_src, VERTEX_SHADER_DEFINES, vs, error) ||
-        !gl::compileShader(GL_FRAGMENT_SHADER, fs_src, PIXEL_SHADER_DEFINES, fs, error)) {
-        throw std::runtime_error("Failed to compile shader");
-    }
-    auto pr = gl::compileProgram({ vs, fs }, error);
-    if (!pr) {
-        throw std::runtime_error("Failed to link shader");
-    }
-}
 
 void NativeRenderer::InitializeGl() {
-    qDebug() << "QQQ" << __FUNCTION__;
-    //gl::initModuleGl();
-#if defined(GVR)
-    InitializeVR();
-#endif
-
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_CULL_FACE);
     glDisable(GL_SCISSOR_TEST);
     glDisable(GL_BLEND);
 
-
-
     const uint32_t vertShader = LoadGLShader(GL_VERTEX_SHADER, kSimepleVertexShader);
-    //const uint32_t vertShader = LoadGLShader(GL_VERTEX_SHADER, kDiffuseLightingVertexShader);
     const uint32_t fragShader = LoadGLShader(GL_FRAGMENT_SHADER, kPassthroughFragmentShader);
     std::string error;
-    _cubeProgram = gl::compileProgram({ vertShader, fragShader }, error);
+    _program = gl::compileProgram({ vertShader, fragShader }, error);
     CheckGLError("build program");
 
-    glGenBuffers(1, &_cubeBuffer);
-    glBindBuffer(GL_ARRAY_BUFFER, _cubeBuffer);
+    glGenBuffers(1, &_geometryBuffer);
+    glBindBuffer(GL_ARRAY_BUFFER, _geometryBuffer);
     glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 9, triangle::TRIANGLE_VERTS.data(), GL_STATIC_DRAW);
-    /*
-    glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 108 * 3, NULL, GL_STATIC_DRAW);
-    glBufferSubData(GL_ARRAY_BUFFER, sizeof(float) * 108 * 0, sizeof(float) * 108, cube::CUBE_COORDS.data());
-    glBufferSubData(GL_ARRAY_BUFFER, sizeof(float) * 108 * 1, sizeof(float) * 108, cube::CUBE_COLORS.data());
-    glBufferSubData(GL_ARRAY_BUFFER, sizeof(float) * 108 * 2, sizeof(float) * 108, cube::CUBE_NORMALS.data());
-     */
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     CheckGLError("upload vertices");
 
-    glGenVertexArrays(1, &_cubeVao);
-    glBindBuffer(GL_ARRAY_BUFFER, _cubeBuffer);
-    glBindVertexArray(_cubeVao);
+    glGenVertexArrays(1, &_vao);
+    glBindBuffer(GL_ARRAY_BUFFER, _geometryBuffer);
+    glBindVertexArray(_vao);
 
     glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (void*)0);
     glEnableVertexAttribArray(0);
-    /*
-    glVertexAttribPointer(0, 3, GL_FLOAT, false, 0, 0);
-    glEnableVertexAttribArray(0);
-    glVertexAttribPointer(1, 3, GL_FLOAT, false, 0, (const void*)(sizeof(float) * 108 * 1) );
-    glEnableVertexAttribArray(1);
-    glVertexAttribPointer(2, 3, GL_FLOAT, false, 0, (const void*)(sizeof(float) * 108 * 2));
-    glEnableVertexAttribArray(2);
-     */
     glBindVertexArray(0);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     CheckGLError("build vao ");
-
-    static std::once_flag once;
-    std::call_once(once, [&]{
-        testShaderBuild(sdf_text3D_vert, sdf_text3D_frag);
-
-        testShaderBuild(DrawTransformUnitQuad_vert, DrawTexture_frag);
-        testShaderBuild(DrawTexcoordRectTransformUnitQuad_vert, DrawTexture_frag);
-        testShaderBuild(DrawViewportQuadTransformTexcoord_vert, DrawTexture_frag);
-        testShaderBuild(DrawTransformUnitQuad_vert, DrawTextureOpaque_frag);
-        testShaderBuild(DrawTransformUnitQuad_vert, DrawColoredTexture_frag);
-
-        testShaderBuild(simple_vert, simple_frag);
-        testShaderBuild(simple_vert, simple_textured_frag);
-        testShaderBuild(simple_vert, simple_textured_unlit_frag);
-        testShaderBuild(deferred_light_vert, directional_ambient_light_frag);
-        testShaderBuild(deferred_light_vert, directional_skybox_light_frag);
-        testShaderBuild(standardTransformPNTC_vert, standardDrawTexture_frag);
-        testShaderBuild(standardTransformPNTC_vert, DrawTextureOpaque_frag);
-
-        testShaderBuild(model_vert, model_frag);
-        testShaderBuild(model_normal_map_vert, model_normal_map_frag);
-        testShaderBuild(model_vert, model_specular_map_frag);
-        testShaderBuild(model_normal_map_vert, model_normal_specular_map_frag);
-        testShaderBuild(model_vert, model_translucent_frag);
-        testShaderBuild(model_normal_map_vert, model_translucent_frag);
-        testShaderBuild(model_lightmap_vert, model_lightmap_frag);
-        testShaderBuild(model_lightmap_normal_map_vert, model_lightmap_normal_map_frag);
-        testShaderBuild(model_lightmap_vert, model_lightmap_specular_map_frag);
-        testShaderBuild(model_lightmap_normal_map_vert, model_lightmap_normal_specular_map_frag);
-
-        testShaderBuild(skin_model_vert, model_frag);
-        testShaderBuild(skin_model_normal_map_vert, model_normal_map_frag);
-        testShaderBuild(skin_model_vert, model_specular_map_frag);
-        testShaderBuild(skin_model_normal_map_vert, model_normal_specular_map_frag);
-        testShaderBuild(skin_model_vert, model_translucent_frag);
-        testShaderBuild(skin_model_normal_map_vert, model_translucent_frag);
-
-        testShaderBuild(model_shadow_vert, model_shadow_frag);
-
-        testShaderBuild(overlay3D_vert, overlay3D_frag);
-
-#if 0
-        testShaderBuild(textured_particle_vert, textured_particle_frag);
-        testShaderBuild(skybox_vert, skybox_frag);
-        testShaderBuild(paintStroke_vert,paintStroke_frag);
-        testShaderBuild(polyvox_vert, polyvox_frag);
-#endif
-
-    });
-
-    qDebug() << "done";
 }
 
-static const float kZNear = 1.0f;
-static const float kZFar = 100.0f;
-static const gvr_rectf fullscreen = {0, 1, 0, 1};
 
 void NativeRenderer::DrawFrame() {
     auto now = std::chrono::duration_cast<std::chrono::milliseconds>(
@@ -559,65 +99,12 @@ void NativeRenderer::DrawFrame() {
     v.g = 1.0f - v.r;
     v.b = 1.0f;
 
-    PrepareFramebuffer();
-
-    // A client app does its rendering here.
-    gvr::ClockTimePoint target_time = gvr::GvrApi::GetTimePointNow();
-    target_time.monotonic_system_time_nanos += kPredictionTimeWithoutVsyncNanos;
-
-    using namespace googlevr;
-    using namespace bilateral;
-    const auto gvrHeadPose = _gvrapi->GetHeadSpaceFromStartSpaceRotation(target_time);
-    _head_view = toGlm(gvrHeadPose);
-    _viewportlist->SetToRecommendedBufferViewports();
-
-    glm::mat4 eye_views[2];
-    for_each_side([&](bilateral::Side side) {
-        int eye = index(side);
-        const gvr::Eye gvr_eye = eye == 0 ? GVR_LEFT_EYE : GVR_RIGHT_EYE;
-        const auto& eyeView = eye_views[eye] = toGlm(_gvrapi->GetEyeFromHeadMatrix(gvr_eye)) * _head_view;
-        auto& viewport = _viewports[eye];
-
-        _viewportlist->GetBufferViewport(eye, &viewport);
-        viewport.SetSourceUv(fullscreen);
-        viewport.SetSourceLayer(eye);
-        _viewportlist->SetBufferViewport(eye, viewport);
-        const auto &mvc = _modelview_cube[eye] = eyeView * _model_cube;
-        const auto &mvf = _modelview_floor[eye] = eyeView * _model_floor;
-        const gvr_rectf fov = viewport.GetSourceFov();
-        const glm::mat4 perspective = perspectiveMatrixFromView(fov, kZNear, kZFar);
-        _modelview_projection_cube[eye] = perspective * mvc;
-        _modelview_projection_floor[eye] = perspective * mvf;
-        _light_pos_eye_space[eye] = glm::vec3(eyeView * _light_pos_world_space);
-    });
-
-
-    gvr::Frame frame = _swapchain->AcquireFrame();
-    withFrameBuffer(frame, 0, [&]{
-        glClearColor(v.r, v.g, v.b, 1);
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        glViewport(0, 0, _renderSize.width / 2, _renderSize.height);
-        glUseProgram(_cubeProgram);
-        glBindVertexArray(_cubeVao);
-        glDrawArrays(GL_TRIANGLES, 0, 3);
-        /*
-        float* fp;
-        fp = (float*)&_light_pos_eye_space[0];
-        glUniform3fv(UNIFORM_LIGHT_POS, 2, fp);
-        fp = (float*)&_modelview_cube[0];
-        glUniformMatrix4fv(UNIFORM_MV, 2, GL_FALSE, fp);
-        fp = (float*)&_modelview_projection_cube[0];
-        glUniformMatrix4fv(UNIFORM_MVP, 2, GL_FALSE, fp);
-        fp = (float*)&_model_cube;
-        glUniformMatrix4fv(UNIFORM_M, 1, GL_FALSE, fp);
-        glDrawArrays(GL_TRIANGLES, 0, 36);
-         */
-        glBindVertexArray(0);
-    });
-
-    frame.Submit(*_viewportlist, gvrHeadPose);
-    CheckGLError("onDrawFrame");
-
+    glClearColor(v.r, v.g, v.b, 1.0f);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glUseProgram(_program);
+    glBindVertexArray(_vao);
+    glDrawArrays(GL_TRIANGLES, 0, 3);
+    glBindVertexArray(0);
 }
 
 void NativeRenderer::OnTriggerEvent() {
@@ -626,11 +113,8 @@ void NativeRenderer::OnTriggerEvent() {
 
 void NativeRenderer::OnPause() {
     qDebug() << "QQQ" << __FUNCTION__;
-    _gvrapi->PauseTracking();
 }
 
 void NativeRenderer::OnResume() {
     qDebug() << "QQQ" << __FUNCTION__;
-    _gvrapi->ResumeTracking();
-    _gvrapi->RefreshViewerProfile();
 }

android/app/src/main/cpp/renderer.h

@@ -4,21 +4,8 @@
 #include <array>
 #include <glm/glm.hpp>
 
-#define GVR
-
-#if defined(GVR)
-#include <vr/gvr/capi/include/gvr.h>
-#endif
-
 class NativeRenderer {
 public:
-
-#if defined(GVR)
-    NativeRenderer(gvr_context* vrContext);
-#else
-    NativeRenderer(void* vrContext);
-#endif
-
     void InitializeGl();
     void DrawFrame();
     void OnTriggerEvent();
@@ -26,35 +13,9 @@ public:
     void OnResume();
 
 private:
+    std::chrono::time_point<std::chrono::system_clock> start { std::chrono::system_clock::now() };
 
-
-    std::chrono::time_point<std::chrono::system_clock> start;
-#if defined(GVR)
-    void InitializeVR();
-    void PrepareFramebuffer();
-
-    std::unique_ptr<gvr::GvrApi> _gvrapi;
-    gvr::ViewerType _gvr_viewer_type;
-    std::unique_ptr<gvr::BufferViewportList> _viewportlist;
-    std::unique_ptr<gvr::SwapChain> _swapchain;
-    std::array<gvr::BufferViewport, 2> _viewports;
-    gvr::Sizei _renderSize;
-#endif
-
-    uint32_t _cubeBuffer { 0 };
-    uint32_t _cubeVao { 0 };
-    uint32_t _cubeProgram { 0 };
-
-    glm::mat4 _head_view;
-    glm::mat4 _model_cube;
-    glm::mat4 _camera;
-    glm::mat4 _view;
-    glm::mat4 _model_floor;
-
-    std::array<glm::mat4, 2> _modelview_cube;
-    std::array<glm::mat4, 2> _modelview_floor;
-    std::array<glm::mat4, 2> _modelview_projection_cube;
-    std::array<glm::mat4, 2> _modelview_projection_floor;
-    std::array<glm::vec3, 2> _light_pos_eye_space;
-    const glm::vec4 _light_pos_world_space{ 0, 2, 0, 1};
+    uint32_t _geometryBuffer { 0 };
+    uint32_t _vao { 0 };
+    uint32_t _program { 0 };
 };

android/app/src/main/java/org/saintandreas/testapp/MainActivity.java

@@ -26,10 +26,9 @@ public class MainActivity extends Activity {
     }
 
     private long nativeRenderer;
-    private GvrLayout gvrLayout;
     private GLSurfaceView surfaceView;
 
-    private native long nativeCreateRenderer(ClassLoader appClassLoader, Context context, long nativeGvrContext);
+    private native long nativeCreateRenderer(ClassLoader appClassLoader, Context context);
     private native void nativeDestroyRenderer(long renderer);
     private native void nativeInitializeGl(long renderer);
     private native void nativeDrawFrame(long renderer);
@@ -55,30 +54,21 @@ public class MainActivity extends Activity {
                 if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) { setImmersiveSticky(); }
             });
 
-        gvrLayout = new GvrLayout(this);
         nativeRenderer = nativeCreateRenderer(
             getClass().getClassLoader(),
-            getApplicationContext(),
-            gvrLayout.getGvrApi().getNativeGvrContext());
+            getApplicationContext());
 
         surfaceView = new GLSurfaceView(this);
         surfaceView.setEGLContextClientVersion(3);
         surfaceView.setEGLConfigChooser(8, 8, 8, 0, 0, 0);
         surfaceView.setPreserveEGLContextOnPause(true);
         surfaceView.setRenderer(new NativeRenderer());
-
-        gvrLayout.setPresentationView(surfaceView);
-        setContentView(gvrLayout);
-        if (gvrLayout.setAsyncReprojectionEnabled(true)) {
-            AndroidCompat.setSustainedPerformanceMode(this, true);
-        }
-        AndroidCompat.setVrModeEnabled(this, true);
+        setContentView(surfaceView);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        gvrLayout.shutdown();
         nativeDestroyRenderer(nativeRenderer);
         nativeRenderer = 0;
     }
@@ -87,14 +77,12 @@ public class MainActivity extends Activity {
     protected void onPause() {
         surfaceView.queueEvent(()->nativeOnPause(nativeRenderer));
         surfaceView.onPause();
-        gvrLayout.onPause();
         super.onPause();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        gvrLayout.onResume();
         surfaceView.onResume();
         surfaceView.queueEvent(()->nativeOnResume(nativeRenderer));
     }

android/build.gradle

@@ -1,91 +1,216 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
+plugins {
+    id 'de.undercouch.download' version '3.3.0'
+}
+
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
+
+def baseFolder = new File(HIFI_ANDROID_PRECOMPILED)
+def jniFolder = new File('app/src/main/jniLibs/arm64-v8a')
+
+import org.apache.tools.ant.taskdefs.condition.Os
+
+def baseUrl = 'https://hifi-public.s3.amazonaws.com/austin/android/'
+def qtFile='qt-5.9.3_linux_armv8-libcpp.tgz'
+def qtChecksum='547da3547d5690144e23d6504c6d6e91'
+if (Os.isFamily(Os.FAMILY_MAC)) {
+    qtFile = 'qt-5.9.3_osx_armv8-libcpp.tgz'
+    qtChecksum='6fa3e068cfdee863fc909b294a3a0cc6'
+} else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+    qtFile = 'qt-5.9.3_win_armv8-libcpp.tgz'
+    qtChecksum='3a757378a7e9dbbfc662177e0eb46408'
+}
+
+def packages = [
+    qt: [
+        file: qtFile,
+        checksum: qtChecksum,
+        sharedLibFolder: '',
+        includeLibs: ['lib/*.so', 'plugins/*/*.so']
+    ],
+    bullet: [
+        file: 'bullet-2.83_armv8-libcpp.tgz',
+        checksum: '2c558d604fce337f5eba3eb7ec1252fd'
+    ],
+    draco: [
+        file: 'draco_armv8-libcpp.tgz',
+        checksum: '617a80d213a5ec69fbfa21a1f2f738cd'
+    ],
+    gvr: [
+        file: 'gvrsdk_v1.101.0.tgz',
+        checksum: '57fd02baa069176ba18597a29b6b4fc7'
+    ],
+    openssl: [
+        file: 'openssl-1.1.0g_armv8.tgz',
+        checksum: 'cabb681fbccd79594f65fcc266e02f32'
+    ],
+    polyvox: [
+        file: 'polyvox_armv8-libcpp.tgz',
+        checksum: '5c918288741ee754c16aeb12bb46b9e1',
+        sharedLibFolder: 'lib',
+        includeLibs: ['Release/libPolyVoxCore.so', 'libPolyVoxUtil.so']
+    ],
+    tbb: [
+        file: 'tbb-2018_U1_armv8_libcpp.tgz',
+        checksum: '20768f298f53b195e71b414b0ae240c4',
+        sharedLibFolder: 'lib/release',
+        includeLibs: ['libtbb.so', 'libtbbmalloc.so']
+    ]
+]
+
+task downloadDependencies {
+    doLast {
+        packages.each { entry ->
+            def filename = entry.value['file'];
+            def url = baseUrl + filename;
+            download {
+                src url
+                dest new File(baseFolder, filename)
+                onlyIfNewer true
+            }
+        }
+    }
+}
+
+import de.undercouch.gradle.tasks.download.Verify
+
+task verifyQt(type: Verify) { def p = packages['qt'];  src new File(baseFolder, p['file']);  checksum p['checksum']; }
+task verifyBullet(type: Verify) { def p = packages['bullet']; src new File(baseFolder, p['file']); checksum p['checksum'] }
+task verifyDraco(type: Verify) { def p = packages['draco']; src new File(baseFolder, p['file']); checksum p['checksum'] }
+task verifyGvr(type: Verify) { def p = packages['gvr']; src new File(baseFolder, p['file']); checksum p['checksum'] }
+task verifyOpenSSL(type: Verify) { def p = packages['openssl']; src new File(baseFolder, p['file']);  checksum p['checksum'] }
+task verifyPolyvox(type: Verify) { def p = packages['polyvox']; src new File(baseFolder, p['file']); checksum p['checksum'] }
+task verifyTBB(type: Verify) { def p = packages['tbb']; src new File(baseFolder, p['file']); checksum p['checksum'] }
+
+task verifyDependencyDownloads(dependsOn: downloadDependencies) { }
+verifyDependencyDownloads.dependsOn verifyQt
+verifyDependencyDownloads.dependsOn verifyBullet
+verifyDependencyDownloads.dependsOn verifyDraco
+verifyDependencyDownloads.dependsOn verifyGvr
+verifyDependencyDownloads.dependsOn verifyOpenSSL
+verifyDependencyDownloads.dependsOn verifyPolyvox
+verifyDependencyDownloads.dependsOn verifyTBB
+
+task extractDependencies(dependsOn: verifyDependencyDownloads) {
+    doLast {
+        packages.each { entry ->
+            def folder = entry.key;
+            def filename = entry.value['file'];
+            def localFile = new File(HIFI_ANDROID_PRECOMPILED, filename)
+            def localFolder = new File(HIFI_ANDROID_PRECOMPILED, folder)
+            copy {
+                from tarTree(resources.gzip(localFile))
+                into localFolder
+            }
+        }
+    }
+}
+
+task copyDependencies(dependsOn: extractDependencies) {
+    doLast {
+        packages.each { entry ->
+            def packageName = entry.key
+            def currentPackage = entry.value;
+            if (currentPackage.containsKey('sharedLibFolder')) {
+                def localFolder = new File(baseFolder, packageName + '/' + currentPackage['sharedLibFolder'])
+                def tree = fileTree(localFolder);
+                if (currentPackage.containsKey('includeLibs')) {
+                    currentPackage['includeLibs'].each { includeSpec -> tree.include includeSpec }
+                }
+                tree.visit { element -> 
+                    if (!element.file.isDirectory()) {
+                        copy {  from element.file; into jniFolder }
+                    } 
+                } 
+            }
+        }
+    }
+}
+
+def scribeFile='scribe_linux_x86_64'
+def scribeLocalFile='scribe'
+def scribeChecksum='c98678d9726bd8bbf1bab792acf3ff6c'
+if (Os.isFamily(Os.FAMILY_MAC)) {
+    scribeFile = 'scribe_osx_x86_64'
+    scribeChecksum='a137ad62c1bf7cca739da219544a9a16'
+} else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+    scribeFile = 'scribe_win32_x86_64.exe'
+    scribeLocalFile = 'scribe.exe'
+    scribeChecksum='75c2ce9ed45d17de375e3988bfaba816'
+
+}
+
+import de.undercouch.gradle.tasks.download.Download
+
+task downloadScribe(type: Download) {
+    src baseUrl + scribeFile
+    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');
+        zipTree(new File(HIFI_ANDROID_PRECOMPILED, 'gvr/gvr-android-sdk-1.101.0/libraries/sdk-audio-1.101.0.aar')).visit { element ->
+            def fileName = element.file.toString();
+            if (fileName.endsWith('libgvr_audio.so') && fileName.contains('arm64-v8a')) {
+                copy {  from element.file; into gvrLibFolder }
+            }
+        }
+        zipTree(new File(HIFI_ANDROID_PRECOMPILED, 'gvr/gvr-android-sdk-1.101.0/libraries/sdk-base-1.101.0.aar')).visit { element ->
+            def fileName = element.file.toString();
+            if (fileName.endsWith('libgvr.so') && fileName.contains('arm64-v8a')) {
+                copy {  from element.file; into gvrLibFolder }
+            }
+        }
+        fileTree(gvrLibFolder).visit { element ->
+            if (element.file.toString().endsWith('.so')) {
+                copy { from element.file; into jniFolder }
+            }
+        }
+    }
+
+}
+
+task setupDependencies(dependsOn: [setupScribe, copyDependencies, extractGvrBinaries]) {
+}
+
+task cleanDependencies(type: Delete) {
+    delete HIFI_ANDROID_PRECOMPILED
+    delete 'app/src/main/jniLibs/arm64-v8a'
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-
-task extractQt5jars(type: Copy) {
-    from fileTree(QT5_ROOT + "/jar")
-    into("${project.rootDir}/libraries/jar")
-    include("*.jar")
-}
-
-task extractQt5so(type: Copy) {
-    from fileTree(QT5_ROOT + "/lib")
-    into("${project.rootDir}/libraries/jni/armeabi-v7a/")
-    include("libQt5AndroidExtras.so")
-    include("libQt5Concurrent.so")
-    include("libQt5Core.so")
-    include("libQt5Gamepad.so")
-    include("libQt5Gui.so")
-    include("libQt5Location.so")
-    include("libQt5Multimedia.so")
-    include("libQt5MultimediaQuick_p.so")
-    include("libQt5Network.so")
-    include("libQt5NetworkAuth.so")
-    include("libQt5OpenGL.so")
-    include("libQt5Positioning.so")
-    include("libQt5Qml.so")
-    include("libQt5Quick.so")
-    include("libQt5QuickControls2.so")
-    include("libQt5QuickParticles.so")
-    include("libQt5QuickTemplates2.so")
-    include("libQt5QuickWidgets.so")
-    include("libQt5Script.so")
-    include("libQt5ScriptTools.so")
-    include("libQt5Sensors.so")
-    include("libQt5Svg.so")
-    include("libQt5WebChannel.so")
-    include("libQt5WebSockets.so")
-    include("libQt5WebView.so")
-    include("libQt5Widgets.so")
-    include("libQt5Xml.so")
-    include("libQt5XmlPatterns.so")
-}
-
-task extractAudioSo(type: Copy) {
-    from zipTree(GVR_ROOT + "/libraries/sdk-audio-1.80.0.aar")
-    into "${project.rootDir}/libraries/"
-    include "jni/armeabi-v7a/libgvr_audio.so"
-}
-
-task extractGvrSo(type: Copy) {
-    from zipTree(GVR_ROOT + "/libraries/sdk-base-1.80.0.aar")
-    into "${project.rootDir}/libraries/"
-    include "jni/armeabi-v7a/libgvr.so"
-}
-
-task extractNdk { }
-extractNdk.dependsOn extractAudioSo
-extractNdk.dependsOn extractGvrSo
-
-task extractQt5 { }
-extractQt5.dependsOn extractQt5so
-extractQt5.dependsOn extractQt5jars
-
-task extractBinaries { }
-extractBinaries.dependsOn extractQt5
-extractBinaries.dependsOn extractNdk
-
-task deleteBinaries(type: Delete) {
-    delete "${project.rootDir}/libraries/jni"
-}
-
-//clean.dependsOn(deleteBinaries)

android/setupGVR.gradle

@@ -0,0 +1,41 @@
+buildscript {
+    repositories {
+        jcenter()
+        google()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'de.undercouch:gradle-download-task:3.3.0'
+    }
+}
+
+
+def file='gvrsdk_v1.101.0.tgz'
+def url='https://hifi-public.s3.amazonaws.com/austin/android/' + file
+def destFile = new File(HIFI_ANDROID_PRECOMPILED, file)
+
+// FIXME find a way to only download if the file doesn't exist
+task downloadGVR(type: de.undercouch.gradle.tasks.download.Download) {
+    src url
+    dest destFile
+}
+
+task extractGVR(dependsOn: downloadGVR, type: Copy) {
+    from tarTree(resources.gzip(destFile))
+    into new File(HIFI_ANDROID_PRECOMPILED, 'gvr')
+}
+
+task copyGVRAudioLibs(dependsOn: extractGVR, type: Copy) {
+    from zipTree(new File(HIFI_ANDROID_PRECOMPILED, 'gvr/gvr-android-sdk-1.101.0/libraries/sdk-audio-1.101.0.aar'))
+    include 'jni/arm64-v8a/libgvr_audio.so'
+    into HIFI_ANDROID_PRECOMPILED
+}
+
+task copyGVRLibs(dependsOn: extractGVR, type: Copy) {
+    from zipTree(new File(HIFI_ANDROID_PRECOMPILED, 'gvr/gvr-android-sdk-1.101.0/libraries/sdk-base-1.101.0.aar'))
+    include 'jni/arm64-v8a/libgvr.so'
+    into HIFI_ANDROID_PRECOMPILED
+}
+
+task setupGVR(dependsOn: [copyGVRLibs, copyGVRAudioLibs]) {
+}

assignment-client/CMakeLists.txt

@@ -13,9 +13,25 @@ setup_memory_debugger()
 link_hifi_libraries(
   audio avatars octree gpu model fbx entities
   networking animation recording shared script-engine embedded-webserver
-  controllers physics plugins midi baking image
+  controllers physics plugins midi image
 )
 
+add_dependencies(${TARGET_NAME} oven)
+
+if (WIN32)
+  add_custom_command(
+    TARGET ${TARGET_NAME} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+            $<TARGET_FILE_DIR:oven>
+            $<TARGET_FILE_DIR:${TARGET_NAME}>)
+else()
+  add_custom_command(
+    TARGET ${TARGET_NAME} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E create_symlink
+            $<TARGET_FILE:oven>
+            $<TARGET_FILE_DIR:${TARGET_NAME}>/oven)
+endif()
+
 if (WIN32)
   package_libraries_for_deployment()
 endif()

assignment-client/src/Agent.cpp

@@ -441,7 +441,7 @@ void Agent::executeScript() {
 
         Transform audioTransform;
         auto headOrientation = scriptedAvatar->getHeadOrientation();
-        audioTransform.setTranslation(scriptedAvatar->getPosition());
+        audioTransform.setTranslation(scriptedAvatar->getWorldPosition());
         audioTransform.setRotation(headOrientation);
 
         QByteArray encodedBuffer;
@@ -452,7 +452,7 @@ void Agent::executeScript() {
         }
 
         AbstractAudioInterface::emitAudioPacket(encodedBuffer.data(), encodedBuffer.size(), audioSequenceNumber,
-            audioTransform, scriptedAvatar->getPosition(), glm::vec3(0),
+            audioTransform, scriptedAvatar->getWorldPosition(), glm::vec3(0),
             packetType, _selectedCodecName);
     });
 
@@ -742,10 +742,10 @@ void Agent::processAgentAvatarAudio() {
             audioPacket->writePrimitive(numAvailableSamples);
 
             // use the orientation and position of this avatar for the source of this audio
-            audioPacket->writePrimitive(scriptedAvatar->getPosition());
+            audioPacket->writePrimitive(scriptedAvatar->getWorldPosition());
             glm::quat headOrientation = scriptedAvatar->getHeadOrientation();
             audioPacket->writePrimitive(headOrientation);
-            audioPacket->writePrimitive(scriptedAvatar->getPosition());
+            audioPacket->writePrimitive(scriptedAvatar->getWorldPosition());
             audioPacket->writePrimitive(glm::vec3(0));
 
             // no matter what, the loudness should be set to 0
@@ -759,10 +759,10 @@ void Agent::processAgentAvatarAudio() {
             audioPacket->writePrimitive((quint8)0);
 
             // use the orientation and position of this avatar for the source of this audio
-            audioPacket->writePrimitive(scriptedAvatar->getPosition());
+            audioPacket->writePrimitive(scriptedAvatar->getWorldPosition());
             glm::quat headOrientation = scriptedAvatar->getHeadOrientation();
             audioPacket->writePrimitive(headOrientation);
-            audioPacket->writePrimitive(scriptedAvatar->getPosition());
+            audioPacket->writePrimitive(scriptedAvatar->getWorldPosition()); // HUH? why do we write this twice??
             audioPacket->writePrimitive(glm::vec3(0));
 
             QByteArray encodedBuffer;

assignment-client/src/AssignmentClientMonitor.cpp

@@ -28,6 +28,10 @@
 const QString ASSIGNMENT_CLIENT_MONITOR_TARGET_NAME = "assignment-client-monitor";
 const int WAIT_FOR_CHILD_MSECS = 1000;
 
+#ifdef Q_OS_WIN
+HANDLE PROCESS_GROUP = createProcessGroup();
+#endif
+
 AssignmentClientMonitor::AssignmentClientMonitor(const unsigned int numAssignmentClientForks,
                                                  const unsigned int minAssignmentClientForks,
                                                  const unsigned int maxAssignmentClientForks,
@@ -202,6 +206,10 @@ void AssignmentClientMonitor::spawnChildClient() {
     assignmentClient->setProcessChannelMode(QProcess::ForwardedChannels);
     assignmentClient->start(QCoreApplication::applicationFilePath(), _childArguments);
 
+#ifdef Q_OS_WIN
+    addProcessToGroup(PROCESS_GROUP, assignmentClient->processId());
+#endif
+
     QString stdoutPath, stderrPath;
 
     if (_wantsChildFileLogging) {

assignment-client/src/assets/AssetServer.cpp

@@ -29,11 +29,10 @@
 #include <QtCore/QUrlQuery>
 
 #include <ClientServerUtils.h>
-#include <FBXBaker.h>
-#include <JSBaker.h>
 #include <NodeType.h>
 #include <SharedUtil.h>
 #include <PathUtils.h>
+#include <image/Image.h>
 
 #include "AssetServerLogging.h"
 #include "BakeAssetTask.h"
@@ -250,7 +249,7 @@ AssetServer::AssetServer(ReceivedMessage& message) :
     image::setNormalTexturesCompressionEnabled(true);
     image::setCubeTexturesCompressionEnabled(true);
 
-    BAKEABLE_TEXTURE_EXTENSIONS = TextureBaker::getSupportedFormats();
+    BAKEABLE_TEXTURE_EXTENSIONS = image::getSupportedFormats();
     qDebug() << "Supported baking texture formats:" << BAKEABLE_MODEL_EXTENSIONS;
 
     // Most of the work will be I/O bound, reading from disk and constructing packet objects,
@@ -416,6 +415,9 @@ void AssetServer::completeSetup() {
     if (assetsFilesizeLimit != 0 && assetsFilesizeLimit < MAX_UPLOAD_SIZE) {
         _filesizeLimit = assetsFilesizeLimit * BITS_PER_MEGABITS;
     }
+
+    PathUtils::removeTemporaryApplicationDirs();
+    PathUtils::removeTemporaryApplicationDirs("Oven");
 }
 
 void AssetServer::cleanupUnmappedFiles() {

assignment-client/src/assets/BakeAssetTask.cpp

@@ -11,11 +11,18 @@
 
 #include "BakeAssetTask.h"
 
-#include <QtCore/QThread>
+#include <mutex>
+
+#include <QtCore/QThread>
+#include <QCoreApplication>
 
-#include <FBXBaker.h>
 #include <PathUtils.h>
-#include <JSBaker.h>
+
+static const int OVEN_STATUS_CODE_SUCCESS { 0 };
+static const int OVEN_STATUS_CODE_FAIL { 1 };
+static const int OVEN_STATUS_CODE_ABORT { 2 };
+
+std::once_flag registerMetaTypesFlag;
 
 BakeAssetTask::BakeAssetTask(const AssetHash& assetHash, const AssetPath& assetPath, const QString& filePath) :
     _assetHash(assetHash),
@@ -23,6 +30,10 @@ BakeAssetTask::BakeAssetTask(const AssetHash& assetHash, const AssetPath& assetP
     _filePath(filePath)
 {
 
+    std::call_once(registerMetaTypesFlag, []() {
+        qRegisterMetaType<QProcess::ProcessError>("QProcess::ProcessError");
+        qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
+    });
 }
 
 void cleanupTempFiles(QString tempOutputDir, std::vector<QString> files) {
@@ -41,67 +52,76 @@ void cleanupTempFiles(QString tempOutputDir, std::vector<QString> files) {
 };
 
 void BakeAssetTask::run() {
-    _isBaking.store(true);
-
-    qRegisterMetaType<QVector<QString> >("QVector<QString>");
-    TextureBakerThreadGetter fn = []() -> QThread* { return QThread::currentThread();  };
-
-    QString tempOutputDir;
-
-    if (_assetPath.endsWith(".fbx")) {
-        tempOutputDir = PathUtils::generateTemporaryDir();
-        _baker = std::unique_ptr<FBXBaker> {
-            new FBXBaker(QUrl("file:///" + _filePath), fn, tempOutputDir)
-        };
-    } else if (_assetPath.endsWith(".js", Qt::CaseInsensitive)) {
-        _baker = std::unique_ptr<JSBaker>{
-            new JSBaker(QUrl("file:///" + _filePath), PathUtils::generateTemporaryDir())
-        };
-    } else {
-        tempOutputDir = PathUtils::generateTemporaryDir();
-        _baker = std::unique_ptr<TextureBaker> {
-            new TextureBaker(QUrl("file:///" + _filePath), image::TextureUsage::CUBE_TEXTURE,
-                             tempOutputDir)
-        };
+    if (_isBaking.exchange(true)) {
+        qWarning() << "Tried to start bake asset task while already baking";
+        return;
     }
 
-    QEventLoop loop;
-    connect(_baker.get(), &Baker::finished, &loop, &QEventLoop::quit);
-    connect(_baker.get(), &Baker::aborted, &loop, &QEventLoop::quit);
-    QMetaObject::invokeMethod(_baker.get(), "bake", Qt::QueuedConnection);
-    loop.exec();
+    QString tempOutputDir = PathUtils::generateTemporaryDir();
+    auto base = QFileInfo(QCoreApplication::applicationFilePath()).absoluteDir();
+    QString path = base.absolutePath() + "/oven";
+    QString extension = _assetPath.mid(_assetPath.lastIndexOf('.') + 1);
+    QStringList args {
+        "-i", _filePath,
+        "-o", tempOutputDir,
+        "-t", extension,
+    };
 
-    if (_baker->wasAborted()) {
-        qDebug() << "Aborted baking: " << _assetHash << _assetPath;
+    _ovenProcess.reset(new QProcess());
 
-        _wasAborted.store(true);
+    connect(_ovenProcess.get(), static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+            this, [this, tempOutputDir](int exitCode, QProcess::ExitStatus exitStatus) {
+        qDebug() << "Baking process finished: " << exitCode << exitStatus;
 
-        cleanupTempFiles(tempOutputDir, _baker->getOutputFiles());
+        if (exitStatus == QProcess::CrashExit) {
+            if (_wasAborted) {
+                emit bakeAborted(_assetHash, _assetPath);
+            } else {
+                QString errors = "Fatal error occurred while baking";
+                emit bakeFailed(_assetHash, _assetPath, errors);
+            }
+        } else if (exitCode == OVEN_STATUS_CODE_SUCCESS) {
+            QDir outputDir = tempOutputDir;
+            auto files = outputDir.entryInfoList(QDir::Files);
+            QVector<QString> outputFiles;
+            for (auto& file : files) {
+                outputFiles.push_back(file.absoluteFilePath());
+            }
 
-        emit bakeAborted(_assetHash, _assetPath);
-    } else if (_baker->hasErrors()) {
-        qDebug() << "Failed to bake: " << _assetHash << _assetPath << _baker->getErrors();
+            emit bakeComplete(_assetHash, _assetPath, tempOutputDir, outputFiles);
+        } else if (exitStatus == QProcess::NormalExit && exitCode == OVEN_STATUS_CODE_ABORT) {
+            _wasAborted.store(true);
+            emit bakeAborted(_assetHash, _assetPath);
+        } else {
+            QString errors;
+            if (exitCode == OVEN_STATUS_CODE_FAIL) {
+                QDir outputDir = tempOutputDir;
+                auto errorFilePath = outputDir.absoluteFilePath("errors.txt");
+                QFile errorFile { errorFilePath };
+                if (errorFile.open(QIODevice::ReadOnly)) {
+                    errors = errorFile.readAll();
+                    errorFile.close();
+                } else {
+                    errors = "Unknown error occurred while baking";
+                }
+            }
+            emit bakeFailed(_assetHash, _assetPath, errors);
+        }
 
-        auto errors = _baker->getErrors().join('\n'); // Join error list into a single string for convenience
-
-        _didFinish.store(true);
-
-        cleanupTempFiles(tempOutputDir, _baker->getOutputFiles());
+    });
 
+    qDebug() << "Starting oven for " << _assetPath;
+    _ovenProcess->start(path, args, QIODevice::ReadOnly);
+    if (!_ovenProcess->waitForStarted(-1)) {
+        QString errors = "Oven process failed to start";
         emit bakeFailed(_assetHash, _assetPath, errors);
-    } else {
-        auto vectorOutputFiles = QVector<QString>::fromStdVector(_baker->getOutputFiles());
-
-        qDebug() << "Finished baking: " << _assetHash << _assetPath << vectorOutputFiles;
-
-        _didFinish.store(true);
-
-        emit bakeComplete(_assetHash, _assetPath, tempOutputDir, vectorOutputFiles);
+        return;
     }
+    _ovenProcess->waitForFinished();
 }
 
 void BakeAssetTask::abort() {
-    if (_baker) {
-        _baker->abort();
+    if (!_wasAborted.exchange(true)) {
+        _ovenProcess->terminate();
     }
 }

assignment-client/src/assets/BakeAssetTask.h

@@ -17,9 +17,10 @@
 #include <QtCore/QDebug>
 #include <QtCore/QObject>
 #include <QtCore/QRunnable>
+#include <QDir>
+#include <QProcess>
 
 #include <AssetUtils.h>
-#include <Baker.h>
 
 class BakeAssetTask : public QObject, public QRunnable {
     Q_OBJECT
@@ -32,7 +33,6 @@ public:
 
     void abort();
     bool wasAborted() const { return _wasAborted.load(); }
-    bool didFinish() const { return _didFinish.load(); }
 
 signals:
     void bakeComplete(QString assetHash, QString assetPath, QString tempOutputDir, QVector<QString> outputFiles);
@@ -44,9 +44,8 @@ private:
     AssetHash _assetHash;
     AssetPath _assetPath;
     QString _filePath;
-    std::unique_ptr<Baker> _baker;
+    std::unique_ptr<QProcess> _ovenProcess { nullptr };
     std::atomic<bool> _wasAborted { false };
-    std::atomic<bool> _didFinish { false };
 };
 
 #endif // hifi_BakeAssetTask_h

assignment-client/src/audio/AudioMixer.cpp

@@ -29,6 +29,7 @@
 #include <UUID.h>
 #include <CPUDetect.h>
 
+#include "AudioLogging.h"
 #include "AudioHelpers.h"
 #include "AudioRingBuffer.h"
 #include "AudioMixerClientData.h"
@@ -130,7 +131,7 @@ void AudioMixer::queueReplicatedAudioPacket(QSharedPointer<ReceivedMessage> mess
     PacketType rewrittenType = PacketTypeEnum::getReplicatedPacketMapping().key(message->getType());
 
     if (rewrittenType == PacketType::Unknown) {
-        qDebug() << "Cannot unwrap replicated packet type not present in REPLICATED_PACKET_WRAPPING";
+        qCDebug(audio) << "Cannot unwrap replicated packet type not present in REPLICATED_PACKET_WRAPPING";
     }
 
     auto replicatedMessage = QSharedPointer<ReceivedMessage>::create(audioData, rewrittenType,
@@ -345,7 +346,7 @@ void AudioMixer::sendStatsPacket() {
 
 void AudioMixer::run() {
 
-    qDebug() << "Waiting for connection to domain to request settings from domain-server.";
+    qCDebug(audio) << "Waiting for connection to domain to request settings from domain-server.";
 
     // wait until we have the domain-server settings, otherwise we bail
     DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler();
@@ -502,14 +503,14 @@ void AudioMixer::throttle(std::chrono::microseconds duration, int frame) {
             int proportionalTerm = 1 + (_trailingMixRatio - TARGET) / 0.1f;
             _throttlingRatio += THROTTLE_RATE * proportionalTerm;
             _throttlingRatio = std::min(_throttlingRatio, 1.0f);
-            qDebug("audio-mixer is struggling (%f mix/sleep) - throttling %f of streams",
-                    (double)_trailingMixRatio, (double)_throttlingRatio);
+            qCDebug(audio) << "audio-mixer is struggling (" << _trailingMixRatio << "mix/sleep) - throttling"
+                << _throttlingRatio << "of streams";
         } else if (_throttlingRatio > 0.0f && _trailingMixRatio <= BACKOFF_TARGET) {
             int proportionalTerm = 1 + (TARGET - _trailingMixRatio) / 0.2f;
             _throttlingRatio -= BACKOFF_RATE * proportionalTerm;
             _throttlingRatio = std::max(_throttlingRatio, 0.0f);
-            qDebug("audio-mixer is recovering (%f mix/sleep) - throttling %f of streams",
-                    (double)_trailingMixRatio, (double)_throttlingRatio);
+            qCDebug(audio) << "audio-mixer is recovering (" << _trailingMixRatio << "mix/sleep) - throttling"
+                << _throttlingRatio << "of streams";
         }
     }
 }
@@ -534,7 +535,7 @@ void AudioMixer::clearDomainSettings() {
 }
 
 void AudioMixer::parseSettingsObject(const QJsonObject& settingsObject) {
-    qDebug() << "AVX2 Support:" << (cpuSupportsAVX2() ? "enabled" : "disabled");
+    qCDebug(audio) << "AVX2 Support:" << (cpuSupportsAVX2() ? "enabled" : "disabled");
 
     if (settingsObject.contains(AUDIO_THREADING_GROUP_KEY)) {
         QJsonObject audioThreadingGroupObject = settingsObject[AUDIO_THREADING_GROUP_KEY].toObject();
@@ -557,7 +558,7 @@ void AudioMixer::parseSettingsObject(const QJsonObject& settingsObject) {
         const QString DYNAMIC_JITTER_BUFFER_JSON_KEY = "dynamic_jitter_buffer";
         bool enableDynamicJitterBuffer = audioBufferGroupObject[DYNAMIC_JITTER_BUFFER_JSON_KEY].toBool();
         if (enableDynamicJitterBuffer) {
-            qDebug() << "Enabling dynamic jitter buffers.";
+            qCDebug(audio) << "Enabling dynamic jitter buffers.";
 
             bool ok;
             const QString DESIRED_JITTER_BUFFER_FRAMES_KEY = "static_desired_jitter_buffer_frames";
@@ -565,9 +566,9 @@ void AudioMixer::parseSettingsObject(const QJsonObject& settingsObject) {
             if (!ok) {
                 _numStaticJitterFrames = InboundAudioStream::DEFAULT_STATIC_JITTER_FRAMES;
             }
-            qDebug() << "Static desired jitter buffer frames:" << _numStaticJitterFrames;
+            qCDebug(audio) << "Static desired jitter buffer frames:" << _numStaticJitterFrames;
         } else {
-            qDebug() << "Disabling dynamic jitter buffers.";
+            qCDebug(audio) << "Disabling dynamic jitter buffers.";
             _numStaticJitterFrames = DISABLE_STATIC_JITTER_FRAMES;
         }
 
@@ -621,7 +622,7 @@ void AudioMixer::parseSettingsObject(const QJsonObject& settingsObject) {
         if (audioEnvGroupObject[CODEC_PREFERENCE_ORDER].isString()) {
             QString codecPreferenceOrder = audioEnvGroupObject[CODEC_PREFERENCE_ORDER].toString();
             _codecPreferenceOrder = codecPreferenceOrder.split(",");
-            qDebug() << "Codec preference order changed to" << _codecPreferenceOrder;
+            qCDebug(audio) << "Codec preference order changed to" << _codecPreferenceOrder;
         }
 
         const QString ATTENATION_PER_DOULING_IN_DISTANCE = "attenuation_per_doubling_in_distance";
@@ -630,7 +631,7 @@ void AudioMixer::parseSettingsObject(const QJsonObject& settingsObject) {
             float attenuation = audioEnvGroupObject[ATTENATION_PER_DOULING_IN_DISTANCE].toString().toFloat(&ok);
             if (ok) {
                 _attenuationPerDoublingInDistance = attenuation;
-                qDebug() << "Attenuation per doubling in distance changed to" << _attenuationPerDoublingInDistance;
+                qCDebug(audio) << "Attenuation per doubling in distance changed to" << _attenuationPerDoublingInDistance;
             }
         }
 
@@ -640,7 +641,7 @@ void AudioMixer::parseSettingsObject(const QJsonObject& settingsObject) {
             float noiseMutingThreshold = audioEnvGroupObject[NOISE_MUTING_THRESHOLD].toString().toFloat(&ok);
             if (ok) {
                 _noiseMutingThreshold = noiseMutingThreshold;
-                qDebug() << "Noise muting threshold changed to" << _noiseMutingThreshold;
+                qCDebug(audio) << "Noise muting threshold changed to" << _noiseMutingThreshold;
             }
         }
 
@@ -680,8 +681,7 @@ void AudioMixer::parseSettingsObject(const QJsonObject& settingsObject) {
                         glm::vec3 dimensions(xMax - xMin, yMax - yMin, zMax - zMin);
                         AABox zoneAABox(corner, dimensions);
                         _audioZones.insert(zone, zoneAABox);
-                        qDebug() << "Added zone:" << zone << "(corner:" << corner
-                                    << ", dimensions:" << dimensions << ")";
+                        qCDebug(audio) << "Added zone:" << zone << "(corner:" << corner << ", dimensions:" << dimensions << ")";
                     }
                 }
             }
@@ -712,7 +712,7 @@ void AudioMixer::parseSettingsObject(const QJsonObject& settingsObject) {
                         _audioZones.contains(settings.source) && _audioZones.contains(settings.listener)) {
 
                         _zoneSettings.push_back(settings);
-                        qDebug() << "Added Coefficient:" << settings.source << settings.listener << settings.coefficient;
+                        qCDebug(audio) << "Added Coefficient:" << settings.source << settings.listener << settings.coefficient;
                     }
                 }
             }
@@ -745,7 +745,7 @@ void AudioMixer::parseSettingsObject(const QJsonObject& settingsObject) {
 
                         _zoneReverbSettings.push_back(settings);
 
-                        qDebug() << "Added Reverb:" << zone << reverbTime << wetLevel;
+                        qCDebug(audio) << "Added Reverb:" << zone << reverbTime << wetLevel;
                     }
                 }
             }

assignment-client/src/audio/AudioMixerClientData.cpp

@@ -19,6 +19,7 @@
 
 #include "InjectedAudioStream.h"
 
+#include "AudioLogging.h"
 #include "AudioHelpers.h"
 #include "AudioMixer.h"
 #include "AudioMixerClientData.h"
@@ -132,7 +133,7 @@ void AudioMixerClientData::optionallyReplicatePacket(ReceivedMessage& message, c
             if (PacketTypeEnum::getReplicatedPacketMapping().key(message.getType()) != PacketType::Unknown) {
                 mirroredType = message.getType();
             } else {
-                qDebug() << "Packet passed to optionallyReplicatePacket was not a replicatable type - returning";
+                qCDebug(audio) << "Packet passed to optionallyReplicatePacket was not a replicatable type - returning";
                 return;
             }
         }
@@ -189,8 +190,16 @@ void AudioMixerClientData::parsePerAvatarGainSet(ReceivedMessage& message, const
     uint8_t packedGain;
     message.readPrimitive(&packedGain);
     float gain = unpackFloatGainFromByte(packedGain);
-    hrtfForStream(avatarUuid, QUuid()).setGainAdjustment(gain);
-    qDebug() << "Setting gain adjustment for hrtf[" << uuid << "][" << avatarUuid << "] to " << gain;
+
+    if (avatarUuid.isNull()) {
+        // set the MASTER avatar gain
+        setMasterAvatarGain(gain);
+        qCDebug(audio) << "Setting MASTER avatar gain for " << uuid << " to " << gain;
+    } else {
+        // set the per-source avatar gain
+        hrtfForStream(avatarUuid, QUuid()).setGainAdjustment(gain);
+        qCDebug(audio) << "Setting avatar gain adjustment for hrtf[" << uuid << "][" << avatarUuid << "] to " << gain;
+    }
 }
 
 void AudioMixerClientData::parseNodeIgnoreRequest(QSharedPointer<ReceivedMessage> message, const SharedNodePointer& node) {
@@ -276,7 +285,7 @@ int AudioMixerClientData::parseData(ReceivedMessage& message) {
 
                 auto avatarAudioStream = new AvatarAudioStream(isStereo, AudioMixer::getStaticJitterFrames());
                 avatarAudioStream->setupCodec(_codec, _selectedCodecName, AudioConstants::MONO);
-                qDebug() << "creating new AvatarAudioStream... codec:" << _selectedCodecName;
+                qCDebug(audio) << "creating new AvatarAudioStream... codec:" << _selectedCodecName;
 
                 connect(avatarAudioStream, &InboundAudioStream::mismatchedAudioCodec,
                         this, &AudioMixerClientData::handleMismatchAudioFormat);
@@ -315,7 +324,7 @@ int AudioMixerClientData::parseData(ReceivedMessage& message) {
 
 #if INJECTORS_SUPPORT_CODECS
                 injectorStream->setupCodec(_codec, _selectedCodecName, isStereo ? AudioConstants::STEREO : AudioConstants::MONO);
-                qDebug() << "creating new injectorStream... codec:" << _selectedCodecName;
+                qCDebug(audio) << "creating new injectorStream... codec:" << _selectedCodecName;
 #endif
 
                 auto emplaced = _audioStreams.emplace(
@@ -339,8 +348,8 @@ int AudioMixerClientData::parseData(ReceivedMessage& message) {
         auto parseResult = matchingStream->parseData(message);
 
         if (matchingStream->getOverflowCount() > overflowBefore) {
-            qDebug() << "Just overflowed on stream from" << message.getSourceID() << "at" << message.getSenderSockAddr();
-            qDebug() << "This stream is for" << (isMicStream ? "microphone audio" : "injected audio");
+            qCDebug(audio) << "Just overflowed on stream from" << message.getSourceID() << "at" << message.getSenderSockAddr();
+            qCDebug(audio) << "This stream is for" << (isMicStream ? "microphone audio" : "injected audio");
         }
 
         return parseResult;
@@ -689,7 +698,7 @@ void AudioMixerClientData::setupCodecForReplicatedAgent(QSharedPointer<ReceivedM
     auto codecString = message->readString();
 
     if (codecString != _selectedCodecName) {
-        qDebug() << "Manually setting codec for replicated agent" << uuidStringWithoutCurlyBraces(getNodeID())
+        qCDebug(audio) << "Manually setting codec for replicated agent" << uuidStringWithoutCurlyBraces(getNodeID())
         << "-" << codecString;
 
         const std::pair<QString, CodecPluginPointer> codec = AudioMixer::negotiateCodec({ codecString });

assignment-client/src/audio/AudioMixerClientData.h

@@ -83,6 +83,9 @@ public:
     // uses randomization to have the AudioMixer send a stats packet to this node around every second
     bool shouldSendStats(int frameNumber);
 
+    float getMasterAvatarGain() const { return _masterAvatarGain; }
+    void setMasterAvatarGain(float gain) { _masterAvatarGain = gain; }
+
     AudioLimiter audioLimiter;
 
     void setupCodec(CodecPluginPointer codec, const QString& codecName);
@@ -175,6 +178,8 @@ private:
 
     int _frameToSendStats { 0 };
 
+    float _masterAvatarGain { 1.0f };   // per-listener mixing gain, applied only to avatars
+
     CodecPluginPointer _codec;
     QString _selectedCodecName;
     Encoder* _encoder{ nullptr }; // for outbound mixed stream

assignment-client/src/audio/AudioMixerSlave.cpp

@@ -48,8 +48,8 @@ void sendEnvironmentPacket(const SharedNodePointer& node, AudioMixerClientData&
 // mix helpers
 inline float approximateGain(const AvatarAudioStream& listeningNodeStream, const PositionalAudioStream& streamToAdd,
         const glm::vec3& relativePosition);
-inline float computeGain(const AvatarAudioStream& listeningNodeStream, const PositionalAudioStream& streamToAdd,
-        const glm::vec3& relativePosition, bool isEcho);
+inline float computeGain(const AudioMixerClientData& listenerNodeData, const AvatarAudioStream& listeningNodeStream,
+        const PositionalAudioStream& streamToAdd, const glm::vec3& relativePosition, bool isEcho);
 inline float computeAzimuth(const AvatarAudioStream& listeningNodeStream, const PositionalAudioStream& streamToAdd,
         const glm::vec3& relativePosition);
 
@@ -266,7 +266,7 @@ void AudioMixerSlave::addStream(AudioMixerClientData& listenerNodeData, const QU
     glm::vec3 relativePosition = streamToAdd.getPosition() - listeningNodeStream.getPosition();
 
     float distance = glm::max(glm::length(relativePosition), EPSILON);
-    float gain = computeGain(listeningNodeStream, streamToAdd, relativePosition, isEcho);
+    float gain = computeGain(listenerNodeData, listeningNodeStream, streamToAdd, relativePosition, isEcho);
     float azimuth = isEcho ? 0.0f : computeAzimuth(listeningNodeStream, listeningNodeStream, relativePosition);
     const int HRTF_DATASET_INDEX = 1;
 
@@ -484,10 +484,12 @@ float approximateGain(const AvatarAudioStream& listeningNodeStream, const Positi
     // when throttling, as close streams are expected to be heard by a user
     float distance = glm::length(relativePosition);
     return gain / distance;
+
+    // avatar: skip master gain - it is constant for all streams
 }
 
-float computeGain(const AvatarAudioStream& listeningNodeStream, const PositionalAudioStream& streamToAdd,
-        const glm::vec3& relativePosition, bool isEcho) {
+float computeGain(const AudioMixerClientData& listenerNodeData, const AvatarAudioStream& listeningNodeStream,
+        const PositionalAudioStream& streamToAdd, const glm::vec3& relativePosition, bool isEcho) {
     float gain = 1.0f;
 
     // injector: apply attenuation
@@ -507,6 +509,9 @@ float computeGain(const AvatarAudioStream& listeningNodeStream, const Positional
         float offAxisCoefficient = MAX_OFF_AXIS_ATTENUATION + (angleOfDelivery * (OFF_AXIS_ATTENUATION_STEP / PI_OVER_TWO));
 
         gain *= offAxisCoefficient;
+
+        // apply master gain, only to avatars
+        gain *= listenerNodeData.getMasterAvatarGain();
     }
 
     auto& audioZones = AudioMixer::getAudioZones();

assignment-client/src/avatars/AvatarMixer.cpp

@@ -870,8 +870,8 @@ AvatarMixerClientData* AvatarMixer::getOrCreateClientData(SharedNodePointer node
         node->setLinkedData(std::unique_ptr<NodeData> { new AvatarMixerClientData(node->getUUID()) });
         clientData = dynamic_cast<AvatarMixerClientData*>(node->getLinkedData());
         auto& avatar = clientData->getAvatar();
-        avatar.setDomainMinimumScale(_domainMinimumScale);
-        avatar.setDomainMaximumScale(_domainMaximumScale);
+        avatar.setDomainMinimumHeight(_domainMinimumHeight);
+        avatar.setDomainMaximumHeight(_domainMaximumHeight);
     }
 
     return clientData;
@@ -939,21 +939,21 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) {
 
     const QString AVATARS_SETTINGS_KEY = "avatars";
 
-    static const QString MIN_SCALE_OPTION = "min_avatar_scale";
-    float settingMinScale = domainSettings[AVATARS_SETTINGS_KEY].toObject()[MIN_SCALE_OPTION].toDouble(MIN_AVATAR_SCALE);
-    _domainMinimumScale = glm::clamp(settingMinScale, MIN_AVATAR_SCALE, MAX_AVATAR_SCALE);
+    static const QString MIN_HEIGHT_OPTION = "min_avatar_height";
+    float settingMinHeight = domainSettings[AVATARS_SETTINGS_KEY].toObject()[MIN_HEIGHT_OPTION].toDouble(MIN_AVATAR_HEIGHT);
+    _domainMinimumHeight = glm::clamp(settingMinHeight, MIN_AVATAR_HEIGHT, MAX_AVATAR_HEIGHT);
 
-    static const QString MAX_SCALE_OPTION = "max_avatar_scale";
-    float settingMaxScale = domainSettings[AVATARS_SETTINGS_KEY].toObject()[MAX_SCALE_OPTION].toDouble(MAX_AVATAR_SCALE);
-    _domainMaximumScale = glm::clamp(settingMaxScale, MIN_AVATAR_SCALE, MAX_AVATAR_SCALE);
+    static const QString MAX_HEIGHT_OPTION = "max_avatar_height";
+    float settingMaxHeight = domainSettings[AVATARS_SETTINGS_KEY].toObject()[MAX_HEIGHT_OPTION].toDouble(MAX_AVATAR_HEIGHT);
+    _domainMaximumHeight = glm::clamp(settingMaxHeight, MIN_AVATAR_HEIGHT, MAX_AVATAR_HEIGHT);
 
     // make sure that the domain owner didn't flip min and max
-    if (_domainMinimumScale > _domainMaximumScale) {
-        std::swap(_domainMinimumScale, _domainMaximumScale);
+    if (_domainMinimumHeight > _domainMaximumHeight) {
+        std::swap(_domainMinimumHeight, _domainMaximumHeight);
     }
 
-    qCDebug(avatars) << "This domain requires a minimum avatar scale of" << _domainMinimumScale
-                     << "and a maximum avatar scale of" << _domainMaximumScale;
+    qCDebug(avatars) << "This domain requires a minimum avatar height of" << _domainMinimumHeight
+                     << "and a maximum avatar height of" << _domainMaximumHeight;
 
     const QString AVATAR_WHITELIST_DEFAULT{ "" };
     static const QString AVATAR_WHITELIST_OPTION = "avatar_whitelist";

assignment-client/src/avatars/AvatarMixer.h

@@ -90,8 +90,8 @@ private:
 
     float _maxKbpsPerNode = 0.0f;
 
-    float _domainMinimumScale { MIN_AVATAR_SCALE };
-    float _domainMaximumScale { MAX_AVATAR_SCALE };
+    float _domainMinimumHeight { MIN_AVATAR_HEIGHT };
+    float _domainMaximumHeight { MAX_AVATAR_HEIGHT };
 
     RateCounter<> _broadcastRate;
     p_high_resolution_clock::time_point _lastDebugMessage;

assignment-client/src/avatars/AvatarMixerClientData.cpp

@@ -25,6 +25,23 @@ AvatarMixerClientData::AvatarMixerClientData(const QUuid& nodeID) :
     _avatar->setID(nodeID);
 }
 
+uint64_t AvatarMixerClientData::getLastOtherAvatarEncodeTime(QUuid otherAvatar) const {
+    std::unordered_map<QUuid, uint64_t>::const_iterator itr = _lastOtherAvatarEncodeTime.find(otherAvatar);
+    if (itr != _lastOtherAvatarEncodeTime.end()) {
+        return itr->second;
+    }
+    return 0;
+}
+
+void AvatarMixerClientData::setLastOtherAvatarEncodeTime(const QUuid& otherAvatar, const uint64_t& time) {
+    std::unordered_map<QUuid, uint64_t>::iterator itr = _lastOtherAvatarEncodeTime.find(otherAvatar);
+    if (itr != _lastOtherAvatarEncodeTime.end()) {
+        itr->second = time;
+    } else {
+        _lastOtherAvatarEncodeTime.emplace(std::pair<QUuid, uint64_t>(otherAvatar, time));
+    }
+}
+
 void AvatarMixerClientData::queuePacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer node) {
     if (!_packetQueue.node) {
         _packetQueue.node = node;

assignment-client/src/avatars/AvatarMixerClientData.h

@@ -91,7 +91,7 @@ public:
 
     void loadJSONStats(QJsonObject& jsonObject) const;
 
-    glm::vec3 getPosition() const { return _avatar ? _avatar->getPosition() : glm::vec3(0); }
+    glm::vec3 getPosition() const { return _avatar ? _avatar->getWorldPosition() : glm::vec3(0); }
     glm::vec3 getGlobalBoundingBoxCorner() const { return _avatar ? _avatar->getGlobalBoundingBoxCorner() : glm::vec3(0); }
     bool isRadiusIgnoring(const QUuid& other) const { return _radiusIgnoredOthers.find(other) != _radiusIgnoredOthers.end(); }
     void addToRadiusIgnoringSet(const QUuid& other) { _radiusIgnoredOthers.insert(other); }
@@ -110,16 +110,10 @@ public:
     bool getRequestsDomainListData() { return _requestsDomainListData; }
     void setRequestsDomainListData(bool requesting) { _requestsDomainListData = requesting; }
 
-    ViewFrustum getViewFrustom() const { return _currentViewFrustum; }
+    ViewFrustum getViewFrustum() const { return _currentViewFrustum; }
 
-    quint64 getLastOtherAvatarEncodeTime(QUuid otherAvatar) {
-        quint64 result = 0;
-        if (_lastOtherAvatarEncodeTime.find(otherAvatar) != _lastOtherAvatarEncodeTime.end()) {
-            result = _lastOtherAvatarEncodeTime[otherAvatar];
-        }
-        _lastOtherAvatarEncodeTime[otherAvatar] = usecTimestampNow();
-        return result;
-    }
+    uint64_t getLastOtherAvatarEncodeTime(QUuid otherAvatar) const;
+    void setLastOtherAvatarEncodeTime(const QUuid& otherAvatar, const uint64_t& time);
 
     QVector<JointData>& getLastOtherAvatarSentJoints(QUuid otherAvatar) {
         _lastOtherAvatarSentJoints[otherAvatar].resize(_avatar->getJointCount());
@@ -143,7 +137,7 @@ private:
 
     // this is a map of the last time we encoded an "other" avatar for
     // sending to "this" node
-    std::unordered_map<QUuid, quint64> _lastOtherAvatarEncodeTime;
+    std::unordered_map<QUuid, uint64_t> _lastOtherAvatarEncodeTime;
     std::unordered_map<QUuid, QVector<JointData>> _lastOtherAvatarSentJoints;
 
     uint64_t _identityChangeTimestamp;

assignment-client/src/avatars/AvatarMixerSlave.cpp

@@ -22,6 +22,7 @@
 #include <NodeList.h>
 #include <Node.h>
 #include <OctreeConstants.h>
+#include <PrioritySortUtil.h>
 #include <udt/PacketHeaders.h>
 #include <SharedUtil.h>
 #include <StDev.h>
@@ -32,7 +33,6 @@
 #include "AvatarMixerClientData.h"
 #include "AvatarMixerSlave.h"
 
-
 void AvatarMixerSlave::configure(ConstIter begin, ConstIter end) {
     _begin = begin;
     _end = end;
@@ -184,10 +184,9 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
 
 
     // setup list of AvatarData as well as maps to map betweeen the AvatarData and the original nodes
-    // for calling the AvatarData::sortAvatars() function and getting our sorted list of client nodes
-    QList<AvatarSharedPointer> avatarList;
+    std::vector<AvatarSharedPointer> avatarsToSort;
     std::unordered_map<AvatarSharedPointer, SharedNodePointer> avatarDataToNodes;
-
+    std::unordered_map<QUuid, uint64_t> avatarEncodeTimes;
     std::for_each(_begin, _end, [&](const SharedNodePointer& otherNode) {
         // make sure this is an agent that we have avatar data for before considering it for inclusion
         if (otherNode->getType() == NodeType::Agent
@@ -195,36 +194,56 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
             const AvatarMixerClientData* otherNodeData = reinterpret_cast<const AvatarMixerClientData*>(otherNode->getLinkedData());
 
             AvatarSharedPointer otherAvatar = otherNodeData->getAvatarSharedPointer();
-            avatarList << otherAvatar;
+            avatarsToSort.push_back(otherAvatar);
             avatarDataToNodes[otherAvatar] = otherNode;
+            QUuid id = otherAvatar->getSessionUUID();
+            avatarEncodeTimes[id] = nodeData->getLastOtherAvatarEncodeTime(id);
         }
     });
 
-    AvatarSharedPointer thisAvatar = nodeData->getAvatarSharedPointer();
-    ViewFrustum cameraView = nodeData->getViewFrustom();
-    std::priority_queue<AvatarPriority> sortedAvatars;
-    AvatarData::sortAvatars(avatarList, cameraView, sortedAvatars,
-                            [&](AvatarSharedPointer avatar)->uint64_t {
-        auto avatarNode = avatarDataToNodes[avatar];
-        assert(avatarNode); // we can't have gotten here without the avatarData being a valid key in the map
-        return nodeData->getLastBroadcastTime(avatarNode->getUUID());
-    }, [&](AvatarSharedPointer avatar)->float{
-        glm::vec3 nodeBoxHalfScale = (avatar->getPosition() - avatar->getGlobalBoundingBoxCorner() * avatar->getSensorToWorldScale());
-        return glm::max(nodeBoxHalfScale.x, glm::max(nodeBoxHalfScale.y, nodeBoxHalfScale.z));
-    }, [&](AvatarSharedPointer avatar)->bool {
+    class SortableAvatar: public PrioritySortUtil::Sortable {
+    public:
+        SortableAvatar() = delete;
+        SortableAvatar(const AvatarSharedPointer& avatar, uint64_t lastEncodeTime)
+            : _avatar(avatar), _lastEncodeTime(lastEncodeTime) {}
+        glm::vec3 getPosition() const override { return _avatar->getWorldPosition(); }
+        float getRadius() const override {
+            glm::vec3 nodeBoxHalfScale = (_avatar->getWorldPosition() - _avatar->getGlobalBoundingBoxCorner() * _avatar->getSensorToWorldScale());
+            return glm::max(nodeBoxHalfScale.x, glm::max(nodeBoxHalfScale.y, nodeBoxHalfScale.z));
+        }
+        uint64_t getTimestamp() const override {
+            return _lastEncodeTime;
+        }
+        const AvatarSharedPointer& getAvatar() const { return _avatar; }
+
+    private:
+        AvatarSharedPointer _avatar;
+        uint64_t _lastEncodeTime;
+    };
+
+    // prepare to sort
+    ViewFrustum cameraView = nodeData->getViewFrustum();
+    PrioritySortUtil::PriorityQueue<SortableAvatar> sortedAvatars(cameraView,
+            AvatarData::_avatarSortCoefficientSize,
+            AvatarData::_avatarSortCoefficientCenter,
+            AvatarData::_avatarSortCoefficientAge);
+
+    // ignore or sort
+    const AvatarSharedPointer& thisAvatar = nodeData->getAvatarSharedPointer();
+    for (const auto& avatar : avatarsToSort) {
         if (avatar == thisAvatar) {
-            return true; // ignore ourselves...
+            // don't echo updates to self
+            continue;
         }
 
         bool shouldIgnore = false;
-
-        // We will also ignore other nodes for a couple of different reasons:
+        // We ignore other nodes for a couple of reasons:
         //   1) ignore bubbles and ignore specific node
         //   2) the node hasn't really updated it's frame data recently, this can
         //      happen if for example the avatar is connected on a desktop and sending
         //      updates at ~30hz. So every 3 frames we skip a frame.
-        auto avatarNode = avatarDataToNodes[avatar];
 
+        auto avatarNode = avatarDataToNodes[avatar];
         assert(avatarNode); // we can't have gotten here without the avatarData being a valid key in the map
 
         const AvatarMixerClientData* avatarNodeData = reinterpret_cast<const AvatarMixerClientData*>(avatarNode->getLinkedData());
@@ -240,7 +259,6 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
             || (avatarNode->isIgnoringNodeWithID(node->getUUID()) && !getsAnyIgnored)) {
             shouldIgnore = true;
         } else {
-
             // Check to see if the space bubble is enabled
             // Don't bother with these checks if the other avatar has their bubble enabled and we're gettingAnyIgnored
             if (node->isIgnoreRadiusEnabled() || (avatarNode->isIgnoreRadiusEnabled() && !getsAnyIgnored)) {
@@ -267,8 +285,6 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
                 nodeData->removeFromRadiusIgnoringSet(node, avatarNode->getUUID());
             }
         }
-        quint64 endIgnoreCalculation = usecTimestampNow();
-        _stats.ignoreCalculationElapsedTime += (endIgnoreCalculation - startIgnoreCalculation);
 
         if (!shouldIgnore) {
             AvatarDataSequenceNumber lastSeqToReceiver = nodeData->getLastBroadcastSequenceNumber(avatarNode->getUUID());
@@ -292,20 +308,26 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
                 ++numAvatarsWithSkippedFrames;
             }
         }
-        return shouldIgnore;
-    });
+        quint64 endIgnoreCalculation = usecTimestampNow();
+        _stats.ignoreCalculationElapsedTime += (endIgnoreCalculation - startIgnoreCalculation);
+
+        if (!shouldIgnore) {
+            // sort this one for later
+            uint64_t lastEncodeTime = 0;
+            std::unordered_map<QUuid, uint64_t>::const_iterator itr = avatarEncodeTimes.find(avatar->getSessionUUID());
+            if (itr != avatarEncodeTimes.end()) {
+                lastEncodeTime = itr->second;
+            }
+            sortedAvatars.push(SortableAvatar(avatar, lastEncodeTime));
+        }
+    }
 
     // loop through our sorted avatars and allocate our bandwidth to them accordingly
-    int avatarRank = 0;
 
-    // this is overly conservative, because it includes some avatars we might not consider
     int remainingAvatars = (int)sortedAvatars.size();
-
     while (!sortedAvatars.empty()) {
-        AvatarPriority sortData = sortedAvatars.top();
+        const auto& avatarData = sortedAvatars.top().getAvatar();
         sortedAvatars.pop();
-        const auto& avatarData = sortData.avatar;
-        avatarRank++;
         remainingAvatars--;
 
         auto otherNode = avatarDataToNodes[avatarData];
@@ -332,10 +354,8 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
             nodeData->setLastBroadcastTime(otherNode->getUUID(), usecTimestampNow());
         }
 
+        // determine if avatar is in view which determines how much data to send
         glm::vec3 otherPosition = otherAvatar->getClientGlobalPosition();
-
-        
-        // determine if avatar is in view, to determine how much data to include...
         glm::vec3 otherNodeBoxScale = (otherPosition - otherNodeData->getGlobalBoundingBoxCorner()) * 2.0f * otherAvatar->getSensorToWorldScale();
         AABox otherNodeBox(otherNodeData->getGlobalBoundingBoxCorner(), otherNodeBoxScale);
         bool isInView = nodeData->otherAvatarInView(otherNodeBox);
@@ -405,14 +425,18 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
                 // set the last sent sequence number for this sender on the receiver
                 nodeData->setLastBroadcastSequenceNumber(otherNode->getUUID(),
                                                          otherNodeData->getLastReceivedSequenceNumber());
+                nodeData->setLastOtherAvatarEncodeTime(otherNode->getUUID(), usecTimestampNow());
             }
+        } else {
+            // TODO? this avatar is not included now, and will probably not be included next frame.
+            // It would be nice if we could tweak its future sort priority to put it at the back of the list.
         }
 
         avatarPacketList->endSegment();
 
         quint64 endAvatarDataPacking = usecTimestampNow();
         _stats.avatarDataPackingElapsedTime += (endAvatarDataPacking - startAvatarDataPacking);
-    };
+    }
 
     quint64 startPacketSending = usecTimestampNow();
 

assignment-client/src/avatars/ScriptableAvatar.cpp

@@ -20,7 +20,7 @@
 
 
 QByteArray ScriptableAvatar::toByteArrayStateful(AvatarDataDetail dataDetail, bool dropFaceTracking) {
-    _globalPosition = getPosition();
+    _globalPosition = getWorldPosition();
     return AvatarData::toByteArrayStateful(dataDetail);
 }
 

assignment-client/src/entities/EntityServer.cpp

@@ -477,7 +477,7 @@ void EntityServer::startDynamicDomainVerification() {
                 QNetworkRequest networkRequest;
                 networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
                 networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-                QUrl requestURL = NetworkingConstants::METAVERSE_SERVER_URL;
+                QUrl requestURL = NetworkingConstants::METAVERSE_SERVER_URL();
                 requestURL.setPath("/api/v1/commerce/proof_of_purchase_status/location");
                 QJsonObject request;
                 request["certificate_id"] = i.key();

assignment-client/src/entities/EntityTreeSendThread.cpp

@@ -23,6 +23,17 @@ EntityTreeSendThread::EntityTreeSendThread(OctreeServer* myServer, const SharedN
 {
     connect(std::static_pointer_cast<EntityTree>(myServer->getOctree()).get(), &EntityTree::editingEntityPointer, this, &EntityTreeSendThread::editingEntityPointer, Qt::QueuedConnection);
     connect(std::static_pointer_cast<EntityTree>(myServer->getOctree()).get(), &EntityTree::deletingEntityPointer, this, &EntityTreeSendThread::deletingEntityPointer, Qt::QueuedConnection);
+
+    // connect to connection ID change on EntityNodeData so we can clear state for this receiver
+    auto nodeData = static_cast<EntityNodeData*>(node->getLinkedData());
+    connect(nodeData, &EntityNodeData::incomingConnectionIDChanged, this, &EntityTreeSendThread::resetState);
+}
+
+void EntityTreeSendThread::resetState() {
+    qCDebug(entities) << "Clearing known EntityTreeSendThread state for" << _nodeUuid;
+
+    _knownState.clear();
+    _traversal.reset();
 }
 
 void EntityTreeSendThread::preDistributionProcessing() {

assignment-client/src/entities/EntityTreeSendThread.h

@@ -33,6 +33,9 @@ protected:
     void traverseTreeAndSendContents(SharedNodePointer node, OctreeQueryNode* nodeData,
             bool viewFrustumChanged, bool isFullScene) override;
 
+private slots:
+    void resetState(); // clears our known state forcing entities to appear unsent
+
 private:
     // the following two methods return booleans to indicate if any extra flagged entities were new additions to set
     bool addAncestorsToExtraFlaggedEntities(const QUuid& filteredEntityID, EntityItem& entityItem, EntityNodeData& nodeData);

assignment-client/src/octree/OctreeSendThread.cpp

@@ -82,8 +82,12 @@ bool OctreeSendThread::process() {
         if (auto node = _node.lock()) {
             OctreeQueryNode* nodeData = static_cast<OctreeQueryNode*>(node->getLinkedData());
 
-            // Sometimes the node data has not yet been linked, in which case we can't really do anything
-            if (nodeData && !nodeData->isShuttingDown()) {
+            // If we don't have the OctreeQueryNode at all
+            // or it's uninitialized because we haven't received a query yet from the client
+            // or we don't know where we should send packets for this node
+            // or we're shutting down
+            // then we can't send an entity data packet
+            if (nodeData && nodeData->hasReceivedFirstQuery() && node->getActiveSocket() && !nodeData->isShuttingDown()) {
                 bool viewFrustumChanged = nodeData->updateCurrentViewFrustum();
                 packetDistributor(node, nodeData, viewFrustumChanged);
             }

assignment-client/src/octree/OctreeSendThread.h

@@ -59,7 +59,8 @@ protected:
     OctreePacketData _packetData;
     QWeakPointer<Node> _node;
     OctreeServer* _myServer { nullptr };
-
+    QUuid _nodeUuid;
+    
 private:
     /// Called before a packetDistributor pass to allow for pre-distribution processing
     virtual void preDistributionProcessing() {};
@@ -71,8 +72,6 @@ private:
     virtual void preStartNewScene(OctreeQueryNode* nodeData, bool isFullScene);
     virtual bool shouldTraverseAndSend(OctreeQueryNode* nodeData) { return hasSomethingToSend(nodeData); }
 
-    QUuid _nodeUuid;
-
     int _truePacketsSent { 0 }; // available for debug stats
     int _trueBytesSent { 0 }; // available for debug stats
     int _packetsSentThisInterval { 0 }; // used for bandwidth throttle condition

cmake/externals/hifiAudioCodec/CMakeLists.txt

@@ -5,43 +5,41 @@ set(EXTERNAL_NAME hifiAudioCodec)
 
 string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 
-if (NOT ANDROID)
-
-  if (WIN32 OR APPLE)
-    ExternalProject_Add(
-      ${EXTERNAL_NAME}
-      URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-1.zip
-      URL_MD5 23ec3fe51eaa155ea159a4971856fc13
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND ""
-      INSTALL_COMMAND ""
-      LOG_DOWNLOAD 1
-    )
-  else ()
-    ExternalProject_Add(
-      ${EXTERNAL_NAME}
-      URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-linux.zip
-      URL_MD5 7d37914a18aa4de971d2f45dd3043bde
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND ""
-      INSTALL_COMMAND ""
-      LOG_DOWNLOAD 1
-    )
-  endif()
-
-  # 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}/include CACHE TYPE INTERNAL)
-
-  if (WIN32)
-    set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/audio.lib CACHE TYPE INTERNAL)
-  elseif(APPLE)
-    set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL)
-  elseif(NOT ANDROID)
-    set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL)
-  endif()
-
+if (WIN32)
+  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-win-2.0.zip)
+  set(DOWNLOAD_MD5 9199d4dbd6b16bed736b235efe980e67)
+elseif (APPLE)
+  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-mac-2.0.zip)
+  set(DOWNLOAD_MD5 21649881e7d5dc94f922179be96f76ba)
+elseif (ANDROID)
+  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-android-2.0.zip)
+  set(DOWNLOAD_MD5 aef2a852600d498d58aa586668191683)
+elseif (UNIX)
+  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-linux-2.0.zip)
+  set(DOWNLOAD_MD5 67fb7755f9bcafb98a9fceea53bc7481)
+else()
+  return()
+endif()
+
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  URL ${DOWNLOAD_URL}
+  URL_MD5 ${DOWNLOAD_MD5}
+  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}/include CACHE TYPE INTERNAL)
+
+if (WIN32)
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/audio.lib CACHE TYPE INTERNAL)
+else()
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL)
 endif()

cmake/macros/GenerateInstallers.cmake

@@ -29,10 +29,6 @@ macro(GENERATE_INSTALLERS)
 
 
   if (WIN32)
-    # Do not install the Visual Studio C runtime libraries.  The installer will do this automatically
-    set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
-    
-    include(InstallRequiredSystemLibraries)
     set(CPACK_NSIS_MUI_ICON "${HF_CMAKE_DIR}/installer/installer.ico")
 
     # install and reference the Add/Remove icon
@@ -49,6 +45,10 @@ macro(GENERATE_INSTALLERS)
     set(_UNINSTALLER_HEADER_BAD_PATH "${HF_CMAKE_DIR}/installer/uninstaller-header.bmp")
     set(UNINSTALLER_HEADER_IMAGE "")
     fix_path_for_nsis(${_UNINSTALLER_HEADER_BAD_PATH} UNINSTALLER_HEADER_IMAGE)
+
+    # grab the latest VC redist (2017) and add it to the installer, our NSIS template
+    # will call it during the install
+    install(CODE "file(DOWNLOAD https://go.microsoft.com/fwlink/?LinkId=746572 \"\${CMAKE_INSTALL_PREFIX}/vcredist_x64.exe\")")
   elseif (APPLE)
     # produce a drag and drop DMG on OS X
     set(CPACK_GENERATOR "DragNDrop")
@@ -84,4 +84,3 @@ macro(GENERATE_INSTALLERS)
 
   include(CPack)
 endmacro()
-

cmake/macros/SetFromEnv.cmake

@@ -0,0 +1,17 @@
+# 
+#  Created by Bradley Austin Davis on 2017/11/27
+#  Copyright 2013-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
+# 
+
+function(set_from_env _RESULT_NAME _ENV_VAR_NAME _DEFAULT_VALUE)
+    if (NOT DEFINED ${_RESULT_NAME}) 
+        if ("$ENV{${_ENV_VAR_NAME}}" STREQUAL "")
+            set (${_RESULT_NAME} ${_DEFAULT_VALUE} PARENT_SCOPE)
+        else()
+            set (${_RESULT_NAME} $ENV{${_ENV_VAR_NAME}} PARENT_SCOPE)
+        endif()
+    endif()
+endfunction()

cmake/macros/SetPackagingParameters.cmake

@@ -15,13 +15,14 @@ macro(SET_PACKAGING_PARAMETERS)
   set(PR_BUILD 0)
   set(PRODUCTION_BUILD 0)
   set(DEV_BUILD 0)
-
-  set(RELEASE_TYPE $ENV{RELEASE_TYPE})
-  set(RELEASE_NUMBER $ENV{RELEASE_NUMBER})
-  string(TOLOWER "$ENV{BRANCH}" BUILD_BRANCH)
   set(BUILD_GLOBAL_SERVICES "DEVELOPMENT")
   set(USE_STABLE_GLOBAL_SERVICES 0)
 
+  set_from_env(RELEASE_TYPE RELEASE_TYPE "DEV")
+  set_from_env(RELEASE_NUMBER RELEASE_NUMBER "")
+  set_from_env(BUILD_BRANCH BRANCH "")
+  string(TOLOWER "${BUILD_BRANCH}" BUILD_BRANCH)
+
   message(STATUS "The BUILD_BRANCH variable is: ${BUILD_BRANCH}")
   message(STATUS "The BRANCH environment variable is: $ENV{BRANCH}")
   message(STATUS "The RELEASE_TYPE variable is: ${RELEASE_TYPE}")

cmake/macros/SetupQt.cmake

@@ -1,21 +1,11 @@
 # 
-#  Copyright 2015 High Fidelity, Inc.
-#  Created by Bradley Austin Davis on 2015/10/10
+#  Created by Bradley Austin Davis on 2017/09/02
+#  Copyright 2013-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
 # 
 
-function(set_from_env _RESULT_NAME _ENV_VAR_NAME _DEFAULT_VALUE)
-    if (NOT DEFINED ${_RESULT_NAME}) 
-        if ("$ENV{${_ENV_VAR_NAME}}" STREQUAL "")
-            set (${_RESULT_NAME} ${_DEFAULT_VALUE} PARENT_SCOPE)
-        else()
-            set (${_RESULT_NAME} $ENV{${_ENV_VAR_NAME}} PARENT_SCOPE)
-        endif()
-    endif()
-endfunction()
-
 # Construct a default QT location from a root path, a version and an architecture
 function(calculate_default_qt_dir _RESULT_NAME)
     if (ANDROID)

cmake/macros/TargetBullet.cmake

@@ -6,8 +6,19 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 # 
 macro(TARGET_BULLET)
-    add_dependency_external_projects(bullet)
-    find_package(Bullet REQUIRED)
+    if (ANDROID)
+        set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/bullet)
+        set(BULLET_INCLUDE_DIRS "${INSTALL_DIR}/include/bullet" CACHE TYPE INTERNAL)
+
+        set(LIB_DIR ${INSTALL_DIR}/lib)
+        list(APPEND BULLET_LIBRARIES ${LIB_DIR}/libBulletDynamics.a)
+        list(APPEND BULLET_LIBRARIES ${LIB_DIR}/libBulletCollision.a)
+        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
     if (APPLE)
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${BULLET_INCLUDE_DIRS}")
@@ -16,3 +27,5 @@ macro(TARGET_BULLET)
     endif()
     target_link_libraries(${TARGET_NAME} ${BULLET_LIBRARIES})
 endmacro()
+
+

cmake/macros/TargetDraco.cmake

@@ -0,0 +1,18 @@
+macro(TARGET_DRACO)
+    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)
+    else()
+        add_dependency_external_projects(draco)
+        find_package(Draco REQUIRED)
+        list(APPEND DRACO_LIBRARIES ${DRACO_LIBRARY})
+        list(APPEND DRACO_LIBRARIES ${DRACO_ENCODER_LIBRARY})
+    endif()
+    target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${DRACO_INCLUDE_DIRS})
+    target_link_libraries(${TARGET_NAME} ${DRACO_LIBRARIES})
+endmacro()

cmake/macros/TargetGoogleVR.cmake

@@ -0,0 +1,14 @@
+# 
+#  Created by Bradley Austin Davis on 2017/11/28
+#  Copyright 2013-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
+# 
+macro(TARGET_GOOGLEVR)
+    if (ANDROID)
+        set(GVR_ROOT "${HIFI_ANDROID_PRECOMPILED}/gvr/gvr-android-sdk-1.101.0/")
+    	target_include_directories(native-lib PRIVATE  "${GVR_ROOT}/libraries/headers")
+        target_link_libraries(native-lib "${GVR_ROOT}/libraries/libgvr.so")
+    endif()
+endmacro()

cmake/macros/TargetOpenSSL.cmake

@@ -6,14 +6,10 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 #
 macro(TARGET_OPENSSL)
-    
     if (ANDROID)
-
-        # FIXME use a distributable binary
-        set(OPENSSL_INSTALL_DIR C:/Android/openssl)
+        set(OPENSSL_INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/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()
 
         find_package(OpenSSL REQUIRED)
@@ -28,5 +24,4 @@ macro(TARGET_OPENSSL)
 
     include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
     target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES})
-
 endmacro()

cmake/macros/TargetPolyvox.cmake

@@ -0,0 +1,24 @@
+# 
+#  Created by Bradley Austin Davis on 2017/11/28
+#  Copyright 2013-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
+# 
+macro(TARGET_POLYVOX)
+    if (ANDROID)
+        set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/polyvox)
+        set(POLYVOX_INCLUDE_DIRS "${INSTALL_DIR}/include" CACHE TYPE INTERNAL)
+        set(LIB_DIR ${INSTALL_DIR}/lib)
+        list(APPEND POLYVOX_LIBRARIES ${LIB_DIR}/libPolyVoxUtil.so)
+        list(APPEND POLYVOX_LIBRARIES ${LIB_DIR}/Release/libPolyVoxCore.so)
+    else()
+        add_dependency_external_projects(polyvox)
+        find_package(PolyVox REQUIRED)
+    endif()
+    target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${POLYVOX_INCLUDE_DIRS})
+    target_link_libraries(${TARGET_NAME} ${POLYVOX_LIBRARIES})
+endmacro()
+
+
+

cmake/macros/TargetTBB.cmake

@@ -8,10 +8,10 @@
 macro(TARGET_TBB)
 
 if (ANDROID)
-    set(TBB_INSTALL_DIR C:/tbb-2018/built)
-    set(TBB_LIBRARY ${HIFI_ANDROID_PRECOMPILED}/libtbb.so CACHE FILEPATH "TBB library location")
-    set(TBB_MALLOC_LIBRARY ${HIFI_ANDROID_PRECOMPILED}/libtbbmalloc.so CACHE FILEPATH "TBB malloc library location")
-    set(TBB_INCLUDE_DIRS ${TBB_INSTALL_DIR}/include CACHE TYPE "List of tbb include directories" CACHE FILEPATH "TBB includes location")
+    set(TBB_INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/tbb)
+    set(TBB_INCLUDE_DIRS ${TBB_INSTALL_DIR}/include CACHE FILEPATH "TBB includes location")
+    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()
     add_dependency_external_projects(tbb)

cmake/templates/FixupBundlePostBuild.cmake.in

@@ -45,5 +45,4 @@ else()
 endif()
 
 file(GLOB EXTRA_PLUGINS "${BUNDLE_PLUGIN_DIR}/*.${PLUGIN_EXTENSION}")
-fixup_bundle("${BUNDLE_EXECUTABLE}" "${EXTRA_PLUGINS}" "@FIXUP_LIBS@")
-
+fixup_bundle("${BUNDLE_EXECUTABLE}" "${EXTRA_PLUGINS}" "@FIXUP_LIBS@" IGNORE_ITEM "vcredist_x86.exe;vcredist_x64.exe")

domain-server/resources/describe-settings.json

@@ -1,5 +1,5 @@
 {
-  "version": 2.0,
+  "version": 2.1,
   "settings": [
     {
       "name": "label",
@@ -916,6 +916,14 @@
               "default": false
             }
           ]
+        },
+        {
+          "name": "multi_kick_logged_in",
+          "type": "checkbox",
+          "label": "Multi-Kick for Logged In Users",
+          "help": "Kick logged in users by machine fingerprint (in addition to the default kick by username)",
+          "default": false,
+          "advanced": true
         }
       ]
     },
@@ -1007,20 +1015,20 @@
       "assignment-types": [ 1, 2 ],
       "settings": [
         {
-          "name": "min_avatar_scale",
+          "name": "min_avatar_height",
           "type": "double",
-          "label": "Minimum Avatar Scale",
-          "help": "Limits the scale of avatars in your domain. Must be at least 0.005.",
-          "placeholder": 0.25,
-          "default": 0.25
+          "label": "Minimum Avatar Height (meters)",
+          "help": "Limits the height of avatars in your domain. Must be at least 0.009.",
+          "placeholder": 0.4,
+          "default": 0.4
         },
         {
-          "name": "max_avatar_scale",
+          "name": "max_avatar_height",
           "type": "double",
-          "label": "Maximum Avatar Scale",
-          "help": "Limits the scale of avatars in your domain. Cannot be greater than 1000.",
-          "placeholder": 3.0,
-          "default": 3.0
+          "label": "Maximum Avatar Height (meters)",
+          "help": "Limits the scale of avatars in your domain. Cannot be greater than 1755.",
+          "placeholder": 5.2,
+          "default": 5.2
         },
         {
           "name": "avatar_whitelist",

domain-server/resources/web/content/index.shtml

@@ -19,12 +19,13 @@
               Upload an entities file (e.g.: models.json.gz) to replace the content of this domain.<br>
               Note: <strong>Your domain's content will be replaced by the content you upload</strong>, but the backup files of your domain's content will not immediately be changed.
             </p>
-            <p>
-              If your domain has any content that you would like to re-use at a later date, save a manual backup of your models.json.gz file, which is usually stored at the following paths:<br>
-              <pre>C:/Users/[username]/AppData/Roaming/High Fidelity/assignment-client/entities/models.json.gz</pre>
-              <pre>/Users/[username]/Library/Application Support/High Fidelity/assignment-client/entities/models.json.gz</pre>
-              <pre>/home/[username]/.local/share/High Fidelity/assignment-client/entities/models.json.gz</pre>
-            </p>
+            <p>If your domain has any content that you would like to re-use at a later date, save a manual backup of your models.json.gz file, which is usually stored at the following paths:</p>
+            <label class="control-label">Windows</label>
+            <pre>C:/Users/[username]/AppData/Roaming/High Fidelity/assignment-client/entities/models.json.gz</pre>
+            <label class="control-label">OSX</label>
+            <pre>/Users/[username]/Library/Application Support/High Fidelity/assignment-client/entities/models.json.gz</pre>
+            <label class="control-label">Linux</label>
+            <pre>/home/[username]/.local/share/High Fidelity/assignment-client/entities/models.json.gz</pre>
             <br>
             <input type="file" name="entities-file" class="form-control-file" accept=".json, .gz">
             <br>

domain-server/resources/web/css/style.css

@@ -1,3 +1,17 @@
+/* cairo-regular - latin */
+@font-face {
+  font-family: 'Cairo';
+  font-style: normal;
+  font-weight: 400;
+  src: url('/fonts/cairo-v2-latin-regular.eot'); /* IE9 Compat Modes */
+  src: local('Cairo'), local('Cairo-Regular'),
+       url('/fonts/cairo-v2-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('/fonts/cairo-v2-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('/fonts/cairo-v2-latin-regular.woff') format('woff'), /* Modern Browsers */
+       url('/fonts/cairo-v2-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('/fonts/cairo-v2-latin-regular.svg#Cairo') format('svg'); /* Legacy iOS */
+}
+
 body {
   position: relative;
   padding-bottom: 30px;
@@ -80,11 +94,23 @@ span.port {
   display: none;
 }
 
-#setup-sidebar.affix {
-  /* This overrides a case where going to the bottom of the page,
-   * then scrolling up, causes `position: relative` to be added to the style
-   */
-  position: fixed !important;
+@media (min-width: 768px) {
+  #setup-sidebar.affix {
+    /* This overrides a case where going to the bottom of the page,
+     * then scrolling up, causes `position: relative` to be added to the style
+     */
+    position: fixed !important;
+  }
+}
+
+@media (max-width: 767px) {
+  #setup-sidebar.affix {
+    position: static !important;
+  }
+
+  #setup-sidebar {
+    margin-bottom: 20px;
+  }
 }
 
 #setup-sidebar button {
@@ -302,17 +328,17 @@ table .headers + .headers td {
 }
 
 .account-connected-header {
+  vertical-align: middle;
   color: #6FCF97;
   font-size: 30px;
   margin-right: 20px;
 }
 
-#visit-domain-link,
 .blue-link {
   font-size: 14px;
   text-decoration-line: underline;
   font-weight: normal;
-  color: #2F80ED;
+  color: #00B3F8;
 }
 
 #manage-cloud-domains-link {

domain-server/resources/web/fonts/cairo-v2-latin-regular.svg

@@ -0,0 +1 @@
+<!DOCTYPE html><html lang=en><meta charset=utf-8><meta name=viewport content="initial-scale=1, minimum-scale=1, width=device-width"><title>Error 500 (Server Error)!!1</title><style>*{margin:0;padding:0}html,code{font:15px/22px arial,sans-serif}html{background:#fff;color:#222;padding:15px}body{color:#222;text-align:unset;margin:7% auto 0;max-width:390px;min-height:180px;padding:30px 0 15px;}* > body{background:url(//www.google.com/images/errors/robot.png) 100% 5px no-repeat;padding-right:205px}p{margin:11px 0 22px;overflow:hidden}pre{white-space:pre-wrap;}ins{color:#777;text-decoration:none}a img{border:0}@media screen and (max-width:772px){body{background:none;margin-top:0;max-width:none;padding-right:0}}#logo{background:url(//www.google.com/images/branding/googlelogo/1x/googlelogo_color_150x54dp.png) no-repeat;margin-left:-5px}@media only screen and (min-resolution:192dpi){#logo{background:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) no-repeat 0% 0%/100% 100%;-moz-border-image:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) 0}}@media only screen and (-webkit-min-device-pixel-ratio:2){#logo{background:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) no-repeat;-webkit-background-size:100% 100%}}#logo{display:inline-block;height:54px;width:150px}</style><div id="af-error-container"><a href=//www.google.com><span id=logo aria-label=Google></span></a><p><b>500.</b> <ins>That’s an error.</ins><p>There was an error. Please try again later. <ins>That’s all we know.</ins></div>

domain-server/resources/web/header.html

@@ -39,7 +39,7 @@
             <li><a href="/settings/">Settings</a></li>
           </ul>
           <ul class="nav navbar-right navbar-nav">
-            <li><a id="visit-domain-link" target="_blank" style="display: none;">Visit domain in VR</a></li>
+            <li><a id="visit-domain-link" class="blue-link" target="_blank" style="display: none;">Visit domain in VR</a></li>
             <li><a href="#" id="restart-server"><span class="glyphicon glyphicon-refresh"></span> Restart</a></li>
           </ul>
         </div>

domain-server/resources/web/images/checkmark.svg

@@ -1,25 +0,0 @@
-<svg width="676" height="676" viewBox="0 0 676 676" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<title>CongratulationImage</title>
-<desc>Created using Figma</desc>
-<g id="Canvas" transform="matrix(4 0 0 4 -21208 -17980)">
-<g id="CongratulationImage">
-<g id="Ellipse">
-<use xlink:href="#path0_fill" transform="translate(5302 4495)" fill="#FFFFFF"/>
-<mask id="mask0_outline_ins">
-<use xlink:href="#path0_fill" fill="white" transform="translate(5302 4495)"/>
-</mask>
-<g mask="url(#mask0_outline_ins)">
-<use xlink:href="#path1_stroke_2x" transform="translate(5302 4495)" fill="#219653"/>
-</g>
-</g>
-<g id="Vector 2">
-<use xlink:href="#path2_stroke" transform="translate(5355 4559)" fill="#219653"/>
-</g>
-</g>
-</g>
-<defs>
-<path id="path0_fill" d="M 169 84.5C 169 131.168 131.168 169 84.5 169C 37.8319 169 0 131.168 0 84.5C 0 37.8319 37.8319 0 84.5 0C 131.168 0 169 37.8319 169 84.5Z"/>
-<path id="path1_stroke_2x" d="M 154 84.5C 154 122.884 122.884 154 84.5 154L 84.5 184C 139.452 184 184 139.452 184 84.5L 154 84.5ZM 84.5 154C 46.1162 154 15 122.884 15 84.5L -15 84.5C -15 139.452 29.5477 184 84.5 184L 84.5 154ZM 15 84.5C 15 46.1162 46.1162 15 84.5 15L 84.5 -15C 29.5477 -15 -15 29.5477 -15 84.5L 15 84.5ZM 84.5 15C 122.884 15 154 46.1162 154 84.5L 184 84.5C 184 29.5477 139.452 -15 84.5 -15L 84.5 15Z"/>
-<path id="path2_stroke" d="M 5.18747 19.8031C 2.19593 16.9382 -2.5517 17.0408 -5.41666 20.0323C -8.28162 23.0238 -8.17901 27.7715 -5.18747 30.6364L 5.18747 19.8031ZM 20.6541 45L 15.4667 50.4167C 18.3816 53.2083 22.9831 53.1924 25.8787 50.3809L 20.6541 45ZM 72.2246 5.38085C 75.1964 2.49539 75.2663 -2.25283 72.3809 -5.2246C 69.4954 -8.19636 64.7472 -8.26632 61.7754 -5.38085L 72.2246 5.38085ZM -5.18747 30.6364L 15.4667 50.4167L 25.8416 39.5833L 5.18747 19.8031L -5.18747 30.6364ZM 25.8787 50.3809L 72.2246 5.38085L 61.7754 -5.38085L 15.4295 39.6191L 25.8787 50.3809Z"/>
-</defs>
-</svg>

domain-server/resources/web/images/copy-icon.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 576 576" style="enable-background:new 0 0 576 576;" xml:space="preserve">
+<path d="M329.7,410.7H127.8c-42.1,0-76.4-34.3-76.4-76.4V132.4c0-42.1,34.3-76.4,76.4-76.4h201.9c42.1,0,76.4,34.3,76.4,76.4v201.9
+	C406.1,376.4,371.8,410.7,329.7,410.7z M127.8,98.9c-18.5,0-33.5,15-33.5,33.5v201.9c0,18.5,15,33.5,33.5,33.5h201.9
+	c18.5,0,33.5-15,33.5-33.5V132.4c0-18.5-15-33.5-33.5-33.5H127.8z"/>
+<path d="M449.4,519H407c-11.9,0-21.5-9.6-21.5-21.5s9.6-21.5,21.5-21.5h42.4c11.9,0,21.5,9.6,21.5,21.5S461.3,519,449.4,519z
+	 M305.1,519H263c-11.9,0-21.5-9.6-21.5-21.5s9.6-21.5,21.5-21.5h42.2c11.9,0,21.5,9.6,21.5,21.5S317,519,305.1,519z M192.4,464.1
+	c-11.9,0-21.5-9.6-21.5-21.4v-42.2c0-11.9,9.6-21.5,21.5-21.5c11.9,0,21.5,9.6,21.5,21.5v42.1C213.8,454.5,204.2,464.1,192.4,464.1z
+	 M504.1,448.2c-11.9,0-21.5-9.6-21.5-21.5v-42.2c0-11.9,9.6-21.5,21.5-21.5c11.9,0,21.5,9.6,21.5,21.5v42.2
+	C525.6,438.6,516,448.2,504.1,448.2z M192.4,320.1c-11.9,0-21.5-9.6-21.5-21.5v-42.2c0-11.9,9.6-21.5,21.5-21.5
+	c11.9,0,21.5,9.6,21.5,21.5v42.2C213.8,310.5,204.2,320.1,192.4,320.1z M504.1,304.1c-11.9,0-21.5-9.6-21.5-21.5v-42
+	c0-11.9,9.6-21.6,21.5-21.6c11.9,0,21.5,9.5,21.5,21.4v42.2C525.6,294.5,516,304.1,504.1,304.1z M433.4,207.2h-42.2
+	c-11.9,0-21.5-9.6-21.5-21.5s9.6-21.5,21.5-21.5h42.2c11.9,0,21.5,9.6,21.5,21.5S445.3,207.2,433.4,207.2z M289.3,207.2h-42.1
+	c-11.9,0-21.5-9.6-21.5-21.5s9.6-21.5,21.4-21.5h42.2c11.9,0,21.5,9.6,21.5,21.5S301.2,207.2,289.3,207.2z"/>
+</svg>

domain-server/resources/web/js/shared.js

@@ -62,26 +62,25 @@ var Strings = {
   // dialog with new path still set, allowing them to retry immediately, and without
   // having to type the new path in again.
   EDIT_PLACE_TITLE: "Modify Viewpoint or Path",
-  EDIT_PLACE_ERROR: "Failed to update place path. Please try again.",
+  EDIT_PLACE_ERROR: "Failed to update Viewpoint or Path for this Place Name. Please try again.",
   EDIT_PLACE_CONFIRM_BUTTON: "Save",
   EDIT_PLACE_CONFIRM_BUTTON_PENDING: "Saving...",
   EDIT_PLACE_CANCEL_BUTTON: "Cancel",
 
-  REMOVE_PLACE_TITLE: "Are you sure you want to remove <strong>{{place}}</strong>?",
-  REMOVE_PLACE_ERROR: "Failed to remove place. Please try again.",
-  REMOVE_PLACE_DELETE_BUTTON: "Delete",
+  REMOVE_PLACE_TITLE: "Are you sure you want to remove <strong>{{place}}</strong> and its path information?",
+  REMOVE_PLACE_ERROR: "Failed to remove Place Name and its Path information.",
+  REMOVE_PLACE_DELETE_BUTTON: "This action removes your Place Name",
   REMOVE_PLACE_DELETE_BUTTON_PENDING: "Deleting...",
   REMOVE_PLACE_CANCEL_BUTTON: "Cancel",
 
   ADD_PLACE_TITLE: "Choose a place",
-  ADD_PLACE_MESSAGE: "Choose the High Fidelity place to point at this domain server.",
-  ADD_PLACE_CONFIRM_BUTTON: "Choose place",
+  ADD_PLACE_MESSAGE: "Choose a Place Name that you own or register a new Place Name.",
+  ADD_PLACE_CONFIRM_BUTTON: "Save",
   ADD_PLACE_CONFIRM_BUTTON_PENDING: "Saving...",
   ADD_PLACE_CANCEL_BUTTON: "Cancel",
-  ADD_PLACE_UNKNOWN_ERROR: "There was an error adding this place name.",
+  ADD_PLACE_UNKNOWN_ERROR: "There was an error adding this Place Name. Try saving again",
 
-  ADD_PLACE_NO_PLACES_MESSAGE: "<p>You do not have any places in your High Fidelity account."
-      + "<br/><br/>Go to your <a href='https://metaverse.highfidelity.com/user/places/new'>places page</a> to create a new one. Once your place is created re-open this dialog to select it.</p>",
+  ADD_PLACE_NO_PLACES_MESSAGE: "You don't have any Place Names registered. Once you have a Place Name, reopen this window to select it.",
   ADD_PLACE_NO_PLACES_BUTTON: "Create new place",
   ADD_PLACE_UNABLE_TO_LOAD_ERROR: "We were unable to load your place names. Please try again later.",
   ADD_PLACE_LOADING_DIALOG: "Loading your places...",
@@ -236,7 +235,7 @@ function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAd
 
               if (forcePathTo === undefined || forcePathTo === null) {
                 var path = "<div class='form-group'>";
-                path += "<label for='place-path-input' class='control-label'>Path</label>";
+                path += "<label for='place-path-input' class='control-label'>Path or Viewpoint</label>";
                 path += "<input type='text' id='place-path-input' class='form-control' value='/'>";
                 path += "</div>";
                 modal_body.append($(path));
@@ -339,7 +338,6 @@ function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAd
                         $('.add-place-confirm-button').html(Strings.ADD_PLACE_CONFIRM_BUTTON);
                         $('.add-place-cancel-button').removeAttr('disabled');
                         bootbox.alert(Strings.ADD_PLACE_UNKNOWN_ERROR);
-                        bootbox.alert("FAIL");
                       });
                     }
                   }
@@ -363,7 +361,8 @@ function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAd
               title: Strings.ADD_PLACE_TITLE,
               message: modal_body,
               closeButton: false,
-              buttons: modal_buttons
+              buttons: modal_buttons,
+              onEscape: true
             });
           } else {
             bootbox.alert(Strings.ADD_PLACE_UNABLE_TO_LOAD_ERROR);

domain-server/resources/web/settings/index.shtml

@@ -36,11 +36,6 @@
     </div>
 
     <div class="col-md-9 col-sm-9 col-xs-12">
-
-      <div id="xs-advanced-container" class="col-xs-12 hidden-sm hidden-md hidden-lg">
-        <button id="advanced-toggle-button-xs" class="btn btn-info advanced-toggle">Show advanced</button>
-      </div>
-
       <div class="col-xs-12">
 
         <div id="cloud-domains-alert" class="alert alert-info alert-dismissible" role="alert" style="display: none;">

domain-server/resources/web/settings/js/settings.js

@@ -503,7 +503,7 @@ function showDomainCreationAlert(justConnected) {
   swal({
     title: 'Create new domain ID',
     type: 'input',
-    text: 'Enter a short description for this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>',
+    text: 'Enter a label this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>',
     showCancelButton: true,
     confirmButtonText: "Create",
     closeOnConfirm: false,
@@ -527,13 +527,12 @@ function showDomainCreationAlert(justConnected) {
 function createNewDomainID(label, justConnected) {
   // get the JSON object ready that we'll use to create a new domain
   var domainJSON = {
-   "label": label
-    //"access_token": $(Settings.ACCESS_TOKEN_SELECTOR).val()
+    "label": label
   }
 
   $.post("/api/domains", domainJSON, function(data){
     // we successfully created a domain ID, set it on that field
-    var domainID = data.domain_id;
+    var domainID = data.domain.id;
     console.log("Setting domain id to ", data, domainID);
     $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
 
@@ -620,18 +619,14 @@ function parseJSONResponse(xhr) {
 
 function showOrHideLabel() {
   var type = getCurrentDomainIDType();
-  if (!accessTokenIsSet() || (type !== DOMAIN_ID_TYPE_FULL && type !== DOMAIN_ID_TYPE_UNKNOWN)) {
-    $(".panel#label").hide();
-    return false;
-  }
-  $(".panel#label").show();
-  return true;
+  var shouldShow = accessTokenIsSet() && (type === DOMAIN_ID_TYPE_FULL || type === DOMAIN_ID_TYPE_UNKNOWN);
+  $(".panel#label").toggle(shouldShow);
+  $("li a[href='#label']").parent().toggle(shouldShow);
+  return shouldShow;
 }
 
 function setupDomainLabelSetting() {
-  if (!showOrHideLabel()) {
-    return;
-  }
+  showOrHideLabel();
 
   var html = "<div>"
   html += "<label class='control-label'>Specify a label for your domain</label> <a class='domain-loading-hide' href='#'>Edit</a>";
@@ -654,6 +649,7 @@ function setupDomainLabelSetting() {
       title: 'Edit Label',
       message: modal_body,
       closeButton: false,
+      onEscape: true,
       buttons: [
         {
           label: 'Cancel',
@@ -742,7 +738,7 @@ function setupDomainNetworkingSettings() {
   var includeAddress = autoNetworkingSetting === 'disabled';
 
   if (includeAddress) {
-    var label = "Network Address and Port";
+    var label = "Network Address:Port";
   } else {
     var label = "Network Port";
   }
@@ -777,6 +773,7 @@ function setupDomainNetworkingSettings() {
       title: 'Edit Network',
       message: modal_body,
       closeButton: false,
+      onEscape: true,
       buttons: [
         {
           label: 'Cancel',
@@ -924,6 +921,7 @@ function placeTableRow(name, path, isTemporary, placeID) {
     var dialog = bootbox.dialog({
       message: confirmString,
       closeButton: false,
+      onEscape: true,
       buttons: [
         {
           label: Strings.REMOVE_PLACE_CANCEL_BUTTON,
@@ -1025,7 +1023,9 @@ function reloadDomainInfo() {
         }
       }
 
-      appendAddButtonToPlacesTable();
+      if (accessTokenIsSet()) {
+        appendAddButtonToPlacesTable();
+      }
 
     } else {
       $('.domain-loading-error').show();
@@ -1098,6 +1098,7 @@ function editHighFidelityPlace(placeID, name, path) {
   dialog = bootbox.dialog({
     title: Strings.EDIT_PLACE_TITLE,
     closeButton: false,
+    onEscape: true,
     message: modal_body,
     buttons: modal_buttons
   })
@@ -1180,6 +1181,7 @@ function chooseFromHighFidelityDomains(clickedButton) {
 
         bootbox.dialog({
           title: "Choose matching domain",
+          onEscape: true,
           message: modal_body,
           buttons: modal_buttons
         })

domain-server/resources/web/wizard/css/style.css

@@ -31,6 +31,12 @@ label {
   color: #373A3C;
 }
 
+.wizard-link {
+  font-size: 16px;
+  font-weight: normal;
+  color: #2F80ED;
+}
+
 #admin-row {
   margin-top: 20px;
   margin-bottom: 20px;
@@ -77,13 +83,80 @@ label {
   margin-bottom: 33px;
 }
 
-#checkmark-image {
-  margin-top: 66px;
-  margin-bottom: 59px;
-  width: 169px;
-  height: 169px;
+.btn.btn-square {
+  border-radius: 0;
 }
 
-#visit-domain-row {
-  margin-bottom: 68px;
+.header {
+  position: absolute;
+  top: -20px;
+  left: 50%;
+  margin-left: -720px; /* Half of the width */
+  min-width: 1440px;
+  z-index: -1;
+}
+
+.title {
+  font-family: 'Cairo';
+  color: white;
+  margin-top: 260px;
+}
+
+#main-description {
+  margin-top: 32px;
+  margin-bottom: 35px;
+}
+
+#share-box {
+  background-color: rgb(240, 240, 240);
+  padding: 20px 20px;
+  margin-top: 15px;
+  margin-bottom: 70px;
+  white-space: nowrap;
+}
+
+#share-box > span {
+  vertical-align: middle;
+  display: table-cell;
+  height: 100%;
+}
+
+#share-box button {
+  border-color: rgb(225, 225, 225);
+  font-size: 18px;
+}
+
+#share-box img {
+  padding-right: 10px;
+}
+
+#share-text {
+  font-size: 22px;
+  padding-right: 15px;
+}
+
+#share-field {
+  background-color: rgb(255, 255, 255);
+  padding: 0 10px;
+  width: 100%;
+}
+
+#share-link {
+  font-size: 28px;
+}
+
+#congrats-list > div > div {
+  margin-bottom: 30px;
+}
+
+#congrats-list ul {
+  padding-left: 16px;
+}
+
+#congrats-list {
+  margin-bottom: 60px;
+}
+
+#open-settings {
+  border-color: black;
 }

domain-server/resources/web/wizard/index.shtml

@@ -60,8 +60,7 @@
   </div>
   <div id="admin-row" class="row">
     <p class="col-md-6">
-      <span id="admin-description" class="step-info"><b>Add your High Fidelity username</b> and any other usernames to grant administrator privileges.</span>
-      <span class='glyphicon glyphicon-info-sign' data-toggle="tooltip" title="Users who will have all the permissions for this domain."></span>
+      <span class="step-info"><span id="admin-description"><b>Add your High Fidelity username</b> and any other usernames</span> to grant <span class='wizard-link' data-toggle="tooltip" title="Users who will have all the permissions for this domain.">administrator privileges</span></span>
     </p>
     <div class="col-md-6">
       <input id="admin-usernames" type="text" class="form-control">
@@ -78,7 +77,7 @@
   <div class="row">
     <div class="col-md-12">
       <p id="connect-question" class="step-info">
-        Who can connect to your domain?
+        Who can <a href='#' class='wizard-link  perms-link'>connect</a> to your domain?
         <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='You can set this to allow a user to connect to this domain.'></span>
       </p>
     </div>
@@ -87,25 +86,21 @@
     <p class="col-md-2">
       <label>
         <input id="connect-none" name="connect-radio" type="radio" value="none" checked> None
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Only the admins of this domain'></span>
       </label>
     </p>
     <p class="col-md-3">
       <label>
         <input id="connect-friends" name="connect-radio" type="radio" value="friends"> Friends
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Users who are your Friends in High Fidelity'></span>
       </label>
     </p>
     <p class="col-md-5">
       <label>
-        <input id="connect-logged-in" name="connect-radio" type="radio" value="logged-in"> Users logged in to High Fidelity
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Users who are currently logged into High Fidelity'></span>
+        <input id="connect-logged-in" name="connect-radio" type="radio" value="logged-in"> Users logged into High Fidelity
       </label>
     </p>
     <p class="col-md-2">
       <label>
         <input id="connect-everyone" name="connect-radio" type="radio" value="everyone"> Everyone
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title="Users who aren't logged into High Fidelity"></span>
       </label>
     </p>
   </div>
@@ -113,7 +108,7 @@
   <div class="row">
     <div class="col-md-12">
       <p class="step-info">
-        Who can rez items in your domain?
+        Who can <a href='#' class='wizard-link perms-link'>rez items</a> in your domain?
         <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='You can set this to allow a user to create entities in this domain.'></span>
       </p>
     </div>
@@ -122,33 +117,32 @@
     <p class="col-md-2">
       <label>
         <input id="rez-none" name="rez-radio" type="radio" value="none" checked> None
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Only the admins of this domain'></span>
       </label>
     </p>
     <p class="col-md-3">
       <label>
-        <input id="rez-friends" name="rez-radio" type="radio" value="friends"> Friends
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Users who are your Friends in High Fidelity'></span>
+        <input id="rez-friends" name="rez-radio" type="radio" value="friends" disabled> Friends
       </label>
     </p>
     <p class="col-md-5">
       <label>
-        <input id="rez-logged-in" name="rez-radio" type="radio" value="logged-in"> Users logged in to High Fidelity
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Users who are currently logged into High Fidelity'></span>
+        <input id="rez-logged-in" name="rez-radio" type="radio" value="logged-in" disabled> Users logged into High Fidelity
       </label>
     </p>
     <p class="col-md-2">
       <label>
-        <input id="rez-everyone" name="rez-radio" type="radio" value="everyone"> Everyone
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title="Users who aren't logged into High Fidelity"></span>
+        <input id="rez-everyone" name="rez-radio" type="radio" value="everyone" disabled> Everyone
       </label>
     </p>
   </div>
 
   <div class="row">
-    <div class="col-md-3 col-md-offset-9">
+    <dd class="col-md-3">
+      <button type="button" class="btn btn-md btn-block btn-default back-button">Back</button>
+    </dd>
+    <dd class="col-md-3 col-md-offset-6">
       <button id="save-permissions" type="button" class="btn btn-md btn-block btn-primary">Next</button>
-    </div>
+    </dd>
   </div>
 </div>
 
@@ -188,36 +182,79 @@
   </dl>
 
   <dl class="row">
-    <dd class="col-md-3 col-md-offset-9">
+    <dd class="col-md-3">
+      <button type="button" class="btn btn-md btn-block btn-default back-button">Back</button>
+    </dd>
+    <dd class="col-md-3 col-md-offset-6">
       <button id="save-username-password" type="button" class="btn btn-md btn-block btn-primary">Finish</button>
     </dd>
   </dl>
 </div>
 
-<div class="wizard-step cloud-only col-md-7 col-centered" style="display: none;">
+<div id="congratulation-step" class="wizard-step cloud-only col-xs-12 col-centered" style="display: none;">
   <div class="row">
-    <div class="col-xs-4 col-centered">
-      <img id="checkmark-image" src="../images/checkmark.svg">
+    <div class="col-xs-10 col-xs-offset-1">
+      <img class="header" src="/images/wizard-congratulation-header.jpg" alt="Header" width="1440" height="339">
+      <h1 class="title">Congratulations!</h1>
     </div>
   </div>
 
   <div class="row">
-    <div class="col-md-12">
-      <p class="step-info">Congratulations! You have successfully setup and configured your cloud hosted domain.</p>
+    <div class="col-xs-10 col-xs-offset-1">
+      <p id="main-description" class="step-info">You have successfully setup and configured your cloud hosted domain.</p>
     </div>
   </div>
 
-  <div id="visit-domain-row" class="row">
-    <div class="col-md-12">
-      <label><input id="go-to-domain" class="form-check-input" type="checkbox"> Visit domain in VR now</label>
+  <div class="row">
+    <div class="col-xs-10 col-xs-offset-1">
+      <div class="step-info">
+        <b>Invite people in!</b>
+      </div>
+      <div id="share-box">
+        <span id="share-text" class="step-info">Share your domain:</span>
+        <span id="share-field">
+          <a id="share-link" class="blue-link" target="_blank"></a>
+        </span>
+        <span>
+          <button type="button" class="btn btn-md btn-default btn-square" onclick="copyToClipboard('#share-link')">
+            <img src="/images/copy-icon.svg" alt="cpy icon" height="30" width="30">copy
+          </button>
+        </span>
+      </div>
     </div>
   </div>
 
-  <dl class="row">
-    <dd class="col-md-5 col-md-offset-7">
-      <button id="explore-settings" type="button" class="btn btn-md btn-block btn-primary">Explore all domain server settings</button>
-    </dd>
-  </dl>
+  <div id="congrats-list" class="row">
+    <div class="col-xs-4 col-xs-offset-1">
+      <div class="step-info">
+        <b>Go to your Domain:</b>
+      </div>
+      <ul>
+        <li class="step-info">Browse environments in the Marketplace to select the perfect content set for your VR world.</li>
+        <li class="step-info">Invite people to your domain right now.</li>
+        <li class="step-info">Meet new people and explore other domains.</li>
+      </ul>
+    </div>
+    <div class="col-xs-3 col-xs-offset-1">
+      <div class="step-info">
+        <b>Continue to Domain settings:</b>
+      </div>
+      <ul>
+        <li class="step-info">Set additional permissions for who can visit and make changes.</li>
+        <li class="step-info">Adjust audio settings.</li>
+        <li class="step-info">Back up your domain's content.</li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-xs-4 col-xs-offset-1">
+      <button id="visit-domain" type="button" class="btn btn-md btn-primary btn-square">Visit Your VR World</button>
+    </div>
+    <div class="col-xs-3 col-xs-offset-1">
+      <button id="open-settings" type="button" class="btn btn-md btn-default btn-square next-button">Open Domain Settings</button>
+    </div>
+  </div>
 </div>
 
 <!--#include virtual="footer.html"-->

domain-server/resources/web/wizard/js/wizard.js

@@ -2,6 +2,8 @@ var Metaverse = {
   accessToken: null
 }
 
+var currentStepNumber;
+
 $(document).ready(function(){
   Strings.ADD_PLACE_NOT_CONNECTED_MESSAGE = "You must have an access token to query your High Fidelity places.<br><br>" +
     "Please go back and connect your account.";
@@ -10,6 +12,22 @@ $(document).ready(function(){
 
   $('[data-toggle="tooltip"]').tooltip();
 
+  $('.perms-link').on('click', function() {
+    var modal_body = '<div>';
+    modal_body += '<b>None</b> - No one will have permissions. Only you and the users your have given administrator privileges to will have permissions.</br></br>';
+    modal_body += '<b>Friends</b> - Users who are your Friends in High Fidelity.</br></br>';
+    modal_body += '<b>Users logged into High Fidelity</b> - Users who are currently logged into High Fidelity.</br></br>';
+    modal_body += '<b>Everyone</b> - Anyone who uses High Fidelity.';
+    modal_body += '</div>';
+
+    dialog = bootbox.dialog({
+      title: "User definition",
+      message: modal_body,
+      closeButton: true
+    });
+    return false;
+  });
+
   $('body').on('click', '.next-button', function() {
     goToNextStep();
   });
@@ -52,8 +70,38 @@ $(document).ready(function(){
     });
   });
 
-  $('body').on('click', '#explore-settings', function() {
-    exploreSettings();
+  $('body').on('click', '#visit-domain', function() {
+    $('#share-link')[0].click();
+  });
+
+  $('input[type=radio][name=connect-radio]').change(function() {
+    var inputs = $('input[type=radio][name=rez-radio]');
+    var disabled = [];
+
+    switch (this.value) {
+      case 'none':
+        disabled = inputs.splice(1);
+        break;
+      case 'friends':
+        disabled = inputs.splice(2);
+        break;
+      case 'logged-in':
+        disabled = inputs.splice(3);
+        break;
+      case 'everyone':
+        disabled = inputs.splice(4);
+        break;
+    }
+
+    $.each(inputs, function() {
+      $(this).prop('disabled', false);
+    });
+    $.each(disabled, function() {
+      if ($(this).prop('checked')) {
+        $(inputs.last()).prop('checked', true);
+      }
+      $(this).prop('disabled', true);
+    });
   });
 
   reloadSettings(function(success) {
@@ -72,13 +120,21 @@ $(document).ready(function(){
   });
 });
 
+function copyToClipboard(element) {
+  var $temp = $("<input>");
+  $("body").append($temp);
+  $temp.val($(element).text()).select();
+  document.execCommand("copy");
+  $temp.remove();
+}
+
 function setupWizardSteps() {
-  var stepsCompleted = Settings.data.values.wizard.steps_completed;
+  currentStepNumber = Settings.data.values.wizard.steps_completed;
   var steps = null;
 
   if (Settings.data.values.wizard.cloud_domain) {
     $('.desktop-only').remove();
-    $('.wizard-step').find('.back-button').hide();
+    $('.wizard-step:first').find('.back-button').hide();
 
     steps = $('.wizard-step');
     $(steps).each(function(i) {
@@ -86,7 +142,7 @@ function setupWizardSteps() {
     });
 
     $('#permissions-description').html('You <span id="username-display"></span>have been assigned administrator privileges to this domain.');
-    $('#admin-description').html('Add more High Fidelity usernames to grant administrator privileges.');
+    $('#admin-description').html('Add more High Fidelity usernames');
   } else {
     $('.cloud-only').remove();
     $('#save-permissions').text("Finish");
@@ -96,18 +152,20 @@ function setupWizardSteps() {
       $(this).children(".step-title").text("Step " + (i + 1) + " of " + steps.length);
     });
 
-    if (stepsCompleted == 0) {
+    if (currentStepNumber == 0) {
       $('#skip-wizard-button').show();
     }
   }
 
-  var currentStep = steps[stepsCompleted];
+  var currentStep = steps[currentStepNumber];
   $(currentStep).show();
 }
 
 function updatePlaceNameLink(address) {
   if (address) {
-    $('#place-name-link').html('Your domain is reachable at: <a target="_blank" href="' + URLs.PLACE_URL + '/' + address + '">' + address + '</a>');
+    var url = URLs.PLACE_URL + '/' + address;
+    $('#place-name-link').html('Your domain is reachable at: <a target="_blank" href="' + url + '">' + address + '</a>');
+    $('#share-field a').attr('href', url).text(url);
   }
 }
 
@@ -204,7 +262,7 @@ function goToNextStep() {
     currentStep.hide();
     nextStep.show();
 
-    var currentStepNumber = parseInt(Settings.data.values.wizard.steps_completed) + 1;
+    currentStepNumber += 1;
 
     postSettings({
       "wizard": {
@@ -233,7 +291,7 @@ function goToPreviousStep() {
     currentStep.hide();
     previousStep.show();
 
-    var currentStepNumber = parseInt(Settings.data.values.wizard.steps_completed) - 1;
+    currentStepNumber -= 1;
 
     postSettings({
       "wizard": {
@@ -439,7 +497,7 @@ function saveUsernamePassword() {
     return;
   }
 
-  var currentStepNumber = parseInt(Settings.data.values.wizard.steps_completed) + 1;
+  currentStepNumber += 1;
 
   var formJSON = {
     "security": {
@@ -459,14 +517,3 @@ function saveUsernamePassword() {
     location.reload();
   });
 }
-
-function exploreSettings() {
-  if ($('#go-to-domain').is(":checked")) {
-    var link = $('#place-name-link a:first');
-    if (link.length > 0) {
-      window.open(link.attr("href"));
-    }
-  }
-
-  goToNextStep();
-}

domain-server/src/DomainGatekeeper.cpp

@@ -183,6 +183,11 @@ NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QStrin
 
 #ifdef WANT_DEBUG
             qDebug() << "|  user-permissions: specific MAC matches, so:" << userPerms;
+#endif
+        } else if (_server->_settingsManager.hasPermissionsForMachineFingerprint(machineFingerprint)) {
+            userPerms = _server->_settingsManager.getPermissionsForMachineFingerprint(machineFingerprint);
+#ifdef WANT_DEBUG
+            qDebug(() << "| user-permissions: specific Machine Fingerprint matches, so: " << userPerms;
 #endif
         } else if (_server->_settingsManager.hasPermissionsForIP(senderAddress)) {
             // this user comes from an IP we have in our permissions table, apply those permissions

domain-server/src/DomainServer.cpp

@@ -94,7 +94,7 @@ bool DomainServer::forwardMetaverseAPIRequest(HTTPConnection* connection,
     root.insert(requestSubobjectKey, subobject);
     QJsonDocument doc { root };
 
-    QUrl url { NetworkingConstants::METAVERSE_SERVER_URL.toString() + metaversePath };
+    QUrl url { NetworkingConstants::METAVERSE_SERVER_URL().toString() + metaversePath };
 
     QNetworkRequest req(url);
     req.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
@@ -420,7 +420,7 @@ bool DomainServer::optionallySetupOAuth() {
 
     // if we don't have an oauth provider URL then we default to the default node auth url
     if (_oauthProviderURL.isEmpty()) {
-        _oauthProviderURL = NetworkingConstants::METAVERSE_SERVER_URL;
+        _oauthProviderURL = NetworkingConstants::METAVERSE_SERVER_URL();
     }
 
     auto accountManager = DependencyManager::get<AccountManager>();
@@ -2159,7 +2159,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             QJsonDocument doc(root);
 
 
-            QUrl url { NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/api/v1/places/" + place_id };
+            QUrl url { NetworkingConstants::METAVERSE_SERVER_URL().toString() + "/api/v1/places/" + place_id };
 
             url.setQuery("access_token=" + accessTokenVariant->toString());
 

domain-server/src/DomainServerSettingsManager.cpp

@@ -304,6 +304,26 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
 
             *wizardCompletedOnce = QVariant(true);
         }
+        if (oldVersion < 2.1) {
+            // convert old avatar scale settings into avatar height.
+
+            const QString AVATAR_MIN_SCALE_KEYPATH = "avatars.min_avatar_scale";
+            const QString AVATAR_MAX_SCALE_KEYPATH = "avatars.max_avatar_scale";
+            const QString AVATAR_MIN_HEIGHT_KEYPATH = "avatars.min_avatar_height";
+            const QString AVATAR_MAX_HEIGHT_KEYPATH = "avatars.max_avatar_height";
+
+            QVariant* avatarMinScale = _configMap.valueForKeyPath(AVATAR_MIN_SCALE_KEYPATH);
+            if (avatarMinScale) {
+                float scale = avatarMinScale->toFloat();
+                _configMap.valueForKeyPath(AVATAR_MIN_HEIGHT_KEYPATH, scale * DEFAULT_AVATAR_HEIGHT);
+            }
+
+            QVariant* avatarMaxScale = _configMap.valueForKeyPath(AVATAR_MAX_SCALE_KEYPATH);
+            if (avatarMaxScale) {
+                float scale = avatarMaxScale->toFloat();
+                _configMap.valueForKeyPath(AVATAR_MAX_HEIGHT_KEYPATH, scale * DEFAULT_AVATAR_HEIGHT);
+            }
+        }
 
         // write the current description version to our settings
         *versionVariant = _descriptionVersion;
@@ -550,6 +570,7 @@ void DomainServerSettingsManager::unpackPermissions() {
             } else {
                 // anonymous, logged in, and friend users get connect permissions by default
                 perms->set(NodePermissions::Permission::canConnectToDomain);
+                perms->set(NodePermissions::Permission::canRezTemporaryCertifiedEntities);
             }
 
             // add the permissions to the standard map
@@ -671,7 +692,7 @@ void DomainServerSettingsManager::processNodeKickRequestPacket(QSharedPointer<Re
                 bool newPermissions = false;
 
                 if (!verifiedUsername.isEmpty()) {
-                    // if we have a verified user name for this user, we apply the kick to the username
+                    // if we have a verified user name for this user, we first apply the kick to the username
 
                     // check if there were already permissions
                     bool hadPermissions = havePermissionsForName(verifiedUsername);
@@ -683,7 +704,14 @@ void DomainServerSettingsManager::processNodeKickRequestPacket(QSharedPointer<Re
 
                     // ensure that the connect permission is clear
                     userPermissions->clear(NodePermissions::Permission::canConnectToDomain);
-                } else {
+                }
+
+                // if we didn't have a username, or this domain-server uses the "multi-kick" setting to
+                // kick logged in users via username AND machine fingerprint (or IP as fallback)
+                // then we remove connect permissions for the machine fingerprint (or IP as fallback)
+                const QString MULTI_KICK_SETTINGS_KEYPATH = "security.multi_kick_logged_in";
+
+                if (verifiedUsername.isEmpty() || valueOrDefaultValueForKeyPath(MULTI_KICK_SETTINGS_KEYPATH).toBool()) {
                     // remove connect permissions for the machine fingerprint
                     DomainServerNodeData* nodeData = static_cast<DomainServerNodeData*>(matchingNode->getLinkedData());
                     if (nodeData) {
@@ -718,8 +746,8 @@ void DomainServerSettingsManager::processNodeKickRequestPacket(QSharedPointer<Re
                         // TODO: soon we will have feedback (in the form of a message to the client) after we kick.  When we
                         // do, we will have a success flag, and perhaps a reason for failure.  For now, just don't do it.
                         if (kickAddress == limitedNodeList->getPublicSockAddr().getAddress() ||
-                                kickAddress == limitedNodeList->getLocalSockAddr().getAddress() ||
-                                kickAddress.isLoopback() ) {
+                            kickAddress == limitedNodeList->getLocalSockAddr().getAddress() ||
+                            kickAddress.isLoopback() ) {
                             qWarning() << "attempt to kick node running on same machine as domain server, ignoring KickRequest";
                             return;
                         }

ice-server/src/IceServer.cpp

@@ -208,7 +208,7 @@ void IceServer::requestDomainPublicKey(const QUuid& domainID) {
     // send a request to the metaverse API for the public key for this domain
     auto& networkAccessManager = NetworkAccessManager::getInstance();
 
-    QUrl publicKeyURL { NetworkingConstants::METAVERSE_SERVER_URL };
+    QUrl publicKeyURL { NetworkingConstants::METAVERSE_SERVER_URL() };
     QString publicKeyPath = QString("/api/v1/domains/%1/public_key").arg(uuidStringWithoutCurlyBraces(domainID));
     publicKeyURL.setPath(publicKeyPath);
 

interface/resources/controllers/oculus_touch.json

@@ -13,11 +13,11 @@
 
         { "from": "OculusTouch.LY", "to": "Standard.LY",
             "filters": [
-                { "type": "deadZone", "min": 0.3 },
+                { "type": "deadZone", "min": 0.7 },
                 "invert"
             ]
         },
-        { "from": "OculusTouch.LX", "filters": { "type": "deadZone", "min": 0.3 }, "to": "Standard.LX" },
+        { "from": "OculusTouch.LX", "filters": { "type": "deadZone", "min": 0.7 }, "to": "Standard.LX" },
         { "from": "OculusTouch.LT", "to": "Standard.LTClick",
             "peek": true,
             "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ]
@@ -29,11 +29,11 @@
 
         { "from": "OculusTouch.RY", "to": "Standard.RY",
             "filters": [
-                { "type": "deadZone", "min": 0.3 },
+                { "type": "deadZone", "min": 0.7 },
                 "invert"
             ]
         },
-        { "from": "OculusTouch.RX", "filters": { "type": "deadZone", "min": 0.3 }, "to": "Standard.RX" },
+        { "from": "OculusTouch.RX", "filters": { "type": "deadZone", "min": 0.7 }, "to": "Standard.RX" },
         { "from": "OculusTouch.RT", "to": "Standard.RTClick",
             "peek": true,
             "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ]

interface/resources/html/createGlobalEventBridge.js

@@ -33,6 +33,56 @@ var EventBridge;
         // replace the TempEventBridge with the real one.
         var tempEventBridge = EventBridge;
         EventBridge = channel.objects.eventBridge;
+        EventBridge.audioOutputDeviceChanged.connect(function(deviceName) {      
+            navigator.mediaDevices.getUserMedia({ audio: true, video: false }).then(function(mediaStream) {
+                navigator.mediaDevices.enumerateDevices().then(function(devices) {
+                    devices.forEach(function(device) {
+                        if (device.kind == "audiooutput") {
+                            if (device.label == deviceName){
+                                console.log("Changing HTML audio output to device " + device.label);
+                                var deviceId = device.deviceId;
+                                var videos = document.getElementsByTagName("video");
+                                for (var i = 0; i < videos.length; i++){
+                                    videos[i].setSinkId(deviceId);
+                                }
+                                var audios = document.getElementsByTagName("audio");
+                                for (var i = 0; i < audios.length; i++){
+                                    audios[i].setSinkId(deviceId);
+                                }
+                            }
+                        }
+                    });
+
+                }).catch(function(err) {
+                    console.log("Error getting media devices"+ err.name + ": " + err.message);
+                });
+            }).catch(function(err) {
+                console.log("Error getting user media"+ err.name + ": " + err.message);
+            });
+        });
+        
+        // To be able to update the state of the output device selection for every element added to the DOM
+        // we need to listen to events that might precede the addition of this elements.
+        // A more robust hack will be to add a setInterval that look for DOM changes every 100-300 ms (low performance?)
+        
+        window.addEventListener("load",function(event) {
+            setTimeout(function() { 
+                EventBridge.forceHtmlAudioOutputDeviceUpdate();
+            }, 1200);
+        }, false);
+        
+        document.addEventListener("click",function(){
+            setTimeout(function() { 
+                EventBridge.forceHtmlAudioOutputDeviceUpdate();
+            }, 1200);
+        }, false);
+        
+        document.addEventListener("change",function(){
+            setTimeout(function() { 
+                EventBridge.forceHtmlAudioOutputDeviceUpdate();
+            }, 1200);
+        }, false);
+        
         tempEventBridge._callbacks.forEach(function (callback) {
             EventBridge.scriptEventReceived.connect(callback);
         });

interface/resources/html/help.html

@@ -1,127 +0,0 @@
-<!-- Copyright 2016 High Fidelity, Inc. -->
-<html>
-    <head>
-        <meta charset="utf-8"/>
-        <input type="hidden" id="version" value="1"/>
-        <title>Welcome to Interface</title>
-
-        <style>
-            body {
-                background: black;
-                width: 100%;
-                overflow-x: hidden;
-                margin: 0;
-                padding: 0;
-            }
-
-            #kbm_button {
-                position: absolute;
-                left: 70;
-                top: 118;
-                width: 297;
-                height: 80;
-            }
-
-            #hand_controllers_button {
-                position: absolute;
-                left: 367;
-                top: 118;
-                width: 267;
-                height: 80;
-            }
-
-            #game_controller_button {
-                position: absolute;
-                left: 634;
-                top: 118;
-                width: 297;
-                height: 80;
-            }
-
-            #image_area {
-                width: 1024;
-                height: 720;
-                margin: auto;
-                position: absolute;
-                top: 0; left: 0; bottom: 0; right: 0;
-            }
-        </style>
-        <script>
-            var handControllerImageURL = null;
-
-            function showKbm() {
-                document.getElementById("main_image").setAttribute("src", "img/controls-help-keyboard.png");
-            }
-
-            function showHandControllers() {
-                document.getElementById("main_image").setAttribute("src", handControllerImageURL);
-            }
-
-            function showGamepad() {
-                document.getElementById("main_image").setAttribute("src", "img/controls-help-gamepad.png");
-            }
-
-            // This is not meant to be a complete or hardened query string parser - it only
-            // needs to handle the values we send in and have control over.
-            //
-            // queryString is a string of the form "key1=value1&key2=value2&key3&key4=value4"
-            function parseQueryString(queryString) {
-                var params = {};
-                var paramsParts = queryString.split("&");
-                for (var i = 0; i < paramsParts.length; ++i) {
-                    var paramKeyValue = paramsParts[i].split("=");
-                    if (paramKeyValue.length == 1) {
-                        params[paramKeyValue[0]] = undefined;
-                    } else if (paramKeyValue.length == 2) {
-                        params[paramKeyValue[0]] = paramKeyValue[1];
-                    } else {
-                        console.error("Error parsing param keyvalue: ", paramParts);
-                    }
-                }
-                return params;
-            }
-
-            function load() {
-                var parts = window.location.href.split("?");
-                var params = {};
-                if (parts.length > 0) {
-                    params = parseQueryString(parts[1]);
-                }
-
-                switch (params.handControllerName) {
-                    case "oculus":
-                        handControllerImageURL = "img/controls-help-oculus.png";
-                        break;
-
-                    case "vive":
-                    default:
-                        handControllerImageURL = "img/controls-help-vive.png";
-                }
-
-                switch (params.defaultTab) {
-                    case "gamepad":
-                        showGamepad();
-                        break;
-
-                    case "handControllers":
-                        showHandControllers();
-                        break;
-
-                    case "kbm":
-                    default:
-                        showKbm();
-                }
-            }
-        </script>
-    </head>
-
-    <body onload="load()">
-        <div id="image_area">
-            <img id="main_image" src="img/controls-help-keyboard.png" width="1024px" height="720px"></img>
-            <a href="#" id="kbm_button" onmousedown="showKbm()"></a>
-            <a href="#" id="hand_controllers_button" onmousedown="showHandControllers()"></a>
-            <a href="#" id="game_controller_button" onmousedown="showGamepad()"></a>
-        </div>
-    </body>
-
-</html>

interface/resources/html/raiseAndLowerKeyboard.js

@@ -12,9 +12,9 @@
     var MAX_WARNINGS = 3;
     var numWarnings = 0;
     var isWindowFocused = true;
-    var isKeyboardRaised = false;
-    var isNumericKeyboard = false;
-    var isPasswordField = false;
+    window.isKeyboardRaised = false;
+    window.isNumericKeyboard = false;
+    window.isPasswordField = false;
 
     function shouldSetPasswordField() {
         var nodeType = document.activeElement.type;
@@ -62,7 +62,7 @@
         var passwordField = shouldSetPasswordField();
 
         if (isWindowFocused &&
-            (keyboardRaised !== isKeyboardRaised || numericKeyboard !== isNumericKeyboard || passwordField !== isPasswordField)) {
+            (keyboardRaised !== window.isKeyboardRaised || numericKeyboard !== window.isNumericKeyboard || passwordField !== window.isPasswordField)) {
 
             if (typeof EventBridge !== "undefined" && EventBridge !== null) {
                 EventBridge.emitWebEvent(
@@ -75,20 +75,20 @@
                 }
             }
 
-            if (!isKeyboardRaised) {
+            if (!window.isKeyboardRaised) {
                 scheduleBringToView(250); // Allow time for keyboard to be raised in QML.
                                           // 2DO: should it be rather done from 'client area height changed' event?
             }
 
-            isKeyboardRaised = keyboardRaised;
-            isNumericKeyboard = numericKeyboard;
-            isPasswordField = passwordField;
+            window.isKeyboardRaised = keyboardRaised;
+            window.isNumericKeyboard = numericKeyboard;
+            window.isPasswordField = passwordField;
         }
     }, POLL_FREQUENCY);
 
     window.addEventListener("click", function () {
         var keyboardRaised = shouldRaiseKeyboard();
-        if(keyboardRaised && isKeyboardRaised) {
+        if (keyboardRaised && window.isKeyboardRaised) {
             scheduleBringToView(150);
         }
     });
@@ -99,7 +99,7 @@
 
     window.addEventListener("blur", function () {
         isWindowFocused = false;
-        isKeyboardRaised = false;
-        isNumericKeyboard = false;
+        window.isKeyboardRaised = false;
+        window.isNumericKeyboard = false;
     });
 })();

interface/resources/qml/AddressBarDialog.qml

@@ -1,532 +0,0 @@
-//
-//  AddressBarDialog.qml
-//
-//  Created by Austin Davis on 2015/04/14
-//  Copyright 2015 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
-//
-
-import Hifi 1.0
-import QtQuick 2.4
-import "controls"
-import "styles"
-import "windows"
-import "hifi"
-import "hifi/toolbars"
-import "styles-uit" as HifiStyles
-import "controls-uit" as HifiControls
-
-Window {
-    id: root
-    HifiConstants { id: hifi }
-    HifiStyles.HifiConstants { id: hifiStyleConstants }
-
-    objectName: "AddressBarDialog"
-    title: "Go To:"
-
-    shown: false
-    destroyOnHidden: false
-    resizable: false
-    pinnable: false;
-
-    width: addressBarDialog.implicitWidth
-    height: addressBarDialog.implicitHeight
-    property int gap: 14
-
-    onShownChanged: {
-        addressBarDialog.keyboardEnabled = HMD.active;
-        addressBarDialog.observeShownChanged(shown);
-    }
-    Component.onCompleted: {
-        root.parentChanged.connect(center);
-        center();
-    }
-    Component.onDestruction: {
-        root.parentChanged.disconnect(center);
-    }
-
-    function center() {
-        // Explicitly center in order to avoid warnings at shutdown
-        anchors.centerIn = parent;
-    }
-
-    function resetAfterTeleport() {
-        storyCardFrame.shown = root.shown = false;
-    }
-    function goCard(targetString) {
-        if (0 !== targetString.indexOf('hifi://')) {
-            storyCardHTML.url = addressBarDialog.metaverseServerUrl + targetString;
-            storyCardFrame.shown = true;
-            return;
-        }
-        addressLine.text = targetString;
-        toggleOrGo(true);
-        clearAddressLineTimer.start();
-    }
-    property var allStories: [];
-    property int cardWidth: 212;
-    property int cardHeight: 152;
-    property string metaverseBase: addressBarDialog.metaverseServerUrl + "/api/v1/";
-    property bool isCursorVisible: false  // Override default cursor visibility.
-
-    AddressBarDialog {
-        id: addressBarDialog
-
-        property bool keyboardEnabled: false
-        property bool keyboardRaised: false
-        property bool punctuationMode: false
-
-        implicitWidth: backgroundImage.width
-        implicitHeight: scroll.height + gap + backgroundImage.height + (keyboardEnabled ? keyboard.height : 0);
-
-        // The buttons have their button state changed on hover, so we have to manually fix them up here
-        onBackEnabledChanged: backArrow.buttonState = addressBarDialog.backEnabled ? 1 : 0;
-        onForwardEnabledChanged: forwardArrow.buttonState = addressBarDialog.forwardEnabled ? 1 : 0;
-        onReceivedHifiSchemeURL: resetAfterTeleport();
-
-        // Update location after using back and forward buttons.
-        onHostChanged: updateLocationTextTimer.start();
-
-        ListModel { id: suggestions }
-
-        ListView {
-            id: scroll
-            height: cardHeight + scroll.stackedCardShadowHeight
-            property int stackedCardShadowHeight: 10;
-            spacing: gap;
-            clip: true;
-            anchors {
-                left: backgroundImage.left
-                right: swipe.left
-                bottom: backgroundImage.top
-            }
-            model: suggestions;
-            orientation: ListView.Horizontal;
-            delegate: Card {
-                width: cardWidth;
-                height: cardHeight;
-                goFunction: goCard;
-                userName: model.username;
-                placeName: model.place_name;
-                hifiUrl: model.place_name + model.path;
-                thumbnail: model.thumbnail_url;
-                imageUrl: model.image_url;
-                action: model.action;
-                timestamp: model.created_at;
-                onlineUsers: model.online_users;
-                storyId: model.metaverseId;
-                drillDownToPlace: model.drillDownToPlace;
-                shadowHeight: scroll.stackedCardShadowHeight;
-                hoverThunk: function () { ListView.view.currentIndex = index; }
-                unhoverThunk: function () { ListView.view.currentIndex = -1; }
-            }
-            highlightMoveDuration: -1;
-            highlightMoveVelocity: -1;
-            highlight: Rectangle { color: "transparent"; border.width: 4; border.color: hifiStyleConstants.colors.blueHighlight; z: 1; }
-        }
-        Image { // Just a visual indicator that the user can swipe the cards over to see more.
-            id: swipe;
-            source: "../images/swipe-chevron.svg";
-            width: 72;
-            visible: suggestions.count > 3;
-            anchors {
-                right: backgroundImage.right;
-                top: scroll.top;
-            }
-            MouseArea {
-                anchors.fill: parent
-                onClicked: scroll.currentIndex = (scroll.currentIndex < 0) ? 3 : (scroll.currentIndex + 3)
-            }
-        }
-
-        Row {
-            spacing: 2 * hifi.layout.spacing;
-            anchors {
-                top: parent.top;
-                left: parent.left;
-                leftMargin: 150;
-                topMargin: -30;
-            }
-            property var selected: allTab;
-            TextButton {
-                id: allTab;
-                text: "ALL";
-                property string includeActions: 'snapshot,concurrency';
-                selected: allTab === selectedTab;
-                action: tabSelect;
-            }
-            TextButton {
-                id: placeTab;
-                text: "PLACES";
-                property string includeActions: 'concurrency';
-                selected: placeTab === selectedTab;
-                action: tabSelect;
-            }
-            TextButton {
-                id: snapsTab;
-                text: "SNAPS";
-                property string includeActions: 'snapshot';
-                selected: snapsTab === selectedTab;
-                action: tabSelect;
-            }
-        }
-
-        Image {
-            id: backgroundImage
-            source: "../images/address-bar-856.svg"
-            width: 856
-            height: 100
-            anchors {
-                bottom: parent.keyboardEnabled ? keyboard.top : parent.bottom;
-            }
-            property int inputAreaHeight: 70
-            property int inputAreaStep: (height - inputAreaHeight) / 2
-
-            ToolbarButton {
-                id: homeButton
-                imageURL: "../images/home.svg"
-                onClicked: {
-                    addressBarDialog.loadHome();
-                    root.shown = false;
-                }
-                anchors {
-                    left: parent.left
-                    leftMargin: homeButton.width / 2
-                    verticalCenter: parent.verticalCenter
-                }
-            }
-
-            ToolbarButton {
-                id: backArrow;
-                imageURL: "../images/backward.svg";
-                onClicked: addressBarDialog.loadBack();
-                anchors {
-                    left: homeButton.right
-                    verticalCenter: parent.verticalCenter
-                }
-            }
-            ToolbarButton {
-                id: forwardArrow;
-                imageURL: "../images/forward.svg";
-                onClicked: addressBarDialog.loadForward();
-                anchors {
-                    left: backArrow.right
-                    verticalCenter: parent.verticalCenter
-                }
-            }
-
-            HifiStyles.RalewayLight {
-                id: notice;
-                font.pixelSize: hifi.fonts.pixelSize * 0.50;
-                anchors {
-                    top: parent.top
-                    topMargin: parent.inputAreaStep + 12
-                    left: addressLine.left
-                    right: addressLine.right
-                }
-            }
-            HifiStyles.FiraSansRegular {
-                id: location;
-                font.pixelSize: addressLine.font.pixelSize;
-                color: "gray";
-                clip: true;
-                anchors.fill: addressLine;
-                visible: addressLine.text.length === 0
-            }
-            TextInput {
-                id: addressLine
-                focus: true
-                anchors {
-                    top: parent.top
-                    bottom: parent.bottom
-                    left: forwardArrow.right
-                    right: parent.right
-                    leftMargin: forwardArrow.width
-                    rightMargin: forwardArrow.width / 2
-                    topMargin: parent.inputAreaStep + (2 * hifi.layout.spacing)
-                    bottomMargin: parent.inputAreaStep
-                }
-                font.pixelSize: hifi.fonts.pixelSize * 0.75
-                cursorVisible: false
-                onTextChanged: {
-                    filterChoicesByText();
-                    updateLocationText(text.length > 0);
-                    if (!isCursorVisible && text.length > 0) {
-                        isCursorVisible = true;
-                        cursorVisible = true;
-                    }
-                }
-                onActiveFocusChanged: {
-                    cursorVisible = isCursorVisible && focus;
-                }
-                MouseArea {
-                    // If user clicks in address bar show cursor to indicate ability to enter address.
-                    anchors.fill: parent
-                    onClicked: {
-                        isCursorVisible = true;
-                        parent.cursorVisible = true;
-                        parent.forceActiveFocus();
-                    }
-                }
-            }
-        }
-
-        Timer {
-            // Delay updating location text a bit to avoid flicker of content and so that connection status is valid.
-            id: updateLocationTextTimer
-            running: false
-            interval: 500  // ms
-            repeat: false
-            onTriggered: updateLocationText(false);
-        }
-
-        Timer {
-            // Delay clearing address line so as to avoid flicker of "not connected" being displayed after entering an address.
-            id: clearAddressLineTimer
-            running: false
-            interval: 100  // ms
-            repeat: false
-            onTriggered: {
-                addressLine.text = "";
-                isCursorVisible = false;
-            }
-        }
-
-        Window {
-            width: 938
-            height: 625
-            HifiControls.WebView {
-                anchors.fill: parent;
-                id: storyCardHTML;
-            }
-            id: storyCardFrame;
-
-            shown: false;
-            destroyOnCloseButton: false;
-            pinnable: false;
-
-            anchors {
-                verticalCenter: backgroundImage.verticalCenter;
-                horizontalCenter: scroll.horizontalCenter;
-            }
-            z: 100
-        }
-
-        HifiControls.Keyboard {
-            id: keyboard
-            raised: parent.keyboardEnabled  // Ignore keyboardRaised; keep keyboard raised if enabled (i.e., in HMD).
-            numeric: parent.punctuationMode
-            anchors {
-                bottom: parent.bottom
-                left: parent.left
-                right: parent.right
-            }
-        }
-    }
-
-    function getRequest(url, cb) { // cb(error, responseOfCorrectContentType) of url. General for 'get' text/html/json, but without redirects.
-        // TODO: make available to other .qml.
-        var request = new XMLHttpRequest();
-        // QT bug: apparently doesn't handle onload. Workaround using readyState.
-        request.onreadystatechange = function () {
-            var READY_STATE_DONE = 4;
-            var HTTP_OK = 200;
-            if (request.readyState >= READY_STATE_DONE) {
-                var error = (request.status !== HTTP_OK) && request.status.toString() + ':' + request.statusText,
-                    response = !error && request.responseText,
-                    contentType = !error && request.getResponseHeader('content-type');
-                if (!error && contentType.indexOf('application/json') === 0) {
-                    try {
-                        response = JSON.parse(response);
-                    } catch (e) {
-                        error = e;
-                    }
-                }
-                cb(error, response);
-            }
-        };
-        request.open("GET", url, true);
-        request.send();
-    }
-
-    function identity(x) {
-        return x;
-    }
-
-    function handleError(url, error, data, cb) { // cb(error) and answer truthy if needed, else falsey
-        if (!error && (data.status === 'success')) {
-            return;
-        }
-        if (!error) { // Create a message from the data
-            error = data.status + ': ' + data.error;
-        }
-        if (typeof(error) === 'string') { // Make a proper Error object
-            error = new Error(error);
-        }
-        error.message += ' in ' + url; // Include the url.
-        cb(error);
-        return true;
-    }
-    function resolveUrl(url) {
-        return (url.indexOf('/') === 0) ? (addressBarDialog.metaverseServerUrl + url) : url;
-    }
-
-    function makeModelData(data) { // create a new obj from data
-        // ListModel elements will only ever have those properties that are defined by the first obj that is added.
-        // So here we make sure that we have all the properties we need, regardless of whether it is a place data or user story.
-        var name = data.place_name,
-            tags = data.tags || [data.action, data.username],
-            description = data.description || "",
-            thumbnail_url = data.thumbnail_url || "";
-        return {
-            place_name: name,
-            username: data.username || "",
-            path: data.path || "",
-            created_at: data.created_at || "",
-            action: data.action || "",
-            thumbnail_url: resolveUrl(thumbnail_url),
-            image_url: resolveUrl(data.details.image_url),
-
-            metaverseId: (data.id || "").toString(), // Some are strings from server while others are numbers. Model objects require uniformity.
-
-            tags: tags,
-            description: description,
-            online_users: data.details.concurrency || 0,
-            drillDownToPlace: false,
-
-            searchText: [name].concat(tags, description || []).join(' ').toUpperCase()
-        }
-    }
-    function suggestable(place) {
-        if (place.action === 'snapshot') {
-            return true;
-        }
-        return (place.place_name !== AddressManager.placename); // Not our entry, but do show other entry points to current domain.
-    }
-    property var selectedTab: allTab;
-    function tabSelect(textButton) {
-        selectedTab = textButton;
-        fillDestinations();
-    }
-    property var placeMap: ({});
-    function addToSuggestions(place) {
-        var collapse = allTab.selected && (place.action !== 'concurrency');
-        if (collapse) {
-            var existing = placeMap[place.place_name];
-            if (existing) {
-                existing.drillDownToPlace = true;
-                return;
-            }
-        }
-        suggestions.append(place);
-        if (collapse) {
-            placeMap[place.place_name] = suggestions.get(suggestions.count - 1);
-        } else if (place.action === 'concurrency') {
-            suggestions.get(suggestions.count - 1).drillDownToPlace = true; // Don't change raw place object (in allStories).
-        }
-    }
-    property int requestId: 0;
-    function getUserStoryPage(pageNumber, cb) { // cb(error) after all pages of domain data have been added to model
-        var options = [
-            'now=' + new Date().toISOString(),
-            'include_actions=' + selectedTab.includeActions,
-            'restriction=' + (Account.isLoggedIn() ? 'open,hifi' : 'open'),
-            'require_online=true',
-            'protocol=' + encodeURIComponent(AddressManager.protocolVersion()),
-            'page=' + pageNumber
-        ];
-        var url = metaverseBase + 'user_stories?' + options.join('&');
-        var thisRequestId = ++requestId;
-        getRequest(url, function (error, data) {
-            if ((thisRequestId !== requestId) || handleError(url, error, data, cb)) {
-                return;
-            }
-            var stories = data.user_stories.map(function (story) { // explicit single-argument function
-                return makeModelData(story, url);
-            });
-            allStories = allStories.concat(stories);
-            stories.forEach(makeFilteredPlaceProcessor());
-            if ((data.current_page < data.total_pages) && (data.current_page <=  10)) { // just 10 pages = 100 stories for now
-                return getUserStoryPage(pageNumber + 1, cb);
-            }
-            cb();
-        });
-    }
-    function makeFilteredPlaceProcessor() { // answer a function(placeData) that adds it to suggestions if it matches
-        var words = addressLine.text.toUpperCase().split(/\s+/).filter(identity),
-            data = allStories;
-        function matches(place) {
-            if (!words.length) {
-                return suggestable(place);
-            }
-            return words.every(function (word) {
-                return place.searchText.indexOf(word) >= 0;
-            });
-        }
-        return function (place) {
-            if (matches(place)) {
-                addToSuggestions(place);
-            }
-        };
-    }
-    function filterChoicesByText() {
-        suggestions.clear();
-        placeMap = {};
-        allStories.forEach(makeFilteredPlaceProcessor());
-    }
-
-    function fillDestinations() {
-        allStories = [];
-        suggestions.clear();
-        placeMap = {};
-        getUserStoryPage(1, function (error) {
-            console.log('user stories query', error || 'ok', allStories.length);
-        });
-    }
-
-    function updateLocationText(enteringAddress) {
-        if (enteringAddress) {
-            notice.text = "Go to a place, @user, path or network address";
-            notice.color = hifiStyleConstants.colors.baseGrayHighlight;
-        } else {
-            notice.text = AddressManager.isConnected ? "Your location:" : "Not Connected";
-            notice.color = AddressManager.isConnected ? hifiStyleConstants.colors.baseGrayHighlight : hifiStyleConstants.colors.redHighlight;
-            // Display hostname, which includes ip address, localhost, and other non-placenames.
-            location.text = (AddressManager.placename || AddressManager.hostname || '') + (AddressManager.pathname ? AddressManager.pathname.match(/\/[^\/]+/)[0] : '');
-        }
-    }
-
-    onVisibleChanged: {
-        updateLocationText(false);
-        if (visible) {
-            addressLine.forceActiveFocus();
-            fillDestinations();
-        }
-    }
-
-    function toggleOrGo(fromSuggestions) {
-        if (addressLine.text !== "") {
-            addressBarDialog.loadAddress(addressLine.text, fromSuggestions)
-        }
-        root.shown = false;
-    }
-
-    Keys.onPressed: {
-        switch (event.key) {
-            case Qt.Key_Escape:
-            case Qt.Key_Back:
-                root.shown = false
-                clearAddressLineTimer.start();
-                event.accepted = true
-                break
-            case Qt.Key_Enter:
-            case Qt.Key_Return:
-                toggleOrGo()
-                clearAddressLineTimer.start();
-                event.accepted = true
-                break
-        }
-    }
-}

interface/resources/qml/AudioScope.qml

@@ -0,0 +1,634 @@
+//
+//  AudioScope.qml
+//
+//  Created by Luis Cuenca on 11/22/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import "styles-uit"
+import "controls-uit" as HifiControlsUit
+
+Item {
+    id: root
+    width: parent.width
+    height: parent.height   
+    
+    property var _scopeInputData 
+    property var _scopeOutputLeftData
+    property var _scopeOutputRightData
+    
+    property var _triggerInputData 
+    property var _triggerOutputLeftData
+    property var _triggerOutputRightData
+    
+    property var _triggerValues: QtObject{ 
+        property int x: parent.width/2 
+        property int y: parent.height/3
+    }
+    
+    property var _triggered: false
+    property var _steps
+    property var _refreshMs: 32
+    property var _framesPerSecond: AudioScope.getFramesPerSecond()
+    property var _isFrameUnits: true
+    
+    property var _holdStart: QtObject{ 
+        property int x: 0
+        property int y: 0
+    }
+    
+    property var _holdEnd: QtObject{ 
+        property int x: 0 
+        property int y: 0
+    }
+    
+    property var _timeBeforeHold: 300
+    property var _pressedTime: 0
+    property var _isPressed: false
+
+    property var _recOpacity : 0.0
+    property var _recSign : 0.05
+
+    property var _outputLeftState: false
+    property var _outputRightState: false
+    
+    property var _wavFilePath: ""
+    
+    function isHolding() {
+        return (_pressedTime > _timeBeforeHold); 
+    }
+    
+    function updateMeasureUnits() {
+        timeButton.text = _isFrameUnits ? "Display Frames" : "Milliseconds";
+        fiveLabel.text = _isFrameUnits ? "5" : "" + (Math.round(1000 * 5.0/_framesPerSecond));
+        twentyLabel.text = _isFrameUnits ? "20" : "" + (Math.round(1000 * 20.0/_framesPerSecond));
+        fiftyLabel.text = _isFrameUnits ? "50" : "" + (Math.round(1000 * 50.0/_framesPerSecond));
+    }
+    
+    function collectScopeData() {
+        if (inputCh.checked) { 
+            _scopeInputData  = AudioScope.scopeInput;
+        }
+        if (outputLeftCh.checked) {
+            _scopeOutputLeftData  = AudioScope.scopeOutputLeft;
+        }
+        if (outputRightCh.checked) {
+            _scopeOutputRightData  = AudioScope.scopeOutputRight;
+        }
+    }
+    
+    function collectTriggerData() {
+        if (inputCh.checked) { 
+            _triggerInputData  = AudioScope.triggerInput;
+        }
+        if (outputLeftCh.checked) {
+            _triggerOutputLeftData  = AudioScope.triggerOutputLeft;
+        }
+        if (outputRightCh.checked) {
+            _triggerOutputRightData  = AudioScope.triggerOutputRight;
+        }
+    }
+
+    function setRecordingLabelOpacity(opacity) {
+        _recOpacity = opacity;
+        recCircle.opacity = _recOpacity;
+        recText.opacity = _recOpacity;
+    }
+
+    function updateRecordingLabel() {
+        _recOpacity += _recSign;
+        if (_recOpacity > 1.0 || _recOpacity < 0.0) {
+            _recOpacity = _recOpacity > 1.0 ? 1.0 : 0.0;
+            _recSign *= -1;
+        }
+        setRecordingLabelOpacity(_recOpacity);
+    }
+        
+    function pullFreshValues() {
+        if (Audio.getRecording()) {
+            updateRecordingLabel();
+        }
+
+        if (!AudioScope.getPause()) {        
+            if (!_triggered) {
+                collectScopeData();
+            }               
+        } 
+        if (inputCh.checked || outputLeftCh.checked || outputRightCh.checked) {
+            mycanvas.requestPaint();
+        }
+    }
+    
+    function startRecording() {
+        _wavFilePath = (new Date()).toISOString();  // yyyy-mm-ddThh:mm:ss.sssZ
+        _wavFilePath = _wavFilePath.replace(/[\-:]|\.\d*Z$/g, "").replace("T", "-") + ".wav";
+        // Using controller recording default directory
+        _wavFilePath = Recording.getDefaultRecordingSaveDirectory() + _wavFilePath;
+        if (!Audio.startRecording(_wavFilePath)) {
+            Messages.sendMessage("Hifi-Notifications", JSON.stringify({message:"Error creating: "+_wavFilePath}));
+            updateRecordingUI(false);
+        }
+    }
+
+    function stopRecording() {
+        Audio.stopRecording();
+        setRecordingLabelOpacity(0.0);
+        Messages.sendMessage("Hifi-Notifications", JSON.stringify({message:"Saved: "+_wavFilePath}));
+    }
+
+    function updateRecordingUI(isRecording) {
+        if (!isRecording) {
+            recordButton.text = "Record";
+            recordButton.color = hifi.buttons.black;
+            outputLeftCh.checked = _outputLeftState;
+            outputRightCh.checked = _outputRightState;
+        } else {
+            recordButton.text = "Stop";
+            recordButton.color = hifi.buttons.red;
+            _outputLeftState = outputLeftCh.checked;
+            _outputRightState = outputRightCh.checked;
+            outputLeftCh.checked = true;
+            outputRightCh.checked = true;
+        }
+    }
+    
+    function toggleRecording() {
+        if (Audio.getRecording()) {
+            updateRecordingUI(false);
+            stopRecording();
+        } else {
+            updateRecordingUI(true);
+            startRecording();
+        }
+    }
+    
+    Timer {
+        interval: _refreshMs; running: true; repeat: true
+        onTriggered: pullFreshValues()
+    }
+
+    Canvas {
+        id: mycanvas
+        anchors.fill:parent
+        
+        onPaint: {
+        
+            function displayMeasureArea(ctx) {
+                
+                ctx.fillStyle = Qt.rgba(0.1, 0.1, 0.1, 1);
+                ctx.fillRect(_holdStart.x, 0, _holdEnd.x - _holdStart.x, height);
+                
+                ctx.lineWidth = "2";
+                ctx.strokeStyle = "#555555";
+                
+                ctx.beginPath();
+                ctx.moveTo(_holdStart.x, 0); 
+                ctx.lineTo(_holdStart.x, height);
+                ctx.moveTo(_holdEnd.x, 0); 
+                ctx.lineTo(_holdEnd.x, height); 
+                                
+                ctx.moveTo(_holdStart.x, _holdStart.y); 
+                ctx.lineTo(_holdEnd.x, _holdStart.y); 
+                ctx.moveTo(_holdEnd.x, _holdEnd.y); 
+                ctx.lineTo(_holdStart.x, _holdEnd.y);
+                
+                ctx.stroke();
+            }
+            
+            function displayTrigger(ctx, lineWidth, color) {
+                var crossSize = 3;
+                var holeSize = 2;
+                
+                ctx.lineWidth = lineWidth;
+                ctx.strokeStyle = color;
+                
+                ctx.beginPath();
+                ctx.moveTo(_triggerValues.x - (crossSize + holeSize), _triggerValues.y); 
+                ctx.lineTo(_triggerValues.x - holeSize, _triggerValues.y); 
+                ctx.moveTo(_triggerValues.x + holeSize, _triggerValues.y); 
+                ctx.lineTo(_triggerValues.x + (crossSize + holeSize), _triggerValues.y); 
+                
+                ctx.moveTo(_triggerValues.x, _triggerValues.y - (crossSize + holeSize)); 
+                ctx.lineTo(_triggerValues.x, _triggerValues.y - holeSize); 
+                ctx.moveTo(_triggerValues.x, _triggerValues.y + holeSize); 
+                ctx.lineTo(_triggerValues.x, _triggerValues.y + (crossSize + holeSize));
+
+                ctx.stroke();
+            }
+            
+            function displayBackground(ctx, datawidth, steps, lineWidth, color) {
+                var verticalPadding = 100;
+                
+                ctx.strokeStyle = color;
+                ctx.lineWidth = lineWidth;
+ 
+                ctx.moveTo(0, height/2); 
+                ctx.lineTo(datawidth, height/2);
+                
+                var gap = datawidth/steps;
+                for (var i = 0; i < steps; i++) {
+                    ctx.moveTo(i*gap + 1, verticalPadding); 
+                    ctx.lineTo(i*gap + 1, height-verticalPadding); 
+                }
+                ctx.moveTo(datawidth-1, verticalPadding); 
+                ctx.lineTo(datawidth-1, height-verticalPadding); 
+                
+                ctx.stroke();
+            }
+            
+            function drawScope(ctx, data, width, color) {
+                ctx.beginPath();
+                ctx.strokeStyle = color;
+                ctx.lineWidth = width;
+                var x = 0;
+                for (var i = 0; i < data.length-1; i++) {
+                    ctx.moveTo(x, data[i] + height/2); 
+                    ctx.lineTo(++x, data[i+1] + height/2);              
+                }
+                ctx.stroke();
+            }
+            
+            function getMeasurementText(dist) {
+                var datasize = _scopeInputData.length;
+                var value = 0;
+                if (fiveFrames.checked) {
+                    value = (_isFrameUnits) ? 5.0*dist/datasize : (Math.round(1000 * 5.0/_framesPerSecond))*dist/datasize;
+                } else if (twentyFrames.checked) {
+                    value = (_isFrameUnits) ? 20.0*dist/datasize : (Math.round(1000 * 20.0/_framesPerSecond))*dist/datasize;
+                } else if (fiftyFrames.checked) {
+                    value = (_isFrameUnits) ? 50.0*dist/datasize : (Math.round(1000 * 50.0/_framesPerSecond))*dist/datasize;
+                }
+                value = Math.abs(Math.round(value*100)/100);
+                var measureText = "" + value + (_isFrameUnits ? " frames" : " milliseconds");
+                return measureText;
+            }
+            
+            function drawMeasurements(ctx, color) {
+                ctx.fillStyle = color;
+                ctx.font = "normal 16px sans-serif";
+                var fontwidth = 8;
+                var measureText = getMeasurementText(_holdEnd.x - _holdStart.x);
+                if (_holdStart.x < _holdEnd.x) {
+                    ctx.fillText("" + height/2 - _holdStart.y, _holdStart.x-40, _holdStart.y);
+                    ctx.fillText("" + height/2 - _holdEnd.y, _holdStart.x-40, _holdEnd.y);  
+                    ctx.fillText(measureText, _holdEnd.x+10, _holdEnd.y);                   
+                } else {
+                    ctx.fillText("" + height/2 - _holdStart.y, _holdStart.x+10, _holdStart.y);
+                    ctx.fillText("" + height/2 - _holdEnd.y, _holdStart.x+10, _holdEnd.y); 
+                    ctx.fillText(measureText, _holdEnd.x-fontwidth*measureText.length, _holdEnd.y);  
+                }                               
+            }
+            
+            var ctx = getContext("2d");
+            
+            ctx.fillStyle = Qt.rgba(0, 0, 0, 1);
+            ctx.fillRect(0, 0, width, height);
+                
+            if (isHolding()) {
+                displayMeasureArea(ctx);
+            }
+
+            var guideLinesColor = "#555555"
+            var guideLinesWidth = "1"
+            
+            displayBackground(ctx, _scopeInputData.length, _steps, guideLinesWidth, guideLinesColor);
+                
+            var triggerWidth = "3"
+            var triggerColor = "#EFB400"
+            
+            if (AudioScope.getAutoTrigger()) {
+                displayTrigger(ctx, triggerWidth, triggerColor);
+            }
+            
+            var scopeWidth = "2"
+            var scopeInputColor = "#00B4EF"
+            var scopeOutputLeftColor = "#BB0000"
+            var scopeOutputRightColor = "#00BB00"
+            
+            if (!_triggered) {
+                if (inputCh.checked) {
+                    drawScope(ctx, _scopeInputData, scopeWidth, scopeInputColor);
+                }
+                if (outputLeftCh.checked) {
+                    drawScope(ctx, _scopeOutputLeftData, scopeWidth, scopeOutputLeftColor);
+                }
+                if (outputRightCh.checked) {
+                    drawScope(ctx, _scopeOutputRightData, scopeWidth, scopeOutputRightColor);
+                }   
+            } else {
+                if (inputCh.checked) {
+                    drawScope(ctx, _triggerInputData, scopeWidth, scopeInputColor);
+                }
+                if (outputLeftCh.checked) {
+                    drawScope(ctx, _triggerOutputLeftData, scopeWidth, scopeOutputLeftColor);
+                }
+                if (outputRightCh.checked) {
+                    drawScope(ctx, _triggerOutputRightData, scopeWidth, scopeOutputRightColor);
+                }
+            }
+            
+            if (isHolding()) {
+                drawMeasurements(ctx, "#eeeeee");
+            }
+            
+            if (_isPressed) {
+                _pressedTime += _refreshMs;
+            }
+        }
+    }
+    
+    MouseArea {
+        id: hitbox
+        anchors.fill: mycanvas
+        hoverEnabled: true
+        onPressed: {
+            _isPressed = true;
+            _pressedTime = 0;
+            _holdStart.x = mouseX;
+            _holdStart.y = mouseY;
+        }
+        onPositionChanged: {
+            _holdEnd.x = mouseX;
+            _holdEnd.y = mouseY;
+        }
+        onReleased: {
+            if (!isHolding() && AudioScope.getAutoTrigger()) {
+                _triggerValues.x = mouseX
+                _triggerValues.y = mouseY
+                AudioScope.setTriggerValues(mouseX, mouseY-height/2);
+            }
+            _isPressed = false;
+            _pressedTime = 0;
+        }
+    }
+    
+    HifiControlsUit.CheckBox {
+        id: activated
+        boxSize: 20
+        anchors.top: parent.top;
+        anchors.left: parent.left;
+        anchors.topMargin: 8;
+        anchors.leftMargin: 20;
+        checked: AudioScope.getVisible();
+        onCheckedChanged: {     
+            AudioScope.setVisible(checked);
+            activelabel.text = AudioScope.getVisible() ? "On" : "Off"
+        }
+    }
+          
+    HifiControlsUit.Label {
+        id: activelabel
+        text: AudioScope.getVisible() ? "On" : "Off"
+        anchors.top: activated.top;
+        anchors.left: activated.right;
+    }
+    
+    HifiControlsUit.CheckBox {
+        id: outputLeftCh
+        boxSize: 20
+        text: "Output L"
+        anchors.horizontalCenter: parent.horizontalCenter;
+        anchors.top: parent.top;
+        anchors.topMargin: 8;
+        onCheckedChanged: {
+            AudioScope.setServerEcho(outputLeftCh.checked || outputRightCh.checked);
+        }
+    }
+	
+    HifiControlsUit.Label {
+        text: "Channels";
+        anchors.horizontalCenter: outputLeftCh.horizontalCenter;
+        anchors.bottom: outputLeftCh.top;
+        anchors.bottomMargin: 8;
+    }
+    
+    HifiControlsUit.CheckBox {
+        id: inputCh
+        boxSize: 20
+        text: "Input Mono"
+        anchors.bottom: outputLeftCh.bottom;
+        anchors.right: outputLeftCh.left;
+        anchors.rightMargin: 40;
+        onCheckedChanged: {
+			AudioScope.setLocalEcho(checked);
+        }
+    }
+    
+    HifiControlsUit.CheckBox {
+        id: outputRightCh
+        boxSize: 20
+        text: "Output R"
+        anchors.bottom: outputLeftCh.bottom;
+        anchors.left: outputLeftCh.right;
+        anchors.leftMargin: 40;
+        onCheckedChanged: {
+            AudioScope.setServerEcho(outputLeftCh.checked || outputRightCh.checked);
+        }
+    }
+    
+    HifiControlsUit.Button {
+        id: recordButton;
+        text: "Record";
+        color: hifi.buttons.black;
+        colorScheme: hifi.colorSchemes.dark;
+        anchors.right: parent.right;
+        anchors.bottom: parent.bottom;
+        anchors.rightMargin: 30;
+        anchors.bottomMargin: 8;
+        width: 95;
+        height: 55;
+        onClicked: {
+            toggleRecording();
+        }
+    }
+    
+    HifiControlsUit.Button {
+        id: pauseButton;
+        color: hifi.buttons.black;
+        colorScheme: hifi.colorSchemes.dark;
+        anchors.right: recordButton.left;
+        anchors.bottom: parent.bottom;
+        anchors.rightMargin: 30;
+        anchors.bottomMargin: 8;
+        height: 55;
+        width: 95;
+        text: " Pause ";
+        onClicked: {
+            AudioScope.togglePause();
+        }
+    }
+    
+    HifiControlsUit.CheckBox {
+        id: twentyFrames
+        boxSize: 20
+        anchors.left: parent.horizontalCenter;
+        anchors.bottom: parent.bottom;
+        anchors.bottomMargin: 8;
+        onCheckedChanged: {
+            if (checked){
+                fiftyFrames.checked = false;
+                fiveFrames.checked = false;
+                AudioScope.selectAudioScopeTwentyFrames();
+                _steps = 20;
+                AudioScope.setPause(false);
+            }
+        }
+    }
+    
+    HifiControlsUit.Label {
+        id:twentyLabel
+        anchors.left: twentyFrames.right;
+        anchors.verticalCenter: twentyFrames.verticalCenter;
+    }
+    
+    HifiControlsUit.Button {
+        id: timeButton;
+        color: hifi.buttons.black;
+        colorScheme: hifi.colorSchemes.dark;
+        text: "Display Frames";
+        anchors.horizontalCenter: twentyFrames.horizontalCenter;
+        anchors.bottom: twentyFrames.top;
+        anchors.bottomMargin: 8;
+        height: 26;
+        onClicked: {
+            _isFrameUnits = !_isFrameUnits;
+            updateMeasureUnits();
+        }
+    }
+    
+    HifiControlsUit.CheckBox {
+        id: fiveFrames
+        boxSize: 20
+        anchors.horizontalCenter: parent.horizontalCenter;
+        anchors.bottom: parent.bottom;
+        anchors.bottomMargin: 8;
+        anchors.horizontalCenterOffset: -50;
+        checked: true;
+        onCheckedChanged: {
+            if (checked) {
+                fiftyFrames.checked = false;
+                twentyFrames.checked = false;
+                AudioScope.selectAudioScopeFiveFrames();
+                _steps = 5;
+                AudioScope.setPause(false);
+            }
+        }
+    }
+    
+    HifiControlsUit.Label {
+        id:fiveLabel
+        anchors.left: fiveFrames.right;
+        anchors.verticalCenter: fiveFrames.verticalCenter;
+    }
+    
+    HifiControlsUit.CheckBox {
+        id: fiftyFrames
+        boxSize: 20
+        anchors.horizontalCenter: parent.horizontalCenter;
+        anchors.bottom: parent.bottom;
+        anchors.bottomMargin: 8;
+        anchors.horizontalCenterOffset: 70;
+        onCheckedChanged: {
+            if (checked) {
+                twentyFrames.checked = false;
+                fiveFrames.checked = false;
+                AudioScope.selectAudioScopeFiftyFrames();
+                _steps = 50;
+                AudioScope.setPause(false);            
+            }
+        }
+    }
+    
+    HifiControlsUit.Label {
+        id:fiftyLabel
+        anchors.left: fiftyFrames.right;
+        anchors.verticalCenter: fiftyFrames.verticalCenter;
+    }
+    
+    HifiControlsUit.Switch {
+        id: triggerSwitch;
+        height: 26;
+        anchors.left: parent.left;
+        anchors.bottom: parent.bottom;
+        anchors.leftMargin: 75;
+        anchors.bottomMargin: 8;
+        labelTextOff: "Off";
+        labelTextOn: "On";
+        onCheckedChanged: {
+            if (!checked) AudioScope.setPause(false);
+            AudioScope.setPause(false);
+            AudioScope.setAutoTrigger(checked);
+            AudioScope.setTriggerValues(_triggerValues.x, _triggerValues.y-root.height/2);
+        }
+    }
+    
+    HifiControlsUit.Label {
+        text: "Trigger";
+        anchors.left: triggerSwitch.left;
+        anchors.leftMargin: -15;
+        anchors.bottom: triggerSwitch.top;
+    }
+    
+    Rectangle {
+        id: recordIcon;
+        width:110;
+        height:40;
+        anchors.right: parent.right;
+        anchors.top: parent.top;
+        anchors.topMargin: 8;
+        color: "transparent"
+        
+        Text {
+            id: recText
+            text: "REC"
+            color: "red"
+            font.pixelSize: 30;
+            anchors.left: recCircle.right;
+            anchors.leftMargin: 10;
+            opacity: _recOpacity;
+            y: -8;
+        }       
+        
+        Rectangle {
+            id: recCircle;
+            width: 25;
+            height: 25;
+            radius: width*0.5
+            opacity: _recOpacity;
+            color: "red";
+        }
+    }
+    
+    Component.onCompleted: {  
+        _steps = AudioScope.getFramesPerScope();
+        AudioScope.setTriggerValues(_triggerValues.x, _triggerValues.y-root.height/2);
+        activated.checked = true;
+		inputCh.checked = true;
+        updateMeasureUnits();
+    }
+    
+    Connections {
+        target: AudioScope
+        onPauseChanged: {
+            if (!AudioScope.getPause()) {
+                pauseButton.text = "Pause";
+                pauseButton.color = hifi.buttons.black;
+                AudioScope.setTriggered(false);
+                _triggered = false;
+            } else {
+                pauseButton.text = "Continue";
+                pauseButton.color = hifi.buttons.blue;
+            }           
+        }
+        onTriggered: {
+            _triggered = true;
+            collectTriggerData();
+            AudioScope.setPause(true);
+        }
+    }
+}

interface/resources/qml/Browser.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.2
 import QtWebChannel 1.0
-import QtWebEngine 1.2
+import QtWebEngine 1.5
 
 import "controls-uit"
 import "styles" as HifiStyles
@@ -212,7 +212,7 @@ ScrollingWindow {
             WebEngineScript {
                 id: createGlobalEventBridge
                 sourceCode: eventBridgeJavaScriptToInject
-                injectionPoint: WebEngineScript.DocumentCreation
+                injectionPoint: WebEngineScript.Deferred
                 worldId: WebEngineScript.MainWorld
             }
 
@@ -233,9 +233,13 @@ ScrollingWindow {
             anchors.right: parent.right
 
             onFeaturePermissionRequested: {
-                permissionsBar.securityOrigin = securityOrigin;
-                permissionsBar.feature = feature;
-                root.showPermissionsBar();
+                if (feature == 2) { // QWebEnginePage::MediaAudioCapture
+                    grantFeaturePermission(securityOrigin, feature, true);
+                } else {
+                    permissionsBar.securityOrigin = securityOrigin;
+                    permissionsBar.feature = feature;
+                    root.showPermissionsBar();
+                }
             }
 
             onLoadingChanged: {

interface/resources/qml/controls-uit/BaseWebView.qml

@@ -8,7 +8,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-import QtQuick 2.5
+import QtQuick 2.7
 import QtWebEngine 1.5
 
 WebEngineView {

interface/resources/qml/controls-uit/Key.qml

@@ -5,10 +5,16 @@ Item {
     id: keyItem
     width: 45
     height: 50
+
+    property int contentPadding: 4
     property string glyph: "a"
     property bool toggle: false   // does this button have the toggle behaivor?
     property bool toggled: false  // is this button currently toggled?
     property alias mouseArea: mouseArea1
+    property alias fontFamily: letter.font.family;
+    property alias fontPixelSize: letter.font.pixelSize
+    property alias verticalAlignment: letter.verticalAlignment
+    property alias letterAnchors: letter.anchors
 
     function resetToggledMode(mode) {
         toggled = mode;
@@ -64,11 +70,12 @@ Item {
             keyItem.state = "mouseOver";
 
             var globalPosition = keyItem.mapToGlobal(mouseArea1.mouseX, mouseArea1.mouseY);
-            var deviceId = Web3DOverlay.deviceIdByTouchPoint(globalPosition.x, globalPosition.y);
-            var hand = deviceId - 1; // based on touchEventUtils.js, deviceId is 'hand + 1', so 'hand' is 'deviceId' - 1
+            var pointerID = Web3DOverlay.deviceIdByTouchPoint(globalPosition.x, globalPosition.y);
 
-            if (hand == leftHand || hand == rightHand) {
-                Controller.triggerHapticPulse(_HAPTIC_STRENGTH, _HAPTIC_DURATION, hand);
+            if (Pointers.isLeftHand(pointerID)) {
+                Controller.triggerHapticPulse(_HAPTIC_STRENGTH, _HAPTIC_DURATION, leftHand);
+            } else if (Pointers.isRightHand(pointerID)) {
+                Controller.triggerHapticPulse(_HAPTIC_STRENGTH, _HAPTIC_DURATION, rightHand);
             }
         }
 
@@ -105,14 +112,8 @@ Item {
         color: "#121212"
         radius: 2
         border.color: "#00000000"
-        anchors.right: parent.right
-        anchors.rightMargin: 4
-        anchors.left: parent.left
-        anchors.leftMargin: 4
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 4
-        anchors.top: parent.top
-        anchors.topMargin: 4
+        anchors.fill: parent
+        anchors.margins: contentPadding
     }
 
     Text {

interface/resources/qml/controls-uit/Keyboard.qml

@@ -8,7 +8,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-import QtQuick 2.0
+import QtQuick 2.7
+import QtGraphicalEffects 1.0
 import "."
 
 Rectangle {
@@ -55,6 +56,8 @@ Rectangle {
             return ">";
         } else if (str === "/") {
             return "?";
+        } else if (str === "-") {
+            return "_";
         } else {
             return str.toUpperCase(str);
         }
@@ -67,6 +70,8 @@ Rectangle {
             return ".";
         } else if (str === "?") {
             return "/";
+        } else if (str === "_") {
+            return "-";
         } else {
             return str.toLowerCase(str);
         }
@@ -85,7 +90,7 @@ Rectangle {
 
     onShiftModeChanged: {
         forEachKey(function (key) {
-            if (/[a-z]/i.test(key.glyph)) {
+            if (/[a-z-_]/i.test(key.glyph)) {
                 if (shiftMode) {
                     key.glyph = keyboardBase.toUpper(key.glyph);
                 } else {
@@ -112,8 +117,6 @@ Rectangle {
     }
 
     Rectangle {
-        y: 0
-        x: 0
         height: showMirrorText ? mirrorTextHeight : 0
         width: keyboardWidth
         color: "#252525"
@@ -122,13 +125,18 @@ Rectangle {
         TextInput {
             id: mirrorText
             visible: showMirrorText
-            FontLoader { id: ralewaySemiBold; source: "../../fonts/Raleway-SemiBold.ttf"; }
-            font.family: ralewaySemiBold.name
-            font.pointSize: 13.5
+            FontLoader { id: font; source: "../../fonts/FiraSans-Regular.ttf"; }
+            font.family: font.name
+            font.pixelSize: 20
             verticalAlignment: Text.AlignVCenter
             horizontalAlignment: Text.AlignHCenter
-            color: "#FFFFFF";
-            anchors.fill: parent
+            color: "#00B4EF";
+            anchors.left: parent.left
+            anchors.leftMargin: 10
+            anchors.right: parent.right
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+
             wrapMode: Text.WordWrap
             readOnly: false // we need this to allow control to accept QKeyEvent
             selectByMouse: false
@@ -140,16 +148,15 @@ Rectangle {
                     event.accepted = true;
                 }
             }
-        }
 
-        MouseArea { // ... and we need this mouse area to prevent mirrorText from getting mouse events to ensure it will never get focus
-            anchors.fill: parent
+            MouseArea { // ... and we need this mouse area to prevent mirrorText from getting mouse events to ensure it will never get focus
+                anchors.fill: parent
+            }
         }
     }
 
     Rectangle {
         id: keyboardRect
-        x: 0
         y: showMirrorText ? mirrorTextHeight : 0
         width: keyboardWidth
         height: raisedHeight
@@ -158,6 +165,8 @@ Rectangle {
         anchors.bottom: parent.bottom
         anchors.bottomMargin: 0
 
+        FontLoader { id: hiFiGlyphs; source: pathToFonts + "fonts/hifi-glyphs.ttf"; }
+
         Column {
             id: columnAlpha
             width: keyboardWidth
@@ -221,7 +230,7 @@ Rectangle {
                 Key { width: 43; glyph: "b"; }
                 Key { width: 43; glyph: "n"; }
                 Key { width: 43; glyph: "m"; }
-                Key { width: 43; glyph: "_"; }
+                Key { width: 43; glyph: "-"; }
                 Key { width: 43; glyph: "/"; }
                 Key { width: 43; glyph: "?"; }
             }
@@ -240,8 +249,13 @@ Rectangle {
                 Key { width: 231; glyph: " "; }
                 Key { width: 43; glyph: ","; }
                 Key { width: 43; glyph: "."; }
-                Key { width: 43; glyph: "\u276C"; }
-                Key { width: 43; glyph: "\u276D"; }
+                Key {
+                    fontFamily: hiFiGlyphs.name;
+                    fontPixelSize: 48;
+                    letterAnchors.topMargin: -4;
+                    verticalAlignment: Text.AlignVCenter;
+                    width: 86; glyph: "\ue02b";
+                }
             }
         }
 
@@ -328,8 +342,13 @@ Rectangle {
                 Key { width: 231; glyph: " "; }
                 Key { width: 43; glyph: ","; }
                 Key { width: 43; glyph: "."; }
-                Key { width: 43; glyph: "\u276C"; }
-                Key { width: 43; glyph: "\u276D"; }
+                Key {
+                    fontFamily: hiFiGlyphs.name;
+                    fontPixelSize: 48;
+                    letterAnchors.topMargin: -4;
+                    verticalAlignment: Text.AlignVCenter;
+                    width: 86; glyph: "\ue02b";
+                }
             }
         }
     }

interface/resources/qml/controls-uit/Table.qml

@@ -11,6 +11,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
+import QtQuick.Controls 2.2 as QQC2
 
 import "../styles-uit"
 
@@ -24,6 +25,45 @@ TableView {
 
     model: ListModel { }
 
+    Component.onCompleted: {
+        if (flickableItem !== null && flickableItem !== undefined) {
+            tableView.flickableItem.QQC2.ScrollBar.vertical = scrollbar
+        }
+    }
+
+    QQC2.ScrollBar {
+        id: scrollbar
+        parent: tableView.flickableItem
+        policy: QQC2.ScrollBar.AsNeeded
+        orientation: Qt.Vertical
+        visible: size < 1.0
+        topPadding: tableView.headerVisible ? hifi.dimensions.tableHeaderHeight + 1 : 1
+        anchors.top: tableView.top
+        anchors.left: tableView.right
+        anchors.bottom: tableView.bottom
+
+        background: Item {
+            implicitWidth: hifi.dimensions.scrollbarBackgroundWidth
+            Rectangle {
+                anchors {
+                    fill: parent;
+                    topMargin: tableView.headerVisible ? hifi.dimensions.tableHeaderHeight : 0
+                }
+                color: isLightColorScheme ? hifi.colors.tableScrollBackgroundLight
+                                          : hifi.colors.tableScrollBackgroundDark
+            }
+        }
+
+        contentItem: Item {
+            implicitWidth: hifi.dimensions.scrollbarHandleWidth
+            Rectangle {
+                anchors.fill: parent
+                radius: (width - 4)/2
+                color: isLightColorScheme ? hifi.colors.tableScrollHandleLight : hifi.colors.tableScrollHandleDark
+            }
+        }
+    }
+
     headerVisible: false
     headerDelegate: Rectangle {
         height: hifi.dimensions.tableHeaderHeight
@@ -98,74 +138,13 @@ TableView {
     backgroundVisible: true
 
     horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-    verticalScrollBarPolicy: Qt.ScrollBarAsNeeded
+    verticalScrollBarPolicy: Qt.ScrollBarAlwaysOff
 
     style: TableViewStyle {
         // Needed in order for rows to keep displaying rows after end of table entries.
         backgroundColor: tableView.isLightColorScheme ? hifi.colors.tableBackgroundLight : hifi.colors.tableBackgroundDark
         alternateBackgroundColor: tableView.isLightColorScheme ? hifi.colors.tableRowLightOdd : hifi.colors.tableRowDarkOdd
-
         padding.top: headerVisible ? hifi.dimensions.tableHeaderHeight: 0
-
-        handle: Item {
-            id: scrollbarHandle
-            implicitWidth: hifi.dimensions.scrollbarHandleWidth
-            Rectangle {
-                anchors {
-                    fill: parent
-                    topMargin: 3
-                    bottomMargin: 3     // ""
-                    leftMargin: 1       // Move it right
-                    rightMargin: -1     // ""
-                }
-                radius: hifi.dimensions.scrollbarHandleWidth/2
-                color: isLightColorScheme ? hifi.colors.tableScrollHandleLight : hifi.colors.tableScrollHandleDark
-            }
-        }
-
-        scrollBarBackground: Item {
-            implicitWidth: hifi.dimensions.scrollbarBackgroundWidth
-            Rectangle {
-                anchors {
-                    fill: parent
-                    margins: -1     // Expand
-                    topMargin: -1
-                }
-                color: isLightColorScheme ? hifi.colors.tableScrollBackgroundLight : hifi.colors.tableScrollBackgroundDark
-                
-                // Extend header color above scrollbar background
-                Rectangle {
-                    anchors {
-                        top: parent.top
-                        topMargin: -hifi.dimensions.tableHeaderHeight
-                        left: parent.left
-                        right: parent.right
-                    }
-                    height: hifi.dimensions.tableHeaderHeight
-                    color: tableView.isLightColorScheme ? hifi.colors.tableBackgroundLight : hifi.colors.tableBackgroundDark
-                    visible: headerVisible
-                }
-                Rectangle {
-                    // Extend header bottom border
-                    anchors {
-                        top: parent.top
-                        left: parent.left
-                        right: parent.right
-                    }
-                    height: 1
-                    color: isLightColorScheme ? hifi.colors.lightGrayText : hifi.colors.baseGrayHighlight
-                    visible: headerVisible
-                }
-            }
-        }
-
-        incrementControl: Item {
-            visible: false
-        }
-
-        decrementControl: Item {
-            visible: false
-        }
     }
 
     rowDelegate: Rectangle {

interface/resources/qml/controls-uit/Tree.qml

@@ -9,9 +9,11 @@
 //
 
 import QtQml.Models 2.2
-import QtQuick 2.5
+import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
+import QtQuick.Controls 2.2 as QQC2
+
 
 import "../styles-uit"
 
@@ -35,6 +37,45 @@ TreeView {
     
     headerVisible: false
 
+    Component.onCompleted: {
+        if (flickableItem !== null && flickableItem !== undefined) {
+            treeView.flickableItem.QQC2.ScrollBar.vertical = scrollbar
+        }
+    }
+
+    QQC2.ScrollBar {
+        id: scrollbar
+        parent: treeView.flickableItem
+        policy: QQC2.ScrollBar.AsNeeded
+        orientation: Qt.Vertical
+        visible: size < 1.0
+        topPadding: treeView.headerVisible ? hifi.dimensions.tableHeaderHeight + 1 : 1
+        anchors.top: treeView.top
+        anchors.left: treeView.right
+        anchors.bottom: treeView.bottom
+
+        background: Item {
+            implicitWidth: hifi.dimensions.scrollbarBackgroundWidth
+            Rectangle {
+                anchors {
+                    fill: parent;
+                    topMargin: treeView.headerVisible ? hifi.dimensions.tableHeaderHeight: 0
+                }
+                color: isLightColorScheme ? hifi.colors.tableScrollBackgroundLight
+                                          : hifi.colors.tableScrollBackgroundDark
+            }
+        }
+
+        contentItem: Item {
+            implicitWidth: hifi.dimensions.scrollbarHandleWidth
+            Rectangle {
+                anchors.fill: parent
+                radius: (width - 4)/2
+                color: isLightColorScheme ? hifi.colors.tableScrollHandleLight : hifi.colors.tableScrollHandleDark
+            }
+        }
+    }
+
     // Use rectangle to draw border with rounded corners.
     frameVisible: false
     Rectangle {
@@ -50,7 +91,7 @@ TreeView {
     backgroundVisible: true
 
     horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-    verticalScrollBarPolicy: Qt.ScrollBarAsNeeded
+    verticalScrollBarPolicy: Qt.ScrollBarAlwaysOff
 
     style: TreeViewStyle {
         // Needed in order for rows to keep displaying rows after end of table entries.
@@ -126,66 +167,6 @@ TreeView {
                 leftMargin: hifi.dimensions.tablePadding / 2
             }
         }
-
-        handle: Item {
-            id: scrollbarHandle
-            implicitWidth: hifi.dimensions.scrollbarHandleWidth
-            Rectangle {
-                anchors {
-                    fill: parent
-                    topMargin: treeView.headerVisible ? hifi.dimensions.tableHeaderHeight + 3 : 3
-                    bottomMargin: 3     // ""
-                    leftMargin: 1       // Move it right
-                    rightMargin: -1     // ""
-                }
-                radius: hifi.dimensions.scrollbarHandleWidth / 2
-                color: treeView.isLightColorScheme ? hifi.colors.tableScrollHandleLight : hifi.colors.tableScrollHandleDark
-            }
-        }
-
-        scrollBarBackground: Item {
-            implicitWidth: hifi.dimensions.scrollbarBackgroundWidth
-            Rectangle {
-                anchors {
-                    fill: parent
-                    topMargin: treeView.headerVisible ? hifi.dimensions.tableHeaderHeight - 1 : -1
-                    margins: -1     // Expand
-                }
-                color: treeView.isLightColorScheme ? hifi.colors.tableScrollBackgroundLight : hifi.colors.tableScrollBackgroundDark
-                
-                // Extend header color above scrollbar background
-                Rectangle {
-                    anchors {
-                        top: parent.top
-                        topMargin: -hifi.dimensions.tableHeaderHeight
-                        left: parent.left
-                        right: parent.right
-                    }
-                    height: hifi.dimensions.tableHeaderHeight
-                    color: treeView.isLightColorScheme ? hifi.colors.tableBackgroundLight : hifi.colors.tableBackgroundDark
-                    visible: treeView.headerVisible
-                }
-                Rectangle {
-                    // Extend header bottom border
-                    anchors {
-                        top: parent.top
-                        left: parent.left
-                        right: parent.right
-                    }
-                    height: 1
-                    color: treeView.isLightColorScheme ? hifi.colors.lightGrayText : hifi.colors.baseGrayHighlight
-                    visible: treeView.headerVisible
-                }
-            }
-        }
-
-        incrementControl: Item {
-            visible: false
-        }
-
-        decrementControl: Item {
-            visible: false
-        }
     }
 
     rowDelegate: Rectangle {
@@ -193,8 +174,8 @@ TreeView {
         color: styleData.selected
                ? hifi.colors.primaryHighlight
                : treeView.isLightColorScheme
-                   ? (styleData.alternate ? hifi.colors.tableRowLightEven : hifi.colors.tableRowLightOdd)
-                   : (styleData.alternate ? hifi.colors.tableRowDarkEven : hifi.colors.tableRowDarkOdd)
+                 ? (styleData.alternate ? hifi.colors.tableRowLightEven : hifi.colors.tableRowLightOdd)
+                 : (styleData.alternate ? hifi.colors.tableRowDarkEven : hifi.colors.tableRowDarkOdd)
     }
 
     itemDelegate: FiraSansSemiBold {
@@ -209,9 +190,9 @@ TreeView {
         text: styleData.value
         size: hifi.fontSizes.tableText
         color: colorScheme == hifi.colorSchemes.light
-                ? (styleData.selected ? hifi.colors.black : hifi.colors.baseGrayHighlight)
-                : (styleData.selected ? hifi.colors.black : hifi.colors.lightGrayText)
-                       
+               ? (styleData.selected ? hifi.colors.black : hifi.colors.baseGrayHighlight)
+               : (styleData.selected ? hifi.colors.black : hifi.colors.lightGrayText)
+
         elide: Text.ElideRight
     }
 

interface/resources/qml/controls/FlickableWebViewCore.qml

@@ -21,12 +21,20 @@ Item {
     signal newViewRequestedCallback(var request)
     signal loadingChangedCallback(var loadRequest)
 
+    width: parent.width
+
     property bool interactive: false
 
     StylesUIt.HifiConstants {
         id: hifi
     }
 
+    function unfocus() {
+        webViewCore.runJavaScript("if (document.activeElement) document.activeElement.blur();", function(result) {
+            console.log('unfocus completed: ', result);
+        });
+    }
+
     function onLoadingChanged(loadRequest) {
         if (WebEngineView.LoadStartedStatus === loadRequest.status) {
 
@@ -52,7 +60,8 @@ Item {
     WebEngineView {
         id: webViewCore
 
-        anchors.fill: parent
+        width: parent.width
+        height: parent.height
 
         profile: HFWebEngineProfile;
         settings.pluginsEnabled: true
@@ -85,20 +94,19 @@ Item {
 
         userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
 
-        property string newUrl: ""
-
         Component.onCompleted: {
             webChannel.registerObject("eventBridge", eventBridge);
             webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-            // Ensure the JS from the web-engine makes it to our logging
-            webViewCore.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-            });
+
             if (webViewCoreUserAgent !== undefined) {
                 webViewCore.profile.httpUserAgent = webViewCoreUserAgent
             } else {
                 webViewCore.profile.httpUserAgent += " (HighFidelityInterface)";
             }
+            // Ensure the JS from the web-engine makes it to our logging
+            webViewCore.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+                console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+            });
         }
 
         onFeaturePermissionRequested: {
@@ -129,4 +137,10 @@ Item {
         playing: visible
         z: 10000
     }
+
+    Keys.onPressed: {
+        if ((event.modifiers & Qt.ShiftModifier) && (event.modifiers & Qt.ControlModifier)) {
+            webViewCore.focus = false;
+        }
+    }
 }

interface/resources/qml/controls/TabletWebScreen.qml

@@ -10,6 +10,11 @@ Item {
     property alias urlTag: webroot.urlTag
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
+    onKeyboardRaisedChanged: {
+        if(!keyboardRaised) {
+            webroot.unfocus();
+        }
+    }
     property bool punctuationMode: false
 
     // FIXME - Keyboard HMD only: Make Interface either set keyboardRaised property directly in OffscreenQmlSurface

interface/resources/qml/controls/TabletWebView.qml

@@ -15,6 +15,11 @@ Item {
     property string scriptURL
     property bool keyboardEnabled: false
     property bool keyboardRaised: false
+    onKeyboardRaisedChanged: {
+        if(!keyboardRaised) {
+            webroot.unfocus();
+        }
+    }
     property bool punctuationMode: false
     property bool passwordField: false
     property bool isDesktop: false

interface/resources/qml/controls/WebView.qml

@@ -12,6 +12,11 @@ Item {
     property alias urlTag: webroot.urlTag
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
+    onKeyboardRaisedChanged: {
+        if(!keyboardRaised) {
+            webroot.unfocus();
+        }
+    }
     property bool punctuationMode: false
     property bool passwordField: false
     property alias flickable: webroot.interactive

interface/resources/qml/desktop/Desktop.qml

@@ -51,19 +51,23 @@ FocusScope {
 
     // The VR version of the primary menu
     property var rootMenu: Menu { 
+        id: rootMenuId
         objectName: "rootMenu" 
 
-        // for some reasons it is not possible to use just '({})' here as it gets empty when passed to TableRoot/DesktopRoot
-        property var exclusionGroupsByMenuItem : ListModel {}
+        property var exclusionGroups: ({});
+        property Component exclusiveGroupMaker: Component {
+            ExclusiveGroup {
+            }
+        }
 
-        function addExclusionGroup(menuItem, exclusionGroup)
-        {
-            exclusionGroupsByMenuItem.append(
-                {
-                    'menuItem' : menuItem.toString(), 
-                    'exclusionGroup' : exclusionGroup.toString()
-                }
-            );
+        function addExclusionGroup(qmlAction, exclusionGroup) {
+
+            var exclusionGroupId = exclusionGroup.toString();
+            if(!exclusionGroups[exclusionGroupId]) {
+                exclusionGroups[exclusionGroupId] = exclusiveGroupMaker.createObject(rootMenuId);
+            }
+
+            qmlAction.exclusiveGroup = exclusionGroups[exclusionGroupId]
         }
     }
 

interface/resources/qml/hifi/Desktop.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
-import QtWebEngine 1.1;
+import QtWebEngine 1.5;
 import Qt.labs.settings 1.0
 
 import "../desktop" as OriginalDesktop

interface/resources/qml/hifi/NameCard.qml

@@ -442,7 +442,7 @@ Item {
     Rectangle {
         id: nameCardVUMeter
         // Size
-        width: isMyCard ? myDisplayName.width - 20 : ((gainSlider.value - gainSlider.minimumValue)/(gainSlider.maximumValue - gainSlider.minimumValue)) * (gainSlider.width);
+        width: ((gainSlider.value - gainSlider.minimumValue)/(gainSlider.maximumValue - gainSlider.minimumValue)) * (gainSlider.width);
         height: 8
         // Anchors
         anchors.bottom: isMyCard ? avatarImage.bottom : parent.bottom;
@@ -526,16 +526,14 @@ Item {
         anchors.verticalCenter: nameCardVUMeter.verticalCenter;
         anchors.left: nameCardVUMeter.left;
         // Properties
-        visible: !isMyCard && selected && pal.activeTab == "nearbyTab" && isPresent;
+        visible: (isMyCard || (selected && pal.activeTab == "nearbyTab")) && isPresent;
         value: Users.getAvatarGain(uuid)
         minimumValue: -60.0
         maximumValue: 20.0
         stepSize: 5
         updateValueWhileDragging: true
         onValueChanged: {
-            if (uuid !== "") {
-                updateGainFromQML(uuid, value, false);
-            }
+            updateGainFromQML(uuid, value, false);
         }
         onPressedChanged: {
             if (!pressed) {
@@ -575,7 +573,19 @@ Item {
                 implicitHeight: 16
             }
         }
-    }
+         RalewayRegular {
+            // The slider for my card is special, it controls the master gain
+            id: gainSliderText;
+            visible: isMyCard;
+            text: "master volume";
+            size: hifi.fontSizes.tabularData;
+            anchors.left: parent.right;
+            anchors.leftMargin: 8;
+            color: hifi.colors.baseGrayHighlight;
+            horizontalAlignment: Text.AlignLeft;
+            verticalAlignment: Text.AlignTop;
+        }
+   }
 
     function updateGainFromQML(avatarUuid, sliderValue, isReleased) {
         Users.setAvatarGain(avatarUuid, sliderValue);

interface/resources/qml/hifi/Pal.qml

@@ -26,6 +26,7 @@ Rectangle {
     // Style
     color: "#E3E3E3";
     // Properties
+    property bool debug: false;
     property int myCardWidth: width - upperRightInfoContainer.width;
     property int myCardHeight: 80;
     property int rowHeight: 60;
@@ -1120,7 +1121,9 @@ Rectangle {
             break;
         case 'connections':
             var data = message.params;
-            console.log('Got connection data: ', JSON.stringify(data));
+            if (pal.debug) {
+                console.log('Got connection data: ', JSON.stringify(data));
+            }
             connectionsUserModelData = data;
             sortConnectionsModel();
             connectionsLoading.visible = false;

interface/resources/qml/hifi/WebBrowser.qml

@@ -1,3 +1,4 @@
+
 //
 //  WebBrowser.qml
 //
@@ -9,12 +10,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-import QtQuick 2.5
-import QtQuick.Controls 1.5 as QQControls
+import QtQuick 2.7
+import QtQuick.Controls 2.2 as QQControls
 import QtQuick.Layouts 1.3
-import QtQuick.Controls.Styles 1.4
+import QtGraphicalEffects 1.0
 
-import QtWebEngine 1.2
+import QtWebEngine 1.5
 import QtWebChannel 1.0
 
 import "../styles-uit"
@@ -22,6 +23,8 @@ import "../controls-uit" as HifiControls
 import "../windows"
 import "../controls"
 
+import HifiWeb 1.0
+
 Rectangle {
     id: root;
 
@@ -32,214 +35,401 @@ Rectangle {
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
     property bool punctuationMode: false
+    property var suggestionsList: []
+    readonly property string searchUrlTemplate: "https://www.google.com/search?client=hifibrowser&q=";
 
 
+    WebBrowserSuggestionsEngine {
+        id: searchEngine
+
+        onSuggestions: {
+            if (suggestions.length > 0) {
+                suggestionsList = []
+                suggestionsList.push(addressBarInput.text); //do not overwrite edit text
+                for(var i = 0; i < suggestions.length; i++) {
+                    suggestionsList.push(suggestions[i]);
+                }
+                addressBar.model = suggestionsList
+                if (!addressBar.popup.visible) {
+                    addressBar.popup.open();
+                }
+            }
+        }
+    }
+
+    Timer {
+        id: suggestionRequestTimer
+        interval: 200
+        repeat: false
+        onTriggered: {
+            if (addressBar.editText !== "") {
+                searchEngine.querySuggestions(addressBarInput.text);
+            }
+        }
+    }
+
     color: hifi.colors.baseGray;
 
-    // only show the title if loaded through a "loader"
+    function goTo(url) {
+        //must be valid attempt to open an site with dot
+        var urlNew = url
+        if (url.indexOf(".") > 0) {
+            if (url.indexOf("http") < 0) {
+                urlNew = "http://" + url;
+            }
+        } else {
+            urlNew = searchUrlTemplate + url
+        }
+
+        addressBar.model = []
+        //need to rebind if binfing was broken by selecting from suggestions
+        addressBar.editText = Qt.binding( function() { return webStack.currentItem.webEngineView.url; });
+        webStack.currentItem.webEngineView.url = urlNew
+        suggestionRequestTimer.stop();
+        addressBar.popup.close();
+    }
 
     Column {
         spacing: 2
         width: parent.width;
 
         RowLayout {
+            id: addressBarRow
             width: parent.width;
             height: 48
 
             HifiControls.WebGlyphButton {
-                enabled: webEngineView.canGoBack
+                enabled: webStack.currentItem.webEngineView.canGoBack || webStack.depth > 1
                 glyph: hifi.glyphs.backward;
                 anchors.verticalCenter: parent.verticalCenter;
                 size: 38;
                 onClicked: {
-                    webEngineView.goBack()
+                    if (webStack.currentItem.webEngineView.canGoBack) {
+                        webStack.currentItem.webEngineView.goBack();
+                    } else if (webStack.depth > 1) {
+                        webStack.pop();
+                    }
                 }
             }
 
             HifiControls.WebGlyphButton {
-                enabled: webEngineView.canGoForward
+                enabled: webStack.currentItem.webEngineView.canGoForward
                 glyph: hifi.glyphs.forward;
                 anchors.verticalCenter: parent.verticalCenter;
                 size: 38;
                 onClicked: {
-                    webEngineView.goForward()
+                    webStack.currentItem.webEngineView.goForward();
                 }
             }
 
-            QQControls.TextField {
+            QQControls.ComboBox {
                 id: addressBar
 
-                Image {
-                    anchors.verticalCenter: addressBar.verticalCenter;
-                    x: 5
-                    z: 2
-                    id: faviconImage
-                    width: 16; height: 16
-                    sourceSize: Qt.size(width, height)
-                    source: webEngineView.icon
+                //selectByMouse: true
+                focus: true
+
+                editable: true
+                //flat: true
+                indicator: Item {}
+                background: Item {}
+                onActivated: {
+                    goTo(textAt(index));
                 }
 
-                HifiControls.WebGlyphButton {
-                    glyph: webEngineView.loading ? hifi.glyphs.closeSmall : hifi.glyphs.reloadSmall;
-                    anchors.verticalCenter: parent.verticalCenter;
-                    width: hifi.dimensions.controlLineHeight
-                    z: 2
-                    x: addressBar.width - 28
-                    onClicked: {
-                        if (webEngineView.loading) {
-                            webEngineView.stop()
-                        } else {
-                            reloadTimer.start()
+                onHighlightedIndexChanged: {
+                    if (highlightedIndex >= 0) {
+                        addressBar.editText = textAt(highlightedIndex)
+                    }
+                }
+
+                popup.height: webStack.height
+
+                onFocusChanged: {
+                    if (focus) {
+                        addressBarInput.selectAll();
+                    }
+                }
+
+                contentItem: QQControls.TextField {
+                    id: addressBarInput
+                    leftPadding: 26
+                    rightPadding: hifi.dimensions.controlLineHeight + 5
+                    text: addressBar.editText
+                    placeholderText: qsTr("Enter URL")
+                    font: addressBar.font
+                    selectByMouse: true
+                    horizontalAlignment: Text.AlignLeft
+                    verticalAlignment: Text.AlignVCenter
+                    onFocusChanged: {
+                        if (focus) {
+                            selectAll();
+                        }
+                    }
+
+                    Keys.onDeletePressed: {
+                        addressBarInput.text = ""
+                    }
+
+                    Keys.onPressed: {
+                        if (event.key === Qt.Key_Return) {
+                            goTo(addressBarInput.text);
+                            event.accepted = true;
+                        }
+                    }
+
+                    Image {
+                        anchors.verticalCenter: parent.verticalCenter;
+                        x: 5
+                        z: 2
+                        id: faviconImage
+                        width: 16; height: 16
+                        sourceSize: Qt.size(width, height)
+                        source: webStack.currentItem.webEngineView.icon
+                    }
+
+                    HifiControls.WebGlyphButton {
+                        glyph: webStack.currentItem.webEngineView.loading ? hifi.glyphs.closeSmall : hifi.glyphs.reloadSmall;
+                        anchors.verticalCenter: parent.verticalCenter;
+                        width: hifi.dimensions.controlLineHeight
+                        z: 2
+                        x: addressBarInput.width - implicitWidth
+                        onClicked: {
+                            if (webStack.currentItem.webEngineView.loading) {
+                                webStack.currentItem.webEngineView.stop();
+                            } else {
+                                webStack.currentItem.reloadTimer.start();
+                            }
                         }
                     }
                 }
 
-                style: TextFieldStyle {
-                    padding {
-                        left: 26;
-                        right: 26
+                Component.onCompleted: ScriptDiscoveryService.scriptsModelFilter.filterRegExp = new RegExp("^.*$", "i");
+
+                Keys.onPressed: {
+                    if (event.key === Qt.Key_Return) {
+                        goTo(addressBarInput.text);
+                        event.accepted = true;
                     }
                 }
-                focus: true
+
+                onEditTextChanged: {
+                    if (addressBar.editText !== "" && addressBar.editText !== webStack.currentItem.webEngineView.url.toString()) {
+                        suggestionRequestTimer.restart();
+                    } else {
+                        addressBar.model = []
+                        addressBar.popup.close();
+                    }
+
+                }
+
                 Layout.fillWidth: true
-                text: webEngineView.url
-                onAccepted: webEngineView.url = text
+                editText: webStack.currentItem.webEngineView.url
+                onAccepted: goTo(addressBarInput.text);
             }
+
             HifiControls.WebGlyphButton {
                 checkable: true
-                //only QtWebEngine 1.3
-                //checked: webEngineView.audioMuted
+                checked: webStack.currentItem.webEngineView.audioMuted
                 glyph: checked ? hifi.glyphs.unmuted : hifi.glyphs.muted
                 anchors.verticalCenter: parent.verticalCenter;
                 width: hifi.dimensions.controlLineHeight
                 onClicked: {
-                    webEngineView.triggerWebAction(WebEngineView.ToggleMediaMute)
+                    webStack.currentItem.webEngineView.audioMuted = !webStack.currentItem.webEngineView.audioMuted
                 }
             }
         }
 
         QQControls.ProgressBar {
             id: loadProgressBar
-            style: ProgressBarStyle {
-                background: Rectangle {
-                    color: "#6A6A6A"
-                }
-                progress: Rectangle{
+            background: Rectangle {
+                implicitHeight: 2
+                color: "#6A6A6A"
+            }
+
+            contentItem: Item {
+                implicitHeight: 2
+
+                Rectangle {
+                    width: loadProgressBar.visualPosition * parent.width
+                    height: parent.height
                     color: "#00B4EF"
                 }
             }
 
             width: parent.width;
-            minimumValue: 0
-            maximumValue: 100
-            value: webEngineView.loadProgress
+            from: 0
+            to: 100
+            value: webStack.currentItem.webEngineView.loadProgress
             height: 2
         }
 
-        HifiControls.BaseWebView {
-            id: webEngineView
-            focus: true
-            objectName: "tabletWebEngineView"
+        Component {
+            id: webViewComponent
+            Rectangle {
+                property alias webEngineView: webEngineView
+                property alias reloadTimer: reloadTimer
 
-            url: "http://www.highfidelity.com"
-            property real webViewHeight: root.height - loadProgressBar.height - 48 - 4
+                property WebEngineNewViewRequest request: null
 
-            width: parent.width;
-            height: keyboardEnabled && keyboardRaised ? webViewHeight - keyboard.height : webViewHeight
+                property bool isDialog: QQControls.StackView.index > 0
+                property real margins: isDialog ? 10 : 0
 
-            profile: HFWebEngineProfile;
+                color: "#d1d1d1"
 
-            property string userScriptUrl: ""
-
-            // creates a global EventBridge object.
-            WebEngineScript {
-                id: createGlobalEventBridge
-                sourceCode: eventBridgeJavaScriptToInject
-                injectionPoint: WebEngineScript.DocumentCreation
-                worldId: WebEngineScript.MainWorld
-            }
-
-            // detects when to raise and lower virtual keyboard
-            WebEngineScript {
-                id: raiseAndLowerKeyboard
-                injectionPoint: WebEngineScript.Deferred
-                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-                worldId: WebEngineScript.MainWorld
-            }
-
-            // User script.
-            WebEngineScript {
-                id: userScript
-                sourceUrl: webEngineView.userScriptUrl
-                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-                worldId: WebEngineScript.MainWorld
-            }
-
-            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-            settings.autoLoadImages: true
-            settings.javascriptEnabled: true
-            settings.errorPageEnabled: true
-            settings.pluginsEnabled: true
-            settings.fullScreenSupportEnabled: false
-            //from WebEngine 1.3
-            //            settings.autoLoadIconsForPage: false
-            //            settings.touchIconsEnabled: false
-
-            onCertificateError: {
-                error.defer();
-            }
-
-            Component.onCompleted: {
-                webChannel.registerObject("eventBridge", eventBridge);
-                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-                webEngineView.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
-            }
-
-            onFeaturePermissionRequested: {
-                grantFeaturePermission(securityOrigin, feature, true);
-            }
-
-            onNewViewRequested: {
-                if (!request.userInitiated) {
-                    print("Warning: Blocked a popup window.");
-                }
-            }
-
-            onRenderProcessTerminated: {
-                var status = "";
-                switch (terminationStatus) {
-                case WebEngineView.NormalTerminationStatus:
-                    status = "(normal exit)";
-                    break;
-                case WebEngineView.AbnormalTerminationStatus:
-                    status = "(abnormal exit)";
-                    break;
-                case WebEngineView.CrashedTerminationStatus:
-                    status = "(crashed)";
-                    break;
-                case WebEngineView.KilledTerminationStatus:
-                    status = "(killed)";
-                    break;
+                QQControls.StackView.onActivated: {
+                    addressBar.editText = Qt.binding( function() { return webStack.currentItem.webEngineView.url; });
                 }
 
-                print("Render process exited with code " + exitCode + " " + status);
-                reloadTimer.running = true;
-            }
+                onRequestChanged: {
+                    if (isDialog && request !== null && request !== undefined) {//is Dialog ?
+                        request.openIn(webEngineView);
+                    }
+                }
 
-            onWindowCloseRequested: {
-            }
+                HifiControls.BaseWebView {
+                    id: webEngineView
+                    anchors.fill: parent
+                    anchors.margins: parent.margins
 
-            Timer {
-                id: reloadTimer
-                interval: 0
-                running: false
-                repeat: false
-                onTriggered: webEngineView.reload()
+                    layer.enabled: parent.isDialog
+                    layer.effect: DropShadow {
+                        verticalOffset: 8
+                        horizontalOffset: 8
+                        color: "#330066ff"
+                        samples: 10
+                        spread: 0.5
+                    }
+
+                    focus: true
+                    objectName: "tabletWebEngineView"
+
+                    //profile: HFWebEngineProfile;
+                    profile.httpUserAgent: "Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0"
+
+                    property string userScriptUrl: ""
+
+                    onLoadingChanged: {
+                        if (!loading) {
+                            addressBarInput.cursorPosition = 0 //set input field cursot to beginning
+                            suggestionRequestTimer.stop();
+                            addressBar.popup.close();
+                        }
+                    }
+
+                    onLinkHovered: {
+                        //TODO: change cursor shape?
+                    }
+
+                    // creates a global EventBridge object.
+                    WebEngineScript {
+                        id: createGlobalEventBridge
+                        sourceCode: eventBridgeJavaScriptToInject
+                        injectionPoint: WebEngineScript.Deferred
+                        worldId: WebEngineScript.MainWorld
+                    }
+
+                    // detects when to raise and lower virtual keyboard
+                    WebEngineScript {
+                        id: raiseAndLowerKeyboard
+                        injectionPoint: WebEngineScript.Deferred
+                        sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+                        worldId: WebEngineScript.MainWorld
+                    }
+
+                    // User script.
+                    WebEngineScript {
+                        id: userScript
+                        sourceUrl: webEngineView.userScriptUrl
+                        injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+                        worldId: WebEngineScript.MainWorld
+                    }
+
+                    userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+
+                    settings.autoLoadImages: true
+                    settings.javascriptEnabled: true
+                    settings.errorPageEnabled: true
+                    settings.pluginsEnabled: true
+                    settings.fullScreenSupportEnabled: true
+                    settings.autoLoadIconsForPage: true
+                    settings.touchIconsEnabled: true
+
+                    onCertificateError: {
+                        error.defer();
+                    }
+
+                    Component.onCompleted: {
+                        webChannel.registerObject("eventBridge", eventBridge);
+                        webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+                    }
+
+                    onFeaturePermissionRequested: {
+                        grantFeaturePermission(securityOrigin, feature, true);
+                    }
+
+                    onNewViewRequested: {
+                        if (request.destination == WebEngineView.NewViewInDialog) {
+                            webStack.push(webViewComponent, {"request": request});
+                        } else {
+                            request.openIn(webEngineView);
+                        }
+                    }
+
+                    onRenderProcessTerminated: {
+                        var status = "";
+                        switch (terminationStatus) {
+                        case WebEngineView.NormalTerminationStatus:
+                            status = "(normal exit)";
+                            break;
+                        case WebEngineView.AbnormalTerminationStatus:
+                            status = "(abnormal exit)";
+                            break;
+                        case WebEngineView.CrashedTerminationStatus:
+                            status = "(crashed)";
+                            break;
+                        case WebEngineView.KilledTerminationStatus:
+                            status = "(killed)";
+                            break;
+                        }
+
+                        console.error("Render process exited with code " + exitCode + " " + status);
+                        reloadTimer.running = true;
+                    }
+
+                    onFullScreenRequested: {
+                        if (request.toggleOn) {
+                            webEngineView.state = "FullScreen";
+                        } else {
+                            webEngineView.state = "";
+                        }
+                        request.accept();
+                    }
+
+                    onWindowCloseRequested: {
+                        webStack.pop();
+                    }
+                }
+                Timer {
+                    id: reloadTimer
+                    interval: 0
+                    running: false
+                    repeat: false
+                    onTriggered: webEngineView.reload()
+                }
             }
         }
+
+        QQControls.StackView {
+            id: webStack
+            width: parent.width;
+            property real webViewHeight: root.height - loadProgressBar.height - 48 - 4
+            height: keyboardEnabled && keyboardRaised ? webViewHeight - keyboard.height : webViewHeight
+
+            Component.onCompleted: webStack.push(webViewComponent, {"webEngineView.url": "https://www.highfidelity.com"});
+        }
     }
 
+
     HifiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised

interface/resources/qml/hifi/commerce/checkout/Checkout.qml

@@ -79,10 +79,12 @@ Rectangle {
             if (result.status !== 'success') {
                 failureErrorText.text = result.message;
                 root.activeView = "checkoutFailure";
+                UserActivityLogger.commercePurchaseFailure(root.itemId, root.itemPrice, !root.alreadyOwned, result.message);
             } else {
                 root.itemHref = result.data.download_url;
                 root.isWearable = result.data.categories.indexOf("Wearables") > -1;
                 root.activeView = "checkoutSuccess";
+                UserActivityLogger.commercePurchaseSuccess(root.itemId, root.itemPrice, !root.alreadyOwned);
             }
         }
 
@@ -596,11 +598,10 @@ Rectangle {
             anchors.right: parent.right;
             text: root.isWearable ? "Wear It" : "Rez It"
             onClicked: {
-                if (urlHandler.canHandleUrl(root.itemHref)) {
-                    urlHandler.handleUrl(root.itemHref);
-                }
+                sendToScript({method: 'checkout_rezClicked', itemHref: root.itemHref, isWearable: root.isWearable});
                 rezzedNotifContainer.visible = true;
                 rezzedNotifContainerTimer.start();
+                UserActivityLogger.commerceEntityRezzed(root.itemId, "checkout", root.isWearable ? "rez" : "wear");
             }
         }
         RalewaySemiBold {
@@ -904,7 +905,7 @@ Rectangle {
                     }
                     buyTextContainer.color = "#FFC3CD";
                     buyTextContainer.border.color = "#F3808F";
-                    buyGlyph.text = hifi.glyphs.error;
+                    buyGlyph.text = hifi.glyphs.alert;
                     buyGlyph.size = 54;
                 } else {
                     if (root.alreadyOwned) {