Merge pull request #12713 from highfidelity/RC66

RC66 - Merge Back

CMakeLists.txt

@@ -39,6 +39,7 @@ set(BUILD_TOOLS_OPTION ON)
 set(BUILD_INSTALLER_OPTION ON)
 set(GLES_OPTION OFF)
 set(DISABLE_QML_OPTION OFF)
+set(DOWNLOAD_SERVERLESS_CONTENT_OPTION OFF)
 
 if (ANDROID OR UWP)
   set(BUILD_SERVER_OPTION OFF)
@@ -74,6 +75,11 @@ option(BUILD_INSTALLER "Build installer" ${BUILD_INSTALLER_OPTION})
 option(USE_GLES "Use OpenGL ES" ${GLES_OPTION})
 option(DISABLE_QML "Disable QML" ${DISABLE_QML_OPTION})
 option(DISABLE_KTX_CACHE "Disable KTX Cache" OFF)
+option(
+  DOWNLOAD_SERVERLESS_CONTENT
+  "Download and setup default serverless content beside Interface"
+  ${DOWNLOAD_SERVERLESS_CONTENT_OPTION}
+)
 
 set(PLATFORM_QT_GL OpenGL)
 
@@ -88,12 +94,13 @@ foreach(PLATFORM_QT_COMPONENT ${PLATFORM_QT_COMPONENTS})
   list(APPEND PLATFORM_QT_LIBRARIES "Qt5::${PLATFORM_QT_COMPONENT}")
 endforeach()
 
-MESSAGE(STATUS "Build server:    " ${BUILD_SERVER})
-MESSAGE(STATUS "Build client:    " ${BUILD_CLIENT})
-MESSAGE(STATUS "Build tests:     " ${BUILD_TESTS})
-MESSAGE(STATUS "Build tools:     " ${BUILD_TOOLS})
-MESSAGE(STATUS "Build installer: " ${BUILD_INSTALLER})
-MESSAGE(STATUS "GL ES:           " ${USE_GLES})
+MESSAGE(STATUS "Build server:          " ${BUILD_SERVER})
+MESSAGE(STATUS "Build client:          " ${BUILD_CLIENT})
+MESSAGE(STATUS "Build tests:           " ${BUILD_TESTS})
+MESSAGE(STATUS "Build tools:           " ${BUILD_TOOLS})
+MESSAGE(STATUS "Build installer:       " ${BUILD_INSTALLER})
+MESSAGE(STATUS "GL ES:                 " ${USE_GLES})
+MESSAGE(STATUS "DL serverless content: " ${DOWNLOAD_SERVERLESS_CONTENT})
 
 if (DISABLE_QML)
   MESSAGE(STATUS "QML disabled!")

cmake/externals/serverless-content/CMakeLists.txt

@@ -0,0 +1,16 @@
+include(ExternalProject)
+
+set(EXTERNAL_NAME serverless-content)
+
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  URL http://cdn.highfidelity.com/content-sets/serverless-tutorial-RC66.zip
+  URL_MD5 91edfde96e06efc847ca327ab97f4c74
+  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")

cmake/macros/SetPackagingParameters.cmake

@@ -73,6 +73,11 @@ macro(SET_PACKAGING_PARAMETERS)
     add_definitions(-DDEV_BUILD)
   endif ()
 
+  if (DEPLOY_PACKAGE)
+    # for deployed packages always grab the serverless content
+    set(DOWNLOAD_SERVERLESS_CONTENT ON)
+  endif ()
+
   if (APPLE)
     set(DMG_SUBFOLDER_NAME "${BUILD_ORGANIZATION}")
 

interface/CMakeLists.txt

@@ -43,7 +43,6 @@ endif()
 list(APPEND GENERATE_QRC_DEPENDS ${RESOURCES_RCC})
 add_custom_target(resources ALL DEPENDS ${GENERATE_QRC_DEPENDS})
 
-
 # set a default root dir for each of our optional externals if it was not passed
 set(OPTIONAL_EXTERNALS "LeapMotion")
 
@@ -313,36 +312,41 @@ if (APPLE)
     COMPONENT ${CLIENT_COMPONENT}
   )
 
-  set(SCRIPTS_INSTALL_DIR "${INTERFACE_INSTALL_APP_PATH}/Contents/Resources")
-
+  set(RESOURCES_INSTALL_DIR "${INTERFACE_INSTALL_APP_PATH}/Contents/Resources")
+  set(RESOURCES_DEV_DIR "$<TARGET_FILE_DIR:${TARGET_NAME}>/../Resources")
 
   # copy script files beside the executable
   add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
     COMMAND "${CMAKE_COMMAND}" -E copy_directory
     "${CMAKE_SOURCE_DIR}/scripts"
-    "$<TARGET_FILE_DIR:${TARGET_NAME}>/../Resources/scripts"
+    "${RESOURCES_DEV_DIR}/scripts"
   )
 
   # call the fixup_interface macro to add required bundling commands for installation
   fixup_interface()
 
 else()
+  set(RESOURCES_DEV_DIR "$<TARGET_FILE_DIR:${TARGET_NAME}>/resources")
+
   # copy the resources files beside the executable
   add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
     COMMAND "${CMAKE_COMMAND}" -E copy_if_different
-    "${RESOURCES_RCC}"
-    "$<TARGET_FILE_DIR:interface>"
+      "${RESOURCES_RCC}"
+      "$<TARGET_FILE_DIR:interface>"
     # FIXME, the edit script code loads HTML from the scripts folder
     # which in turn relies on CSS that refers to the fonts.  In theory
     # we should be able to modify the CSS to reference the QRC path to
     # the ttf files, but doing so generates a CORS policy violation,
     # so we have to retain a copy of the fonts outside of the resources binary
     COMMAND "${CMAKE_COMMAND}" -E copy_directory
-    "${PROJECT_SOURCE_DIR}/resources/fonts"
-    "$<TARGET_FILE_DIR:${TARGET_NAME}>/resources/fonts"
+      "${PROJECT_SOURCE_DIR}/resources/fonts"
+      "$<TARGET_FILE_DIR:${TARGET_NAME}>/resources/fonts"
     COMMAND "${CMAKE_COMMAND}" -E copy_directory
-    "${CMAKE_SOURCE_DIR}/scripts"
-    "$<TARGET_FILE_DIR:${TARGET_NAME}>/scripts"
+      "${CMAKE_SOURCE_DIR}/scripts"
+      "${RESOURCES_DEV_DIR}/scripts"
+    COMMAND "${CMAKE_COMMAND}" -E copy_if_different
+      "${PROJECT_SOURCE_DIR}/resources/serverless/tutorial.json"
+      "$<TARGET_FILE_DIR:${TARGET_NAME}>/resources/serverless/tutorial.json"
   )
 
   # link target to external libraries
@@ -359,7 +363,7 @@ else()
       PATTERN "*.exp" EXCLUDE
     )
 
-    set(SCRIPTS_INSTALL_DIR "${INTERFACE_INSTALL_DIR}")
+    set(RESOURCES_INSTALL_DIR "${INTERFACE_INSTALL_DIR}")
 
     set(EXECUTABLE_COMPONENT ${CLIENT_COMPONENT})
 
@@ -367,16 +371,28 @@ else()
   endif()
 endif()
 
-if (SCRIPTS_INSTALL_DIR)
-
+if (RESOURCES_INSTALL_DIR)
   # setup install of scripts beside interface executable
   install(
     DIRECTORY "${CMAKE_SOURCE_DIR}/scripts/"
-    DESTINATION ${SCRIPTS_INSTALL_DIR}/scripts
+    DESTINATION ${RESOURCES_INSTALL_DIR}/scripts
     COMPONENT ${CLIENT_COMPONENT}
   )
 endif()
 
+if (DOWNLOAD_SERVERLESS_CONTENT)
+  add_dependency_external_projects(serverless-content)
+
+  ExternalProject_Get_Property(serverless-content SOURCE_DIR)
+
+  # for dev builds, copy the serverless content to the resources folder
+  add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E copy_directory
+      "${SOURCE_DIR}"
+      "${RESOURCES_DEV_DIR}/serverless"
+  )
+endif ()
+
 if (WIN32)
     set(EXTRA_DEPLOY_OPTIONS "--qmldir  \"${PROJECT_SOURCE_DIR}/resources/qml\"")
 

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

@@ -1160,14 +1160,14 @@ Rectangle {
     function authSuccessStep() {
         if (!root.debugCheckoutSuccess) {
             root.activeView = "checkoutMain";
-        } else {
-            root.activeView = "checkoutSuccess";
             root.ownershipStatusReceived = false;
             Commerce.alreadyOwned(root.itemId);
             root.availableUpdatesReceived = false;
             Commerce.getAvailableUpdates(root.itemId);
             root.balanceReceived = false;
             Commerce.balance();
+        } else {
+            root.activeView = "checkoutSuccess";
         }
     }
 

interface/resources/serverless/tutorial.json

@@ -0,0 +1,18 @@
+{
+    "Entities": [
+        {
+            "type": "Box",
+            "dimensions": {
+                "x": 20,
+                "y": 1,
+                "z": 20
+            },
+            "position" : {
+                "x": 0,
+                "y": -12,
+                "z": 0
+            }
+        }
+    ],
+    "Version": 84
+}

libraries/networking/src/AddressManager.cpp

@@ -30,12 +30,7 @@
 #include "UserActivityLogger.h"
 #include "udt/PacketHeaders.h"
 
-#if USE_STABLE_GLOBAL_SERVICES
-const QString DEFAULT_HIFI_ADDRESS = "hifi://welcome/hello";
-#else
-const QString DEFAULT_HIFI_ADDRESS = "hifi://dev-welcome/hello";
-#endif
-
+const QString DEFAULT_HIFI_ADDRESS = "file:///~/serverless/tutorial.json";
 const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager";
 const QString SETTINGS_CURRENT_ADDRESS_KEY = "address";