merge upstream/master into andrew/thermonuclear

BUILD.md

@@ -2,7 +2,6 @@
 
 * [cmake](http://www.cmake.org/cmake/resources/software.html) ~> 2.8.12.2
 * [Qt](http://qt-project.org/downloads) ~> 5.3.2
-* [glm](http://glm.g-truc.net/0.9.5/index.html) ~> 0.9.5.4
 * [OpenSSL](https://www.openssl.org/related/binaries.html) ~> 1.0.1g
   * IMPORTANT: OpenSSL 1.0.1g is critical to avoid a security vulnerability.
 * [Intel Threading Building Blocks](https://www.threadingbuildingblocks.org/) ~> 4.3
@@ -10,6 +9,13 @@
 * [Bullet Physics Engine](https://code.google.com/p/bullet/downloads/list) ~> 2.82
 * [Gverb](https://github.com/highfidelity/gverb/archive/master.zip) (direct download to latest version)
 
+#### CMake External Project Dependencies
+
+The following dependencies will be downloaded, built, linked and included automatically by CMake where we require them. The CMakeLists files that handle grabbing each of the following external dependencies can be found in the [cmake/externals folder](cmake/externals). The resulting downloads, source files and binaries will be placed in the `build` directory in each of the subfolders for each external project. These are not placed in your normal build tree when doing an out of source build so that they do not need to be re-downloaded and re-compiled every time the CMake build folder is cleared.
+
+* [glm](http://glm.g-truc.net/0.9.5/index.html) ~> 0.9.5.4
+* [gverb](https://github.com/highfidelity/gverb)
+
 ### OS Specific Build Guides
 * [BUILD_OSX.md](BUILD_OSX.md) - additional instructions for OS X.
 * [BUILD_LINUX.md](BUILD_LINUX.md) - additional instructions for Linux.

BUILD_ANDROID.md

@@ -127,11 +127,6 @@ To put the Gear VR Service into developer mode you need an application with an O
 
 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.
 
-####GLM
-
-GLM is a header only library and technically the same GLM used for desktop builds of hifi could be used for the Android build. However, to avoid conflicts with system installations of Android dependencies, CMake will only look for Android headers and libraries in `ANDROID_LIB_DIR` or in your android-ndk install. 
-
-Download the [glm headers](http://sourceforge.net/projects/ogl-math/files/) from their sourceforge page. The version you download should match the requirement shown in the [general build guide](BUILD.md). Extract the archive into your `ANDROID_LIB_DIR` and rename the extracted folder to `glm`.
 
 ###CMake
 

BUILD_OSX.md

@@ -4,7 +4,7 @@ Please read the [general build guide](BUILD.md) for information on dependencies
 [Homebrew](http://brew.sh/) is an excellent package manager for OS X. It makes install of all hifi dependencies very simple.
 
     brew tap highfidelity/homebrew-formulas
-    brew install cmake glm openssl tbb libsoxr
+    brew install cmake openssl tbb libsoxr
     brew install highfidelity/formulas/qt5
     brew link qt5 --force
 

BUILD_WIN.md

@@ -56,9 +56,6 @@ The recommended route for CMake to find the external dependencies is to place al
             -> bin
             -> include
             -> lib
-        -> glm
-            -> glm
-                -> glm.hpp
         -> openssl
             -> bin
             -> include
@@ -129,26 +126,6 @@ Download the binary package: `glew-1.10.0-win32.zip`. Extract to %HIFI_LIB_DIR%\
 
 Add to the PATH: `%HIFI_LIB_DIR%\glew\bin\Release\Win32`
 
-###GLM
-
-This package contains only headers, so there's nothing to add to the PATH.
-
-Be careful with glm. For the folder other libraries would normally call 'include', the folder containing the headers, glm opts to use 'glm'. You will have a glm folder nested inside the top-level glm folder.
-
-###Gverb
-
-1. Go to https://github.com/highfidelity/gverb
-   Or download the sources directly via this link: 
-   https://github.com/highfidelity/gverb/archive/master.zip
-
-2. Extract the archive
-
-3. Place the directories “include” and “src” in interface/external/gverb 
-   (Normally next to this readme)
-
-4. Clear your build directory, run cmake, build and you should be all set.
-
-
 ###Bullet
 
 Bullet 2.82 source can be [downloaded here](https://code.google.com/p/bullet/downloads/detail?name=bullet-2.82-r2704.zip). Bullet does not come with prebuilt libraries, you need to make those yourself.

CMakeLists.txt

@@ -104,6 +104,7 @@ set(HIFI_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
 
 set(MACRO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros")
+set(EXTERNAL_PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/externals")
 
 file(GLOB HIFI_CUSTOM_MACROS "cmake/macros/*.cmake")
 foreach(CUSTOM_MACRO ${HIFI_CUSTOM_MACROS})

assignment-client/CMakeLists.txt

@@ -2,7 +2,9 @@ set(TARGET_NAME assignment-client)
 
 setup_hifi_project(Core Gui Network Script Widgets)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})
 
 # link in the shared libraries
 link_hifi_libraries( 

cmake/externals/glm/CMakeLists.txt

@@ -0,0 +1,15 @@
+set(EXTERNAL_NAME glm)
+
+include(ExternalProject)
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  PREFIX ${EXTERNAL_NAME}
+  URL http://pkgs.fedoraproject.org/repo/pkgs/glm/glm-0.9.5.4.zip/fab76fc982b256b46208e5c750ed456a/glm-0.9.5.4.zip
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+  LOG_DOWNLOAD ON
+)
+
+ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
+
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE TYPE STRING)

cmake/externals/gverb/CMakeLists.txt

@@ -0,0 +1,25 @@
+set(EXTERNAL_NAME gverb)
+
+if (ANDROID)
+  set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
+endif ()
+
+include(ExternalProject)
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  PREFIX ${EXTERNAL_NAME}
+  GIT_REPOSITORY https://github.com/birarda/gverb.git
+  CMAKE_ARGS ${ANDROID_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+  LOG_DOWNLOAD ON
+)
+
+ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
+
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE TYPE STRING)
+
+if (WIN32) 
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/gverb.lib CACHE TYPE STRING)
+else ()
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libgverb.a CACHE TYPE STRING)
+endif ()

cmake/macros/AddDependencyExternalProject.cmake

@@ -0,0 +1,25 @@
+# 
+#  SetupExternalProject.cmake
+#  cmake/macros
+# 
+#  Copyright 2015 High Fidelity, Inc.
+#  Created by Stephen Birarda on February 13, 2014
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+# 
+
+macro(ADD_DEPENDENCY_EXTERNAL_PROJECT _PROJ_NAME)
+  
+  string(TOUPPER ${_PROJ_NAME} _PROJ_NAME_UPPER)
+  
+  if (NOT DEFINED GET_${_PROJ_NAME_UPPER} OR GET_${_PROJ_NAME_UPPER})
+    if (NOT TARGET ${_PROJ_NAME})    
+      add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${CMAKE_BINARY_DIR}/externals/${_PROJ_NAME})
+    endif ()
+  
+    add_dependencies(${TARGET_NAME} ${_PROJ_NAME})
+    
+  endif ()
+  
+endmacro()

cmake/macros/HifiLibrarySearchHints.cmake

@@ -10,22 +10,21 @@
 
 macro(HIFI_LIBRARY_SEARCH_HINTS LIBRARY_FOLDER)
   string(TOUPPER ${LIBRARY_FOLDER} LIBRARY_PREFIX)
-  set(${LIBRARY_PREFIX}_SEARCH_DIRS "")
   
   if (${LIBRARY_PREFIX}_ROOT_DIR)
-    set(${LIBRARY_PREFIX}_SEARCH_DIRS "${${LIBRARY_PREFIX}_ROOT_DIR}")
+    list(APPEND ${LIBRARY_PREFIX}_SEARCH_DIRS "${${LIBRARY_PREFIX}_ROOT_DIR}")
   endif ()
   
   if (ANDROID)
-    set(${LIBRARY_PREFIX}_SEARCH_DIRS "${${LIBRARY_PREFIX}_SEARCH_DIRS}" "/${LIBRARY_FOLDER}")
+    list(APPEND ${LIBRARY_PREFIX}_SEARCH_DIRS "/${LIBRARY_FOLDER}")
   endif ()
   
   if (DEFINED ENV{${LIBRARY_PREFIX}_ROOT_DIR})
-    set(${LIBRARY_PREFIX}_SEARCH_DIRS "${${LIBRARY_PREFIX}_SEARCH_DIRS}" "$ENV{${LIBRARY_PREFIX}_ROOT_DIR}")
+    list(APPEND ${LIBRARY_PREFIX}_SEARCH_DIRS "$ENV{${LIBRARY_PREFIX}_ROOT_DIR}")
   endif ()
   
   if (DEFINED ENV{HIFI_LIB_DIR})
-    set(${LIBRARY_PREFIX}_SEARCH_DIRS "${${LIBRARY_PREFIX}_SEARCH_DIRS}" "$ENV{HIFI_LIB_DIR}/${LIBRARY_FOLDER}")
+    list(APPEND ${LIBRARY_PREFIX}_SEARCH_DIRS "$ENV{HIFI_LIB_DIR}/${LIBRARY_FOLDER}")
   endif ()
   
 endmacro(HIFI_LIBRARY_SEARCH_HINTS _library_folder)

cmake/macros/IncludeGLM.cmake

@@ -1,13 +0,0 @@
-# 
-#  IncludeGLM.cmake
-# 
-#  Copyright 2013 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(INCLUDE_GLM)
-	find_package(GLM REQUIRED)
-	include_directories(SYSTEM "${GLM_INCLUDE_DIRS}")
-endmacro(INCLUDE_GLM)

cmake/modules/FindGLM.cmake

@@ -18,9 +18,7 @@ include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
 hifi_library_search_hints("glm")
 
 # locate header
-find_path(GLM_INCLUDE_DIR "glm/glm.hpp" HINTS ${GLM_SEARCH_DIRS})
-
-set(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}")
+find_path(GLM_INCLUDE_DIRS "glm/glm.hpp" HINTS ${GLM_SEARCH_DIRS})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GLM DEFAULT_MSG GLM_INCLUDE_DIRS)

cmake/modules/FindGverb.cmake

@@ -15,25 +15,11 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 #
 
-if (GVERB_INCLUDE_DIRS)
-  # in cache already
-  set(GVERB_FOUND TRUE)
-else (GVERB_INCLUDE_DIRS)
+include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
+hifi_library_search_hints("gverb")
 
-  include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
-  hifi_library_search_hints("gverb")
+find_path(GVERB_INCLUDE_DIRS gverb.h PATH_SUFFIXES include HINTS ${GVERB_SEARCH_DIRS})
+find_library(GVERB_LIBRARIES gverb PATH_SUFFIXES lib HINTS ${GVERB_SEARCH_DIRS})
 
-  find_path(GVERB_INCLUDE_DIRS gverb.h PATH_SUFFIXES include HINTS ${GVERB_SEARCH_DIRS} NO_CMAKE_FIND_ROOT_PATH)
-  find_path(GVERB_SRC_DIRS gverb.c PATH_SUFFIXES src HINTS ${GVERB_SEARCH_DIRS} NO_CMAKE_FIND_ROOT_PATH)
-
-  if (GVERB_INCLUDE_DIRS)
-    set(GVERB_FOUND TRUE)
-  endif (GVERB_INCLUDE_DIRS)
-
-  if (GVERB_FOUND)
-    message(STATUS "Found Gverb: ${GVERB_INCLUDE_DIRS}")
-  else (GVERB_FOUND)
-    message(FATAL_ERROR "Could NOT find Gverb. Read ./libraries/audio-client/externals/gverb/readme.txt")
-  endif (GVERB_FOUND)
-
-endif(GVERB_INCLUDE_DIRS)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GVERB DEFAULT_MSG GVERB_INCLUDE_DIRS GVERB_LIBRARIES)

examples/controllers/oculus/goTo.js

@@ -0,0 +1,248 @@
+//
+//  goTo.js
+//  examples
+//
+//  Created by Thijs Wenker on 12/28/14.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Control a virtual keyboard using your favorite HMD.
+//  Usage: Enable VR-mode and go to First person mode,
+//  look at the key that you would like to press, and press the spacebar on your "REAL" keyboard.
+//
+//  Enter a location URL using your HMD. Press Enter to pop-up the virtual keyboard and location input.
+//  Press Space on the keyboard or the X button on your gamepad to press a key that you have selected.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+Script.include("../../libraries/globals.js");
+Script.include("../../libraries/virtualKeyboard.js");
+
+const MAX_SHOW_INSTRUCTION_TIMES = 2;
+const INSTRUCTIONS_SETTING = "GoToInstructionsShowCounter"
+
+var windowDimensions = Controller.getViewportDimensions();
+
+function Instructions(imageURL, originalWidth, originalHeight) {
+    var tthis = this;
+    this.originalSize = {w: originalWidth, h: originalHeight};
+    this.visible = false;
+    this.overlay = Overlays.addOverlay("image", {
+                imageURL: imageURL,
+                x: 0,
+                y: 0,
+                width: originalWidth,
+                height: originalHeight,
+                alpha: 1,
+                visible: this.visible
+    });
+
+    this.show = function() {
+        var timesShown = Settings.getValue(INSTRUCTIONS_SETTING);
+        timesShown = timesShown === "" ? 0 : parseInt(timesShown);
+        print(timesShown);
+        if (timesShown < MAX_SHOW_INSTRUCTION_TIMES) {
+            Settings.setValue(INSTRUCTIONS_SETTING, timesShown + 1);
+            tthis.visible = true;
+            tthis.rescale();
+            Overlays.editOverlay(tthis.overlay, {visible: tthis.visible});
+            return;
+        }
+        tthis.remove();
+    }
+
+    this.remove = function() {
+        Overlays.deleteOverlay(tthis.overlay);
+        tthis.visible = false;
+    };
+
+    this.rescale = function() {
+        var scale = Math.min(windowDimensions.x / tthis.originalSize.w, windowDimensions.y / tthis.originalSize.h);
+        var newWidth = tthis.originalSize.w * scale;
+        var newHeight = tthis.originalSize.h * scale;
+        Overlays.editOverlay(tthis.overlay, {
+            x: (windowDimensions.x / 2) - (newWidth / 2),
+            y: (windowDimensions.y / 2) - (newHeight / 2),
+            width: newWidth,
+            height: newHeight
+        });
+    };
+    this.rescale();
+};
+
+var theInstruction = new Instructions(HIFI_PUBLIC_BUCKET + "images/tutorial-goTo.svg", 457, 284.1);
+
+var firstControllerPlugged = false;
+
+
+var cursor = new Cursor({visible: false});
+var keyboard = new Keyboard({visible: false});
+var textFontSize = 9;
+var text = null;
+var locationURL = "";
+
+function appendChar(char) {
+    locationURL += char;
+    updateTextOverlay();
+    Overlays.editOverlay(text, {text: locationURL});
+}
+
+function deleteChar() {
+    if (locationURL.length > 0) {
+        locationURL = locationURL.substring(0, locationURL.length - 1);
+        updateTextOverlay();
+    }
+}
+
+function updateTextOverlay() {
+    var maxLineWidth = Overlays.textSize(text, locationURL).width;
+    var suggestedFontSize = (windowDimensions.x / maxLineWidth) * textFontSize * 0.90;
+    var maxFontSize = 140;
+    textFontSize = (suggestedFontSize > maxFontSize) ? maxFontSize : suggestedFontSize;
+    var topMargin = (250 - textFontSize) / 4;
+    Overlays.editOverlay(text, {text: locationURL, font: {size: textFontSize}, topMargin: topMargin, visible: keyboard.visible});
+    maxLineWidth = Overlays.textSize(text, locationURL).width;
+    Overlays.editOverlay(text, {leftMargin: (windowDimensions.x - maxLineWidth) / 2});
+}
+
+keyboard.onKeyPress = function(event) {
+    if (event.event == 'keypress') {
+        appendChar(event.char);
+    }
+};
+
+keyboard.onKeyRelease = function(event) {
+    // you can cancel a key by releasing its focusing before releasing it
+    if (event.focus) {
+        if (event.event == 'delete') {
+            deleteChar();
+        } else if (event.event == 'submit' || event.event == 'enter') {
+            print("going to hifi://" + locationURL);
+            location = "hifi://" + locationURL;
+            locationURL = "";
+            keyboard.hide();
+            cursor.hide();
+            updateTextOverlay();
+        }
+    }
+};
+
+keyboard.onFullyLoaded = function() {
+    print("Virtual-keyboard fully loaded.");
+    var dimensions = Controller.getViewportDimensions();
+    text = Overlays.addOverlay("text", {
+            x: 0,
+            y: dimensions.y - keyboard.height() - 260,
+            width: dimensions.x,
+            height: 250,
+            backgroundColor: { red: 255, green: 255, blue: 255},
+            color: { red: 0, green: 0, blue: 0},
+            topMargin: 5,
+            leftMargin: 0,
+            font: {size: textFontSize},
+            text: "",
+            alpha: 0.8,
+            visible: keyboard.visible
+    });
+    updateTextOverlay();
+    // the cursor is being loaded after the keyboard, else it will be on the background of the keyboard 
+    cursor.initialize();
+    cursor.updateVisibility(keyboard.visible);
+    cursor.onUpdate = function(position) {
+        keyboard.setFocusPosition(position.x, position.y);
+    };
+};
+
+function keyPressEvent(event) {
+    if (theInstruction.visible) {
+        return;
+    }
+    if (event.key === SPACEBAR_CHARCODE) {
+        keyboard.pressFocussedKey();
+    } else if (event.key === ENTER_CHARCODE || event.key === RETURN_CHARCODE) {
+        keyboard.toggle();
+        if (cursor !== undefined) {
+            cursor.updateVisibility(keyboard.visible);
+        }
+        Overlays.editOverlay(text, {visible: keyboard.visible});
+    }
+}
+
+function keyReleaseEvent(event) {
+    if (theInstruction.visible) {
+        return;
+    }
+    if (event.key === SPACEBAR_CHARCODE) {
+        keyboard.releaseKeys();
+    }
+}
+
+function scriptEnding() {
+    keyboard.remove();
+    cursor.remove();
+    Overlays.deleteOverlay(text);
+    Overlays.deleteOverlay(textSizeMeasureOverlay);
+    Controller.releaseKeyEvents({key: SPACEBAR_CHARCODE});
+    Controller.releaseKeyEvents({key: RETURN_CHARCODE});
+    Controller.releaseKeyEvents({key: ENTER_CHARCODE});
+    theInstruction.remove();
+}
+
+function reportButtonValue(button, newValue, oldValue) {
+    if (theInstruction.visible) {
+        if (button == Joysticks.BUTTON_FACE_BOTTOM && newValue) {
+            theInstruction.remove();
+        }
+    } else if (button == Joysticks.BUTTON_FACE_BOTTOM) {
+        if (newValue) {
+            keyboard.pressFocussedKey();
+        } else {
+            keyboard.releaseKeys();
+        }
+    } else if (button == Joysticks.BUTTON_FACE_RIGHT && newValue) {
+        deleteChar();
+    } else if (button == Joysticks.BUTTON_FACE_LEFT && newValue) {
+        keyboard.hide();
+        if (cursor !== undefined) {
+            cursor.hide();
+        }
+        Overlays.editOverlay(text, {visible: false});
+    } else if (button == Joysticks.BUTTON_RIGHT_SHOULDER && newValue) {
+        if (keyboard.visible) {
+            print("going to hifi://" + locationURL);
+            location = "hifi://" + locationURL;
+            locationURL = "";
+            keyboard.hide();
+            cursor.hide();
+            updateTextOverlay();
+            return;
+        }
+        keyboard.show();
+        if (cursor !== undefined) {
+            cursor.show();
+        }
+        Overlays.editOverlay(text, {visible: true});            
+    }
+}
+
+function addJoystick(gamepad) {
+    gamepad.buttonStateChanged.connect(reportButtonValue);
+    if (!firstControllerPlugged) {
+        firstControllerPlugged = true;
+        theInstruction.show();
+    }
+}
+
+var allJoysticks = Joysticks.getAllJoysticks();
+for (var i = 0; i < allJoysticks.length; i++) {
+    addJoystick(allJoysticks[i]);
+}
+
+Joysticks.joystickAdded.connect(addJoystick);
+Controller.captureKeyEvents({key: RETURN_CHARCODE});
+Controller.captureKeyEvents({key: ENTER_CHARCODE});
+Controller.captureKeyEvents({key: SPACEBAR_CHARCODE});
+Controller.keyPressEvent.connect(keyPressEvent);
+Controller.keyReleaseEvent.connect(keyReleaseEvent);
+Script.scriptEnding.connect(scriptEnding);

examples/controllers/oculus/virtualKeyboardTextEntityExample.js

@@ -0,0 +1,183 @@
+//
+//  virtualKeyboardTextEntityExample.js
+//  examples
+//
+//  Created by Thijs Wenker on 12/28/14.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Control a virtual keyboard using your favorite HMD.
+//  Usage: Enable VR-mode and go to First person mode,
+//  look at the key that you would like to press, and press the spacebar on your "REAL" keyboard.
+//
+//  leased some code from newEditEntities.js for Text Entity example
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+Script.include("../../libraries/globals.js");
+Script.include("../../libraries/virtualKeyboard.js");
+
+const SPAWN_DISTANCE = 1;
+const DEFAULT_TEXT_DIMENSION_Z = 0.02;
+
+const TEXT_MARGIN_TOP = 0.15;
+const TEXT_MARGIN_LEFT = 0.15;
+const TEXT_MARGIN_RIGHT = 0.17;
+const TEXT_MARGIN_BOTTOM = 0.17;
+
+var windowDimensions = Controller.getViewportDimensions();
+var cursor = new Cursor();
+var keyboard = new Keyboard();
+var textFontSize = 9;
+var text = null;
+var textText = "";
+var textSizeMeasureOverlay = Overlays.addOverlay("text3d", {visible: false});
+
+function appendChar(char) {
+    textText += char;
+    updateTextOverlay();
+    Overlays.editOverlay(text, {text: textText});
+}
+
+function deleteChar() {
+    if (textText.length > 0) {
+        textText = textText.substring(0, textText.length - 1);
+        updateTextOverlay();
+    }
+}
+  
+function updateTextOverlay() {
+    var textLines = textText.split("\n");
+    var suggestedFontSize = (windowDimensions.x / Overlays.textSize(text, textText).width) * textFontSize * 0.90;
+    var maxFontSize = 170 / textLines.length;
+    textFontSize = (suggestedFontSize > maxFontSize) ? maxFontSize : suggestedFontSize;
+    var topMargin = (250 - (textFontSize * textLines.length)) / 4;
+    Overlays.editOverlay(text, {text: textText, font: {size: textFontSize}, topMargin: topMargin});
+    Overlays.editOverlay(text, {leftMargin: (windowDimensions.x - Overlays.textSize(text, textLines).width) / 2});
+}
+
+keyboard.onKeyPress = function(event) {
+    if (event.event == 'keypress') {
+        appendChar(event.char);
+    } else if (event.event == 'enter') {
+        appendChar("\n");
+    }
+};
+
+keyboard.onKeyRelease = function(event) {
+    print("Key release event test");
+    // you can cancel a key by releasing its focusing before releasing it
+    if (event.focus) {
+        if (event.event == 'delete') {
+            deleteChar();
+        } else if (event.event == 'submit') {
+           print(textText);
+
+           var position = Vec3.sum(MyAvatar.position, Vec3.multiply(Quat.getFront(MyAvatar.orientation), SPAWN_DISTANCE));
+
+           var textLines = textText.split("\n");
+           var maxLineWidth = Overlays.textSize(textSizeMeasureOverlay, textText).width;
+           var usernameLine = "--" + GlobalServices.myUsername;
+           var usernameWidth = Overlays.textSize(textSizeMeasureOverlay, usernameLine).width;
+           if (maxLineWidth < usernameWidth) {
+               maxLineWidth = usernameWidth;
+           } else {
+                var spaceableWidth = maxLineWidth - usernameWidth;
+                //TODO: WORKAROUND WARNING BELOW Fix this when spaces are not trimmed out of the textsize calculation anymore
+                var spaceWidth = Overlays.textSize(textSizeMeasureOverlay, "| |").width
+                    - Overlays.textSize(textSizeMeasureOverlay, "||").width;
+                var numberOfSpaces = Math.floor(spaceableWidth / spaceWidth);
+                for (var i = 0; i < numberOfSpaces; i++) {
+                    usernameLine = " " + usernameLine;
+                }
+           }
+           var dimension_x = maxLineWidth + TEXT_MARGIN_RIGHT + TEXT_MARGIN_LEFT;
+           if (position.x > 0 && position.y > 0 && position.z > 0) {
+               Entities.addEntity({ 
+                   type: "Text",
+                   rotation: MyAvatar.orientation,
+                   position: position,
+                   dimensions: { x: dimension_x, y: (textLines.length + 1) * 0.14 + TEXT_MARGIN_TOP + TEXT_MARGIN_BOTTOM, z: DEFAULT_TEXT_DIMENSION_Z },
+                   backgroundColor: { red: 0, green: 0, blue: 0 },
+                   textColor: { red: 255, green: 255, blue: 255 },
+                   text: textText + "\n" + usernameLine,
+                   lineHeight: 0.1
+               });
+           }
+           textText = "";
+           updateTextOverlay();
+        }
+    }
+};
+
+keyboard.onFullyLoaded = function() {
+    print("Virtual-keyboard fully loaded.");
+    var dimensions = Controller.getViewportDimensions();
+    text = Overlays.addOverlay("text", {
+         x: 0,
+         y: dimensions.y - keyboard.height() - 260,
+         width: dimensions.x,
+         height: 250,
+         backgroundColor: { red: 255, green: 255, blue: 255},
+         color: { red: 0, green: 0, blue: 0},
+         topMargin: 5,
+         leftMargin: 0,
+         font: {size: textFontSize},
+         text: "",
+         alpha: 0.8
+    });
+    updateTextOverlay();
+    // the cursor is being loaded after the keyboard, else it will be on the background of the keyboard 
+    cursor.initialize();
+    cursor.onUpdate = function(position) {
+        keyboard.setFocusPosition(position.x, position.y);
+    };
+};
+
+function keyPressEvent(event) {
+    if (event.key === SPACEBAR_CHARCODE) {
+        keyboard.pressFocussedKey();
+    }
+}
+
+function keyReleaseEvent(event) {
+    if (event.key === SPACEBAR_CHARCODE) {
+        keyboard.releaseKeys();
+    }
+}
+
+function scriptEnding() {
+    keyboard.remove();
+    cursor.remove();
+    Overlays.deleteOverlay(text);
+    Overlays.deleteOverlay(textSizeMeasureOverlay);
+    Controller.releaseKeyEvents({key: SPACEBAR_CHARCODE});
+}
+
+function reportButtonValue(button, newValue, oldValue) {
+    if (button == Joysticks.BUTTON_FACE_BOTTOM) {
+        if (newValue) {
+            keyboard.pressFocussedKey();
+        } else {
+            keyboard.releaseKeys();
+        }
+    } else if (button == Joysticks.BUTTON_FACE_RIGHT && newValue) {
+        deleteChar();
+    }
+}
+
+function addJoystick(gamepad) {
+    gamepad.buttonStateChanged.connect(reportButtonValue);
+}
+
+var allJoysticks = Joysticks.getAllJoysticks();
+for (var i = 0; i < allJoysticks.length; i++) {
+    addJoystick(allJoysticks[i]);
+}
+
+Joysticks.joystickAdded.connect(addJoystick);
+Controller.captureKeyEvents({key: SPACEBAR_CHARCODE});
+Controller.keyPressEvent.connect(keyPressEvent);
+Controller.keyReleaseEvent.connect(keyReleaseEvent);
+Script.scriptEnding.connect(scriptEnding);

examples/editEntities.js

@@ -127,7 +127,7 @@ var toolBar = (function () {
             height: toolHeight,
             alpha: 0.9,
             visible: true
-        }, true, false);
+        });
 
         browseModelsButton = toolBar.addTool({
             imageURL: toolIconUrl + "list-icon.svg",
@@ -262,6 +262,8 @@ var toolBar = (function () {
         toolBar.move(toolsX, toolsY);
     };
 
+    var newModelButtonDown = false;
+    var browseModelsButtonDown = false;
     that.mousePressEvent = function (event) {
         var clickedOverlay,
             url,
@@ -274,19 +276,14 @@ var toolBar = (function () {
             return true;
         }
 
+        // Handle these two buttons in the mouseRelease event handler so that we don't suppress a mouseRelease event from
+        // occurring when showing a modal dialog.
         if (newModelButton === toolBar.clicked(clickedOverlay)) {
-            url = Window.prompt("Model URL", modelURLs[Math.floor(Math.random() * modelURLs.length)]);
-            if (url !== null && url !== "") {
-                addModel(url);
-            }
+            newModelButtonDown = true;
             return true;
         }
-
         if (browseModelsButton === toolBar.clicked(clickedOverlay)) {
-            url = Window.s3Browse(".*(fbx|FBX)");
-            if (url !== null && url !== "") {
-                addModel(url);
-            }
+            browseModelsButtonDown = true;
             return true;
         }
 
@@ -348,6 +345,7 @@ var toolBar = (function () {
             return true;
         }
 
+
         if (newTextButton === toolBar.clicked(clickedOverlay)) {
             var position = Vec3.sum(MyAvatar.position, Vec3.multiply(Quat.getFront(MyAvatar.orientation), SPAWN_DISTANCE));
 
@@ -367,10 +365,37 @@ var toolBar = (function () {
             return true;
         }
 
-
         return false;
     };
 
+    that.mouseReleaseEvent = function(event) {
+        var handled = false;
+        if (newModelButtonDown) {
+            var clickedOverlay = Overlays.getOverlayAtPoint({ x: event.x, y: event.y });
+            if (newModelButton === toolBar.clicked(clickedOverlay)) {
+                url = Window.prompt("Model URL", modelURLs[Math.floor(Math.random() * modelURLs.length)]);
+                if (url !== null && url !== "") {
+                    addModel(url);
+                }
+                handled = true;
+            }
+        } else if (browseModelsButtonDown) {
+            var clickedOverlay = Overlays.getOverlayAtPoint({ x: event.x, y: event.y });
+            if (browseModelsButton === toolBar.clicked(clickedOverlay)) {
+                url = Window.s3Browse(".*(fbx|FBX)");
+                if (url !== null && url !== "") {
+                    addModel(url);
+                }
+                handled = true;
+            }
+        }
+
+        newModelButtonDown = false;
+        browseModelsButtonDown = false;
+
+        return handled;
+    }
+
     that.cleanup = function () {
         toolBar.cleanup();
     };
@@ -533,6 +558,9 @@ function highlightEntityUnderCursor(position, accurateRay) {
 
 
 function mouseReleaseEvent(event) {
+    if (toolBar.mouseReleaseEvent(event)) {
+        return true;
+    }
     if (placingEntityID) {
         if (isActive) {
             selectionManager.setSelections([placingEntityID]);

examples/libraries/virtualKeyboard.js

@@ -9,179 +9,50 @@
 //  Usage: Enable VR-mode and go to First person mode,
 //  look at the key that you would like to press, and press the spacebar on your "REAL" keyboard.
 //
-//  leased some code from newEditEntities.js for Text Entity example
-//
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
+// experimental 3dmode
+THREE_D_MODE = false;
 
-const KBD_UPPERCASE_DEFAULT = 0;
-const KBD_LOWERCASE_DEFAULT = 1;
-const KBD_UPPERCASE_HOVER   = 2;
-const KBD_LOWERCASE_HOVER   = 3;
-const KBD_BACKGROUND        = 4;
+KBD_UPPERCASE_DEFAULT = 0;
+KBD_LOWERCASE_DEFAULT = 1;
+KBD_UPPERCASE_HOVER   = 2;
+KBD_LOWERCASE_HOVER   = 3;
+KBD_BACKGROUND        = 4;
 
-const KEYBOARD_URL = HIFI_PUBLIC_BUCKET + "images/keyboard.svg";
-const CURSOR_URL = HIFI_PUBLIC_BUCKET + "images/cursor.svg";
+KEYBOARD_URL = HIFI_PUBLIC_BUCKET + "images/keyboard.svg";
+CURSOR_URL = HIFI_PUBLIC_BUCKET + "images/cursor.svg";
 
-const SPACEBAR_CHARCODE = 32;
+RETURN_CHARCODE = 0x01000004;
+ENTER_CHARCODE = 0x01000005;
+SPACEBAR_CHARCODE = 32;
 
-const KEYBOARD_WIDTH  = 1174.7;
-const KEYBOARD_HEIGHT = 434.1;
+KEYBOARD_WIDTH  = 1174.7;
+KEYBOARD_HEIGHT = 434.1;
 
-const CURSOR_WIDTH = 33.9;
-const CURSOR_HEIGHT = 33.9;
+CURSOR_WIDTH = 33.9;
+CURSOR_HEIGHT = 33.9;
+
+KEYBOARD_SCALE_MULTIPLIER = 0.50;
 
 // VIEW_ANGLE can be adjusted to your likings, the smaller the faster movement.
 // Try setting it to 60 if it goes too fast for you.
 const VIEW_ANGLE = 40.0;
 const VIEW_ANGLE_BY_TWO = VIEW_ANGLE / 2;
 
-const SPAWN_DISTANCE = 1;
-const DEFAULT_TEXT_DIMENSION_Z = 0.02;
-
 const BOUND_X = 0;
 const BOUND_Y = 1;
 const BOUND_W = 2;
 const BOUND_H = 3;
 
-const KEY_STATE_LOWER = 0;
-const KEY_STATE_UPPER = 1;
-
-const TEXT_MARGIN_TOP = 0.15;
-const TEXT_MARGIN_LEFT = 0.15;
-const TEXT_MARGIN_RIGHT = 0.17;
-const TEXT_MARGIN_BOTTOM = 0.17;
+KEY_STATE_LOWER = 0;
+KEY_STATE_UPPER = 1;
 
 var windowDimensions = Controller.getViewportDimensions();
-var cursor = null;
-var keyboard = new Keyboard();
-var textFontSize = 9;
-var text = null;
-var textText = "";
-var textSizeMeasureOverlay = Overlays.addOverlay("text3d", {visible: false});
 
-function appendChar(char) {
-    textText += char;
-    updateTextOverlay();
-    Overlays.editOverlay(text, {text: textText});
-}
-
-function deleteChar() {
-    if (textText.length > 0) {
-        textText = textText.substring(0, textText.length - 1);
-        updateTextOverlay();
-    }
-}
-
-function updateTextOverlay() {
-    var textLines = textText.split("\n");
-    var maxLineWidth = 0;
-    for (textLine in textLines) {
-        var lineWidth = Overlays.textSize(text, textLines[textLine]).width;
-        if (lineWidth > maxLineWidth) {
-            maxLineWidth = lineWidth;
-        }
-    }
-    var suggestedFontSize = (windowDimensions.x / maxLineWidth) * textFontSize * 0.90;
-    var maxFontSize = 190 / textLines.length;
-    textFontSize = (suggestedFontSize > maxFontSize) ? maxFontSize : suggestedFontSize;
-    var topMargin = (250 - (textFontSize * textLines.length)) / 4;
-    Overlays.editOverlay(text, {text: textText, font: {size: textFontSize}, topMargin: topMargin});
-    var maxLineWidth = 0;
-    for (textLine in textLines) {
-        var lineWidth = Overlays.textSize(text, textLines[textLine]).width;
-        if (lineWidth > maxLineWidth) {
-            maxLineWidth = lineWidth;
-        }
-    }
-    Overlays.editOverlay(text, {leftMargin: (windowDimensions.x - maxLineWidth) / 2});
-}
-
-keyboard.onKeyPress = function(event) {
-    if (event.event == 'keypress') {
-        appendChar(event.char);
-    } else if (event.event == 'enter') {
-        appendChar("\n");
-    }
-};
-
-keyboard.onKeyRelease = function(event) {
-    print("Key release event test");
-    // you can cancel a key by releasing its focusing before releasing it
-    if (event.focus) {
-        if (event.event == 'delete') {
-           deleteChar();
-        } else if (event.event == 'submit') {
-           print(textText);
-
-           var position = Vec3.sum(MyAvatar.position, Vec3.multiply(Quat.getFront(MyAvatar.orientation), SPAWN_DISTANCE));
-
-           var textLines = textText.split("\n");
-           var maxLineWidth = 0;
-           for (textLine in textLines) {
-               var lineWidth = Overlays.textSize(textSizeMeasureOverlay, textLines[textLine]).width;
-               if (lineWidth > maxLineWidth) {
-                   maxLineWidth = lineWidth;
-               }
-           }
-           var usernameLine = "--" + GlobalServices.myUsername;
-           var usernameWidth = Overlays.textSize(textSizeMeasureOverlay, usernameLine).width;
-           if (maxLineWidth < usernameWidth) {
-               maxLineWidth = usernameWidth;
-           } else {
-               var spaceableWidth = maxLineWidth - usernameWidth;
-               var spaceWidth = Overlays.textSize(textSizeMeasureOverlay, " ").width;
-               var numberOfSpaces = Math.floor(spaceableWidth / spaceWidth);
-               for (var i = 0; i < numberOfSpaces; i++) {
-                   usernameLine = " " + usernameLine;
-               }
-           }
-           var dimension_x = maxLineWidth + TEXT_MARGIN_RIGHT + TEXT_MARGIN_LEFT;
-           if (position.x > 0 && position.y > 0 && position.z > 0) {
-               Entities.addEntity({ 
-                   type: "Text",
-                   rotation: MyAvatar.orientation,
-                   position: position,
-                   dimensions: { x: dimension_x, y: (textLines.length + 1) * 0.14 + TEXT_MARGIN_TOP + TEXT_MARGIN_BOTTOM, z: DEFAULT_TEXT_DIMENSION_Z },
-                   backgroundColor: { red: 0, green: 0, blue: 0 },
-                   textColor: { red: 255, green: 255, blue: 255 },
-                   text: textText + "\n" + usernameLine
-               });
-           }
-           textText = "";
-           updateTextOverlay();
-        }
-    }
-};
-
-keyboard.onFullyLoaded = function() {
-    print("Virtual-keyboard fully loaded.");
-    var dimensions = Controller.getViewportDimensions();
-    text = Overlays.addOverlay("text", {
-         x: 0,
-         y: dimensions.y - keyboard.height() - 260,
-         width: dimensions.x,
-         height: 250,
-         backgroundColor: { red: 255, green: 255, blue: 255},
-         color: { red: 0, green: 0, blue: 0},
-         topMargin: 5,
-         leftMargin: 0,
-         font: {size: textFontSize},
-         text: "",
-         alpha: 0.8
-    });
-    updateTextOverlay();
-    // the cursor is being loaded after the keyboard, else it will be on the background of the keyboard 
-    cursor = new Cursor();
-    cursor.onUpdate = function(position) {
-        keyboard.setFocusPosition(position.x, position.y);
-    };
-};
-
-function KeyboardKey(keyboard, keyProperties) {
+KeyboardKey = (function(keyboard, keyProperties) {
     var tthis = this;
     this._focus = false;
     this._beingPressed = false;
@@ -247,6 +118,11 @@ function KeyboardKey(keyboard, keyProperties) {
              });
         }
     };
+    this.updateVisibility = function() {
+        for (var i = 0; i < tthis.bounds.length; i++) {
+             Overlays.editOverlay(tthis.overlays[i], {visible: tthis.keyboard.visible});
+        }
+    };
     this.rescale = function() {
         for (var i = 0; i < tthis.bounds.length; i++) {
              Overlays.editOverlay(tthis.overlays[i], {
@@ -271,24 +147,48 @@ function KeyboardKey(keyboard, keyProperties) {
         return true;
     };
     for (var i = 0; i < this.bounds.length; i++) {
-        var newOverlay = Overlays.cloneOverlay(this.keyboard.background);
-        Overlays.editOverlay(newOverlay, {
-            x: this.keyboard.getX() + this.bounds[i][BOUND_X] * keyboard.scale,
-            y: this.keyboard.getY() + this.bounds[i][BOUND_Y] * keyboard.scale,
-            width: this.bounds[i][BOUND_W] * keyboard.scale,
-            height: this.bounds[i][BOUND_H] * keyboard.scale,
-            subImage: {width: this.bounds[i][BOUND_W], height: this.bounds[i][BOUND_H], x: this.bounds[i][BOUND_X], y: (KEYBOARD_HEIGHT * this.keyState) + this.bounds[i][BOUND_Y]},
-            alpha: 1
-        });
-        this.overlays.push(newOverlay);
+        if (THREE_D_MODE) {
+            this.overlays.push(Overlays.addOverlay("billboard", {
+                scale: 1,
+                rotation: MyAvatar.rotation,
+                isFacingAvatar: false,
+                url: KEYBOARD_URL,
+                alpha: 1,
+                position: {
+                    x: MyAvatar.position.x,// + this.bounds[i][BOUND_X] * 0.01,// /*+ this.keyboard.getX()*/ + this.bounds[i][BOUND_X] * keyboard.scale,
+                    y: MyAvatar.position.y,// - this.bounds[i][BOUND_Y] * 0.01,// /*+ this.keyboard.getY()*/ + this.bounds[i][BOUND_Y] * keyboard.scale,
+                    z: MyAvatar.position.z
+                },
+                width: this.bounds[i][BOUND_W] * keyboard.scale,
+                height: this.bounds[i][BOUND_H] * keyboard.scale,
+                subImage: {width: this.bounds[i][BOUND_W], height: this.bounds[i][BOUND_H], x: this.bounds[i][BOUND_X], y: (KEYBOARD_HEIGHT * this.keyState) + this.bounds[i][BOUND_Y]},
+                alpha: 1,
+                visible: tthis.keyboard.visible
+            }));
+        } else {
+            this.overlays.push(Overlays.addOverlay("image", {
+                imageURL: KEYBOARD_URL,
+                x: this.keyboard.getX() + this.bounds[i][BOUND_X] * keyboard.scale,
+                y: this.keyboard.getY() + this.bounds[i][BOUND_Y] * keyboard.scale,
+                width: this.bounds[i][BOUND_W] * keyboard.scale,
+                height: this.bounds[i][BOUND_H] * keyboard.scale,
+                subImage: {width: this.bounds[i][BOUND_W], height: this.bounds[i][BOUND_H], x: this.bounds[i][BOUND_X], y: (KEYBOARD_HEIGHT * this.keyState) + this.bounds[i][BOUND_Y]},
+                alpha: 1,
+                visible: tthis.keyboard.visible
+            }));
+        }
     }
-}
+});
 
-function Keyboard() {
+Keyboard = (function(params) {
+    if (params === undefined) {
+        params = {};
+    }
     var tthis = this;
     this.focussed_key = -1;
-    this.scale = windowDimensions.x / KEYBOARD_WIDTH;
+    this.scale = (windowDimensions.x / KEYBOARD_WIDTH) * KEYBOARD_SCALE_MULTIPLIER;
     this.shift = false;
+    this.visible = params.visible != undefined ? params.visible : true;
     this.width = function() {
         return KEYBOARD_WIDTH * tthis.scale;
     };
@@ -301,17 +201,33 @@ function Keyboard() {
     this.getY = function() {
         return windowDimensions.y - this.height();
     };
-    this.background = Overlays.addOverlay("image", {
-        x: this.getX(),
-        y: this.getY(),
-        width: this.width(),
-        height: this.height(),
-        subImage: {width: KEYBOARD_WIDTH, height: KEYBOARD_HEIGHT, y: KEYBOARD_HEIGHT * KBD_BACKGROUND},
-        imageURL: KEYBOARD_URL,
-        alpha: 1
-    });
+    if (THREE_D_MODE) {
+        this.background = Overlays.addOverlay("billboard", {
+            scale: 1,
+            position: MyAvatar.position,
+            rotation: MyAvatar.rotation,
+            width: this.width(),
+            height: this.height(),
+            subImage: {width: KEYBOARD_WIDTH, height: KEYBOARD_HEIGHT, y: KEYBOARD_HEIGHT * KBD_BACKGROUND},
+            isFacingAvatar: false,
+            url: KEYBOARD_URL,
+            alpha: 1,
+            visible: this.visible
+        });
+    } else {
+        this.background = Overlays.addOverlay("image", {
+            x: this.getX(),
+            y: this.getY(),
+            width: this.width(),
+            height: this.height(),
+            subImage: {width: KEYBOARD_WIDTH, height: KEYBOARD_HEIGHT, y: KEYBOARD_HEIGHT * KBD_BACKGROUND},
+            imageURL: KEYBOARD_URL,
+            alpha: 1,
+            visible: this.visible
+        });
+    }
     this.rescale = function() {
-        this.scale = windowDimensions.x / KEYBOARD_WIDTH;
+        this.scale = (windowDimensions.x / KEYBOARD_WIDTH) * KEYBOARD_SCALE_MULTIPLIER;
         Overlays.editOverlay(tthis.background, {
             x: this.getX(),
             y: this.getY(),
@@ -349,6 +265,9 @@ function Keyboard() {
     };
 
     this.pressFocussedKey = function() {
+        if (!tthis.visible) {
+            return tthis;
+        }
         if (tthis.focussed_key != -1) {
             if (tthis.keys[tthis.focussed_key].event == 'shift') {
                 tthis.toggleShift();
@@ -402,6 +321,32 @@ function Keyboard() {
         for (var i = 0; i < this.keys.length; i++) {
             this.keys[i].remove();
         }
+        // resets the cursor and magnifier
+        this.updateVisibility(false);
+    };
+
+    this.show = function() {
+        tthis.updateVisibility(true);
+    };
+
+    this.hide = function() {
+        tthis.updateVisibility(false);
+    };
+
+    this.toggle = function() {
+        tthis.updateVisibility(!tthis.visible);
+    };
+    
+    this.updateVisibility = function(visible) {
+        tthis.visible = visible;
+        if (HMD.magnifier == visible) {
+            HMD.toggleMagnifier();
+        }
+        Window.cursorVisible = !visible;
+        Overlays.editOverlay(tthis.background, { visible: tthis.visible });
+        for (var i = 0; i < this.keys.length; i++) {
+            this.keys[i].updateVisibility();
+        }
     };
 
     this.onKeyPress = null;
@@ -502,97 +447,94 @@ function Keyboard() {
 
         {bounds: [[899, 355, 263, 67]], event: 'submit'}
     ];
-
+    for (var i = 0; i < keyProperties.length; i++) {
+        this.keys.push(new KeyboardKey(this, keyProperties[i]));
+    }
     this.keyboardTextureLoaded = function() {
         if (Overlays.isLoaded(tthis.background)) {
             Script.clearInterval(tthis.keyboardTextureLoaded_timer);
-            for (var i = 0; i < keyProperties.length; i++) {
-                tthis.keys.push(new KeyboardKey(tthis, keyProperties[i]));
-            }
             if (keyboard.onFullyLoaded != null) {
                 tthis.onFullyLoaded();
             }
         }
     };
     this.keyboardTextureLoaded_timer = Script.setInterval(this.keyboardTextureLoaded, 250);
-}
+});
 
-function Cursor() {
+Cursor = (function(params) {
+    if (params === undefined) {
+        params = {};
+    }
     var tthis = this;
-    this.x = windowDimensions.x / 2;
-    this.y = windowDimensions.y / 2;
-    this.overlay = Overlays.addOverlay("image", {
-        x: this.x,
-        y: this.y,
-        width: CURSOR_WIDTH,
-        height: CURSOR_HEIGHT,
-        imageURL: CURSOR_URL,
-        alpha: 1
-    });
-    this.remove = function() {
-        Overlays.deleteOverlay(this.overlay);
+    this.initialize = function() {
+        this.visible = params.visible != undefined ? params.visible : true;
+        this.x = windowDimensions.x / 2;
+        this.y = windowDimensions.y / 2;
+        this.overlay = Overlays.addOverlay("image", {
+            x: this.x,
+            y: this.y,
+            width: CURSOR_WIDTH,
+            height: CURSOR_HEIGHT,
+            imageURL: CURSOR_URL,
+            alpha: 1,
+            visible: this.visible
+        });
+        this.remove = function() {
+            Overlays.deleteOverlay(this.overlay);
+        };
+        this.getPosition = function() {
+            return {x: tthis.getX(), y: tthis.getY()};
+        };
+        this.getX = function() {
+            return tthis.x;
+        };
+        this.getY = function() {
+            return tthis.y;
+        };
+        this.show = function() {
+            tthis.updateVisibility(true);
+        };
+        this.hide = function() {
+            tthis.updateVisibility(false);
+        };
+        this.toggle = function() {
+            tthis.updateVisibility(!tthis.visible);
+        };
+        this.updateVisibility = function(visible) {
+            tthis.visible = visible;
+            Overlays.editOverlay(this.overlay, { visible: tthis.visible });
+        };
+        this.onUpdate = null;
+        this.update = function() {
+            var newWindowDimensions = Controller.getViewportDimensions();
+            if (newWindowDimensions.x != windowDimensions.x || newWindowDimensions.y != windowDimensions.y) {
+                windowDimensions = newWindowDimensions;
+                keyboard.rescale();
+                Overlays.editOverlay(text, {
+                    y: windowDimensions.y - keyboard.height() - 260,
+                    width: windowDimensions.x
+                });
+            }
+            var editobject = {};
+            var hudLookatPosition = HMD.getHUDLookAtPosition2D();
+            if (hudLookatPosition === null) {
+                return;
+            }
+            if (tthis.x !== hudLookatPosition.x) {
+                 tthis.x = hudLookatPosition.x;
+                 editobject.x = tthis.x - (CURSOR_WIDTH / 2);
+            }
+            if (tthis.y !== hudLookatPosition.y) {
+                 tthis.y = hudLookatPosition.y;
+                 editobject.y = tthis.y - (CURSOR_HEIGHT / 2);
+            }
+            if (Object.keys(editobject).length > 0) {
+                Overlays.editOverlay(tthis.overlay, editobject);
+                if (tthis.onUpdate != null) {
+                    tthis.onUpdate(tthis.getPosition());
+                } 
+            }
+        };
+        Script.update.connect(this.update);
     };
-    this.getPosition = function() {
-        return {x: tthis.getX(), y: tthis.getY()};
-    };
-    this.getX = function() {
-        return tthis.x;
-    };
-    this.getY = function() {
-        return tthis.y;
-    };
-    this.onUpdate = null;
-    this.update = function() {
-        var newWindowDimensions = Controller.getViewportDimensions();
-        if (newWindowDimensions.x != windowDimensions.x || newWindowDimensions.y != windowDimensions.y) {
-            windowDimensions = newWindowDimensions;
-            keyboard.rescale();
-            Overlays.editOverlay(text, {
-                y: windowDimensions.y - keyboard.height() - 260,
-                width: windowDimensions.x
-            });
-        }
-        var editobject = {};
-        if (MyAvatar.getHeadFinalYaw() <= VIEW_ANGLE_BY_TWO && MyAvatar.getHeadFinalYaw() >= -1 * VIEW_ANGLE_BY_TWO) {
-             angle = ((-1 * MyAvatar.getHeadFinalYaw()) + VIEW_ANGLE_BY_TWO) / VIEW_ANGLE;
-             tthis.x = angle * windowDimensions.x;
-             editobject.x = tthis.x - (CURSOR_WIDTH / 2);
-        }
-        if (MyAvatar.getHeadFinalPitch() <= VIEW_ANGLE_BY_TWO && MyAvatar.getHeadFinalPitch() >= -1 * VIEW_ANGLE_BY_TWO) {
-             angle = ((-1 * MyAvatar.getHeadFinalPitch()) + VIEW_ANGLE_BY_TWO) / VIEW_ANGLE;
-             tthis.y = angle * windowDimensions.y;
-             editobject.y = tthis.y - (CURSOR_HEIGHT / 2);
-        }
-        if (Object.keys(editobject).length > 0) {
-            Overlays.editOverlay(tthis.overlay, editobject);
-            if (tthis.onUpdate != null) {
-                tthis.onUpdate(tthis.getPosition());
-            } 
-        }
-    };
-    Script.update.connect(this.update);
-}
-
-function keyPressEvent(event) {
-    if (event.key === SPACEBAR_CHARCODE) {
-        keyboard.pressFocussedKey();
-    }
-}
-
-function keyReleaseEvent(event) {
-    if (event.key === SPACEBAR_CHARCODE) {
-        keyboard.releaseKeys();
-    }
-}
-
-function scriptEnding() {
-    keyboard.remove();
-    cursor.remove();
-    Overlays.deleteOverlay(text);
-    Overlays.deleteOverlay(textSizeMeasureOverlay);
-    Controller.releaseKeyEvents({key: SPACEBAR_CHARCODE});
-}
-Controller.captureKeyEvents({key: SPACEBAR_CHARCODE});
-Controller.keyPressEvent.connect(keyPressEvent);
-Controller.keyReleaseEvent.connect(keyReleaseEvent);
-Script.scriptEnding.connect(scriptEnding);
+});

gvr-interface/CMakeLists.txt

@@ -24,7 +24,9 @@ endif ()
 
 include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared networking audio-client avatars)
 include_dependency_includes()

interface/CMakeLists.txt

@@ -32,8 +32,6 @@ elseif (WIN32)
   set(GL_HEADERS "#include <windowshacks.h>\n#include <GL/glew.h>\n#include <GL/wglew.h>")
 endif ()
 
-# set up the external glm library
-include_glm()
 include_bullet()
 
 # create the InterfaceConfig.h file based on GL_HEADERS above
@@ -109,6 +107,11 @@ endif()
 # create the executable, make it a bundle on OS X
 add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS} ${QM})
 
+# set up the external glm library
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})
+
 # link required hifi libraries
 link_hifi_libraries(shared octree environment gpu model fbx metavoxels networking entities avatars 
                     audio audio-client animation script-engine physics 

interface/src/Application.cpp

@@ -111,6 +111,7 @@
 #include "scripting/AccountScriptingInterface.h"
 #include "scripting/AudioDeviceScriptingInterface.h"
 #include "scripting/ClipboardScriptingInterface.h"
+#include "scripting/HMDScriptingInterface.h"
 #include "scripting/JoystickScriptingInterface.h"
 #include "scripting/GlobalServicesScriptingInterface.h"
 #include "scripting/LocationScriptingInterface.h"
@@ -3492,6 +3493,10 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
 
     scriptEngine->registerGlobalObject("UndoStack", &_undoStackScriptingInterface);
 
+    QScriptValue hmdInterface = scriptEngine->registerGlobalObject("HMD", &HMDScriptingInterface::getInstance());
+    scriptEngine->registerFunction(hmdInterface, "getHUDLookAtPosition2D", HMDScriptingInterface::getHUDLookAtPosition2D, 0);
+    scriptEngine->registerFunction(hmdInterface, "getHUDLookAtPosition3D", HMDScriptingInterface::getHUDLookAtPosition3D, 0);
+
 #ifdef HAVE_RTMIDI
     scriptEngine->registerGlobalObject("MIDI", &MIDIManager::getInstance());
 #endif

interface/src/devices/OculusManager.cpp

@@ -688,7 +688,7 @@ void OculusManager::getEulerAngles(float& yaw, float& pitch, float& roll) {
     roll = 0.0f;
 #endif
 }
-    
+
 glm::vec3 OculusManager::getRelativePosition() {
 #if (defined(__APPLE__) || defined(_WIN32)) && HAVE_LIBOVR
     ovrTrackingState trackingState = ovrHmd_GetTrackingState(_ovrHmd, ovr_GetTimeInSeconds());

interface/src/scripting/HMDScriptingInterface.cpp

@@ -0,0 +1,56 @@
+//
+//  HMDScriptingInterface.cpp
+//  interface/src/scripting
+//
+//  Created by Thijs Wenker on 1/12/15.
+//  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
+//
+
+#include "HMDScriptingInterface.h"
+
+#include <avatar/AvatarManager.h>
+
+HMDScriptingInterface& HMDScriptingInterface::getInstance() {
+    static HMDScriptingInterface sharedInstance;
+    return sharedInstance;
+}
+
+bool HMDScriptingInterface::getHUDLookAtPosition3D(glm::vec3& result) const {
+    Camera* camera = Application::getInstance()->getCamera();
+    glm::vec3 position = camera->getPosition();
+    glm::quat orientation = camera->getOrientation();
+
+    glm::vec3 direction = orientation * glm::vec3(0.0f, 0.0f, -1.0f);
+
+    ApplicationOverlay& applicationOverlay = Application::getInstance()->getApplicationOverlay();
+
+    return applicationOverlay.calculateRayUICollisionPoint(position, direction, result);
+}
+
+QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine) {
+
+    glm::vec3 hudIntersection;
+
+    if ((&HMDScriptingInterface::getInstance())->getHUDLookAtPosition3D(hudIntersection)) {
+        MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+        glm::vec3 sphereCenter = myAvatar->getDefaultEyePosition();
+        glm::vec3 direction = glm::inverse(myAvatar->getOrientation()) * (hudIntersection - sphereCenter);
+        glm::quat rotation = ::rotationBetween(glm::vec3(0.0f, 0.0f, -1.0f), direction);
+        glm::vec3 eulers = ::safeEulerAngles(rotation);
+        return qScriptValueFromValue<glm::vec2>(engine, Application::getInstance()->getApplicationOverlay()
+                                                .sphericalToOverlay(glm::vec2(eulers.y, -eulers.x)));
+    }
+    return QScriptValue::NullValue;
+}
+
+QScriptValue HMDScriptingInterface::getHUDLookAtPosition3D(QScriptContext* context, QScriptEngine* engine) {
+    glm::vec3 result;
+    HMDScriptingInterface* hmdInterface = &HMDScriptingInterface::getInstance();
+    if ((&HMDScriptingInterface::getInstance())->getHUDLookAtPosition3D(result)) {
+        return qScriptValueFromValue<glm::vec3>(engine, result);
+    }
+    return QScriptValue::NullValue;
+}

interface/src/scripting/HMDScriptingInterface.h

@@ -0,0 +1,42 @@
+//
+//  HMDScriptingInterface.h
+//  interface/src/scripting
+//
+//  Created by Thijs Wenker on 1/12/15.
+//  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
+//
+
+#ifndef hifi_HMDScriptingInterface_h
+#define hifi_HMDScriptingInterface_h
+
+#include <GLMHelpers.h>
+
+#include "Application.h"
+#include "devices/OculusManager.h"
+
+class HMDScriptingInterface : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(bool magnifier READ getMagnifier)
+    Q_PROPERTY(bool active READ isHMDMode)
+public:
+    static HMDScriptingInterface& getInstance();
+
+    static QScriptValue getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine);
+    static QScriptValue getHUDLookAtPosition3D(QScriptContext* context, QScriptEngine* engine);
+
+public slots:
+    void toggleMagnifier() { Application::getInstance()->getApplicationOverlay().toggleMagnifier(); };
+
+private:
+    HMDScriptingInterface() {};
+    bool getMagnifier() const { return Application::getInstance()->getApplicationOverlay().hasMagnifier(); };
+    bool isHMDMode() const { return Application::getInstance()->isHMDMode(); }
+
+    bool getHUDLookAtPosition3D(glm::vec3& result) const;
+
+};
+
+#endif // hifi_HMDScriptingInterface_h

interface/src/ui/ApplicationOverlay.cpp

@@ -139,6 +139,7 @@ ApplicationOverlay::ApplicationOverlay() :
     _alpha(1.0f),
     _oculusUIRadius(1.0f),
     _crosshairTexture(0),
+    _magnifier(true),
     _previousBorderWidth(-1),
     _previousBorderHeight(-1),
     _previousMagnifierBottomLeft(),
@@ -559,7 +560,7 @@ void ApplicationOverlay::renderPointers() {
         
         _reticlePosition[MOUSE] = position;
         _reticleActive[MOUSE] = true;
-        _magActive[MOUSE] = true;
+        _magActive[MOUSE] = _magnifier;
         _reticleActive[LEFT_CONTROLLER] = false;
         _reticleActive[RIGHT_CONTROLLER] = false;
     } else if (qApp->getLastMouseMoveWasSimulated() && Menu::getInstance()->isOptionChecked(MenuOption::SixenseMouseInput)) {
@@ -718,6 +719,9 @@ void ApplicationOverlay::renderPointersOculus(const glm::vec3& eyePos) {
 
 //Renders a small magnification of the currently bound texture at the coordinates
 void ApplicationOverlay::renderMagnifier(glm::vec2 magPos, float sizeMult, bool showBorder) {
+    if (!_magnifier) {
+        return;
+    }
     auto glCanvas = DependencyManager::get<GLCanvas>();
     
     const int widgetWidth = glCanvas->width();
@@ -789,7 +793,7 @@ void ApplicationOverlay::renderAudioMeter() {
     //  Audio VU Meter and Mute Icon
     const int MUTE_ICON_SIZE = 24;
     const int MUTE_ICON_PADDING = 10;
-    const int AUDIO_METER_WIDTH = MIRROR_VIEW_WIDTH - MUTE_ICON_SIZE  - MUTE_ICON_PADDING;
+    const int AUDIO_METER_WIDTH = MIRROR_VIEW_WIDTH - MUTE_ICON_SIZE - MUTE_ICON_PADDING;
     const int AUDIO_METER_SCALE_WIDTH = AUDIO_METER_WIDTH - 2 ;
     const int AUDIO_METER_HEIGHT = 8;
     const int AUDIO_METER_GAP = 5;
@@ -845,8 +849,8 @@ void ApplicationOverlay::renderAudioMeter() {
     audioMeterY += AUDIO_METER_HEIGHT;
 
     //  Draw audio meter background Quad
-    DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X, audioMeterY, AUDIO_METER_WIDTH, AUDIO_METER_HEIGHT, 
-                                                            glm::vec4(0.298f, 0.757f, 0.722f, 1));
+    DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X, audioMeterY, AUDIO_METER_WIDTH, AUDIO_METER_HEIGHT,
+                                                            glm::vec4(0.0f, 0.0f, 0.0f, 1.0f));
 
     if (audioLevel > AUDIO_RED_START) {
         glm::vec4 quadColor;

interface/src/ui/ApplicationOverlay.h

@@ -37,6 +37,9 @@ public:
     QPoint getPalmClickLocation(const PalmData *palm) const;
     bool calculateRayUICollisionPoint(const glm::vec3& position, const glm::vec3& direction, glm::vec3& result) const;
     
+    bool hasMagnifier() const { return _magnifier; }
+    void toggleMagnifier() { _magnifier = !_magnifier; }
+
     float getOculusUIAngularSize() const { return _oculusUIAngularSize; }
     void setOculusUIAngularSize(float oculusUIAngularSize) { _oculusUIAngularSize = oculusUIAngularSize; }
     
@@ -109,7 +112,8 @@ private:
     bool _magActive[NUMBER_OF_RETICLES];
     float _magSizeMult[NUMBER_OF_RETICLES];
     quint64 _lastMouseMove;
-    
+    bool _magnifier;
+
     float _alpha;
     float _oculusUIRadius;
     float _trailingAudioLoudness;

interface/src/ui/LoginDialog.cpp

@@ -41,6 +41,9 @@ LoginDialog::LoginDialog(QWidget* parent) :
             this, &LoginDialog::handleLoginClicked);
     connect(_ui->closeButton, &QPushButton::clicked,
             this, &LoginDialog::close);
+
+    // Initialize toggle connection
+    toggleQAction();
 };
 
 LoginDialog::~LoginDialog() {

libraries/audio-client/CMakeLists.txt

@@ -8,17 +8,13 @@ link_hifi_libraries(audio)
 # append audio includes to our list of includes to bubble
 list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES "${HIFI_LIBRARY_DIR}/audio/src")
 
-set(GVERB_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/gverb")
+# have CMake grab Gverb from git and then set up linking and directory include
+add_dependency_external_project(gverb)
 
-# As Gverb is currently the only reverb library, it's required.
 find_package(Gverb REQUIRED)
 
-file(GLOB GVERB_SRCS ${GVERB_SRC_DIRS}/*.c)
-add_library(gverb STATIC ${GVERB_SRCS})
-target_link_libraries(${TARGET_NAME} gverb)
-
-# append gverb includes to our list of includes to bubble
-list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES "${GVERB_INCLUDE_DIRS}")
+target_link_libraries(${TARGET_NAME} ${GVERB_LIBRARIES})
+target_include_directories(${TARGET_NAME} PRIVATE ${GVERB_INCLUDE_DIRS})
 
 # we use libsoxr for resampling
 find_package(Soxr REQUIRED)

libraries/audio-client/external/gverb/readme.txt

@@ -1,14 +0,0 @@
-Instructions for adding the Gverb library to audio-client
-(This is a required library)
-Clément Brisset, October 22nd, 2014
-
-1. Go to https://github.com/highfidelity/gverb
-   Or download the sources directly via this link: 
-   https://github.com/highfidelity/gverb/archive/master.zip
-
-2. Extract the archive
-
-3. Place the directories “include” and “src” in libraries/audio-client/external/gverb 
-   (Normally next to this readme)
-
-4. Clear your build directory, run cmake, build and you should be all set.

libraries/audio-client/src/AudioClient.cpp

@@ -33,6 +33,11 @@
 #include <QtMultimedia/QAudioInput>
 #include <QtMultimedia/QAudioOutput>
 
+extern "C" {
+    #include <gverb/gverb.h>
+    #include <gverb/gverbdsp.h>
+}
+
 #include <soxr.h>
 
 #include <NodeList.h>

libraries/audio-client/src/AudioClient.h

@@ -47,10 +47,7 @@
 #pragma warning( disable : 4273 )
 #pragma warning( disable : 4305 )
 #endif
-extern "C" {
-    #include <gverb.h>
-    #include <gverbdsp.h>
-}
+
 #ifdef _WIN32
 #pragma warning( pop )
 #endif
@@ -68,6 +65,7 @@ class QAudioInput;
 class QAudioOutput;
 class QIODevice;
 struct soxr;
+typedef struct ty_gverb ty_gverb;
 
 typedef glm::vec3 (*AudioPositionGetter)();
 typedef glm::quat (*AudioOrientationGetter)();

libraries/audio/CMakeLists.txt

@@ -3,7 +3,9 @@ set(TARGET_NAME audio)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(networking shared)
 

libraries/avatars/CMakeLists.txt

@@ -3,7 +3,9 @@ set(TARGET_NAME avatars)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network Script)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(audio shared networking)
 

libraries/entities-renderer/CMakeLists.txt

@@ -3,7 +3,9 @@ set(TARGET_NAME entities-renderer)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Widgets OpenGL Network Script)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared gpu script-engine render-utils)
 

libraries/entities/CMakeLists.txt

@@ -3,7 +3,10 @@ set(TARGET_NAME entities)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network Script)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
+
 include_bullet()
 
 link_hifi_libraries(avatars shared octree gpu model fbx networking animation)

libraries/environment/CMakeLists.txt

@@ -3,7 +3,9 @@ set(TARGET_NAME environment)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared networking)
 

libraries/fbx/CMakeLists.txt

@@ -3,7 +3,9 @@ set(TARGET_NAME fbx)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared gpu model networking octree)
 

libraries/gpu/CMakeLists.txt

@@ -3,8 +3,6 @@ set(TARGET_NAME gpu)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
-include_glm()
-
 link_hifi_libraries(shared)
 
 if (APPLE)

libraries/metavoxels/CMakeLists.txt

@@ -8,7 +8,9 @@ setup_hifi_library(Network Script Widgets)
 # link in the networking library
 link_hifi_libraries(shared networking)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 # call macro to include our dependency includes and bubble them up via a property on our target
 include_dependency_includes()

libraries/model/CMakeLists.txt

@@ -3,7 +3,9 @@ set(TARGET_NAME model)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared gpu)
 

libraries/networking/src/LimitedNodeList.cpp

@@ -39,6 +39,7 @@ const char SOLO_NODE_TYPES[2] = {
 const QUrl DEFAULT_NODE_AUTH_URL = QUrl("https://metaverse.highfidelity.io");
 
 LimitedNodeList::LimitedNodeList(unsigned short socketListenPort, unsigned short dtlsListenPort) :
+    linkedDataCreateCallback(NULL),
     _sessionUUID(),
     _nodeHash(),
     _nodeMutex(QReadWriteLock::Recursive),

libraries/octree/CMakeLists.txt

@@ -3,7 +3,9 @@ set(TARGET_NAME octree)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared networking)
 

libraries/physics/CMakeLists.txt

@@ -3,7 +3,10 @@ set(TARGET_NAME physics)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
+
 include_bullet()
 if (BULLET_FOUND)
      target_link_libraries(${TARGET_NAME} ${BULLET_LIBRARIES})

libraries/render-utils/CMakeLists.txt

@@ -8,7 +8,9 @@ qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Widgets OpenGL Network Script)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(animation fbx shared gpu)
 

libraries/script-engine/CMakeLists.txt

@@ -3,7 +3,9 @@ set(TARGET_NAME script-engine)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Gui Network Script Widgets)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared octree gpu model fbx entities animation audio physics metavoxels)
 

libraries/script-engine/src/ScriptEngine.cpp

@@ -272,8 +272,12 @@ QScriptValue ScriptEngine::registerGlobalObject(const QString& name, QObject* ob
 }
 
 void ScriptEngine::registerFunction(const QString& name, QScriptEngine::FunctionSignature fun, int numArguments) {
+    registerFunction(globalObject(), name, fun, numArguments);
+}
+
+void ScriptEngine::registerFunction(QScriptValue parent, const QString& name, QScriptEngine::FunctionSignature fun, int numArguments) {
     QScriptValue scriptFun = newFunction(fun, numArguments);
-    globalObject().setProperty(name, scriptFun);
+    parent.setProperty(name, scriptFun);
 }
 
 void ScriptEngine::registerGetterSetter(const QString& name, QScriptEngine::FunctionSignature getter,

libraries/script-engine/src/ScriptEngine.h

@@ -58,6 +58,8 @@ public:
     void registerGetterSetter(const QString& name, QScriptEngine::FunctionSignature getter,
                               QScriptEngine::FunctionSignature setter, QScriptValue object = QScriptValue::NullValue);
     void registerFunction(const QString& name, QScriptEngine::FunctionSignature fun, int numArguments = -1);
+    void registerFunction(QScriptValue parent, const QString& name, QScriptEngine::FunctionSignature fun,
+                          int numArguments = -1);
 
     Q_INVOKABLE void setIsAvatar(bool isAvatar);
     bool isAvatar() const { return _isAvatar; }

libraries/shared/CMakeLists.txt

@@ -4,5 +4,9 @@ set(TARGET_NAME shared)
 # TODO: there isn't really a good reason to have Script linked here - let's get what is requiring it out (RegisteredMetaTypes.cpp)
 setup_hifi_library(Gui Network Script Widgets)
 
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
+
 # call macro to include our dependency includes and bubble them up via a property on our target
 include_dependency_includes()

tests/audio/CMakeLists.txt

@@ -2,8 +2,6 @@ set(TARGET_NAME audio-tests)
 
 setup_hifi_project()
 
-include_glm()
-
 # link in the shared libraries
 link_hifi_libraries(shared audio networking)
 

tests/metavoxels/CMakeLists.txt

@@ -2,8 +2,6 @@ set(TARGET_NAME metavoxel-tests)
 
 auto_mtc()
 
-include_glm()
-
 setup_hifi_project(Network Script Widgets)
 
 # link in the shared libraries

tests/octree/CMakeLists.txt

@@ -2,8 +2,6 @@ set(TARGET_NAME octree-tests)
 
 setup_hifi_project(Script Network)
 
-include_glm()
-
 # link in the shared libraries
 link_hifi_libraries(shared octree gpu model fbx metavoxels networking entities avatars audio animation script-engine physics)
 

tests/physics/CMakeLists.txt

@@ -2,7 +2,10 @@ set(TARGET_NAME physics-tests)
 
 setup_hifi_project()
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
+
 include_bullet()
 
 link_hifi_libraries(shared physics)

tests/render-utils/CMakeLists.txt

@@ -2,8 +2,6 @@ set(TARGET_NAME render-utils-tests)
  
 setup_hifi_project(Quick Gui OpenGL)
 
-include_glm()
-
 #include_oglplus()
 
 # link in the shared libraries

tests/shared/CMakeLists.txt

@@ -2,8 +2,6 @@ set(TARGET_NAME shared-tests)
 
 setup_hifi_project()
 
-include_glm()
-
 # link in the shared libraries
 link_hifi_libraries(shared)
 

tools/bitstream2json/CMakeLists.txt

@@ -1,8 +1,6 @@
 set(TARGET_NAME bitstream2json)
 setup_hifi_project(Widgets Script)
 
-include_glm()
-
 link_hifi_libraries(metavoxels)
 
 include_dependency_includes()

tools/json2bitstream/CMakeLists.txt

@@ -1,8 +1,6 @@
 set(TARGET_NAME json2bitstream)
 setup_hifi_project(Widgets Script)
 
-include_glm()
-
 link_hifi_libraries(metavoxels)
 
 include_dependency_includes()