From d2a768c2f0fbeddd774056c026dcbc277a4fce90 Mon Sep 17 00:00:00 2001 From: ksuprynowicz Date: Wed, 3 Aug 2022 21:53:33 +0200 Subject: [PATCH] Renamed environment variables --- .github/workflows/master_build.yml | 4 +- .github/workflows/pr_build.yml | 16 ++--- BUILD.md | 4 +- BUILD_LINUX.md | 8 +-- BUILD_OSX.md | 4 +- BUILD_WIN.md | 12 ++-- CMakeLists.txt | 48 +++++++-------- .../src/avatars/ScriptableAvatar.cpp | 2 +- cmake/macros/MemoryDebugger.cmake | 8 +-- cmake/macros/SetupQt.cmake | 2 +- cmake/macros/ThreadDebugger.cmake | 8 +-- domain-server/src/DomainGatekeeper.cpp | 2 +- domain-server/src/DomainServer.cpp | 8 +-- hifi_qt.py | 14 ++--- interface/CMakeLists.txt | 4 +- interface/src/Application.cpp | 16 ++--- interface/src/main.cpp | 2 +- .../scripting/WindowScriptingInterface.cpp | 6 +- interface/src/ui/ModelsBrowser.cpp | 4 +- libraries/auto-updater/src/AutoUpdater.cpp | 2 +- libraries/baking/src/JSBaker.cpp | 2 +- libraries/baking/src/ModelBaker.cpp | 2 +- libraries/baking/src/TextureBaker.cpp | 2 +- libraries/gpu-gl/CMakeLists.txt | 4 +- libraries/model-serializers/src/FSTReader.cpp | 2 +- libraries/networking/src/AccountManager.h | 2 +- libraries/networking/src/AddressManager.cpp | 58 +++++++++---------- libraries/networking/src/AddressManager.h | 2 +- .../networking/src/DomainAccountManager.cpp | 2 +- libraries/networking/src/DomainHandler.cpp | 14 ++--- libraries/networking/src/DomainHandler.h | 14 ++--- libraries/networking/src/ExternalResource.h | 2 +- .../networking/src/HTTPResourceRequest.cpp | 2 +- .../networking/src/NetworkingConstants.h | 10 ++-- libraries/networking/src/NodeList.cpp | 2 +- .../src/OAuthNetworkAccessManager.cpp | 2 +- libraries/networking/src/ResourceManager.cpp | 2 +- libraries/networking/src/SandboxUtils.cpp | 2 +- libraries/render-utils/src/text/Font.cpp | 2 +- libraries/script-engine/src/ScriptEngine.cpp | 2 +- libraries/script-engine/src/ScriptsModel.cpp | 2 +- .../script-engine/src/XMLHttpRequestClass.cpp | 2 +- libraries/shared/src/LogHandler.cpp | 4 +- pkg-scripts/docker-entrypoint.sh | 16 ++--- pkg-scripts/make-docker-server | 46 +++++++-------- prebuild.py | 2 +- script-archive/acScripts/simpleBot.js | 2 +- script-archive/airship/airship.js | 6 +- script-archive/avatarSelector.js | 14 ++--- script-archive/blockWorld.js | 6 +- script-archive/controlPanel.js | 10 ++-- script-archive/controllers/hydra/airGuitar.js | 28 ++++----- script-archive/controllers/hydra/drumStick.js | 6 +- script-archive/controllers/hydra/frisbee.js | 4 +- script-archive/controllers/hydra/gun.js | 20 +++---- .../controllers/hydra/paddleBall.js | 10 ++-- script-archive/controllers/hydra/toyball.js | 4 +- script-archive/controllers/oculus/goTo.js | 4 +- .../virtualKeyboardTextEntityExample.js | 2 +- script-archive/controllers/toybox.js | 4 +- .../entityScripts/recordingMaster.js | 8 +-- script-archive/example/audio/audioBall.js | 4 +- .../example/audio/jsstreamplayer.js | 4 +- script-archive/example/audio/radio.js | 6 +- script-archive/example/brownianFun.js | 6 +- script-archive/example/dynamicLandscape.js | 4 +- .../example/entities/editModelExample.js | 4 +- .../example/entities/entityModelExample.js | 4 +- .../example/entities/zoneEntityExample.js | 2 +- .../example/entities/zoneSkyboxExample.js | 2 +- script-archive/example/games/airHockey.js | 6 +- script-archive/example/games/billiards.js | 8 +-- script-archive/example/games/make-dummy.js | 4 +- script-archive/example/games/planky.js | 10 ++-- .../example/games/spaceInvadersExample.js | 32 +++++----- script-archive/example/soundToys.js | 8 +-- .../example/ui/overlayPanelExample.js | 6 +- 77 files changed, 307 insertions(+), 307 deletions(-) diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml index 31dac18d8d..a973884cb8 100644 --- a/.github/workflows/master_build.yml +++ b/.github/workflows/master_build.yml @@ -64,7 +64,7 @@ jobs: echo "PYTHON_EXEC=python3" >> $GITHUB_ENV echo "INSTALLER_EXT=tgz" >> $GITHUB_ENV echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV - echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV + echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV fi # Mac build variables if [ "${{ matrix.os }}" = "macOS-10.15" ]; then @@ -72,7 +72,7 @@ jobs: echo "ZIP_COMMAND=zip" >> $GITHUB_ENV echo "ZIP_ARGS=-r" >> $GITHUB_ENV echo "INSTALLER_EXT=dmg" >> $GITHUB_ENV - echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV + echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV echo "::set-output name=symbols_archive::${BUILD_NUMBER}-${{ matrix.build_type }}-mac-symbols.zip" echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV fi diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 7766ecb946..a4c7d7155f 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -76,27 +76,27 @@ jobs: echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV # Variables specific to our aarch64 runner if [ "${{ matrix.os }}" = "self-hosted_debian-11_aarch64" ]; then - echo "VIRCADIA_USE_SYSTEM_QT=true" >> $GITHUB_ENV + echo "OVERTE_USE_SYSTEM_QT=true" >> $GITHUB_ENV echo "CI_WORKSPACE=${{runner.workspace}}" >> $GITHUB_ENV # Don't optimize builds to save build time. - echo "VIRCADIA_OPTIMIZE=false" >> $GITHUB_ENV + echo "OVERTE_OPTIMIZE=false" >> $GITHUB_ENV fi if [[ "${{ matrix.os }}" = *"aarch64" ]]; then echo "VCPKG_FORCE_SYSTEM_BINARIES=true" >> $GITHUB_ENV if [ "${{ matrix.build_type }}" = "full" ]; then - echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV + echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV else - echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV + echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV fi fi if [[ "${{ matrix.os }}" != *"aarch64" ]]; then if [ "${{ matrix.build_type }}" = "full" ]; then - echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV + echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV else - echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV + echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV fi fi fi @@ -106,9 +106,9 @@ jobs: echo "PYTHON_EXEC=python3" >> $GITHUB_ENV echo "INSTALLER_EXT=dmg" >> $GITHUB_ENV if [ "${{ matrix.build_type }}" = "full" ]; then - echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV + echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV else - echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCLIENT_ONLY=1 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV + echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCLIENT_ONLY=1 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV fi echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV fi diff --git a/BUILD.md b/BUILD.md index 6ecee986e1..2031d2226d 100644 --- a/BUILD.md +++ b/BUILD.md @@ -194,8 +194,8 @@ The following build options can be used when running CMake ### Optimization build options -* VIRCADIA_OPTIMIZE - This variable defaults to 1 if not set and enables compiler optimization flags on Linux and MacOS. Setting it to 0 will result in unoptimized build. -* VIRCADIA_CPU_ARCHITECTURE - This variable contains architecture specific compiler flags which are used if `VIRCADIA_OPTIMIZE` is true. If it is not set, it defaults to `-march=native -mtune=native`, which helps yield more performance for locally used build, but for packaging it needs to be set to different value for portability, for example `-msse3`. Setting `VIRCADIA_CPU_ARCHITECTURE` to empty string will use default compiler settings and yield +* OVERTE_OPTIMIZE - This variable defaults to 1 if not set and enables compiler optimization flags on Linux and MacOS. Setting it to 0 will result in unoptimized build. +* OVERTE_CPU_ARCHITECTURE - This variable contains architecture specific compiler flags which are used if `OVERTE_OPTIMIZE` is true. If it is not set, it defaults to `-march=native -mtune=native`, which helps yield more performance for locally used build, but for packaging it needs to be set to different value for portability, for example `-msse3`. Setting `OVERTE_CPU_ARCHITECTURE` to empty string will use default compiler settings and yield maximum compatibility. diff --git a/BUILD_LINUX.md b/BUILD_LINUX.md index 4f21db4344..51b31323f2 100644 --- a/BUILD_LINUX.md +++ b/BUILD_LINUX.md @@ -101,19 +101,19 @@ git tag ### Using a custom Qt build Qt binaries are only provided for Ubuntu. In order to build on other distributions, a Qt5 install -needs to be provided by setting the `VIRCADIA_QT_PATH` environment variable to a directory containing +needs to be provided by setting the `OVERTE_QT_PATH` environment variable to a directory containing a Qt install. ### Using the system's Qt The system's Qt can be used, if the development packages are installed, by setting the -`VIRCADIA_USE_SYSTEM_QT` environment variable. The minimum recommended version is Qt 5.15.2, which is +`OVERTE_USE_SYSTEM_QT` environment variable. The minimum recommended version is Qt 5.15.2, which is also the last version available in the Qt 5 branch. It is expected that Linux distributions will have Qt 5.15.2 available for a long time. ### Architecture support -If the build is intended to be packaged for distribution, the `VIRCADIA_CPU_ARCHITECTURE` +If the build is intended to be packaged for distribution, the `OVERTE_CPU_ARCHITECTURE` CMake variable needs to be set to an architecture specific value. By default, it is set to `-march=native -mtune=native`, which yields builds optimized for a particular @@ -121,7 +121,7 @@ machine, but these builds will not work on machines lacking same CPU instruction For packaging, it is recommended to set it to a different value, for example `-msse3`. This will help ensure that the build will run on all reasonably modern CPUs. -Setting `VIRCADIA_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield maximum compatibility. +Setting `OVERTE_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield maximum compatibility. ### Compiling diff --git a/BUILD_OSX.md b/BUILD_OSX.md index 455d2c75fc..094669d07b 100644 --- a/BUILD_OSX.md +++ b/BUILD_OSX.md @@ -66,7 +66,7 @@ To package the installation, you can simply run `make package` afterwards. ## Architecture Support -If the build is intended to be packaged for distribution, the `VIRCADIA_CPU_ARCHITECTURE` +If the build is intended to be packaged for distribution, the `OVERTE_CPU_ARCHITECTURE` CMake variable needs to be set to an architecture specific value. By default, it is set to `-march=native -mtune=native`, which yields builds optimized for a particular @@ -74,7 +74,7 @@ machine, but these builds will not work on machines lacking same CPU instruction For packaging, it is recommended to set it to a different value, for example `-msse3`. This will help ensure that the build will run on all reasonably modern CPUs. -Setting `VIRCADIA_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield +Setting `OVERTE_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield maximum compatibility. ## FAQ diff --git a/BUILD_WIN.md b/BUILD_WIN.md index 8cc7752ba2..fa038fb84c 100644 --- a/BUILD_WIN.md +++ b/BUILD_WIN.md @@ -89,18 +89,18 @@ To create this variable: ## Step 7. Running CMake to Generate Build Files Run Command Prompt from Start and run the following commands: -`cd "%VIRCADIA_DIR%"` +`cd "%OVERTE_DIR%"` `mkdir build` `cd build` ### Visual Studio 2019 Run `cmake .. -G "Visual Studio 16 2019" -A x64`. -Where `%VIRCADIA_DIR%` is the directory for the Overte repository. +Where `%OVERTE_DIR%` is the directory for the Overte repository. ## Step 8. Making a Build -Open `%VIRCADIA_DIR%\build\overte.sln` using Visual Studio. +Open `%OVERTE_DIR%\build\overte.sln` using Visual Studio. Change the Solution Configuration (menu ribbon under the menu bar, next to the green play button) from "Debug" to "Release" for best performance. @@ -118,7 +118,7 @@ In Visual Studio, right-click "interface" under the Apps folder in Solution Expl Now, you should have a full build of Overte and be able to run the Interface using Visual Studio. -Note: You can also run Interface by launching it from command line or File Explorer from `%VIRCADIA_DIR%\build\interface\Release\interface.exe` +Note: You can also run Interface by launching it from command line or File Explorer from `%OVERTE_DIR%\build\interface\Release\interface.exe` # Troubleshooting @@ -130,8 +130,8 @@ For any problems after Step #7, first try this: ## CMake gives you the same error message repeatedly after the build fails -Remove `CMakeCache.txt` found in the `%VIRCADIA_DIR%\build` directory. +Remove `CMakeCache.txt` found in the `%OVERTE_DIR%\build` directory. ## CMake can't find OpenSSL -Remove `CMakeCache.txt` found in the `%VIRCADIA_DIR%\build` directory. Verify that your HIFI_VCPKG_BASE environment variable is set and pointing to the correct location. Verify that the file `${HIFI_VCPKG_BASE}/installed/x64-windows/include/openssl/ssl.h` exists. +Remove `CMakeCache.txt` found in the `%OVERTE_DIR%\build` directory. Verify that your HIFI_VCPKG_BASE environment variable is set and pointing to the correct location. Verify that the file `${HIFI_VCPKG_BASE}/installed/x64-windows/include/openssl/ssl.h` exists. diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f7c9ffc48..46c53607ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,62 +74,62 @@ if ((NOT "${RELEASE_TYPE}" STREQUAL "PRODUCTION") AND (NOT "${RELEASE_TYPE}" STR set(RELEASE_TYPE "DEV") endif() -# VIRCADIA_OPTIMIZE +# OVERTE_OPTIMIZE # Variable determining Overte optimization. If not set, it defaults to true. # It's used to determine build flags for main codebase and for VCPKG dependencies. # Should be set to false to get completely unoptimized build for easier line-by-line debugging if( NOT WIN32 ) - if(NOT DEFINED VIRCADIA_OPTIMIZE) + if(NOT DEFINED OVERTE_OPTIMIZE) message("Enabling code optimization for Overte and compiled dependencies") - set(VIRCADIA_OPTIMIZE true CACHE BOOL "Enable code optimization for Overte and compiled dependencies") + set(OVERTE_OPTIMIZE true CACHE BOOL "Enable code optimization for Overte and compiled dependencies") endif() #compiler needs to be detected before building VCPKG dependencies set(CMAKE_PLATFORM_INFO_DIR "${CMAKE_CURRENT_BINARY_DIR}") include(CMakeDetermineCXXCompiler) - set(VIRCADIA_OPTIMIZE_FLAGS "") + set(OVERTE_OPTIMIZE_FLAGS "") - if(VIRCADIA_OPTIMIZE) + if(OVERTE_OPTIMIZE) - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/VIRCADIA_OPTIMIZE.txt" "${VIRCADIA_OPTIMIZE}") + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/OVERTE_OPTIMIZE.txt" "${OVERTE_OPTIMIZE}") if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") message("Clang compiler detected, adding -O3 -fPIC -g flags") - set(VIRCADIA_OPTIMIZE_FLAGS "-O3 -fPIC -g") + set(OVERTE_OPTIMIZE_FLAGS "-O3 -fPIC -g") elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU") message("GCC compiler detected, adding -O3 -fPIC -ggdb flags") - set(VIRCADIA_OPTIMIZE_FLAGS "-O3 -fPIC -ggdb") + set(OVERTE_OPTIMIZE_FLAGS "-O3 -fPIC -ggdb") else() message("No predefined optimization flags for compiler ${CMAKE_CXX_COMPILER_ID}") endif() endif() - MESSAGE(STATUS "VIRCADIA_OPTIMIZE: ${VIRCADIA_OPTIMIZE}") + MESSAGE(STATUS "OVERTE_OPTIMIZE: ${OVERTE_OPTIMIZE}") - # VIRCADIA_CPU_ARCHITECTURE + # OVERTE_CPU_ARCHITECTURE # Variable determining CPU architecture for which Overte will be built. # If defined, it's appended to CXXFLAGS and CFLAGS for both Overte and VCPKG dependencies #Assume -march=native for compilers that allow it if architecture is not specified - if(NOT DEFINED VIRCADIA_CPU_ARCHITECTURE) - if(VIRCADIA_OPTIMIZE AND ( (CMAKE_CXX_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "GNU") ) ) + if(NOT DEFINED OVERTE_CPU_ARCHITECTURE) + if(OVERTE_OPTIMIZE AND ( (CMAKE_CXX_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "GNU") ) ) message("Optimization is enabled, but architecture is not specified. Assuming native build") - set(VIRCADIA_CPU_ARCHITECTURE "-march=native -mtune=native" CACHE STRING "Specify architecture dependent compiler flags here") + set(OVERTE_CPU_ARCHITECTURE "-march=native -mtune=native" CACHE STRING "Specify architecture dependent compiler flags here") endif() endif() - if(DEFINED VIRCADIA_CPU_ARCHITECTURE) - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/VIRCADIA_CPU_ARCHITECTURE.txt" "${VIRCADIA_CPU_ARCHITECTURE}") - set(VIRCADIA_OPTIMIZE_FLAGS "${VIRCADIA_OPTIMIZE_FLAGS} ${VIRCADIA_CPU_ARCHITECTURE}") - message("Adding CPU architecture flags: ${VIRCADIA_CPU_ARCHITECTURE}") - MESSAGE(STATUS "VIRCADIA_CPU_ARCHITECTURE: ${VIRCADIA_CPU_ARCHITECTURE}") + if(DEFINED OVERTE_CPU_ARCHITECTURE) + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/OVERTE_CPU_ARCHITECTURE.txt" "${OVERTE_CPU_ARCHITECTURE}") + set(OVERTE_OPTIMIZE_FLAGS "${OVERTE_OPTIMIZE_FLAGS} ${OVERTE_CPU_ARCHITECTURE}") + message("Adding CPU architecture flags: ${OVERTE_CPU_ARCHITECTURE}") + MESSAGE(STATUS "OVERTE_CPU_ARCHITECTURE: ${OVERTE_CPU_ARCHITECTURE}") endif() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OVERTE_OPTIMIZE_FLAGS}") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OVERTE_OPTIMIZE_FLAGS}") - set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}") - set(ENV{CFLAGS} "$ENV{CFLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}") + set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} ${OVERTE_OPTIMIZE_FLAGS}") + set(ENV{CFLAGS} "$ENV{CFLAGS} ${OVERTE_OPTIMIZE_FLAGS}") message($ENV{CXXFLAGS}) endif() @@ -207,7 +207,7 @@ include("${CMAKE_BINARY_DIR}/vcpkg.cmake") if (HIFI_ANDROID) set(QT_CMAKE_PREFIX_PATH "$ENV{HIFI_ANDROID_PRECOMPILED}/qt/lib/cmake") else() - if ("$ENV{VIRCADIA_USE_SYSTEM_QT}" STREQUAL "") + if ("$ENV{OVERTE_USE_SYSTEM_QT}" STREQUAL "") if(NOT EXISTS "${CMAKE_BINARY_DIR}/qt.cmake") message(FATAL_ERROR "qt configuration missing.") endif() @@ -413,7 +413,7 @@ set_packaging_parameters() # Locate the required Qt build on the filesystem setup_qt() -if ("$ENV{VIRCADIA_USE_SYSTEM_QT}" STREQUAL "") +if ("$ENV{OVERTE_USE_SYSTEM_QT}" STREQUAL "") list(APPEND CMAKE_PREFIX_PATH "${QT_CMAKE_PREFIX_PATH}") endif() diff --git a/assignment-client/src/avatars/ScriptableAvatar.cpp b/assignment-client/src/avatars/ScriptableAvatar.cpp index 752eaf81d2..b6c9070cf9 100644 --- a/assignment-client/src/avatars/ScriptableAvatar.cpp +++ b/assignment-client/src/avatars/ScriptableAvatar.cpp @@ -222,7 +222,7 @@ void ScriptableAvatar::updateJointMappings() { QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkRequest networkRequest = QNetworkRequest(_skeletonModelURL); networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); - networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); DependencyManager::get()->update( _skeletonModelURL, -1, "AvatarData::updateJointMappings"); QNetworkReply* networkReply = networkAccessManager.get(networkRequest); diff --git a/cmake/macros/MemoryDebugger.cmake b/cmake/macros/MemoryDebugger.cmake index 244d47b02e..00964c1044 100644 --- a/cmake/macros/MemoryDebugger.cmake +++ b/cmake/macros/MemoryDebugger.cmake @@ -8,15 +8,15 @@ # macro(SETUP_MEMORY_DEBUGGER) -if ("$ENV{VIRCADIA_MEMORY_DEBUGGING}") - if (VIRCADIA_THREAD_DEBUGGING) +if ("$ENV{OVERTE_MEMORY_DEBUGGING}") + if (OVERTE_THREAD_DEBUGGING) message(FATAL_ERROR "Thread debugging and memory debugging can't be enabled at the same time." ) endif() - SET( VIRCADIA_MEMORY_DEBUGGING true ) + SET( OVERTE_MEMORY_DEBUGGING true ) endif () -if (VIRCADIA_MEMORY_DEBUGGING) +if (OVERTE_MEMORY_DEBUGGING) if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=address -fsanitize-recover=address") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fsanitize=address -fsanitize-recover=address") diff --git a/cmake/macros/SetupQt.cmake b/cmake/macros/SetupQt.cmake index 743ac934c4..7525c2d2f6 100644 --- a/cmake/macros/SetupQt.cmake +++ b/cmake/macros/SetupQt.cmake @@ -51,7 +51,7 @@ endfunction() # Sets the QT_CMAKE_PREFIX_PATH and QT_DIR variables # Also enables CMAKE_AUTOMOC and CMAKE_AUTORCC macro(setup_qt) - if ($ENV{VIRCADIA_USE_SYSTEM_QT}) + if ($ENV{OVERTE_USE_SYSTEM_QT}) message(STATUS "Using system Qt") else() # if we are in a development build and QT_CMAKE_PREFIX_PATH is specified diff --git a/cmake/macros/ThreadDebugger.cmake b/cmake/macros/ThreadDebugger.cmake index 0353e3b1cb..55dac651e2 100644 --- a/cmake/macros/ThreadDebugger.cmake +++ b/cmake/macros/ThreadDebugger.cmake @@ -8,15 +8,15 @@ # macro(SETUP_THREAD_DEBUGGER) -if ("$ENV{VIRCADIA_THREAD_DEBUGGING}") - if (VIRCADIA_MEMORY_DEBUGGING ) +if ("$ENV{OVERTE_THREAD_DEBUGGING}") + if (OVERTE_MEMORY_DEBUGGING ) message(FATAL_ERROR "Thread debugging and memory debugging can't be enabled at the same time." ) endif () - SET(VIRCADIA_THREAD_DEBUGGING true) + SET(OVERTE_THREAD_DEBUGGING true) endif () -if (VIRCADIA_THREAD_DEBUGGING) +if (OVERTE_THREAD_DEBUGGING) if (UNIX) if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # for clang on Linux diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp index b52fb2ee2e..1d34d7db84 100644 --- a/domain-server/src/DomainGatekeeper.cpp +++ b/domain-server/src/DomainGatekeeper.cpp @@ -1250,7 +1250,7 @@ void DomainGatekeeper::requestDomainUser(const QString& username, const QString& QNetworkRequest request; - request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); request.setRawHeader(QByteArray("Authorization"), QString("Bearer " + accessToken).toUtf8()); diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 9f00c6df4d..b0edcd51b6 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -156,7 +156,7 @@ bool DomainServer::forwardMetaverseAPIRequest(HTTPConnection* connection, QUrl url { MetaverseAPI::getCurrentMetaverseServerURL().toString() + metaversePath }; QNetworkRequest req(url); - req.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + req.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); if (accessTokenVariant.isValid()) { @@ -2649,7 +2649,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url url.setQuery("access_token=" + accessTokenVariant.toString()); QNetworkRequest req(url); - req.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + req.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); QNetworkReply* reply = NetworkAccessManager::getInstance().put(req, doc.toJson()); @@ -2750,7 +2750,7 @@ bool DomainServer::handleHTTPSRequest(HTTPSConnection* connection, const QUrl &u QNetworkRequest tokenRequest(tokenRequestUrl); tokenRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); - tokenRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + tokenRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); tokenRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); QNetworkReply* tokenReply = NetworkAccessManager::getInstance().post(tokenRequest, tokenPostBody.toLocal8Bit()); @@ -3095,7 +3095,7 @@ QNetworkReply* DomainServer::profileRequestGivenTokenReply(QNetworkReply* tokenR QNetworkRequest profileRequest(profileURL); profileRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); - profileRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + profileRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); return NetworkAccessManager::getInstance().get(profileRequest); } diff --git a/hifi_qt.py b/hifi_qt.py index f0d498a02b..4f133dabbb 100644 --- a/hifi_qt.py +++ b/hifi_qt.py @@ -52,7 +52,7 @@ endif() def __init__(self, args): self.args = args self.configFilePath = os.path.join(args.build_root, 'qt.cmake') - self.version = os.getenv('VIRCADIA_USE_QT_VERSION', '5.15.2') + self.version = os.getenv('OVERTE_USE_QT_VERSION', '5.15.2') self.assets_url = hifi_utils.readEnviromentVariableFromFile(args.build_root, 'EXTERNAL_BUILD_ASSETS') # OS dependent information @@ -62,7 +62,7 @@ endif() system_qt = False # Here we handle the 3 possible cases of dealing with Qt: - if os.getenv('VIRCADIA_USE_SYSTEM_QT', "") != "": + if os.getenv('OVERTE_USE_SYSTEM_QT', "") != "": # 1. Using the system provided Qt. This is only recommended for Qt 5.15.0 and above, # as it includes a required fix on Linux. # @@ -78,11 +78,11 @@ endif() system_qt = True print("Using system Qt") - elif os.getenv('VIRCADIA_QT_PATH', "") != "": + elif os.getenv('OVERTE_QT_PATH', "") != "": # 2. Using an user-provided directory. - # VIRCADIA_QT_PATH must point to a directory with a Qt install in it. + # OVERTE_QT_PATH must point to a directory with a Qt install in it. - self.path = os.getenv('VIRCADIA_QT_PATH') + self.path = os.getenv('OVERTE_QT_PATH') self.fullPath = self.path self.cmakePath = os.path.join(self.fullPath, 'lib', 'cmake') @@ -195,7 +195,7 @@ endif() print("It's also possible to build Qt for your distribution, please see the documentation at:") print("https://github.com/overte-org/overte/tree/master/tools/qt-builder") print("") - print("Alternatively, you can try building against the system Qt by setting the VIRCADIA_USE_SYSTEM_QT environment variable.") + print("Alternatively, you can try building against the system Qt by setting the OVERTE_USE_SYSTEM_QT environment variable.") print("You'll need to install the development packages, and to have Qt 5.15.0 or later.") def writeConfig(self): @@ -238,7 +238,7 @@ endif() print('') print("If this is a recent distribution, dating from 2021 or so, you can try building") print("against the system Qt by running this command, and trying again:") - print(" export VIRCADIA_USE_SYSTEM_QT=1") + print(" export OVERTE_USE_SYSTEM_QT=1") print("") hifi_utils.color('clear') print("If you'd like to try to build Qt from source either for building Overte, or") diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index fc3ff60b67..52d9894ec7 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -296,7 +296,7 @@ target_link_libraries( ${PLATFORM_QT_LIBRARIES} ) -if (UNIX AND NOT ANDROID AND NOT VIRCADIA_THREAD_DEBUGGING) +if (UNIX AND NOT ANDROID AND NOT OVERTE_THREAD_DEBUGGING) if (CMAKE_SYSTEM_NAME MATCHES "Linux") # Linux target_link_libraries(${TARGET_NAME} pthread atomic) @@ -429,7 +429,7 @@ else() endif() endif() -if ("$ENV{VIRCADIA_USE_SYSTEM_QT}" STREQUAL "") +if ("$ENV{OVERTE_USE_SYSTEM_QT}" STREQUAL "") if (DEV_BUILD AND (APPLE OR UNIX)) # create a qt.conf file to override hard-coded search paths in Qt libs set(QT_LIB_PATH "${QT_CMAKE_PREFIX_PATH}/../..") diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index dca6e555c0..41403e0e02 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2645,7 +2645,7 @@ QString Application::getUserAgent() { return userAgent; } - QString userAgent = NetworkingConstants::VIRCADIA_USER_AGENT + "/" + BuildInfo::VERSION + "; " + QString userAgent = NetworkingConstants::OVERTE_USER_AGENT + "/" + BuildInfo::VERSION + "; " + QSysInfo::productType() + " " + QSysInfo::productVersion() + ")"; auto formatPluginName = [](QString name) -> QString { return name.trimmed().replace(" ", "-"); }; @@ -3983,7 +3983,7 @@ void Application::handleSandboxStatus(QNetworkReply* reply) { // when --url in command line, teleport to location if (!_urlParam.isEmpty()) { // Not sure if format supported by isValid(). - if (_urlParam.scheme() == URL_SCHEME_VIRCADIAAPP) { + if (_urlParam.scheme() == URL_SCHEME_OVERTEAPP) { Setting::Handle("startUpApp").set(_urlParam.path()); } else { addressLookupString = _urlParam.toString(); @@ -3998,7 +3998,7 @@ void Application::handleSandboxStatus(QNetworkReply* reply) { // If this is a first run we short-circuit the address passed in if (_firstRun.get()) { if (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty()) { - DependencyManager::get()->setHomeLocationToAddress(NetworkingConstants::DEFAULT_VIRCADIA_ADDRESS); + DependencyManager::get()->setHomeLocationToAddress(NetworkingConstants::DEFAULT_OVERTE_ADDRESS); Menu::getInstance()->triggerOption(MenuOption::HomeLocation); } @@ -7268,7 +7268,7 @@ void Application::clearDomainOctreeDetails(bool clearAll) { void Application::domainURLChanged(QUrl domainURL) { // disable physics until we have enough information about our new location to not cause craziness. - setIsServerlessMode(domainURL.scheme() != URL_SCHEME_VIRCADIA); + setIsServerlessMode(domainURL.scheme() != URL_SCHEME_OVERTE); if (isServerlessMode()) { loadServerlessDomain(domainURL); } @@ -7277,7 +7277,7 @@ void Application::domainURLChanged(QUrl domainURL) { void Application::goToErrorDomainURL(QUrl errorDomainURL) { // disable physics until we have enough information about our new location to not cause craziness. - setIsServerlessMode(errorDomainURL.scheme() != URL_SCHEME_VIRCADIA); + setIsServerlessMode(errorDomainURL.scheme() != URL_SCHEME_OVERTE); if (isServerlessMode()) { loadErrorDomain(errorDomainURL); } @@ -7641,7 +7641,7 @@ bool Application::canAcceptURL(const QString& urlString) const { QUrl url(urlString); if (url.query().contains(WEB_VIEW_TAG)) { return false; - } else if (urlString.startsWith(URL_SCHEME_VIRCADIA)) { + } else if (urlString.startsWith(URL_SCHEME_OVERTE)) { return true; } QString lowerPath = url.path().toLower(); @@ -7656,7 +7656,7 @@ bool Application::canAcceptURL(const QString& urlString) const { bool Application::acceptURL(const QString& urlString, bool defaultUpload) { QUrl url(urlString); - if (url.scheme() == URL_SCHEME_VIRCADIA) { + if (url.scheme() == URL_SCHEME_OVERTE) { // this is a hifi URL - have the AddressManager handle it QMetaObject::invokeMethod(DependencyManager::get().data(), "handleLookupString", Qt::AutoConnection, Q_ARG(const QString&, urlString)); @@ -7787,7 +7787,7 @@ bool Application::askToWearAvatarAttachmentUrl(const QString& url) { QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkRequest networkRequest = QNetworkRequest(url); networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); - networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); QNetworkReply* reply = networkAccessManager.get(networkRequest); int requestNumber = ++_avatarAttachmentRequest; connect(reply, &QNetworkReply::finished, [this, reply, url, requestNumber]() { diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 04613485b7..a90eda57a7 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -466,7 +466,7 @@ int main(int argc, const char* argv[]) { if (socket.waitForConnected(LOCAL_SERVER_TIMEOUT_MS)) { if (parser.isSet(urlOption)) { QUrl url = QUrl(parser.value(urlOption)); - if (url.isValid() && (url.scheme() == URL_SCHEME_VIRCADIA || url.scheme() == URL_SCHEME_VIRCADIAAPP + if (url.isValid() && (url.scheme() == URL_SCHEME_OVERTE || url.scheme() == URL_SCHEME_OVERTEAPP || url.scheme() == HIFI_URL_SCHEME_HTTP || url.scheme() == HIFI_URL_SCHEME_HTTPS || url.scheme() == HIFI_URL_SCHEME_FILE)) { qDebug() << "Writing URL to local socket"; diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp index e594ecd536..6c3b7adb06 100644 --- a/interface/src/scripting/WindowScriptingInterface.cpp +++ b/interface/src/scripting/WindowScriptingInterface.cpp @@ -139,9 +139,9 @@ void WindowScriptingInterface::disconnectedFromDomain() { void WindowScriptingInterface::openUrl(const QUrl& url) { if (!url.isEmpty()) { auto scheme = url.scheme(); - if (scheme == URL_SCHEME_VIRCADIA) { + if (scheme == URL_SCHEME_OVERTE) { DependencyManager::get()->handleLookupString(url.toString()); - } else if (scheme == URL_SCHEME_VIRCADIAAPP) { + } else if (scheme == URL_SCHEME_OVERTEAPP) { DependencyManager::get()->openSystemApp(url.path()); } else { #if defined(Q_OS_ANDROID) @@ -413,7 +413,7 @@ QString WindowScriptingInterface::checkVersion() { } QString WindowScriptingInterface::getUserAgent() { - return NetworkingConstants::VIRCADIA_USER_AGENT; + return NetworkingConstants::OVERTE_USER_AGENT; } QString WindowScriptingInterface::protocolSignature() { diff --git a/interface/src/ui/ModelsBrowser.cpp b/interface/src/ui/ModelsBrowser.cpp index 50d9571e35..8b25ddd997 100644 --- a/interface/src/ui/ModelsBrowser.cpp +++ b/interface/src/ui/ModelsBrowser.cpp @@ -227,7 +227,7 @@ void ModelHandler::update() { QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkRequest request(url); request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); - request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); QNetworkReply* reply = networkAccessManager.head(request); connect(reply, SIGNAL(finished()), SLOT(downloadFinished())); } @@ -280,7 +280,7 @@ void ModelHandler::queryNewFiles(QString marker) { QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkRequest request(url); request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); - request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); QNetworkReply* reply = networkAccessManager.get(request); connect(reply, SIGNAL(finished()), SLOT(downloadFinished())); diff --git a/libraries/auto-updater/src/AutoUpdater.cpp b/libraries/auto-updater/src/AutoUpdater.cpp index e00ae6dafc..280fbc0328 100644 --- a/libraries/auto-updater/src/AutoUpdater.cpp +++ b/libraries/auto-updater/src/AutoUpdater.cpp @@ -51,7 +51,7 @@ void AutoUpdater::getLatestVersionData() { QNetworkRequest latestVersionRequest(buildsURL); latestVersionRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); - latestVersionRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + latestVersionRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); QNetworkReply* reply = networkAccessManager.get(latestVersionRequest); connect(reply, &QNetworkReply::finished, this, &AutoUpdater::parseLatestVersionData); } diff --git a/libraries/baking/src/JSBaker.cpp b/libraries/baking/src/JSBaker.cpp index def217f8fd..bd93ac313d 100644 --- a/libraries/baking/src/JSBaker.cpp +++ b/libraries/baking/src/JSBaker.cpp @@ -63,7 +63,7 @@ void JSBaker::loadScript() { // setup the request to follow re-directs and always hit the network networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork); - networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); networkRequest.setUrl(_jsURL); diff --git a/libraries/baking/src/ModelBaker.cpp b/libraries/baking/src/ModelBaker.cpp index 1b81ee9740..936208ca42 100644 --- a/libraries/baking/src/ModelBaker.cpp +++ b/libraries/baking/src/ModelBaker.cpp @@ -160,7 +160,7 @@ void ModelBaker::saveSourceModel() { // setup the request to follow re-directs and always hit the network networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork); - networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); networkRequest.setUrl(_modelURL); diff --git a/libraries/baking/src/TextureBaker.cpp b/libraries/baking/src/TextureBaker.cpp index d9b63d6b7a..6f18a5da40 100644 --- a/libraries/baking/src/TextureBaker.cpp +++ b/libraries/baking/src/TextureBaker.cpp @@ -100,7 +100,7 @@ void TextureBaker::loadTexture() { // setup the request to follow re-directs and always hit the network networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork); - networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); networkRequest.setUrl(_textureURL); diff --git a/libraries/gpu-gl/CMakeLists.txt b/libraries/gpu-gl/CMakeLists.txt index 5797fb5172..a9010c95d3 100644 --- a/libraries/gpu-gl/CMakeLists.txt +++ b/libraries/gpu-gl/CMakeLists.txt @@ -1,9 +1,9 @@ set(TARGET_NAME gpu-gl) setup_hifi_library(Concurrent) link_hifi_libraries(shared gl gpu gpu-gl-common shaders) -if (UNIX AND NOT VIRCADIA_THREAD_DEBUGGING) +if (UNIX AND NOT OVERTE_THREAD_DEBUGGING) target_link_libraries(${TARGET_NAME} pthread) -endif(UNIX AND NOT VIRCADIA_THREAD_DEBUGGING) +endif(UNIX AND NOT OVERTE_THREAD_DEBUGGING) GroupSources("src") set(OpenGL_GL_PREFERENCE "GLVND") diff --git a/libraries/model-serializers/src/FSTReader.cpp b/libraries/model-serializers/src/FSTReader.cpp index 7aa3570dd6..be04a31d53 100644 --- a/libraries/model-serializers/src/FSTReader.cpp +++ b/libraries/model-serializers/src/FSTReader.cpp @@ -254,7 +254,7 @@ hifi::VariantMultiHash FSTReader::downloadMapping(const QString& url) { QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkRequest networkRequest = QNetworkRequest(url); networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); - networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); QNetworkReply* reply = networkAccessManager.get(networkRequest); QEventLoop loop; QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit); diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h index ad8a92a187..4ea8faa558 100644 --- a/libraries/networking/src/AccountManager.h +++ b/libraries/networking/src/AccountManager.h @@ -58,7 +58,7 @@ const auto METAVERSE_SESSION_ID_HEADER = QString("HFM-SessionID").toLocal8Bit(); using UserAgentGetter = std::function; -const auto DEFAULT_USER_AGENT_GETTER = []() -> QString { return NetworkingConstants::VIRCADIA_USER_AGENT; }; +const auto DEFAULT_USER_AGENT_GETTER = []() -> QString { return NetworkingConstants::OVERTE_USER_AGENT; }; class AccountManager : public QObject, public Dependency { Q_OBJECT diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index 96d72cabaf..10c4a93ef7 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -36,14 +36,14 @@ const QString REDIRECT_HIFI_ADDRESS = NetworkingConstants::REDIRECT_HIFI_ADDRESS const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager"; const QString SETTINGS_CURRENT_ADDRESS_KEY = "address"; -const QString DEFAULT_VIRCADIA_ADDRESS = (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty()) +const QString DEFAULT_OVERTE_ADDRESS = (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty()) ? BuildInfo::PRELOADED_STARTUP_LOCATION - : NetworkingConstants::DEFAULT_VIRCADIA_ADDRESS; + : NetworkingConstants::DEFAULT_OVERTE_ADDRESS; const QString DEFAULT_HOME_ADDRESS = (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty()) ? BuildInfo::PRELOADED_STARTUP_LOCATION - : NetworkingConstants::DEFAULT_VIRCADIA_ADDRESS; + : NetworkingConstants::DEFAULT_OVERTE_ADDRESS; -Setting::Handle currentAddressHandle(QStringList() << ADDRESS_MANAGER_SETTINGS_GROUP << "address", DEFAULT_VIRCADIA_ADDRESS); +Setting::Handle currentAddressHandle(QStringList() << ADDRESS_MANAGER_SETTINGS_GROUP << "address", DEFAULT_OVERTE_ADDRESS); bool AddressManager::isConnected() { return DependencyManager::get()->getDomainHandler().isConnected(); @@ -56,7 +56,7 @@ QString AddressManager::getProtocol() const { QUrl AddressManager::currentAddress(bool domainOnly) const { QUrl hifiURL = _domainURL; - if (!domainOnly && hifiURL.scheme() == URL_SCHEME_VIRCADIA) { + if (!domainOnly && hifiURL.scheme() == URL_SCHEME_OVERTE) { hifiURL.setPath(currentPath()); } @@ -65,7 +65,7 @@ QUrl AddressManager::currentAddress(bool domainOnly) const { QUrl AddressManager::currentFacingAddress() const { auto hifiURL = currentAddress(); - if (hifiURL.scheme() == URL_SCHEME_VIRCADIA) { + if (hifiURL.scheme() == URL_SCHEME_OVERTE) { hifiURL.setPath(currentFacingPath()); } @@ -77,7 +77,7 @@ QUrl AddressManager::currentShareableAddress(bool domainOnly) const { // if we have a shareable place name use that instead of whatever the current host is QUrl hifiURL; - hifiURL.setScheme(URL_SCHEME_VIRCADIA); + hifiURL.setScheme(URL_SCHEME_OVERTE); hifiURL.setHost(_shareablePlaceName); if (!domainOnly) { @@ -94,7 +94,7 @@ QUrl AddressManager::currentPublicAddress(bool domainOnly) const { // return an address that can be used by others to visit this client's current location. If // in a serverless domain (which can't be visited) return an empty URL. QUrl shareableAddress = currentShareableAddress(domainOnly); - if (shareableAddress.scheme() != URL_SCHEME_VIRCADIA) { + if (shareableAddress.scheme() != URL_SCHEME_OVERTE) { return QUrl(); // file: urls aren't public } return shareableAddress; @@ -103,7 +103,7 @@ QUrl AddressManager::currentPublicAddress(bool domainOnly) const { QUrl AddressManager::currentFacingShareableAddress() const { auto hifiURL = currentShareableAddress(); - if (hifiURL.scheme() == URL_SCHEME_VIRCADIA) { + if (hifiURL.scheme() == URL_SCHEME_OVERTE) { hifiURL.setPath(currentFacingPath()); } @@ -114,7 +114,7 @@ QUrl AddressManager::currentFacingPublicAddress() const { // return an address that can be used by others to visit this client's current location. If // in a serverless domain (which can't be visited) return an empty URL. QUrl shareableAddress = currentFacingShareableAddress(); - if (shareableAddress.scheme() != URL_SCHEME_VIRCADIA) { + if (shareableAddress.scheme() != URL_SCHEME_OVERTE) { return QUrl(); // file: urls aren't public } return shareableAddress; @@ -165,7 +165,7 @@ void AddressManager::storeCurrentAddress() { if (url.scheme() == HIFI_URL_SCHEME_FILE || url.scheme() == HIFI_URL_SCHEME_HTTP || url.scheme() == HIFI_URL_SCHEME_HTTPS || - (url.scheme() == URL_SCHEME_VIRCADIA && !url.host().isEmpty())) { + (url.scheme() == URL_SCHEME_OVERTE && !url.host().isEmpty())) { // TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can // be loaded over http(s) // url.scheme() == HIFI_URL_SCHEME_HTTP || @@ -258,23 +258,23 @@ bool AddressManager::handleUrl(const QUrl& lookupUrlIn, LookupTrigger trigger, c if (lookupUrl.scheme().isEmpty() && !lookupUrl.path().startsWith("/")) { // 'urls' without schemes are taken as domain names, as opposed to // simply a path portion of a url, so we need to set the scheme - lookupUrl.setScheme(URL_SCHEME_VIRCADIA); + lookupUrl.setScheme(URL_SCHEME_OVERTE); } static const QRegExp PORT_REGEX = QRegExp("\\d{1,5}(\\/.*)?"); if(!lookupUrl.scheme().isEmpty() && lookupUrl.host().isEmpty() && PORT_REGEX.exactMatch(lookupUrl.path())) { // this is in the form somewhere:, convert it to hifi://somewhere: - lookupUrl = QUrl(URL_SCHEME_VIRCADIA + "://" + lookupUrl.toString()); + lookupUrl = QUrl(URL_SCHEME_OVERTE + "://" + lookupUrl.toString()); } // it should be noted that url's in the form // somewhere: are not valid, as that // would indicate that the scheme is 'somewhere' // use hifi://somewhere: instead - if (lookupUrl.scheme() == URL_SCHEME_VIRCADIA || lookupUrlInString.startsWith(URL_SCHEME_VIRCADIA + "://")) { + if (lookupUrl.scheme() == URL_SCHEME_OVERTE || lookupUrlInString.startsWith(URL_SCHEME_OVERTE + "://")) { QString lookupUrlString; - if (lookupUrlInString.startsWith(URL_SCHEME_VIRCADIA + "://")) { + if (lookupUrlInString.startsWith(URL_SCHEME_OVERTE + "://")) { lookupUrlString = lookupUrlInString; } else { lookupUrlString = lookupUrl.toString(QUrl::FullyEncoded); @@ -282,8 +282,8 @@ bool AddressManager::handleUrl(const QUrl& lookupUrlIn, LookupTrigger trigger, c if (lookupUrl.host().isEmpty()) { // this was in the form hifi:/somewhere or hifi:somewhere. Fix it by making it hifi://somewhere - static const QRegExp HIFI_SCHEME_REGEX = QRegExp(URL_SCHEME_VIRCADIA + ":\\/{0,2}", Qt::CaseInsensitive); - lookupUrl = QUrl(lookupUrl.toString().replace(HIFI_SCHEME_REGEX, URL_SCHEME_VIRCADIA + "://")); + static const QRegExp HIFI_SCHEME_REGEX = QRegExp(URL_SCHEME_OVERTE + ":\\/{0,2}", Qt::CaseInsensitive); + lookupUrl = QUrl(lookupUrl.toString().replace(HIFI_SCHEME_REGEX, URL_SCHEME_OVERTE + "://")); } DependencyManager::get()->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::LookupAddress); @@ -359,12 +359,12 @@ bool AddressManager::handleUrl(const QUrl& lookupUrlIn, LookupTrigger trigger, c _previousAPILookup = lookupUrl; // Let's convert this to a QString for processing in case there are spaces in it. - if (lookupUrlString.contains(URL_SCHEME_VIRCADIA + "://", Qt::CaseInsensitive)) { - lookupUrlString = lookupUrlString.replace((URL_SCHEME_VIRCADIA + "://"), ""); - } else if (lookupUrlString.contains(URL_SCHEME_VIRCADIA + ":/", Qt::CaseInsensitive)) { - lookupUrlString = lookupUrlString.replace((URL_SCHEME_VIRCADIA + ":/"), ""); - } else if (lookupUrlString.contains(URL_SCHEME_VIRCADIA + ":", Qt::CaseInsensitive)) { - lookupUrlString = lookupUrlString.replace((URL_SCHEME_VIRCADIA + ":"), ""); + if (lookupUrlString.contains(URL_SCHEME_OVERTE + "://", Qt::CaseInsensitive)) { + lookupUrlString = lookupUrlString.replace((URL_SCHEME_OVERTE + "://"), ""); + } else if (lookupUrlString.contains(URL_SCHEME_OVERTE + ":/", Qt::CaseInsensitive)) { + lookupUrlString = lookupUrlString.replace((URL_SCHEME_OVERTE + ":/"), ""); + } else if (lookupUrlString.contains(URL_SCHEME_OVERTE + ":", Qt::CaseInsensitive)) { + lookupUrlString = lookupUrlString.replace((URL_SCHEME_OVERTE + ":"), ""); } // Get the path and then strip it out. @@ -520,7 +520,7 @@ void AddressManager::goToAddressFromObject(const QVariantMap& dataObject, const qCDebug(networking) << "Possible domain change required to connect to" << domainHostname << "on" << domainPort; QUrl domainURL; - domainURL.setScheme(URL_SCHEME_VIRCADIA); + domainURL.setScheme(URL_SCHEME_OVERTE); domainURL.setHost(domainHostname); if (domainPort > 0) { domainURL.setPort(domainPort); @@ -691,7 +691,7 @@ bool AddressManager::handleNetworkAddress(const QString& lookupString, LookupTri emit lookupResultsFinished(); QUrl domainURL; - domainURL.setScheme(URL_SCHEME_VIRCADIA); + domainURL.setScheme(URL_SCHEME_OVERTE); domainURL.setHost(domainIPString); if (domainPort > 0) { domainURL.setPort(domainPort); @@ -714,7 +714,7 @@ bool AddressManager::handleNetworkAddress(const QString& lookupString, LookupTri emit lookupResultsFinished(); QUrl domainURL; - domainURL.setScheme(URL_SCHEME_VIRCADIA); + domainURL.setScheme(URL_SCHEME_OVERTE); domainURL.setHost(domainHostname); if (domainPort > 0) { domainURL.setPort(domainPort); @@ -847,7 +847,7 @@ bool AddressManager::setHost(const QString& host, LookupTrigger trigger, quint16 addCurrentAddressToHistory(trigger); _domainURL = QUrl(); - _domainURL.setScheme(URL_SCHEME_VIRCADIA); + _domainURL.setScheme(URL_SCHEME_OVERTE); _domainURL.setHost(host); if (port > 0) { _domainURL.setPort(port); @@ -884,7 +884,7 @@ bool AddressManager::setDomainInfo(const QUrl& domainURL, LookupTrigger trigger) // clear any current place information _rootPlaceID = QUuid(); - if (_domainURL.scheme() == URL_SCHEME_VIRCADIA) { + if (_domainURL.scheme() == URL_SCHEME_OVERTE) { qCDebug(networking) << "Possible domain change required to connect to domain at" << hostname << "on" << port; } else { qCDebug(networking) << "Possible domain change required to serverless domain: " << domainURL.toString(); @@ -902,7 +902,7 @@ bool AddressManager::setDomainInfo(const QUrl& domainURL, LookupTrigger trigger) void AddressManager::goToEntry(LookupTrigger trigger) { resetConfirmConnectWithoutAvatarEntities(); - handleUrl(DEFAULT_VIRCADIA_ADDRESS, trigger); + handleUrl(DEFAULT_OVERTE_ADDRESS, trigger); } void AddressManager::goToUser(const QString& username, bool shouldMatchOrientation) { diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h index 0a8f4591ad..02f8f1503d 100644 --- a/libraries/networking/src/AddressManager.h +++ b/libraries/networking/src/AddressManager.h @@ -24,7 +24,7 @@ #include "AccountManager.h" extern const QString REDIRECT_HIFI_ADDRESS; -extern const QString DEFAULT_VIRCADIA_ADDRESS; +extern const QString DEFAULT_OVERTE_ADDRESS; extern const QString DEFAULT_HOME_ADDRESS; const QString SANDBOX_HIFI_ADDRESS = "hifi://localhost"; diff --git a/libraries/networking/src/DomainAccountManager.cpp b/libraries/networking/src/DomainAccountManager.cpp index 9ec5badc91..03a38323e3 100644 --- a/libraries/networking/src/DomainAccountManager.cpp +++ b/libraries/networking/src/DomainAccountManager.cpp @@ -82,7 +82,7 @@ void DomainAccountManager::requestAccessToken(const QString& username, const QSt QNetworkRequest request; - request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); // miniOrange WordPress API Authentication plugin: diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp index 4881ba23ea..e13696c6b4 100644 --- a/libraries/networking/src/DomainHandler.cpp +++ b/libraries/networking/src/DomainHandler.cpp @@ -184,7 +184,7 @@ void DomainHandler::setSockAddr(const SockAddr& sockAddr, const QString& hostnam // some callers may pass a hostname, this is not to be used for lookup but for DTLS certificate verification _domainURL = QUrl(); - _domainURL.setScheme(URL_SCHEME_VIRCADIA); + _domainURL.setScheme(URL_SCHEME_OVERTE); _domainURL.setHost(hostname); _domainURL.setPort(_sockAddr.getPort()); } @@ -199,7 +199,7 @@ void DomainHandler::setUUID(const QUuid& uuid) { void DomainHandler::setURLAndID(QUrl domainURL, QUuid domainID) { _pendingDomainID = domainID; - if (domainURL.scheme() != URL_SCHEME_VIRCADIA) { + if (domainURL.scheme() != URL_SCHEME_OVERTE) { _sockAddr.clear(); // if this is a file URL we need to see if it has a ~ for us to expand @@ -215,7 +215,7 @@ void DomainHandler::setURLAndID(QUrl domainURL, QUuid domainID) { // if it's in the error state, reset and try again. if (_domainURL != domainURL - || (_sockAddr.getPort() != domainPort && domainURL.scheme() == URL_SCHEME_VIRCADIA) + || (_sockAddr.getPort() != domainPort && domainURL.scheme() == URL_SCHEME_OVERTE) || isServerless() // For reloading content in serverless domain. || _isInErrorState) { // re-set the domain info so that auth information is reloaded @@ -230,7 +230,7 @@ void DomainHandler::setURLAndID(QUrl domainURL, QUuid domainID) { qCDebug(networking) << "Updated domain hostname to" << domainURL.host(); if (!domainURL.host().isEmpty()) { - if (domainURL.scheme() == URL_SCHEME_VIRCADIA) { + if (domainURL.scheme() == URL_SCHEME_OVERTE) { // re-set the sock addr to null and fire off a lookup of the IP address for this domain-server's hostname qCDebug(networking, "Looking up DS hostname %s.", domainURL.host().toLocal8Bit().constData()); QHostInfo::lookupHost(domainURL.host(), this, SLOT(completedHostnameLookup(const QHostInfo&))); @@ -303,7 +303,7 @@ void DomainHandler::setIceServerHostnameAndID(const QString& iceServerHostname, void DomainHandler::activateICELocalSocket() { DependencyManager::get()->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SetDomainSocket); _sockAddr = _icePeer.getLocalSocket(); - _domainURL.setScheme(URL_SCHEME_VIRCADIA); + _domainURL.setScheme(URL_SCHEME_OVERTE); _domainURL.setHost(_sockAddr.getAddress().toString()); emit domainURLChanged(_domainURL); emit completedSocketDiscovery(); @@ -312,7 +312,7 @@ void DomainHandler::activateICELocalSocket() { void DomainHandler::activateICEPublicSocket() { DependencyManager::get()->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SetDomainSocket); _sockAddr = _icePeer.getPublicSocket(); - _domainURL.setScheme(URL_SCHEME_VIRCADIA); + _domainURL.setScheme(URL_SCHEME_OVERTE); _domainURL.setHost(_sockAddr.getAddress().toString()); emit domainURLChanged(_domainURL); emit completedSocketDiscovery(); @@ -369,7 +369,7 @@ void DomainHandler::setIsConnected(bool isConnected) { // FIXME: Reinstate the requestDomainSettings() call here in version 2021.2.0 instead of having it in // NodeList::processDomainList(). /* - if (_domainURL.scheme() == URL_SCHEME_VIRCADIA && !_domainURL.host().isEmpty()) { + if (_domainURL.scheme() == URL_SCHEME_OVERTE && !_domainURL.host().isEmpty()) { // we've connected to new domain - time to ask it for global settings requestDomainSettings(); } diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h index 84ef909620..1613475219 100644 --- a/libraries/networking/src/DomainHandler.h +++ b/libraries/networking/src/DomainHandler.h @@ -45,9 +45,9 @@ const unsigned short DEFAULT_DOMAIN_SERVER_PORT = const unsigned short DEFAULT_DOMAIN_SERVER_WS_PORT = QProcessEnvironment::systemEnvironment() - .contains("VIRCADIA_DOMAIN_SERVER_WS_PORT") + .contains("OVERTE_DOMAIN_SERVER_WS_PORT") ? QProcessEnvironment::systemEnvironment() - .value("VIRCADIA_DOMAIN_SERVER_WS_PORT") + .value("OVERTE_DOMAIN_SERVER_WS_PORT") .toUShort() : 40102; // TCP @@ -77,17 +77,17 @@ const quint16 DOMAIN_SERVER_HTTPS_PORT = const quint16 DOMAIN_SERVER_EXPORTER_PORT = QProcessEnvironment::systemEnvironment() - .contains("VIRCADIA_DOMAIN_SERVER_EXPORTER_PORT") + .contains("OVERTE_DOMAIN_SERVER_EXPORTER_PORT") ? QProcessEnvironment::systemEnvironment() - .value("VIRCADIA_DOMAIN_SERVER_EXPORTER_PORT") + .value("OVERTE_DOMAIN_SERVER_EXPORTER_PORT") .toUInt() : 9703; const quint16 DOMAIN_SERVER_METADATA_EXPORTER_PORT = QProcessEnvironment::systemEnvironment() - .contains("VIRCADIA_DOMAIN_SERVER_METADATA_EXPORTER_PORT") + .contains("OVERTE_DOMAIN_SERVER_METADATA_EXPORTER_PORT") ? QProcessEnvironment::systemEnvironment() - .value("VIRCADIA_DOMAIN_SERVER_METADATA_EXPORTER_PORT") + .value("OVERTE_DOMAIN_SERVER_METADATA_EXPORTER_PORT") .toUInt() : 9704; @@ -146,7 +146,7 @@ public: void setCanConnectWithoutAvatarEntities(bool canConnect); bool canConnectWithoutAvatarEntities(); - bool isServerless() const { return _domainURL.scheme() != URL_SCHEME_VIRCADIA; } + bool isServerless() const { return _domainURL.scheme() != URL_SCHEME_OVERTE; } bool getInterstitialModeEnabled() const; void setInterstitialModeEnabled(bool enableInterstitialMode); diff --git a/libraries/networking/src/ExternalResource.h b/libraries/networking/src/ExternalResource.h index 15b01a521a..37a2bc084c 100644 --- a/libraries/networking/src/ExternalResource.h +++ b/libraries/networking/src/ExternalResource.h @@ -133,7 +133,7 @@ private: { Bucket::HF_Public, QUrl(NetworkingConstants::HF_PUBLIC_CDN_URL) }, { Bucket::HF_Content, QUrl(NetworkingConstants::HF_CONTENT_CDN_URL) }, { Bucket::HF_Marketplace, QUrl(NetworkingConstants::HF_MPASSETS_CDN_URL) }, - { Bucket::Assets, QUrl(NetworkingConstants::VIRCADIA_CONTENT_CDN_URL) } + { Bucket::Assets, QUrl(NetworkingConstants::OVERTE_CONTENT_CDN_URL) } }; }; diff --git a/libraries/networking/src/HTTPResourceRequest.cpp b/libraries/networking/src/HTTPResourceRequest.cpp index b13b66f740..4a209ecf8b 100644 --- a/libraries/networking/src/HTTPResourceRequest.cpp +++ b/libraries/networking/src/HTTPResourceRequest.cpp @@ -55,7 +55,7 @@ void HTTPResourceRequest::doSend() { QNetworkRequest networkRequest(_url); networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); - networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); if (_cacheEnabled) { networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache); diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h index 63557fc6c4..399ad678bb 100644 --- a/libraries/networking/src/NetworkingConstants.h +++ b/libraries/networking/src/NetworkingConstants.h @@ -37,7 +37,7 @@ namespace NetworkingConstants { const QStringList IS_AUTHABLE_HOSTNAME = { "overte.org" }; // Use a custom User-Agent to avoid ModSecurity filtering, e.g. by hosting providers. - const QByteArray VIRCADIA_USER_AGENT = "Mozilla/5.0 (OverteInterface)"; + const QByteArray OVERTE_USER_AGENT = "Mozilla/5.0 (OverteInterface)"; const QString WEB_ENGINE_USER_AGENT = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) " + WEB_ENGINE_VERSION + " Mobile Safari/537.36"; const QString MOBILE_USER_AGENT = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) " + WEB_ENGINE_VERSION + " Mobile Safari/537.36"; @@ -57,7 +57,7 @@ namespace NetworkingConstants { const QString HF_MPASSETS_CDN_URL = "https://cdn-1.vircadia.com/eu-c-1/vircadia-mpassets/"; const QString HF_PUBLIC_CDN_URL = "https://cdn-1.vircadia.com/eu-c-1/vircadia-public/"; const QString HF_MARKETPLACE_CDN_HOSTNAME = "mpassets.highfidelity.com"; - const QString VIRCADIA_CONTENT_CDN_URL = "https://cdn-1.vircadia.com/us-e-1/"; + const QString OVERTE_CONTENT_CDN_URL = "https://cdn-1.vircadia.com/us-e-1/"; #if USE_STABLE_GLOBAL_SERVICES const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.overte.org"; @@ -78,14 +78,14 @@ namespace NetworkingConstants { const QUrl HELP_RELEASE_NOTES_URL{ "https://docs.overte.org/en/latest/release-notes.html" }; const QUrl HELP_BUG_REPORT_URL{ "https://github.com/overte-org/overte/issues" }; - const QString DEFAULT_VIRCADIA_ADDRESS = "file:///~/serverless/tutorial.json"; + const QString DEFAULT_OVERTE_ADDRESS = "file:///~/serverless/tutorial.json"; const QString DEFAULT_HOME_ADDRESS = "file:///~/serverless/tutorial.json"; const QString REDIRECT_HIFI_ADDRESS = "file:///~/serverless/redirect.json"; } const QString HIFI_URL_SCHEME_ABOUT = "about"; -const QString URL_SCHEME_VIRCADIA = "hifi"; -const QString URL_SCHEME_VIRCADIAAPP = "hifiapp"; +const QString URL_SCHEME_OVERTE = "hifi"; +const QString URL_SCHEME_OVERTEAPP = "hifiapp"; const QString URL_SCHEME_DATA = "data"; const QString URL_SCHEME_QRC = "qrc"; const QString HIFI_URL_SCHEME_FILE = "file"; diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index aeb87c70ee..40e5798155 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -834,7 +834,7 @@ void NodeList::processDomainList(QSharedPointer message) { // FIXME: Remove this call to requestDomainSettings() and reinstate the one in DomainHandler::setIsConnected(), in version // 2021.2.0. (New protocol version implies a domain server upgrade.) if (!_domainHandler.isConnected() - && _domainHandler.getScheme() == URL_SCHEME_VIRCADIA && !_domainHandler.getHostname().isEmpty()) { + && _domainHandler.getScheme() == URL_SCHEME_OVERTE && !_domainHandler.getHostname().isEmpty()) { // We're about to connect but we need the domain settings (in particular, the node permissions) in order to adjust the // canRezAvatarEntities permission above before using the permissions in determining whether or not to connect without // avatar entities rezzing below. diff --git a/libraries/networking/src/OAuthNetworkAccessManager.cpp b/libraries/networking/src/OAuthNetworkAccessManager.cpp index a036588646..594eb42f7b 100644 --- a/libraries/networking/src/OAuthNetworkAccessManager.cpp +++ b/libraries/networking/src/OAuthNetworkAccessManager.cpp @@ -39,7 +39,7 @@ QNetworkReply* OAuthNetworkAccessManager::createRequest(QNetworkAccessManager::O && req.url().host() == MetaverseAPI::getCurrentMetaverseServerURL().host()) { QNetworkRequest authenticatedRequest(req); authenticatedRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); - authenticatedRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + authenticatedRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); authenticatedRequest.setRawHeader(ACCESS_TOKEN_AUTHORIZATION_HEADER, accountManager->getAccountInfo().getAccessToken().authorizationHeaderValue()); diff --git a/libraries/networking/src/ResourceManager.cpp b/libraries/networking/src/ResourceManager.cpp index f4e4cca482..5507ea180b 100644 --- a/libraries/networking/src/ResourceManager.cpp +++ b/libraries/networking/src/ResourceManager.cpp @@ -163,7 +163,7 @@ bool ResourceManager::resourceExists(const QUrl& url) { QNetworkRequest request{ url }; request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); - request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); auto reply = networkAccessManager.head(request); diff --git a/libraries/networking/src/SandboxUtils.cpp b/libraries/networking/src/SandboxUtils.cpp index e3ef2a787d..d73123092a 100644 --- a/libraries/networking/src/SandboxUtils.cpp +++ b/libraries/networking/src/SandboxUtils.cpp @@ -30,7 +30,7 @@ QNetworkReply* getStatus() { auto& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkRequest sandboxStatus(SANDBOX_STATUS_URL); sandboxStatus.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); - sandboxStatus.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + sandboxStatus.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); return networkAccessManager.get(sandboxStatus); } diff --git a/libraries/render-utils/src/text/Font.cpp b/libraries/render-utils/src/text/Font.cpp index 7147c10872..fb213c53b2 100644 --- a/libraries/render-utils/src/text/Font.cpp +++ b/libraries/render-utils/src/text/Font.cpp @@ -97,7 +97,7 @@ Font::Pointer Font::load(const QString& family) { QNetworkRequest networkRequest; networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); - networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); networkRequest.setUrl(family); auto networkReply = networkAccessManager.get(networkRequest); diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 18747ab56b..5ac80d4516 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -2405,7 +2405,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co QString currentDomain = DependencyManager::get()->getDomainURL().host(); QString domainSafeIP = nodeList->getDomainHandler().getHostname(); - QString domainSafeURL = URL_SCHEME_VIRCADIA + "://" + currentDomain; + QString domainSafeURL = URL_SCHEME_OVERTE + "://" + currentDomain; for (const auto& str : safeURLPrefixes) { if (domainSafeURL.startsWith(str) || domainSafeIP.startsWith(str)) { qCDebug(scriptengine) << whitelistPrefix << "Whitelist Bypassed, entire domain is whitelisted. Current Domain Host: " diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp index 40482c12ee..02a60e5d02 100644 --- a/libraries/script-engine/src/ScriptsModel.cpp +++ b/libraries/script-engine/src/ScriptsModel.cpp @@ -192,7 +192,7 @@ void ScriptsModel::requestDefaultFiles(QString marker) { QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkRequest request(url); request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); - request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); QNetworkReply* reply = networkAccessManager.get(request); connect(reply, SIGNAL(finished()), SLOT(downloadFinished())); } diff --git a/libraries/script-engine/src/XMLHttpRequestClass.cpp b/libraries/script-engine/src/XMLHttpRequestClass.cpp index e8acba8366..c848e2c0c5 100644 --- a/libraries/script-engine/src/XMLHttpRequestClass.cpp +++ b/libraries/script-engine/src/XMLHttpRequestClass.cpp @@ -62,7 +62,7 @@ void XMLHttpRequestClass::abort() { } void XMLHttpRequestClass::setRequestHeader(const QString& name, const QString& value) { - _request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); + _request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); _request.setRawHeader(QByteArray(name.toLatin1()), QByteArray(value.toLatin1())); } diff --git a/libraries/shared/src/LogHandler.cpp b/libraries/shared/src/LogHandler.cpp index e04a036b1a..7230062fe8 100644 --- a/libraries/shared/src/LogHandler.cpp +++ b/libraries/shared/src/LogHandler.cpp @@ -45,7 +45,7 @@ LogHandler& LogHandler::getInstance() { } LogHandler::LogHandler() { - QString logOptions = qgetenv("VIRCADIA_LOG_OPTIONS").toLower(); + QString logOptions = qgetenv("OVERTE_LOG_OPTIONS").toLower(); #ifdef Q_OS_UNIX // Enable color by default if we're on Unix, and output is a tty (so we're not being piped into something) @@ -61,7 +61,7 @@ LogHandler::LogHandler() { _useJournald = true; #endif - parseOptions(logOptions, "VIRCADIA_LOG_OPTIONS"); + parseOptions(logOptions, "OVERTE_LOG_OPTIONS"); } const char* stringForLogType(LogMsgType msgType) { diff --git a/pkg-scripts/docker-entrypoint.sh b/pkg-scripts/docker-entrypoint.sh index ba50311b28..160c7efa7d 100755 --- a/pkg-scripts/docker-entrypoint.sh +++ b/pkg-scripts/docker-entrypoint.sh @@ -8,17 +8,17 @@ set -x # group in container to match the docker.sock GID mounted from the host. if [ -f /var/lib/overte/.local -a "$(id -u)" = "0" ]; then # realign gid - THIS_VIRCADIA_GID=`ls -ngd /var/lib/overte/.local | cut -f3 -d' '` - CUR_VIRCADIA_GID=`getent group overte | cut -f3 -d: || true` - if [ ! -z "$THIS_VIRCADIA_GID" -a "$THIS_VIRCADIA_GID" != "$CUR_VIRCADIA_GID" ]; then - groupmod -g ${THIS_VIRCADIA_GID} -o overte + THIS_OVERTE_GID=`ls -ngd /var/lib/overte/.local | cut -f3 -d' '` + CUR_OVERTE_GID=`getent group overte | cut -f3 -d: || true` + if [ ! -z "$THIS_OVERTE_GID" -a "$THIS_OVERTE_GID" != "$CUR_OVERTE_GID" ]; then + groupmod -g ${THIS_OVERTE_GID} -o overte fi # realign pid - THIS_VIRCADIA_PID=`ls -nd /var/lib/overte/.local | cut -f3 -d' '` - CUR_VIRCADIA_PID=`getent passwd overte | cut -f3 -d: || true` - if [ ! -z "$THIS_VIRCADIA_PID" -a "$THIS_VIRCADIA_PID" != "$CUR_VIRCADIA_PID" ]; then - usermod -u ${THIS_VIRCADIA_PID} -o overte + THIS_OVERTE_PID=`ls -nd /var/lib/overte/.local | cut -f3 -d' '` + CUR_OVERTE_PID=`getent passwd overte | cut -f3 -d: || true` + if [ ! -z "$THIS_OVERTE_PID" -a "$THIS_OVERTE_PID" != "$CUR_OVERTE_PID" ]; then + usermod -u ${THIS_OVERTE_PID} -o overte fi if ! groups overte | grep -q overte; then diff --git a/pkg-scripts/make-docker-server b/pkg-scripts/make-docker-server index 322d2e0bd5..c8b8702d14 100755 --- a/pkg-scripts/make-docker-server +++ b/pkg-scripts/make-docker-server @@ -1,51 +1,51 @@ #!/bin/sh -if [ "$VIRCADIA" = "" ]; then - VIRCADIA=`realpath ../..` +if [ "$OVERTE" = "" ]; then + OVERTE=`realpath ../..` fi -GITSRC=`git -C $VIRCADIA/source config --get remote.origin.url | cut -d':' -f 2` -GITDATE=`git -C $VIRCADIA/source log -n 1 --format=raw | grep author | cut -d">" -f 2 | cut -d" " -f 2 | xargs -I {} date -d @{} +"%Y%m%d"` -GITCOMMIT=`git -C $VIRCADIA/source rev-parse HEAD | cut -c 1-7` +GITSRC=`git -C $OVERTE/source config --get remote.origin.url | cut -d':' -f 2` +GITDATE=`git -C $OVERTE/source log -n 1 --format=raw | grep author | cut -d">" -f 2 | cut -d" " -f 2 | xargs -I {} date -d @{} +"%Y%m%d"` +GITCOMMIT=`git -C $OVERTE/source rev-parse HEAD | cut -c 1-7` sudo apt-get install chrpath binutils DOCK_BUILD_ROOT=temp-make-dock rm -r temp-make-dock mkdir -p $DOCK_BUILD_ROOT -cp $VIRCADIA/source/pkg-scripts/Dockerfile.templ $DOCK_BUILD_ROOT/Dockerfile -cp $VIRCADIA/source/pkg-scripts/docker-entrypoint.sh $DOCK_BUILD_ROOT/entrypoint.sh -cp $VIRCADIA/source/pkg-scripts/docker-overte-supervisor.conf $DOCK_BUILD_ROOT/overte.conf +cp $OVERTE/source/pkg-scripts/Dockerfile.templ $DOCK_BUILD_ROOT/Dockerfile +cp $OVERTE/source/pkg-scripts/docker-entrypoint.sh $DOCK_BUILD_ROOT/entrypoint.sh +cp $OVERTE/source/pkg-scripts/docker-overte-supervisor.conf $DOCK_BUILD_ROOT/overte.conf # copy the files over mkdir -p $DOCK_BUILD_ROOT/opt -cp $VIRCADIA/build/assignment-client/assignment-client $DOCK_BUILD_ROOT/opt -cp $VIRCADIA/build/domain-server/domain-server $DOCK_BUILD_ROOT/opt -cp $VIRCADIA/build/tools/oven/oven $DOCK_BUILD_ROOT/opt -#cp $VIRCADIA/build/ice-server/ice-server $DOCK_BUILD_ROOT/opt +cp $OVERTE/build/assignment-client/assignment-client $DOCK_BUILD_ROOT/opt +cp $OVERTE/build/domain-server/domain-server $DOCK_BUILD_ROOT/opt +cp $OVERTE/build/tools/oven/oven $DOCK_BUILD_ROOT/opt +#cp $OVERTE/build/ice-server/ice-server $DOCK_BUILD_ROOT/opt strip --strip-all $DOCK_BUILD_ROOT/opt/* chrpath -d $DOCK_BUILD_ROOT/opt/* -cp -a $VIRCADIA/build/assignment-client/plugins $DOCK_BUILD_ROOT/opt +cp -a $OVERTE/build/assignment-client/plugins $DOCK_BUILD_ROOT/opt strip --strip-all $DOCK_BUILD_ROOT/opt/plugins/*.so chrpath -d $DOCK_BUILD_ROOT/opt/plugins/*.so strip --strip-all $DOCK_BUILD_ROOT/opt/plugins/*/*.so chrpath -d $DOCK_BUILD_ROOT/opt/plugins/*/*.so -cp -a $VIRCADIA/source/domain-server/resources $DOCK_BUILD_ROOT/opt +cp -a $OVERTE/source/domain-server/resources $DOCK_BUILD_ROOT/opt find $DOCK_BUILD_ROOT/opt/resources -name ".gitignore" -delete find $DOCK_BUILD_ROOT/opt/resources -type f -executable -exec sh -c 'chmod -x {}' \; mkdir -p $DOCK_BUILD_ROOT/lib -cp $VIRCADIA/build/libraries/*/*.so $DOCK_BUILD_ROOT/lib -cp $VIRCADIA/qt5-install/lib/libQt5Network.so.*.*.* $DOCK_BUILD_ROOT/lib -cp $VIRCADIA/qt5-install/lib/libQt5Core.so.*.*.* $DOCK_BUILD_ROOT/lib -cp $VIRCADIA/qt5-install/lib/libQt5Widgets.so.*.*.* $DOCK_BUILD_ROOT/lib -cp $VIRCADIA/qt5-install/lib/libQt5Gui.so.*.*.* $DOCK_BUILD_ROOT/lib -cp $VIRCADIA/qt5-install/lib/libQt5Script.so.*.*.* $DOCK_BUILD_ROOT/lib -cp $VIRCADIA/qt5-install/lib/libQt5WebSockets.so.*.*.* $DOCK_BUILD_ROOT/lib -cp $VIRCADIA/qt5-install/lib/libQt5Qml.so.*.*.* $DOCK_BUILD_ROOT/lib -cp $VIRCADIA/qt5-install/lib/libQt5ScriptTools.so.*.*.* $DOCK_BUILD_ROOT/lib +cp $OVERTE/build/libraries/*/*.so $DOCK_BUILD_ROOT/lib +cp $OVERTE/qt5-install/lib/libQt5Network.so.*.*.* $DOCK_BUILD_ROOT/lib +cp $OVERTE/qt5-install/lib/libQt5Core.so.*.*.* $DOCK_BUILD_ROOT/lib +cp $OVERTE/qt5-install/lib/libQt5Widgets.so.*.*.* $DOCK_BUILD_ROOT/lib +cp $OVERTE/qt5-install/lib/libQt5Gui.so.*.*.* $DOCK_BUILD_ROOT/lib +cp $OVERTE/qt5-install/lib/libQt5Script.so.*.*.* $DOCK_BUILD_ROOT/lib +cp $OVERTE/qt5-install/lib/libQt5WebSockets.so.*.*.* $DOCK_BUILD_ROOT/lib +cp $OVERTE/qt5-install/lib/libQt5Qml.so.*.*.* $DOCK_BUILD_ROOT/lib +cp $OVERTE/qt5-install/lib/libQt5ScriptTools.so.*.*.* $DOCK_BUILD_ROOT/lib chmod +x $DOCK_BUILD_ROOT/lib/* strip --strip-all $DOCK_BUILD_ROOT/lib/* chrpath -d $DOCK_BUILD_ROOT/lib/* diff --git a/prebuild.py b/prebuild.py index 89b018390e..79a29cc198 100644 --- a/prebuild.py +++ b/prebuild.py @@ -128,7 +128,7 @@ def main(): qt.installQt() qt.writeConfig() else: - if (os.environ["VIRCADIA_USE_SYSTEM_QT"]): + if (os.environ["OVERTE_USE_SYSTEM_QT"]): print("System Qt selected") else: raise Exception("Internal error: System Qt not selected, but hifi_qt.py failed to return a cmake path") diff --git a/script-archive/acScripts/simpleBot.js b/script-archive/acScripts/simpleBot.js index f6cece6ff1..9a96135ef0 100644 --- a/script-archive/acScripts/simpleBot.js +++ b/script-archive/acScripts/simpleBot.js @@ -10,7 +10,7 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; function getRandomFloat(min, max) { return Math.random() * (max - min) + min; diff --git a/script-archive/airship/airship.js b/script-archive/airship/airship.js index 68d481149c..3b253f0baa 100644 --- a/script-archive/airship/airship.js +++ b/script-archive/airship/airship.js @@ -29,9 +29,9 @@ lightTimeoutID = undefined, audioInjector = null; - var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; - var cannonSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "philip/cannonShot.wav"); - var explosionSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "philip/explosion.wav"); + var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; + var cannonSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "philip/cannonShot.wav"); + var explosionSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "philip/explosion.wav"); var NO_SHOOT_COLOR = { red: 100, green: 100, blue: 100 }; diff --git a/script-archive/avatarSelector.js b/script-archive/avatarSelector.js index 59eea17e83..f9382a480d 100644 --- a/script-archive/avatarSelector.js +++ b/script-archive/avatarSelector.js @@ -12,7 +12,7 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var panelWall = false; var orbShell = false; @@ -48,16 +48,16 @@ var panelsCenterShift = Vec3.subtract(panelsCenter, orbCenter); var ORB_SHIFT = { x: 0, y: -1.4, z: -0.8 }; -var LOBBY_PANEL_WALL_URL = VIRCADIA_PUBLIC_CDN + "models/sets/Lobby/PanelWallForInterface.fbx"; -var LOBBY_BLANK_PANEL_TEXTURE_URL = VIRCADIA_PUBLIC_CDN + "models/sets/Lobby/Texture.jpg"; -var LOBBY_SHELL_URL = VIRCADIA_PUBLIC_CDN + "models/sets/Lobby/LobbyShellForInterface.fbx"; +var LOBBY_PANEL_WALL_URL = OVERTE_PUBLIC_CDN + "models/sets/Lobby/PanelWallForInterface.fbx"; +var LOBBY_BLANK_PANEL_TEXTURE_URL = OVERTE_PUBLIC_CDN + "models/sets/Lobby/Texture.jpg"; +var LOBBY_SHELL_URL = OVERTE_PUBLIC_CDN + "models/sets/Lobby/LobbyShellForInterface.fbx"; -var droneSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Lobby/drone.stereo.raw") +var droneSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Lobby/drone.stereo.raw") var currentDrone = null; -var latinSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Lobby/latin.stereo.raw") +var latinSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Lobby/latin.stereo.raw") var latinInjector = null; -var elevatorSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Lobby/elevator.stereo.raw") +var elevatorSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Lobby/elevator.stereo.raw") var elevatorInjector = null; var currentMuzakInjector = null; var currentSound = null; diff --git a/script-archive/blockWorld.js b/script-archive/blockWorld.js index f3226ac4c1..73ef1998fe 100644 --- a/script-archive/blockWorld.js +++ b/script-archive/blockWorld.js @@ -20,7 +20,7 @@ var blocks = []; var blockSpawner; -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var floorPos = Vec3.sum(MyAvatar.position, { @@ -62,7 +62,7 @@ var offButton = Overlays.addOverlay("image", { y: screenSize.y - (BUTTON_SIZE + PADDING), width: BUTTON_SIZE, height: BUTTON_SIZE, - imageURL: VIRCADIA_PUBLIC_CDN + "images/close.png", + imageURL: OVERTE_PUBLIC_CDN + "images/close.png", color: { red: 255, green: 255, @@ -76,7 +76,7 @@ var deleteButton = Overlays.addOverlay("image", { y: screenSize.y - (BUTTON_SIZE + PADDING), width: BUTTON_SIZE, height: BUTTON_SIZE, - imageURL: VIRCADIA_PUBLIC_CDN + "images/delete.png", + imageURL: OVERTE_PUBLIC_CDN + "images/delete.png", color: { red: 255, green: 255, diff --git a/script-archive/controlPanel.js b/script-archive/controlPanel.js index d911c32035..76eb24c083 100644 --- a/script-archive/controlPanel.js +++ b/script-archive/controlPanel.js @@ -16,11 +16,11 @@ Script.include([ "libraries/overlayManager.js", ]); -var BG_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/card-bg.svg"; -var CLOSE_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/tools/close.svg"; -var MIC_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/tools/mic-toggle.svg"; -var FACE_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/tools/face-toggle.svg"; -var ADDRESS_BAR_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/tools/address-bar-toggle.svg"; +var BG_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/card-bg.svg"; +var CLOSE_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/tools/close.svg"; +var MIC_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/tools/mic-toggle.svg"; +var FACE_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/tools/face-toggle.svg"; +var ADDRESS_BAR_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/tools/address-bar-toggle.svg"; var panel = new OverlayPanel({ anchorPositionBinding: { avatar: "MyAvatar" }, diff --git a/script-archive/controllers/hydra/airGuitar.js b/script-archive/controllers/hydra/airGuitar.js index 4e4758a228..12de83cb5a 100644 --- a/script-archive/controllers/hydra/airGuitar.js +++ b/script-archive/controllers/hydra/airGuitar.js @@ -11,7 +11,7 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; function length(v) { return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z); @@ -29,7 +29,7 @@ function vMinus(a, b) { } // The model file to be used for the guitar -var guitarModel = VIRCADIA_PUBLIC_CDN + "models/attachments/guitar.fst"; +var guitarModel = OVERTE_PUBLIC_CDN + "models/attachments/guitar.fst"; // Load sounds that will be played @@ -37,22 +37,22 @@ var heyManWave = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/sound var chords = new Array(); // Nylon string guitar -chords[1] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+A.raw"); -chords[2] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+B.raw"); -chords[3] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+E.raw"); -chords[4] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+G.raw"); +chords[1] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+A.raw"); +chords[2] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+B.raw"); +chords[3] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+E.raw"); +chords[4] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+G.raw"); // Electric guitar -chords[5] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+A+short.raw"); -chords[6] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+B+short.raw"); -chords[7] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+E+short.raw"); -chords[8] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+G+short.raw"); +chords[5] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+A+short.raw"); +chords[6] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+B+short.raw"); +chords[7] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+E+short.raw"); +chords[8] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+G+short.raw"); // Steel Guitar -chords[9] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+A.raw"); -chords[10] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+B.raw"); -chords[11] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+E.raw"); -chords[12] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+G.raw"); +chords[9] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+A.raw"); +chords[10] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+B.raw"); +chords[11] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+E.raw"); +chords[12] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+G.raw"); var NUM_CHORDS = 4; var NUM_GUITARS = 3; diff --git a/script-archive/controllers/hydra/drumStick.js b/script-archive/controllers/hydra/drumStick.js index 6a4a73a48a..98ee43fb47 100644 --- a/script-archive/controllers/hydra/drumStick.js +++ b/script-archive/controllers/hydra/drumStick.js @@ -11,7 +11,7 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; function length(v) { return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z); @@ -29,8 +29,8 @@ function vMinus(a, b) { // First, load two percussion sounds to be used on the sticks -var drum1 = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Drums/RackTomHi.raw"); -var drum2 = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Drums/RackTomLo.raw"); +var drum1 = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Drums/RackTomHi.raw"); +var drum2 = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Drums/RackTomLo.raw"); // State Machine: // 0 = not triggered diff --git a/script-archive/controllers/hydra/frisbee.js b/script-archive/controllers/hydra/frisbee.js index 449464c652..093badcd86 100644 --- a/script-archive/controllers/hydra/frisbee.js +++ b/script-archive/controllers/hydra/frisbee.js @@ -16,7 +16,7 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; Script.include("../../libraries/toolBars.js"); const LEFT_PALM = 0; @@ -172,7 +172,7 @@ var currentMouseControl = false; var newSound = SoundCache.getSound("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/throw.raw"); var catchSound = SoundCache.getSound("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/catch.raw"); -var throwSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Switches%20and%20sliders/slider%20-%20whoosh1.raw"); +var throwSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Switches%20and%20sliders/slider%20-%20whoosh1.raw"); var simulatedFrisbees = []; diff --git a/script-archive/controllers/hydra/gun.js b/script-archive/controllers/hydra/gun.js index 7cb7f8f6de..8b1fbbbb45 100644 --- a/script-archive/controllers/hydra/gun.js +++ b/script-archive/controllers/hydra/gun.js @@ -23,7 +23,7 @@ Script.include("../../libraries/constants.js"); Script.include("../../libraries/toolBars.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var LASER_WIDTH = 2; var POSE_CONTROLS = [ Controller.Standard.LeftHand, Controller.Standard.RightHand ]; @@ -31,7 +31,7 @@ var TRIGGER_CONTROLS = [ Controller.Standard.LT, Controller.Standard.RT ]; var MIN_THROWER_DELAY = 1000; var MAX_THROWER_DELAY = 1000; var RELOAD_INTERVAL = 5; -var GUN_MODEL = VIRCADIA_PUBLIC_CDN + "cozza13/gun/m1911-handgun+1.fbx?v=4"; +var GUN_MODEL = OVERTE_PUBLIC_CDN + "cozza13/gun/m1911-handgun+1.fbx?v=4"; var BULLET_VELOCITY = 10.0; var GUN_OFFSETS = [ { x: -0.04, @@ -85,11 +85,11 @@ function getRandomFloat(min, max) { var showScore = false; // Load some sound to use for loading and firing -var fireSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guns/GUN-SHOT2.raw"); -var loadSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guns/Gun_Reload_Weapon22.raw"); -var impactSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guns/BulletImpact2.raw"); -var targetHitSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/hit.raw"); -var targetLaunchSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/shoot.raw"); +var fireSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guns/GUN-SHOT2.raw"); +var loadSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guns/Gun_Reload_Weapon22.raw"); +var impactSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guns/BulletImpact2.raw"); +var targetHitSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/hit.raw"); +var targetLaunchSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/shoot.raw"); var audioOptions = { volume: 0.9 @@ -119,7 +119,7 @@ var toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.gun.toolbar", var offButton = toolBar.addOverlay("image", { width: BUTTON_SIZE, height: BUTTON_SIZE, - imageURL: VIRCADIA_PUBLIC_CDN + "images/gun/close.svg", + imageURL: OVERTE_PUBLIC_CDN + "images/gun/close.svg", alpha: 1 }); @@ -129,7 +129,7 @@ var platformButton = toolBar.addOverlay("image", { y: screenSize.y - (BUTTON_SIZE + PADDING), width: BUTTON_SIZE, height: BUTTON_SIZE, - imageURL: VIRCADIA_PUBLIC_CDN + "images/gun/platform-targets.svg", + imageURL: OVERTE_PUBLIC_CDN + "images/gun/platform-targets.svg", alpha: 1 }); @@ -139,7 +139,7 @@ var gridButton = toolBar.addOverlay("image", { y: screenSize.y - (BUTTON_SIZE + PADDING), width: BUTTON_SIZE, height: BUTTON_SIZE, - imageURL: VIRCADIA_PUBLIC_CDN + "images/gun/floating-targets.svg", + imageURL: OVERTE_PUBLIC_CDN + "images/gun/floating-targets.svg", alpha: 1 }); diff --git a/script-archive/controllers/hydra/paddleBall.js b/script-archive/controllers/hydra/paddleBall.js index 731c664ed6..0b44c875bc 100644 --- a/script-archive/controllers/hydra/paddleBall.js +++ b/script-archive/controllers/hydra/paddleBall.js @@ -11,11 +11,11 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; -hitSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav"); -var rightHandAnimation = VIRCADIA_PUBLIC_CDN + "animations/RightHandAnimPhilip.fbx"; -var leftHandAnimation = VIRCADIA_PUBLIC_CDN + "animations/LeftHandAnimPhilip.fbx"; +hitSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav"); +var rightHandAnimation = OVERTE_PUBLIC_CDN + "animations/RightHandAnimPhilip.fbx"; +var leftHandAnimation = OVERTE_PUBLIC_CDN + "animations/LeftHandAnimPhilip.fbx"; var BALL_SIZE = 0.08; var PADDLE_SIZE = 0.20; @@ -44,7 +44,7 @@ var offButton = Overlays.addOverlay("image", { y: 96, width: 32, height: 32, - imageURL: VIRCADIA_PUBLIC_CDN + "images/close.png", + imageURL: OVERTE_PUBLIC_CDN + "images/close.png", color: { red: 255, green: 255, blue: 255}, alpha: 1 }); diff --git a/script-archive/controllers/hydra/toyball.js b/script-archive/controllers/hydra/toyball.js index 72b74bc808..1a746bf8c9 100644 --- a/script-archive/controllers/hydra/toyball.js +++ b/script-archive/controllers/hydra/toyball.js @@ -16,7 +16,7 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; // maybe we should make these constants... var LEFT_PALM = 0; @@ -41,7 +41,7 @@ var rightHandEntity = false; var newSound = SoundCache.getSound("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/throw.raw"); var catchSound = SoundCache.getSound("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/catch.raw"); -var throwSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Switches%20and%20sliders/slider%20-%20whoosh1.raw"); +var throwSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Switches%20and%20sliders/slider%20-%20whoosh1.raw"); var targetRadius = 0.25; diff --git a/script-archive/controllers/oculus/goTo.js b/script-archive/controllers/oculus/goTo.js index c7274f254f..430babf02b 100644 --- a/script-archive/controllers/oculus/goTo.js +++ b/script-archive/controllers/oculus/goTo.js @@ -72,7 +72,7 @@ function Instructions(imageURL, originalWidth, originalHeight) { this.rescale(); }; -var theInstruction = new Instructions(VIRCADIA_PUBLIC_CDN + "images/tutorial-goTo.svg", 457, 284.1); +var theInstruction = new Instructions(OVERTE_PUBLIC_CDN + "images/tutorial-goTo.svg", 457, 284.1); var firstControllerPlugged = false; @@ -86,7 +86,7 @@ var locationURL = ""; var randomSounds = new SoundArray({}, true); var numberOfSounds = 7; for (var i = 1; i <= numberOfSounds; i++) { - randomSounds.addSound(VIRCADIA_PUBLIC_CDN + "sounds/UI/virtualKeyboard-press" + i + ".raw"); + randomSounds.addSound(OVERTE_PUBLIC_CDN + "sounds/UI/virtualKeyboard-press" + i + ".raw"); } function appendChar(char) { diff --git a/script-archive/controllers/oculus/virtualKeyboardTextEntityExample.js b/script-archive/controllers/oculus/virtualKeyboardTextEntityExample.js index b0fee07182..02d9355356 100644 --- a/script-archive/controllers/oculus/virtualKeyboardTextEntityExample.js +++ b/script-archive/controllers/oculus/virtualKeyboardTextEntityExample.js @@ -38,7 +38,7 @@ var textSizeMeasureOverlay = Overlays.addOverlay("text3d", {visible: false}); var randomSounds = new SoundArray({}, true); var numberOfSounds = 7; for (var i = 1; i <= numberOfSounds; i++) { - randomSounds.addSound(VIRCADIA_PUBLIC_CDN + "sounds/UI/virtualKeyboard-press" + i + ".raw"); + randomSounds.addSound(OVERTE_PUBLIC_CDN + "sounds/UI/virtualKeyboard-press" + i + ".raw"); } function appendChar(char) { diff --git a/script-archive/controllers/toybox.js b/script-archive/controllers/toybox.js index 76042a9673..10e148e2b5 100644 --- a/script-archive/controllers/toybox.js +++ b/script-archive/controllers/toybox.js @@ -12,7 +12,7 @@ Script.include("http://s3.amazonaws.com/hifi-public/scripts/libraries/toolBars.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; @@ -140,7 +140,7 @@ function createTable() { dimensions: TABLE_DIMENSIONS, rotation: MyAvatar.orientation, // color: { red: 102, green: 51, blue: 0 }, - modelURL: VIRCADIA_PUBLIC_CDN + 'eric/models/woodFloor.fbx', + modelURL: OVERTE_PUBLIC_CDN + 'eric/models/woodFloor.fbx', collisionSoundURL: "http://public.highfidelity.io/sounds/dice/diceCollide.wav" }); diff --git a/script-archive/entityScripts/recordingMaster.js b/script-archive/entityScripts/recordingMaster.js index aed3a17a75..65592ab405 100644 --- a/script-archive/entityScripts/recordingMaster.js +++ b/script-archive/entityScripts/recordingMaster.js @@ -11,15 +11,15 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; -Script.include(VIRCADIA_PUBLIC_CDN + "scripts/libraries/toolBars.js"); -Script.include(VIRCADIA_PUBLIC_CDN + "scripts/libraries/utils.js"); +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +Script.include(OVERTE_PUBLIC_CDN + "scripts/libraries/toolBars.js"); +Script.include(OVERTE_PUBLIC_CDN + "scripts/libraries/utils.js"); var rotation = Quat.safeEulerAngles(Camera.getOrientation()); rotation = Quat.fromPitchYawRollDegrees(0, rotation.y, 0); var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1, Quat.getFront(rotation))); -var TOOL_ICON_URL = VIRCADIA_PUBLIC_CDN + "images/tools/"; +var TOOL_ICON_URL = OVERTE_PUBLIC_CDN + "images/tools/"; var ALPHA_ON = 1.0; var ALPHA_OFF = 0.7; var COLOR_TOOL_BAR = { red: 0, green: 0, blue: 0 }; diff --git a/script-archive/example/audio/audioBall.js b/script-archive/example/audio/audioBall.js index 0a99c0cc89..d4dbd26613 100644 --- a/script-archive/example/audio/audioBall.js +++ b/script-archive/example/audio/audioBall.js @@ -14,9 +14,9 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; -var sound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Animals/mexicanWhipoorwill.raw"); +var sound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Animals/mexicanWhipoorwill.raw"); var CHANCE_OF_PLAYING_SOUND = 0.01; var FACTOR = 0.05; diff --git a/script-archive/example/audio/jsstreamplayer.js b/script-archive/example/audio/jsstreamplayer.js index cecbe3e8f5..1f2a7a8063 100644 --- a/script-archive/example/audio/jsstreamplayer.js +++ b/script-archive/example/audio/jsstreamplayer.js @@ -15,12 +15,12 @@ // Declare HiFi public bucket. -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; // Declare variables and set up new WebWindow. var stream; var volume = 1; -var streamWindow = new WebWindow('Stream', VIRCADIA_PUBLIC_CDN + "examples/html/jsstreamplayer.html", 0, 0, false); +var streamWindow = new WebWindow('Stream', OVERTE_PUBLIC_CDN + "examples/html/jsstreamplayer.html", 0, 0, false); // Set up toggleStreamURLButton overlay. var toggleStreamURLButton = Overlays.addOverlay("text", { diff --git a/script-archive/example/audio/radio.js b/script-archive/example/audio/radio.js index 777f3775ac..af0366904d 100644 --- a/script-archive/example/audio/radio.js +++ b/script-archive/example/audio/radio.js @@ -10,10 +10,10 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; -var modelURL = VIRCADIA_PUBLIC_CDN + "models/entities/radio/Speakers.fbx"; -var soundURL = VIRCADIA_PUBLIC_CDN + "sounds/family.stereo.raw"; +var modelURL = OVERTE_PUBLIC_CDN + "models/entities/radio/Speakers.fbx"; +var soundURL = OVERTE_PUBLIC_CDN + "sounds/family.stereo.raw"; var AudioRotationOffset = Quat.fromPitchYawRollDegrees(0, -90, 0); var audioOptions = { diff --git a/script-archive/example/brownianFun.js b/script-archive/example/brownianFun.js index 3ff8ee15ae..f4b2108ad1 100644 --- a/script-archive/example/brownianFun.js +++ b/script-archive/example/brownianFun.js @@ -1,6 +1,6 @@ var -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; -var SOUND_PATH = VIRCADIA_PUBLIC_CDN + "sounds/Collisions-hitsandslaps/"; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var SOUND_PATH = OVERTE_PUBLIC_CDN + "sounds/Collisions-hitsandslaps/"; var soundURLS = ["67LCollision01.wav", "67LCollision02.wav", "airhockey_hit1.wav"]; var FLOOR_SIZE = 10; var center = Vec3.sum(MyAvatar.position, Vec3.multiply(FLOOR_SIZE * 1.5, Quat.getFront(Camera.getOrientation()))); @@ -44,7 +44,7 @@ var brownianButton = Overlays.addOverlay("image", { y: screenSize.y - (BUTTON_SIZE + PADDING), width: BUTTON_SIZE, height: BUTTON_SIZE, - imageURL: VIRCADIA_PUBLIC_CDN + "images/blocks.png", + imageURL: OVERTE_PUBLIC_CDN + "images/blocks.png", color: buttonOffColor, alpha: 1 }); diff --git a/script-archive/example/dynamicLandscape.js b/script-archive/example/dynamicLandscape.js index 38209547ed..b71c7de0c1 100644 --- a/script-archive/example/dynamicLandscape.js +++ b/script-archive/example/dynamicLandscape.js @@ -11,8 +11,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; -Script.include(VIRCADIA_PUBLIC_CDN + 'scripts/utilities.js') +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +Script.include(OVERTE_PUBLIC_CDN + 'scripts/utilities.js') var NUM_ROWS = 10; var CUBE_SIZE = 1; diff --git a/script-archive/example/entities/editModelExample.js b/script-archive/example/entities/editModelExample.js index 561993af5d..2c3540d120 100644 --- a/script-archive/example/entities/editModelExample.js +++ b/script-archive/example/entities/editModelExample.js @@ -12,7 +12,7 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var count = 0; var moveUntil = 2000; @@ -38,7 +38,7 @@ type: "Model", green: 255, blue: 0 }, - modelURL: VIRCADIA_PUBLIC_CDN + "meshes/Feisar_Ship.FBX", + modelURL: OVERTE_PUBLIC_CDN + "meshes/Feisar_Ship.FBX", rotation: rotation diff --git a/script-archive/example/entities/entityModelExample.js b/script-archive/example/entities/entityModelExample.js index ffd8e33035..dec8cd9489 100644 --- a/script-archive/example/entities/entityModelExample.js +++ b/script-archive/example/entities/entityModelExample.js @@ -12,7 +12,7 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var count = 0; var stopAfter = 1000; @@ -27,7 +27,7 @@ var modelPropertiesA = { y: 3.34, z: 0.54 }, - modelURL: VIRCADIA_PUBLIC_CDN + "meshes/Feisar_Ship.FBX", + modelURL: OVERTE_PUBLIC_CDN + "meshes/Feisar_Ship.FBX", lifetime: 20 }; diff --git a/script-archive/example/entities/zoneEntityExample.js b/script-archive/example/entities/zoneEntityExample.js index 4e870949a9..fe8aa8479a 100644 --- a/script-archive/example/entities/zoneEntityExample.js +++ b/script-archive/example/entities/zoneEntityExample.js @@ -12,7 +12,7 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var count = 0; var stopAfter = 1000; diff --git a/script-archive/example/entities/zoneSkyboxExample.js b/script-archive/example/entities/zoneSkyboxExample.js index a5d7f9d78a..528cb62587 100644 --- a/script-archive/example/entities/zoneSkyboxExample.js +++ b/script-archive/example/entities/zoneSkyboxExample.js @@ -12,7 +12,7 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var count = 0; var stopAfter = 600; diff --git a/script-archive/example/games/airHockey.js b/script-archive/example/games/airHockey.js index 6673750eb4..d8b7c60d67 100755 --- a/script-archive/example/games/airHockey.js +++ b/script-archive/example/games/airHockey.js @@ -61,7 +61,7 @@ var paddleModel = "https://hifi-public.s3.amazonaws.com/ozan/props/airHockeyTabl var paddleCollisionModel = "http://headache.hungry.com/~seth/hifi/paddle-hull.obj" -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var screenSize = Controller.getViewportDimensions(); var BUTTON_SIZE = 32; var PADDING = 3; @@ -114,7 +114,7 @@ var deleteButton = Overlays.addOverlay("image", { y: screenSize.y - (BUTTON_SIZE * 2 + PADDING), width: BUTTON_SIZE, height: BUTTON_SIZE, - imageURL: VIRCADIA_PUBLIC_CDN + "images/delete.png", + imageURL: OVERTE_PUBLIC_CDN + "images/delete.png", color: { red: 255, green: 255, @@ -128,7 +128,7 @@ var spawnButton = Overlays.addOverlay("image", { y: screenSize.y - (BUTTON_SIZE * 2 + PADDING), width: BUTTON_SIZE, height: BUTTON_SIZE, - imageURL: VIRCADIA_PUBLIC_CDN + "images/puck.png", + imageURL: OVERTE_PUBLIC_CDN + "images/puck.png", color: { red: 255, green: 255, diff --git a/script-archive/example/games/billiards.js b/script-archive/example/games/billiards.js index a28f24539a..19d2112645 100644 --- a/script-archive/example/games/billiards.js +++ b/script-archive/example/games/billiards.js @@ -11,7 +11,7 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var tableParts = []; var balls = []; @@ -34,18 +34,18 @@ var cuePosition; var startStroke = 0; // Sounds to use -var hitSound = VIRCADIA_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav"; +var hitSound = OVERTE_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav"; SoundCache.getSound(hitSound); -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var screenSize = Controller.getViewportDimensions(); var reticle = Overlays.addOverlay("image", { x: screenSize.x / 2 - 16, y: screenSize.y / 2 - 16, width: 32, height: 32, - imageURL: VIRCADIA_PUBLIC_CDN + "images/billiardsReticle.png", + imageURL: OVERTE_PUBLIC_CDN + "images/billiardsReticle.png", color: { red: 255, green: 255, blue: 255}, alpha: 1 }); diff --git a/script-archive/example/games/make-dummy.js b/script-archive/example/games/make-dummy.js index 4dc919628d..a9232fc381 100644 --- a/script-archive/example/games/make-dummy.js +++ b/script-archive/example/games/make-dummy.js @@ -15,14 +15,14 @@ /*jslint vars: true*/ var Overlays, Entities, Controller, Script, MyAvatar, Vec3; // Referenced globals provided by High Fidelity. -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var rezButton = Overlays.addOverlay("image", { x: 100, y: 350, width: 32, height: 32, - imageURL: VIRCADIA_PUBLIC_CDN + "images/close.png", + imageURL: OVERTE_PUBLIC_CDN + "images/close.png", color: { red: 255, green: 255, diff --git a/script-archive/example/games/planky.js b/script-archive/example/games/planky.js index 87aab32dc8..55339cb45a 100644 --- a/script-archive/example/games/planky.js +++ b/script-archive/example/games/planky.js @@ -10,7 +10,7 @@ // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -VIRCADIA_PUBLIC_CDN = 'http://s3.amazonaws.com/hifi-public/'; +OVERTE_PUBLIC_CDN = 'http://s3.amazonaws.com/hifi-public/'; Script.include('/~/system/libraries/toolBars.js'); @@ -190,7 +190,7 @@ PlankyStack = function() { if (!_this.ground) { _this.ground = Entities.addEntity({ type: 'Model', - modelURL: VIRCADIA_PUBLIC_CDN + 'eric/models/woodFloor.fbx', + modelURL: OVERTE_PUBLIC_CDN + 'eric/models/woodFloor.fbx', dimensions: _this.options.baseDimension, position: Vec3.sum(_this.basePosition, {y: -(_this.options.baseDimension.y / 2)}), rotation: _this.baseRotation, @@ -247,7 +247,7 @@ PlankyStack = function() { }); var newProperties = { type: 'Model', - modelURL: VIRCADIA_PUBLIC_CDN + 'marketplace/hificontent/Games/blocks/block.fbx', + modelURL: OVERTE_PUBLIC_CDN + 'marketplace/hificontent/Games/blocks/block.fbx', shapeType: 'box', name: 'PlankyBlock' + layer + '-' + row, dimensions: Vec3.sum(_this.options.blockSize, {x: 0, y: -((_this.options.blockSize.y * (_this.options.blockHeightVariation / MAXIMUM_PERCENTAGE)) * Math.random()), z: 0}), @@ -334,7 +334,7 @@ toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.games.planky", fun button = toolBar.addTool({ width: BUTTON_DIMENSIONS.width, height: BUTTON_DIMENSIONS.height, - imageURL: VIRCADIA_PUBLIC_CDN + 'marketplace/hificontent/Games/blocks/planky_button.svg', + imageURL: OVERTE_PUBLIC_CDN + 'marketplace/hificontent/Games/blocks/planky_button.svg', alpha: 0.8, visible: true }); @@ -342,7 +342,7 @@ button = toolBar.addTool({ cogButton = toolBar.addTool({ width: BUTTON_DIMENSIONS.width, height: BUTTON_DIMENSIONS.height, - imageURL: VIRCADIA_PUBLIC_CDN + 'marketplace/hificontent/Games/blocks/cog.svg', + imageURL: OVERTE_PUBLIC_CDN + 'marketplace/hificontent/Games/blocks/cog.svg', subImage: { x: 0, y: BUTTON_DIMENSIONS.height, width: BUTTON_DIMENSIONS.width, height: BUTTON_DIMENSIONS.height }, alpha: 0.8, visible: true diff --git a/script-archive/example/games/spaceInvadersExample.js b/script-archive/example/games/spaceInvadersExample.js index bd0a351e7c..af677bae3c 100644 --- a/script-archive/example/games/spaceInvadersExample.js +++ b/script-archive/example/games/spaceInvadersExample.js @@ -12,7 +12,7 @@ // -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var iteration = 0; @@ -94,13 +94,13 @@ var maxInvaderRowOffset=stepsToGround; var myMissile; // sounds -var hitSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/hit.raw"); -var shootSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/shoot.raw"); +var hitSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/hit.raw"); +var shootSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/shoot.raw"); var moveSounds = new Array(); -moveSounds[0] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/Lo1.raw"); -moveSounds[1] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/Lo2.raw"); -moveSounds[2] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/Lo3.raw"); -moveSounds[3] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/Lo4.raw"); +moveSounds[0] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/Lo1.raw"); +moveSounds[1] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/Lo2.raw"); +moveSounds[2] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/Lo3.raw"); +moveSounds[3] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/Lo4.raw"); var currentMoveSound = 0; var numberOfSounds = 4; var stepsPerSound = invaderStepsPerCycle / numberOfSounds; @@ -111,36 +111,36 @@ var soundInMyHead = true; // models... var invaderModels = new Array(); invaderModels[0] = { - modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx", + modelURL: OVERTE_PUBLIC_CDN + "meshes/space_invader.fbx", modelScale: 450, modelTranslation: { x: -1.3, y: -1.3, z: -1.3 }, }; invaderModels[1] = { - modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx", + modelURL: OVERTE_PUBLIC_CDN + "meshes/space_invader.fbx", modelScale: 450, modelTranslation: { x: -1.3, y: -1.3, z: -1.3 }, }; invaderModels[2] = { - modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx", + modelURL: OVERTE_PUBLIC_CDN + "meshes/space_invader.fbx", modelScale: 450, modelTranslation: { x: -1.3, y: -1.3, z: -1.3 }, }; invaderModels[3] = { - modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx", + modelURL: OVERTE_PUBLIC_CDN + "meshes/space_invader.fbx", modelScale: 450, modelTranslation: { x: -1.3, y: -1.3, z: -1.3 }, }; invaderModels[4] = { - modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx", + modelURL: OVERTE_PUBLIC_CDN + "meshes/space_invader.fbx", modelScale: 450, modelTranslation: { x: -1.3, y: -1.3, z: -1.3 }, }; -//modelURL: VIRCADIA_PUBLIC_CDN + "meshes/Feisar_Ship.FBX", -//modelURL: VIRCADIA_PUBLIC_CDN + "meshes/invader.svo", -// VIRCADIA_PUBLIC_CDN + "meshes/spaceInvader3.fbx" +//modelURL: OVERTE_PUBLIC_CDN + "meshes/Feisar_Ship.FBX", +//modelURL: OVERTE_PUBLIC_CDN + "meshes/invader.svo", +// OVERTE_PUBLIC_CDN + "meshes/spaceInvader3.fbx" function initializeMyShip() { myShipProperties = { @@ -151,7 +151,7 @@ function initializeMyShip() { damping: 0, dimensions: { x: shipSize * 2, y: shipSize * 2, z: shipSize * 2 }, color: { red: 0, green: 255, blue: 0 }, - modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx", + modelURL: OVERTE_PUBLIC_CDN + "meshes/space_invader.fbx", lifetime: itemLifetimes }; myShip = Entities.addEntity(myShipProperties); diff --git a/script-archive/example/soundToys.js b/script-archive/example/soundToys.js index 2456ff4b06..dc48ab0d26 100644 --- a/script-archive/example/soundToys.js +++ b/script-archive/example/soundToys.js @@ -9,7 +9,7 @@ var Camera, Vec3, Quat, Entities, Script; // Globals defined by HiFi, var'ed here to keep jslint happy. var -var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; +var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var SOUND_BUCKET = "http://public.highfidelity.io/sounds/Collisions-hitsandslaps/"; var MAX_ANGULAR_SPEED = Math.PI; var N_EACH_OBJECTS = 3; @@ -23,8 +23,8 @@ function makeAll() { right = Vec3.multiply(0.6, Quat.getRight(Camera.getOrientation())), currentDimensions, data = [ - ["models/props/Dice/goldDie.fbx", VIRCADIA_PUBLIC_CDN + "sounds/dice/diceCollide.wav"], - ["models/props/Pool/ball_8.fbx", VIRCADIA_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav"], + ["models/props/Dice/goldDie.fbx", OVERTE_PUBLIC_CDN + "sounds/dice/diceCollide.wav"], + ["models/props/Pool/ball_8.fbx", OVERTE_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav"], ["eric/models/woodFloor.fbx", SOUND_BUCKET + "67LCollision05.wav"] ]; currentPosition = Vec3.sum(currentPosition, Vec3.multiply(-1 * data.length * N_EACH_OBJECTS / 2, right)); @@ -36,7 +36,7 @@ function makeAll() { } thisEntity = Entities.addEntity({ type: "Model", - modelURL: VIRCADIA_PUBLIC_CDN + model, + modelURL: OVERTE_PUBLIC_CDN + model, collisionSoundURL: sound, dynamic: true, shapeType: "box", diff --git a/script-archive/example/ui/overlayPanelExample.js b/script-archive/example/ui/overlayPanelExample.js index 281a19d3b9..b69f771cf9 100644 --- a/script-archive/example/ui/overlayPanelExample.js +++ b/script-archive/example/ui/overlayPanelExample.js @@ -14,9 +14,9 @@ Script.include([ "../../libraries/overlayManager.js", ]); -var BG_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/card-bg.svg"; -var RED_DOT_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/red-dot.svg"; -var BLUE_SQUARE_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/blue-square.svg"; +var BG_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/card-bg.svg"; +var RED_DOT_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/red-dot.svg"; +var BLUE_SQUARE_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/blue-square.svg"; var mainPanel = new OverlayPanel({ anchorPositionBinding: { avatar: "MyAvatar" },