Renamed environment variables

This commit is contained in:
ksuprynowicz 2022-08-03 21:53:33 +02:00
parent 2bc9982b99
commit d2a768c2f0
77 changed files with 307 additions and 307 deletions

View file

@ -64,7 +64,7 @@ jobs:
echo "PYTHON_EXEC=python3" >> $GITHUB_ENV echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
echo "INSTALLER_EXT=tgz" >> $GITHUB_ENV echo "INSTALLER_EXT=tgz" >> $GITHUB_ENV
echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $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 fi
# Mac build variables # Mac build variables
if [ "${{ matrix.os }}" = "macOS-10.15" ]; then if [ "${{ matrix.os }}" = "macOS-10.15" ]; then
@ -72,7 +72,7 @@ jobs:
echo "ZIP_COMMAND=zip" >> $GITHUB_ENV echo "ZIP_COMMAND=zip" >> $GITHUB_ENV
echo "ZIP_ARGS=-r" >> $GITHUB_ENV echo "ZIP_ARGS=-r" >> $GITHUB_ENV
echo "INSTALLER_EXT=dmg" >> $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 "::set-output name=symbols_archive::${BUILD_NUMBER}-${{ matrix.build_type }}-mac-symbols.zip"
echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV
fi fi

View file

@ -76,27 +76,27 @@ jobs:
echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV
# Variables specific to our aarch64 runner # Variables specific to our aarch64 runner
if [ "${{ matrix.os }}" = "self-hosted_debian-11_aarch64" ]; then 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 echo "CI_WORKSPACE=${{runner.workspace}}" >> $GITHUB_ENV
# Don't optimize builds to save build time. # Don't optimize builds to save build time.
echo "VIRCADIA_OPTIMIZE=false" >> $GITHUB_ENV echo "OVERTE_OPTIMIZE=false" >> $GITHUB_ENV
fi fi
if [[ "${{ matrix.os }}" = *"aarch64" ]]; then if [[ "${{ matrix.os }}" = *"aarch64" ]]; then
echo "VCPKG_FORCE_SYSTEM_BINARIES=true" >> $GITHUB_ENV echo "VCPKG_FORCE_SYSTEM_BINARIES=true" >> $GITHUB_ENV
if [ "${{ matrix.build_type }}" = "full" ]; then 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 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
fi fi
if [[ "${{ matrix.os }}" != *"aarch64" ]]; then if [[ "${{ matrix.os }}" != *"aarch64" ]]; then
if [ "${{ matrix.build_type }}" = "full" ]; 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 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 fi
fi fi
@ -106,9 +106,9 @@ jobs:
echo "PYTHON_EXEC=python3" >> $GITHUB_ENV echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
echo "INSTALLER_EXT=dmg" >> $GITHUB_ENV echo "INSTALLER_EXT=dmg" >> $GITHUB_ENV
if [ "${{ matrix.build_type }}" = "full" ]; then 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 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 fi
echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV
fi fi

View file

@ -194,8 +194,8 @@ The following build options can be used when running CMake
### Optimization build options ### 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. * 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.
* 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_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. maximum compatibility.

View file

@ -101,19 +101,19 @@ git tag
### Using a custom Qt build ### Using a custom Qt build
Qt binaries are only provided for Ubuntu. In order to build on other distributions, a Qt5 install 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. a Qt install.
### Using the system's Qt ### Using the system's Qt
The system's Qt can be used, if the development packages are installed, by setting the 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 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. Qt 5.15.2 available for a long time.
### Architecture support ### 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. 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 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. 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 ### Compiling

View file

@ -66,7 +66,7 @@ To package the installation, you can simply run `make package` afterwards.
## Architecture Support ## 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. 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 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. 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. maximum compatibility.
## FAQ ## FAQ

View file

@ -89,18 +89,18 @@ To create this variable:
## Step 7. Running CMake to Generate Build Files ## Step 7. Running CMake to Generate Build Files
Run Command Prompt from Start and run the following commands: Run Command Prompt from Start and run the following commands:
`cd "%VIRCADIA_DIR%"` `cd "%OVERTE_DIR%"`
`mkdir build` `mkdir build`
`cd build` `cd build`
### Visual Studio 2019 ### Visual Studio 2019
Run `cmake .. -G "Visual Studio 16 2019" -A x64`. 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 ## 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. 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. 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 # 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 ## 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 ## 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.

View file

@ -74,62 +74,62 @@ if ((NOT "${RELEASE_TYPE}" STREQUAL "PRODUCTION") AND (NOT "${RELEASE_TYPE}" STR
set(RELEASE_TYPE "DEV") set(RELEASE_TYPE "DEV")
endif() endif()
# VIRCADIA_OPTIMIZE # OVERTE_OPTIMIZE
# Variable determining Overte optimization. If not set, it defaults to true. # 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. # 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 # Should be set to false to get completely unoptimized build for easier line-by-line debugging
if( NOT WIN32 ) if( NOT WIN32 )
if(NOT DEFINED VIRCADIA_OPTIMIZE) if(NOT DEFINED OVERTE_OPTIMIZE)
message("Enabling code optimization for Overte and compiled dependencies") 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() endif()
#compiler needs to be detected before building VCPKG dependencies #compiler needs to be detected before building VCPKG dependencies
set(CMAKE_PLATFORM_INFO_DIR "${CMAKE_CURRENT_BINARY_DIR}") set(CMAKE_PLATFORM_INFO_DIR "${CMAKE_CURRENT_BINARY_DIR}")
include(CMakeDetermineCXXCompiler) 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") if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
message("Clang compiler detected, adding -O3 -fPIC -g flags") 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") elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
message("GCC compiler detected, adding -O3 -fPIC -ggdb flags") message("GCC compiler detected, adding -O3 -fPIC -ggdb flags")
set(VIRCADIA_OPTIMIZE_FLAGS "-O3 -fPIC -ggdb") set(OVERTE_OPTIMIZE_FLAGS "-O3 -fPIC -ggdb")
else() else()
message("No predefined optimization flags for compiler ${CMAKE_CXX_COMPILER_ID}") message("No predefined optimization flags for compiler ${CMAKE_CXX_COMPILER_ID}")
endif() endif()
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. # 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 # 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 #Assume -march=native for compilers that allow it if architecture is not specified
if(NOT DEFINED VIRCADIA_CPU_ARCHITECTURE) if(NOT DEFINED OVERTE_CPU_ARCHITECTURE)
if(VIRCADIA_OPTIMIZE AND ( (CMAKE_CXX_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "GNU") ) ) 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") 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()
endif() endif()
if(DEFINED VIRCADIA_CPU_ARCHITECTURE) if(DEFINED OVERTE_CPU_ARCHITECTURE)
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/VIRCADIA_CPU_ARCHITECTURE.txt" "${VIRCADIA_CPU_ARCHITECTURE}") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/OVERTE_CPU_ARCHITECTURE.txt" "${OVERTE_CPU_ARCHITECTURE}")
set(VIRCADIA_OPTIMIZE_FLAGS "${VIRCADIA_OPTIMIZE_FLAGS} ${VIRCADIA_CPU_ARCHITECTURE}") set(OVERTE_OPTIMIZE_FLAGS "${OVERTE_OPTIMIZE_FLAGS} ${OVERTE_CPU_ARCHITECTURE}")
message("Adding CPU architecture flags: ${VIRCADIA_CPU_ARCHITECTURE}") message("Adding CPU architecture flags: ${OVERTE_CPU_ARCHITECTURE}")
MESSAGE(STATUS "VIRCADIA_CPU_ARCHITECTURE: ${VIRCADIA_CPU_ARCHITECTURE}") MESSAGE(STATUS "OVERTE_CPU_ARCHITECTURE: ${OVERTE_CPU_ARCHITECTURE}")
endif() endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OVERTE_OPTIMIZE_FLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OVERTE_OPTIMIZE_FLAGS}")
set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}") set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} ${OVERTE_OPTIMIZE_FLAGS}")
set(ENV{CFLAGS} "$ENV{CFLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}") set(ENV{CFLAGS} "$ENV{CFLAGS} ${OVERTE_OPTIMIZE_FLAGS}")
message($ENV{CXXFLAGS}) message($ENV{CXXFLAGS})
endif() endif()
@ -207,7 +207,7 @@ include("${CMAKE_BINARY_DIR}/vcpkg.cmake")
if (HIFI_ANDROID) if (HIFI_ANDROID)
set(QT_CMAKE_PREFIX_PATH "$ENV{HIFI_ANDROID_PRECOMPILED}/qt/lib/cmake") set(QT_CMAKE_PREFIX_PATH "$ENV{HIFI_ANDROID_PRECOMPILED}/qt/lib/cmake")
else() else()
if ("$ENV{VIRCADIA_USE_SYSTEM_QT}" STREQUAL "") if ("$ENV{OVERTE_USE_SYSTEM_QT}" STREQUAL "")
if(NOT EXISTS "${CMAKE_BINARY_DIR}/qt.cmake") if(NOT EXISTS "${CMAKE_BINARY_DIR}/qt.cmake")
message(FATAL_ERROR "qt configuration missing.") message(FATAL_ERROR "qt configuration missing.")
endif() endif()
@ -413,7 +413,7 @@ set_packaging_parameters()
# Locate the required Qt build on the filesystem # Locate the required Qt build on the filesystem
setup_qt() 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}") list(APPEND CMAKE_PREFIX_PATH "${QT_CMAKE_PREFIX_PATH}")
endif() endif()

View file

@ -222,7 +222,7 @@ void ScriptableAvatar::updateJointMappings() {
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest networkRequest = QNetworkRequest(_skeletonModelURL); QNetworkRequest networkRequest = QNetworkRequest(_skeletonModelURL);
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
DependencyManager::get<ResourceRequestObserver>()->update( DependencyManager::get<ResourceRequestObserver>()->update(
_skeletonModelURL, -1, "AvatarData::updateJointMappings"); _skeletonModelURL, -1, "AvatarData::updateJointMappings");
QNetworkReply* networkReply = networkAccessManager.get(networkRequest); QNetworkReply* networkReply = networkAccessManager.get(networkRequest);

View file

@ -8,15 +8,15 @@
# #
macro(SETUP_MEMORY_DEBUGGER) macro(SETUP_MEMORY_DEBUGGER)
if ("$ENV{VIRCADIA_MEMORY_DEBUGGING}") if ("$ENV{OVERTE_MEMORY_DEBUGGING}")
if (VIRCADIA_THREAD_DEBUGGING) if (OVERTE_THREAD_DEBUGGING)
message(FATAL_ERROR "Thread debugging and memory debugging can't be enabled at the same time." ) message(FATAL_ERROR "Thread debugging and memory debugging can't be enabled at the same time." )
endif() endif()
SET( VIRCADIA_MEMORY_DEBUGGING true ) SET( OVERTE_MEMORY_DEBUGGING true )
endif () endif ()
if (VIRCADIA_MEMORY_DEBUGGING) if (OVERTE_MEMORY_DEBUGGING)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") 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_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") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fsanitize=address -fsanitize-recover=address")

View file

@ -51,7 +51,7 @@ endfunction()
# Sets the QT_CMAKE_PREFIX_PATH and QT_DIR variables # Sets the QT_CMAKE_PREFIX_PATH and QT_DIR variables
# Also enables CMAKE_AUTOMOC and CMAKE_AUTORCC # Also enables CMAKE_AUTOMOC and CMAKE_AUTORCC
macro(setup_qt) macro(setup_qt)
if ($ENV{VIRCADIA_USE_SYSTEM_QT}) if ($ENV{OVERTE_USE_SYSTEM_QT})
message(STATUS "Using system Qt") message(STATUS "Using system Qt")
else() else()
# if we are in a development build and QT_CMAKE_PREFIX_PATH is specified # if we are in a development build and QT_CMAKE_PREFIX_PATH is specified

View file

@ -8,15 +8,15 @@
# #
macro(SETUP_THREAD_DEBUGGER) macro(SETUP_THREAD_DEBUGGER)
if ("$ENV{VIRCADIA_THREAD_DEBUGGING}") if ("$ENV{OVERTE_THREAD_DEBUGGING}")
if (VIRCADIA_MEMORY_DEBUGGING ) if (OVERTE_MEMORY_DEBUGGING )
message(FATAL_ERROR "Thread debugging and memory debugging can't be enabled at the same time." ) message(FATAL_ERROR "Thread debugging and memory debugging can't be enabled at the same time." )
endif () endif ()
SET(VIRCADIA_THREAD_DEBUGGING true) SET(OVERTE_THREAD_DEBUGGING true)
endif () endif ()
if (VIRCADIA_THREAD_DEBUGGING) if (OVERTE_THREAD_DEBUGGING)
if (UNIX) if (UNIX)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# for clang on Linux # for clang on Linux

View file

@ -1250,7 +1250,7 @@ void DomainGatekeeper::requestDomainUser(const QString& username, const QString&
QNetworkRequest request; 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.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
request.setRawHeader(QByteArray("Authorization"), QString("Bearer " + accessToken).toUtf8()); request.setRawHeader(QByteArray("Authorization"), QString("Bearer " + accessToken).toUtf8());

View file

@ -156,7 +156,7 @@ bool DomainServer::forwardMetaverseAPIRequest(HTTPConnection* connection,
QUrl url { MetaverseAPI::getCurrentMetaverseServerURL().toString() + metaversePath }; QUrl url { MetaverseAPI::getCurrentMetaverseServerURL().toString() + metaversePath };
QNetworkRequest req(url); 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"); req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
if (accessTokenVariant.isValid()) { if (accessTokenVariant.isValid()) {
@ -2649,7 +2649,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
url.setQuery("access_token=" + accessTokenVariant.toString()); url.setQuery("access_token=" + accessTokenVariant.toString());
QNetworkRequest req(url); 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"); req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QNetworkReply* reply = NetworkAccessManager::getInstance().put(req, doc.toJson()); QNetworkReply* reply = NetworkAccessManager::getInstance().put(req, doc.toJson());
@ -2750,7 +2750,7 @@ bool DomainServer::handleHTTPSRequest(HTTPSConnection* connection, const QUrl &u
QNetworkRequest tokenRequest(tokenRequestUrl); QNetworkRequest tokenRequest(tokenRequestUrl);
tokenRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); 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"); tokenRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
QNetworkReply* tokenReply = NetworkAccessManager::getInstance().post(tokenRequest, tokenPostBody.toLocal8Bit()); QNetworkReply* tokenReply = NetworkAccessManager::getInstance().post(tokenRequest, tokenPostBody.toLocal8Bit());
@ -3095,7 +3095,7 @@ QNetworkReply* DomainServer::profileRequestGivenTokenReply(QNetworkReply* tokenR
QNetworkRequest profileRequest(profileURL); QNetworkRequest profileRequest(profileURL);
profileRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); 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); return NetworkAccessManager::getInstance().get(profileRequest);
} }

View file

@ -52,7 +52,7 @@ endif()
def __init__(self, args): def __init__(self, args):
self.args = args self.args = args
self.configFilePath = os.path.join(args.build_root, 'qt.cmake') 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') self.assets_url = hifi_utils.readEnviromentVariableFromFile(args.build_root, 'EXTERNAL_BUILD_ASSETS')
# OS dependent information # OS dependent information
@ -62,7 +62,7 @@ endif()
system_qt = False system_qt = False
# Here we handle the 3 possible cases of dealing with Qt: # 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, # 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. # as it includes a required fix on Linux.
# #
@ -78,11 +78,11 @@ endif()
system_qt = True system_qt = True
print("Using system Qt") print("Using system Qt")
elif os.getenv('VIRCADIA_QT_PATH', "") != "": elif os.getenv('OVERTE_QT_PATH', "") != "":
# 2. Using an user-provided directory. # 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.fullPath = self.path
self.cmakePath = os.path.join(self.fullPath, 'lib', 'cmake') 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("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("https://github.com/overte-org/overte/tree/master/tools/qt-builder")
print("") 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.") print("You'll need to install the development packages, and to have Qt 5.15.0 or later.")
def writeConfig(self): def writeConfig(self):
@ -238,7 +238,7 @@ endif()
print('') print('')
print("If this is a recent distribution, dating from 2021 or so, you can try building") 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("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("") print("")
hifi_utils.color('clear') hifi_utils.color('clear')
print("If you'd like to try to build Qt from source either for building Overte, or") print("If you'd like to try to build Qt from source either for building Overte, or")

View file

@ -296,7 +296,7 @@ target_link_libraries(
${PLATFORM_QT_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") if (CMAKE_SYSTEM_NAME MATCHES "Linux")
# Linux # Linux
target_link_libraries(${TARGET_NAME} pthread atomic) target_link_libraries(${TARGET_NAME} pthread atomic)
@ -429,7 +429,7 @@ else()
endif() endif()
endif() endif()
if ("$ENV{VIRCADIA_USE_SYSTEM_QT}" STREQUAL "") if ("$ENV{OVERTE_USE_SYSTEM_QT}" STREQUAL "")
if (DEV_BUILD AND (APPLE OR UNIX)) if (DEV_BUILD AND (APPLE OR UNIX))
# create a qt.conf file to override hard-coded search paths in Qt libs # create a qt.conf file to override hard-coded search paths in Qt libs
set(QT_LIB_PATH "${QT_CMAKE_PREFIX_PATH}/../..") set(QT_LIB_PATH "${QT_CMAKE_PREFIX_PATH}/../..")

View file

@ -2645,7 +2645,7 @@ QString Application::getUserAgent() {
return userAgent; return userAgent;
} }
QString userAgent = NetworkingConstants::VIRCADIA_USER_AGENT + "/" + BuildInfo::VERSION + "; " QString userAgent = NetworkingConstants::OVERTE_USER_AGENT + "/" + BuildInfo::VERSION + "; "
+ QSysInfo::productType() + " " + QSysInfo::productVersion() + ")"; + QSysInfo::productType() + " " + QSysInfo::productVersion() + ")";
auto formatPluginName = [](QString name) -> QString { return name.trimmed().replace(" ", "-"); }; 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 // when --url in command line, teleport to location
if (!_urlParam.isEmpty()) { // Not sure if format supported by isValid(). if (!_urlParam.isEmpty()) { // Not sure if format supported by isValid().
if (_urlParam.scheme() == URL_SCHEME_VIRCADIAAPP) { if (_urlParam.scheme() == URL_SCHEME_OVERTEAPP) {
Setting::Handle<QVariant>("startUpApp").set(_urlParam.path()); Setting::Handle<QVariant>("startUpApp").set(_urlParam.path());
} else { } else {
addressLookupString = _urlParam.toString(); 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 this is a first run we short-circuit the address passed in
if (_firstRun.get()) { if (_firstRun.get()) {
if (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty()) { if (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty()) {
DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(NetworkingConstants::DEFAULT_VIRCADIA_ADDRESS); DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(NetworkingConstants::DEFAULT_OVERTE_ADDRESS);
Menu::getInstance()->triggerOption(MenuOption::HomeLocation); Menu::getInstance()->triggerOption(MenuOption::HomeLocation);
} }
@ -7268,7 +7268,7 @@ void Application::clearDomainOctreeDetails(bool clearAll) {
void Application::domainURLChanged(QUrl domainURL) { void Application::domainURLChanged(QUrl domainURL) {
// disable physics until we have enough information about our new location to not cause craziness. // 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()) { if (isServerlessMode()) {
loadServerlessDomain(domainURL); loadServerlessDomain(domainURL);
} }
@ -7277,7 +7277,7 @@ void Application::domainURLChanged(QUrl domainURL) {
void Application::goToErrorDomainURL(QUrl errorDomainURL) { void Application::goToErrorDomainURL(QUrl errorDomainURL) {
// disable physics until we have enough information about our new location to not cause craziness. // 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()) { if (isServerlessMode()) {
loadErrorDomain(errorDomainURL); loadErrorDomain(errorDomainURL);
} }
@ -7641,7 +7641,7 @@ bool Application::canAcceptURL(const QString& urlString) const {
QUrl url(urlString); QUrl url(urlString);
if (url.query().contains(WEB_VIEW_TAG)) { if (url.query().contains(WEB_VIEW_TAG)) {
return false; return false;
} else if (urlString.startsWith(URL_SCHEME_VIRCADIA)) { } else if (urlString.startsWith(URL_SCHEME_OVERTE)) {
return true; return true;
} }
QString lowerPath = url.path().toLower(); QString lowerPath = url.path().toLower();
@ -7656,7 +7656,7 @@ bool Application::canAcceptURL(const QString& urlString) const {
bool Application::acceptURL(const QString& urlString, bool defaultUpload) { bool Application::acceptURL(const QString& urlString, bool defaultUpload) {
QUrl url(urlString); 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 // this is a hifi URL - have the AddressManager handle it
QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString", QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString",
Qt::AutoConnection, Q_ARG(const QString&, urlString)); Qt::AutoConnection, Q_ARG(const QString&, urlString));
@ -7787,7 +7787,7 @@ bool Application::askToWearAvatarAttachmentUrl(const QString& url) {
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest networkRequest = QNetworkRequest(url); QNetworkRequest networkRequest = QNetworkRequest(url);
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); 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); QNetworkReply* reply = networkAccessManager.get(networkRequest);
int requestNumber = ++_avatarAttachmentRequest; int requestNumber = ++_avatarAttachmentRequest;
connect(reply, &QNetworkReply::finished, [this, reply, url, requestNumber]() { connect(reply, &QNetworkReply::finished, [this, reply, url, requestNumber]() {

View file

@ -466,7 +466,7 @@ int main(int argc, const char* argv[]) {
if (socket.waitForConnected(LOCAL_SERVER_TIMEOUT_MS)) { if (socket.waitForConnected(LOCAL_SERVER_TIMEOUT_MS)) {
if (parser.isSet(urlOption)) { if (parser.isSet(urlOption)) {
QUrl url = QUrl(parser.value(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_HTTP || url.scheme() == HIFI_URL_SCHEME_HTTPS
|| url.scheme() == HIFI_URL_SCHEME_FILE)) { || url.scheme() == HIFI_URL_SCHEME_FILE)) {
qDebug() << "Writing URL to local socket"; qDebug() << "Writing URL to local socket";

View file

@ -139,9 +139,9 @@ void WindowScriptingInterface::disconnectedFromDomain() {
void WindowScriptingInterface::openUrl(const QUrl& url) { void WindowScriptingInterface::openUrl(const QUrl& url) {
if (!url.isEmpty()) { if (!url.isEmpty()) {
auto scheme = url.scheme(); auto scheme = url.scheme();
if (scheme == URL_SCHEME_VIRCADIA) { if (scheme == URL_SCHEME_OVERTE) {
DependencyManager::get<AddressManager>()->handleLookupString(url.toString()); DependencyManager::get<AddressManager>()->handleLookupString(url.toString());
} else if (scheme == URL_SCHEME_VIRCADIAAPP) { } else if (scheme == URL_SCHEME_OVERTEAPP) {
DependencyManager::get<QmlCommerce>()->openSystemApp(url.path()); DependencyManager::get<QmlCommerce>()->openSystemApp(url.path());
} else { } else {
#if defined(Q_OS_ANDROID) #if defined(Q_OS_ANDROID)
@ -413,7 +413,7 @@ QString WindowScriptingInterface::checkVersion() {
} }
QString WindowScriptingInterface::getUserAgent() { QString WindowScriptingInterface::getUserAgent() {
return NetworkingConstants::VIRCADIA_USER_AGENT; return NetworkingConstants::OVERTE_USER_AGENT;
} }
QString WindowScriptingInterface::protocolSignature() { QString WindowScriptingInterface::protocolSignature() {

View file

@ -227,7 +227,7 @@ void ModelHandler::update() {
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest request(url); QNetworkRequest request(url);
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); 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); QNetworkReply* reply = networkAccessManager.head(request);
connect(reply, SIGNAL(finished()), SLOT(downloadFinished())); connect(reply, SIGNAL(finished()), SLOT(downloadFinished()));
} }
@ -280,7 +280,7 @@ void ModelHandler::queryNewFiles(QString marker) {
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest request(url); QNetworkRequest request(url);
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); 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); QNetworkReply* reply = networkAccessManager.get(request);
connect(reply, SIGNAL(finished()), SLOT(downloadFinished())); connect(reply, SIGNAL(finished()), SLOT(downloadFinished()));

View file

@ -51,7 +51,7 @@ void AutoUpdater::getLatestVersionData() {
QNetworkRequest latestVersionRequest(buildsURL); QNetworkRequest latestVersionRequest(buildsURL);
latestVersionRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); 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); QNetworkReply* reply = networkAccessManager.get(latestVersionRequest);
connect(reply, &QNetworkReply::finished, this, &AutoUpdater::parseLatestVersionData); connect(reply, &QNetworkReply::finished, this, &AutoUpdater::parseLatestVersionData);
} }

View file

@ -63,7 +63,7 @@ void JSBaker::loadScript() {
// setup the request to follow re-directs and always hit the network // setup the request to follow re-directs and always hit the network
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork); 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); networkRequest.setUrl(_jsURL);

View file

@ -160,7 +160,7 @@ void ModelBaker::saveSourceModel() {
// setup the request to follow re-directs and always hit the network // setup the request to follow re-directs and always hit the network
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork); 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); networkRequest.setUrl(_modelURL);

View file

@ -100,7 +100,7 @@ void TextureBaker::loadTexture() {
// setup the request to follow re-directs and always hit the network // setup the request to follow re-directs and always hit the network
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork); 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); networkRequest.setUrl(_textureURL);

View file

@ -1,9 +1,9 @@
set(TARGET_NAME gpu-gl) set(TARGET_NAME gpu-gl)
setup_hifi_library(Concurrent) setup_hifi_library(Concurrent)
link_hifi_libraries(shared gl gpu gpu-gl-common shaders) 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) target_link_libraries(${TARGET_NAME} pthread)
endif(UNIX AND NOT VIRCADIA_THREAD_DEBUGGING) endif(UNIX AND NOT OVERTE_THREAD_DEBUGGING)
GroupSources("src") GroupSources("src")
set(OpenGL_GL_PREFERENCE "GLVND") set(OpenGL_GL_PREFERENCE "GLVND")

View file

@ -254,7 +254,7 @@ hifi::VariantMultiHash FSTReader::downloadMapping(const QString& url) {
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest networkRequest = QNetworkRequest(url); QNetworkRequest networkRequest = QNetworkRequest(url);
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); 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); QNetworkReply* reply = networkAccessManager.get(networkRequest);
QEventLoop loop; QEventLoop loop;
QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit); QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);

View file

@ -58,7 +58,7 @@ const auto METAVERSE_SESSION_ID_HEADER = QString("HFM-SessionID").toLocal8Bit();
using UserAgentGetter = std::function<QString()>; using UserAgentGetter = std::function<QString()>;
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 { class AccountManager : public QObject, public Dependency {
Q_OBJECT Q_OBJECT

View file

@ -36,14 +36,14 @@ const QString REDIRECT_HIFI_ADDRESS = NetworkingConstants::REDIRECT_HIFI_ADDRESS
const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager"; const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager";
const QString SETTINGS_CURRENT_ADDRESS_KEY = "address"; 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 ? BuildInfo::PRELOADED_STARTUP_LOCATION
: NetworkingConstants::DEFAULT_VIRCADIA_ADDRESS; : NetworkingConstants::DEFAULT_OVERTE_ADDRESS;
const QString DEFAULT_HOME_ADDRESS = (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty()) const QString DEFAULT_HOME_ADDRESS = (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty())
? BuildInfo::PRELOADED_STARTUP_LOCATION ? BuildInfo::PRELOADED_STARTUP_LOCATION
: NetworkingConstants::DEFAULT_VIRCADIA_ADDRESS; : NetworkingConstants::DEFAULT_OVERTE_ADDRESS;
Setting::Handle<QUrl> currentAddressHandle(QStringList() << ADDRESS_MANAGER_SETTINGS_GROUP << "address", DEFAULT_VIRCADIA_ADDRESS); Setting::Handle<QUrl> currentAddressHandle(QStringList() << ADDRESS_MANAGER_SETTINGS_GROUP << "address", DEFAULT_OVERTE_ADDRESS);
bool AddressManager::isConnected() { bool AddressManager::isConnected() {
return DependencyManager::get<NodeList>()->getDomainHandler().isConnected(); return DependencyManager::get<NodeList>()->getDomainHandler().isConnected();
@ -56,7 +56,7 @@ QString AddressManager::getProtocol() const {
QUrl AddressManager::currentAddress(bool domainOnly) const { QUrl AddressManager::currentAddress(bool domainOnly) const {
QUrl hifiURL = _domainURL; QUrl hifiURL = _domainURL;
if (!domainOnly && hifiURL.scheme() == URL_SCHEME_VIRCADIA) { if (!domainOnly && hifiURL.scheme() == URL_SCHEME_OVERTE) {
hifiURL.setPath(currentPath()); hifiURL.setPath(currentPath());
} }
@ -65,7 +65,7 @@ QUrl AddressManager::currentAddress(bool domainOnly) const {
QUrl AddressManager::currentFacingAddress() const { QUrl AddressManager::currentFacingAddress() const {
auto hifiURL = currentAddress(); auto hifiURL = currentAddress();
if (hifiURL.scheme() == URL_SCHEME_VIRCADIA) { if (hifiURL.scheme() == URL_SCHEME_OVERTE) {
hifiURL.setPath(currentFacingPath()); 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 // if we have a shareable place name use that instead of whatever the current host is
QUrl hifiURL; QUrl hifiURL;
hifiURL.setScheme(URL_SCHEME_VIRCADIA); hifiURL.setScheme(URL_SCHEME_OVERTE);
hifiURL.setHost(_shareablePlaceName); hifiURL.setHost(_shareablePlaceName);
if (!domainOnly) { 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 // 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. // in a serverless domain (which can't be visited) return an empty URL.
QUrl shareableAddress = currentShareableAddress(domainOnly); QUrl shareableAddress = currentShareableAddress(domainOnly);
if (shareableAddress.scheme() != URL_SCHEME_VIRCADIA) { if (shareableAddress.scheme() != URL_SCHEME_OVERTE) {
return QUrl(); // file: urls aren't public return QUrl(); // file: urls aren't public
} }
return shareableAddress; return shareableAddress;
@ -103,7 +103,7 @@ QUrl AddressManager::currentPublicAddress(bool domainOnly) const {
QUrl AddressManager::currentFacingShareableAddress() const { QUrl AddressManager::currentFacingShareableAddress() const {
auto hifiURL = currentShareableAddress(); auto hifiURL = currentShareableAddress();
if (hifiURL.scheme() == URL_SCHEME_VIRCADIA) { if (hifiURL.scheme() == URL_SCHEME_OVERTE) {
hifiURL.setPath(currentFacingPath()); 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 // 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. // in a serverless domain (which can't be visited) return an empty URL.
QUrl shareableAddress = currentFacingShareableAddress(); QUrl shareableAddress = currentFacingShareableAddress();
if (shareableAddress.scheme() != URL_SCHEME_VIRCADIA) { if (shareableAddress.scheme() != URL_SCHEME_OVERTE) {
return QUrl(); // file: urls aren't public return QUrl(); // file: urls aren't public
} }
return shareableAddress; return shareableAddress;
@ -165,7 +165,7 @@ void AddressManager::storeCurrentAddress() {
if (url.scheme() == HIFI_URL_SCHEME_FILE || if (url.scheme() == HIFI_URL_SCHEME_FILE ||
url.scheme() == HIFI_URL_SCHEME_HTTP || url.scheme() == HIFI_URL_SCHEME_HTTPS || 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 // TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can
// be loaded over http(s) // be loaded over http(s)
// url.scheme() == HIFI_URL_SCHEME_HTTP || // 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("/")) { if (lookupUrl.scheme().isEmpty() && !lookupUrl.path().startsWith("/")) {
// 'urls' without schemes are taken as domain names, as opposed to // '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 // 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}(\\/.*)?"); static const QRegExp PORT_REGEX = QRegExp("\\d{1,5}(\\/.*)?");
if(!lookupUrl.scheme().isEmpty() && lookupUrl.host().isEmpty() && PORT_REGEX.exactMatch(lookupUrl.path())) { if(!lookupUrl.scheme().isEmpty() && lookupUrl.host().isEmpty() && PORT_REGEX.exactMatch(lookupUrl.path())) {
// this is in the form somewhere:<port>, convert it to hifi://somewhere:<port> // this is in the form somewhere:<port>, convert it to hifi://somewhere:<port>
lookupUrl = QUrl(URL_SCHEME_VIRCADIA + "://" + lookupUrl.toString()); lookupUrl = QUrl(URL_SCHEME_OVERTE + "://" + lookupUrl.toString());
} }
// it should be noted that url's in the form // it should be noted that url's in the form
// somewhere:<port> are not valid, as that // somewhere:<port> are not valid, as that
// would indicate that the scheme is 'somewhere' // would indicate that the scheme is 'somewhere'
// use hifi://somewhere:<port> instead // use hifi://somewhere:<port> 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; QString lookupUrlString;
if (lookupUrlInString.startsWith(URL_SCHEME_VIRCADIA + "://")) { if (lookupUrlInString.startsWith(URL_SCHEME_OVERTE + "://")) {
lookupUrlString = lookupUrlInString; lookupUrlString = lookupUrlInString;
} else { } else {
lookupUrlString = lookupUrl.toString(QUrl::FullyEncoded); lookupUrlString = lookupUrl.toString(QUrl::FullyEncoded);
@ -282,8 +282,8 @@ bool AddressManager::handleUrl(const QUrl& lookupUrlIn, LookupTrigger trigger, c
if (lookupUrl.host().isEmpty()) { if (lookupUrl.host().isEmpty()) {
// this was in the form hifi:/somewhere or hifi:somewhere. Fix it by making it hifi://somewhere // 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); static const QRegExp HIFI_SCHEME_REGEX = QRegExp(URL_SCHEME_OVERTE + ":\\/{0,2}", Qt::CaseInsensitive);
lookupUrl = QUrl(lookupUrl.toString().replace(HIFI_SCHEME_REGEX, URL_SCHEME_VIRCADIA + "://")); lookupUrl = QUrl(lookupUrl.toString().replace(HIFI_SCHEME_REGEX, URL_SCHEME_OVERTE + "://"));
} }
DependencyManager::get<NodeList>()->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::LookupAddress); DependencyManager::get<NodeList>()->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::LookupAddress);
@ -359,12 +359,12 @@ bool AddressManager::handleUrl(const QUrl& lookupUrlIn, LookupTrigger trigger, c
_previousAPILookup = lookupUrl; _previousAPILookup = lookupUrl;
// Let's convert this to a QString for processing in case there are spaces in it. // Let's convert this to a QString for processing in case there are spaces in it.
if (lookupUrlString.contains(URL_SCHEME_VIRCADIA + "://", Qt::CaseInsensitive)) { if (lookupUrlString.contains(URL_SCHEME_OVERTE + "://", Qt::CaseInsensitive)) {
lookupUrlString = lookupUrlString.replace((URL_SCHEME_VIRCADIA + "://"), ""); lookupUrlString = lookupUrlString.replace((URL_SCHEME_OVERTE + "://"), "");
} else if (lookupUrlString.contains(URL_SCHEME_VIRCADIA + ":/", Qt::CaseInsensitive)) { } else if (lookupUrlString.contains(URL_SCHEME_OVERTE + ":/", Qt::CaseInsensitive)) {
lookupUrlString = lookupUrlString.replace((URL_SCHEME_VIRCADIA + ":/"), ""); lookupUrlString = lookupUrlString.replace((URL_SCHEME_OVERTE + ":/"), "");
} else if (lookupUrlString.contains(URL_SCHEME_VIRCADIA + ":", Qt::CaseInsensitive)) { } else if (lookupUrlString.contains(URL_SCHEME_OVERTE + ":", Qt::CaseInsensitive)) {
lookupUrlString = lookupUrlString.replace((URL_SCHEME_VIRCADIA + ":"), ""); lookupUrlString = lookupUrlString.replace((URL_SCHEME_OVERTE + ":"), "");
} }
// Get the path and then strip it out. // 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 qCDebug(networking) << "Possible domain change required to connect to" << domainHostname
<< "on" << domainPort; << "on" << domainPort;
QUrl domainURL; QUrl domainURL;
domainURL.setScheme(URL_SCHEME_VIRCADIA); domainURL.setScheme(URL_SCHEME_OVERTE);
domainURL.setHost(domainHostname); domainURL.setHost(domainHostname);
if (domainPort > 0) { if (domainPort > 0) {
domainURL.setPort(domainPort); domainURL.setPort(domainPort);
@ -691,7 +691,7 @@ bool AddressManager::handleNetworkAddress(const QString& lookupString, LookupTri
emit lookupResultsFinished(); emit lookupResultsFinished();
QUrl domainURL; QUrl domainURL;
domainURL.setScheme(URL_SCHEME_VIRCADIA); domainURL.setScheme(URL_SCHEME_OVERTE);
domainURL.setHost(domainIPString); domainURL.setHost(domainIPString);
if (domainPort > 0) { if (domainPort > 0) {
domainURL.setPort(domainPort); domainURL.setPort(domainPort);
@ -714,7 +714,7 @@ bool AddressManager::handleNetworkAddress(const QString& lookupString, LookupTri
emit lookupResultsFinished(); emit lookupResultsFinished();
QUrl domainURL; QUrl domainURL;
domainURL.setScheme(URL_SCHEME_VIRCADIA); domainURL.setScheme(URL_SCHEME_OVERTE);
domainURL.setHost(domainHostname); domainURL.setHost(domainHostname);
if (domainPort > 0) { if (domainPort > 0) {
domainURL.setPort(domainPort); domainURL.setPort(domainPort);
@ -847,7 +847,7 @@ bool AddressManager::setHost(const QString& host, LookupTrigger trigger, quint16
addCurrentAddressToHistory(trigger); addCurrentAddressToHistory(trigger);
_domainURL = QUrl(); _domainURL = QUrl();
_domainURL.setScheme(URL_SCHEME_VIRCADIA); _domainURL.setScheme(URL_SCHEME_OVERTE);
_domainURL.setHost(host); _domainURL.setHost(host);
if (port > 0) { if (port > 0) {
_domainURL.setPort(port); _domainURL.setPort(port);
@ -884,7 +884,7 @@ bool AddressManager::setDomainInfo(const QUrl& domainURL, LookupTrigger trigger)
// clear any current place information // clear any current place information
_rootPlaceID = QUuid(); _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; qCDebug(networking) << "Possible domain change required to connect to domain at" << hostname << "on" << port;
} else { } else {
qCDebug(networking) << "Possible domain change required to serverless domain: " << domainURL.toString(); 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) { void AddressManager::goToEntry(LookupTrigger trigger) {
resetConfirmConnectWithoutAvatarEntities(); resetConfirmConnectWithoutAvatarEntities();
handleUrl(DEFAULT_VIRCADIA_ADDRESS, trigger); handleUrl(DEFAULT_OVERTE_ADDRESS, trigger);
} }
void AddressManager::goToUser(const QString& username, bool shouldMatchOrientation) { void AddressManager::goToUser(const QString& username, bool shouldMatchOrientation) {

View file

@ -24,7 +24,7 @@
#include "AccountManager.h" #include "AccountManager.h"
extern const QString REDIRECT_HIFI_ADDRESS; extern const QString REDIRECT_HIFI_ADDRESS;
extern const QString DEFAULT_VIRCADIA_ADDRESS; extern const QString DEFAULT_OVERTE_ADDRESS;
extern const QString DEFAULT_HOME_ADDRESS; extern const QString DEFAULT_HOME_ADDRESS;
const QString SANDBOX_HIFI_ADDRESS = "hifi://localhost"; const QString SANDBOX_HIFI_ADDRESS = "hifi://localhost";

View file

@ -82,7 +82,7 @@ void DomainAccountManager::requestAccessToken(const QString& username, const QSt
QNetworkRequest request; 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.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
// miniOrange WordPress API Authentication plugin: // miniOrange WordPress API Authentication plugin:

View file

@ -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 // some callers may pass a hostname, this is not to be used for lookup but for DTLS certificate verification
_domainURL = QUrl(); _domainURL = QUrl();
_domainURL.setScheme(URL_SCHEME_VIRCADIA); _domainURL.setScheme(URL_SCHEME_OVERTE);
_domainURL.setHost(hostname); _domainURL.setHost(hostname);
_domainURL.setPort(_sockAddr.getPort()); _domainURL.setPort(_sockAddr.getPort());
} }
@ -199,7 +199,7 @@ void DomainHandler::setUUID(const QUuid& uuid) {
void DomainHandler::setURLAndID(QUrl domainURL, QUuid domainID) { void DomainHandler::setURLAndID(QUrl domainURL, QUuid domainID) {
_pendingDomainID = domainID; _pendingDomainID = domainID;
if (domainURL.scheme() != URL_SCHEME_VIRCADIA) { if (domainURL.scheme() != URL_SCHEME_OVERTE) {
_sockAddr.clear(); _sockAddr.clear();
// if this is a file URL we need to see if it has a ~ for us to expand // 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 it's in the error state, reset and try again.
if (_domainURL != domainURL 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. || isServerless() // For reloading content in serverless domain.
|| _isInErrorState) { || _isInErrorState) {
// re-set the domain info so that auth information is reloaded // 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(); qCDebug(networking) << "Updated domain hostname to" << domainURL.host();
if (!domainURL.host().isEmpty()) { 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 // 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()); qCDebug(networking, "Looking up DS hostname %s.", domainURL.host().toLocal8Bit().constData());
QHostInfo::lookupHost(domainURL.host(), this, SLOT(completedHostnameLookup(const QHostInfo&))); QHostInfo::lookupHost(domainURL.host(), this, SLOT(completedHostnameLookup(const QHostInfo&)));
@ -303,7 +303,7 @@ void DomainHandler::setIceServerHostnameAndID(const QString& iceServerHostname,
void DomainHandler::activateICELocalSocket() { void DomainHandler::activateICELocalSocket() {
DependencyManager::get<NodeList>()->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SetDomainSocket); DependencyManager::get<NodeList>()->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SetDomainSocket);
_sockAddr = _icePeer.getLocalSocket(); _sockAddr = _icePeer.getLocalSocket();
_domainURL.setScheme(URL_SCHEME_VIRCADIA); _domainURL.setScheme(URL_SCHEME_OVERTE);
_domainURL.setHost(_sockAddr.getAddress().toString()); _domainURL.setHost(_sockAddr.getAddress().toString());
emit domainURLChanged(_domainURL); emit domainURLChanged(_domainURL);
emit completedSocketDiscovery(); emit completedSocketDiscovery();
@ -312,7 +312,7 @@ void DomainHandler::activateICELocalSocket() {
void DomainHandler::activateICEPublicSocket() { void DomainHandler::activateICEPublicSocket() {
DependencyManager::get<NodeList>()->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SetDomainSocket); DependencyManager::get<NodeList>()->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SetDomainSocket);
_sockAddr = _icePeer.getPublicSocket(); _sockAddr = _icePeer.getPublicSocket();
_domainURL.setScheme(URL_SCHEME_VIRCADIA); _domainURL.setScheme(URL_SCHEME_OVERTE);
_domainURL.setHost(_sockAddr.getAddress().toString()); _domainURL.setHost(_sockAddr.getAddress().toString());
emit domainURLChanged(_domainURL); emit domainURLChanged(_domainURL);
emit completedSocketDiscovery(); 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 // FIXME: Reinstate the requestDomainSettings() call here in version 2021.2.0 instead of having it in
// NodeList::processDomainList(). // 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 // we've connected to new domain - time to ask it for global settings
requestDomainSettings(); requestDomainSettings();
} }

View file

@ -45,9 +45,9 @@ const unsigned short DEFAULT_DOMAIN_SERVER_PORT =
const unsigned short DEFAULT_DOMAIN_SERVER_WS_PORT = const unsigned short DEFAULT_DOMAIN_SERVER_WS_PORT =
QProcessEnvironment::systemEnvironment() QProcessEnvironment::systemEnvironment()
.contains("VIRCADIA_DOMAIN_SERVER_WS_PORT") .contains("OVERTE_DOMAIN_SERVER_WS_PORT")
? QProcessEnvironment::systemEnvironment() ? QProcessEnvironment::systemEnvironment()
.value("VIRCADIA_DOMAIN_SERVER_WS_PORT") .value("OVERTE_DOMAIN_SERVER_WS_PORT")
.toUShort() .toUShort()
: 40102; // TCP : 40102; // TCP
@ -77,17 +77,17 @@ const quint16 DOMAIN_SERVER_HTTPS_PORT =
const quint16 DOMAIN_SERVER_EXPORTER_PORT = const quint16 DOMAIN_SERVER_EXPORTER_PORT =
QProcessEnvironment::systemEnvironment() QProcessEnvironment::systemEnvironment()
.contains("VIRCADIA_DOMAIN_SERVER_EXPORTER_PORT") .contains("OVERTE_DOMAIN_SERVER_EXPORTER_PORT")
? QProcessEnvironment::systemEnvironment() ? QProcessEnvironment::systemEnvironment()
.value("VIRCADIA_DOMAIN_SERVER_EXPORTER_PORT") .value("OVERTE_DOMAIN_SERVER_EXPORTER_PORT")
.toUInt() .toUInt()
: 9703; : 9703;
const quint16 DOMAIN_SERVER_METADATA_EXPORTER_PORT = const quint16 DOMAIN_SERVER_METADATA_EXPORTER_PORT =
QProcessEnvironment::systemEnvironment() QProcessEnvironment::systemEnvironment()
.contains("VIRCADIA_DOMAIN_SERVER_METADATA_EXPORTER_PORT") .contains("OVERTE_DOMAIN_SERVER_METADATA_EXPORTER_PORT")
? QProcessEnvironment::systemEnvironment() ? QProcessEnvironment::systemEnvironment()
.value("VIRCADIA_DOMAIN_SERVER_METADATA_EXPORTER_PORT") .value("OVERTE_DOMAIN_SERVER_METADATA_EXPORTER_PORT")
.toUInt() .toUInt()
: 9704; : 9704;
@ -146,7 +146,7 @@ public:
void setCanConnectWithoutAvatarEntities(bool canConnect); void setCanConnectWithoutAvatarEntities(bool canConnect);
bool canConnectWithoutAvatarEntities(); bool canConnectWithoutAvatarEntities();
bool isServerless() const { return _domainURL.scheme() != URL_SCHEME_VIRCADIA; } bool isServerless() const { return _domainURL.scheme() != URL_SCHEME_OVERTE; }
bool getInterstitialModeEnabled() const; bool getInterstitialModeEnabled() const;
void setInterstitialModeEnabled(bool enableInterstitialMode); void setInterstitialModeEnabled(bool enableInterstitialMode);

View file

@ -133,7 +133,7 @@ private:
{ Bucket::HF_Public, QUrl(NetworkingConstants::HF_PUBLIC_CDN_URL) }, { Bucket::HF_Public, QUrl(NetworkingConstants::HF_PUBLIC_CDN_URL) },
{ Bucket::HF_Content, QUrl(NetworkingConstants::HF_CONTENT_CDN_URL) }, { Bucket::HF_Content, QUrl(NetworkingConstants::HF_CONTENT_CDN_URL) },
{ Bucket::HF_Marketplace, QUrl(NetworkingConstants::HF_MPASSETS_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) }
}; };
}; };

View file

@ -55,7 +55,7 @@ void HTTPResourceRequest::doSend() {
QNetworkRequest networkRequest(_url); QNetworkRequest networkRequest(_url);
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
if (_cacheEnabled) { if (_cacheEnabled) {
networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache); networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);

View file

@ -37,7 +37,7 @@ namespace NetworkingConstants {
const QStringList IS_AUTHABLE_HOSTNAME = { "overte.org" }; const QStringList IS_AUTHABLE_HOSTNAME = { "overte.org" };
// Use a custom User-Agent to avoid ModSecurity filtering, e.g. by hosting providers. // 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 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"; 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_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_PUBLIC_CDN_URL = "https://cdn-1.vircadia.com/eu-c-1/vircadia-public/";
const QString HF_MARKETPLACE_CDN_HOSTNAME = "mpassets.highfidelity.com"; 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 #if USE_STABLE_GLOBAL_SERVICES
const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.overte.org"; 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_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 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 DEFAULT_HOME_ADDRESS = "file:///~/serverless/tutorial.json";
const QString REDIRECT_HIFI_ADDRESS = "file:///~/serverless/redirect.json"; const QString REDIRECT_HIFI_ADDRESS = "file:///~/serverless/redirect.json";
} }
const QString HIFI_URL_SCHEME_ABOUT = "about"; const QString HIFI_URL_SCHEME_ABOUT = "about";
const QString URL_SCHEME_VIRCADIA = "hifi"; const QString URL_SCHEME_OVERTE = "hifi";
const QString URL_SCHEME_VIRCADIAAPP = "hifiapp"; const QString URL_SCHEME_OVERTEAPP = "hifiapp";
const QString URL_SCHEME_DATA = "data"; const QString URL_SCHEME_DATA = "data";
const QString URL_SCHEME_QRC = "qrc"; const QString URL_SCHEME_QRC = "qrc";
const QString HIFI_URL_SCHEME_FILE = "file"; const QString HIFI_URL_SCHEME_FILE = "file";

View file

@ -834,7 +834,7 @@ void NodeList::processDomainList(QSharedPointer<ReceivedMessage> message) {
// FIXME: Remove this call to requestDomainSettings() and reinstate the one in DomainHandler::setIsConnected(), in version // 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.) // 2021.2.0. (New protocol version implies a domain server upgrade.)
if (!_domainHandler.isConnected() 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 // 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 // canRezAvatarEntities permission above before using the permissions in determining whether or not to connect without
// avatar entities rezzing below. // avatar entities rezzing below.

View file

@ -39,7 +39,7 @@ QNetworkReply* OAuthNetworkAccessManager::createRequest(QNetworkAccessManager::O
&& req.url().host() == MetaverseAPI::getCurrentMetaverseServerURL().host()) { && req.url().host() == MetaverseAPI::getCurrentMetaverseServerURL().host()) {
QNetworkRequest authenticatedRequest(req); QNetworkRequest authenticatedRequest(req);
authenticatedRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); 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, authenticatedRequest.setRawHeader(ACCESS_TOKEN_AUTHORIZATION_HEADER,
accountManager->getAccountInfo().getAccessToken().authorizationHeaderValue()); accountManager->getAccountInfo().getAccessToken().authorizationHeaderValue());

View file

@ -163,7 +163,7 @@ bool ResourceManager::resourceExists(const QUrl& url) {
QNetworkRequest request{ url }; QNetworkRequest request{ url };
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); 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); auto reply = networkAccessManager.head(request);

View file

@ -30,7 +30,7 @@ QNetworkReply* getStatus() {
auto& networkAccessManager = NetworkAccessManager::getInstance(); auto& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest sandboxStatus(SANDBOX_STATUS_URL); QNetworkRequest sandboxStatus(SANDBOX_STATUS_URL);
sandboxStatus.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); 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); return networkAccessManager.get(sandboxStatus);
} }

View file

@ -97,7 +97,7 @@ Font::Pointer Font::load(const QString& family) {
QNetworkRequest networkRequest; QNetworkRequest networkRequest;
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
networkRequest.setUrl(family); networkRequest.setUrl(family);
auto networkReply = networkAccessManager.get(networkRequest); auto networkReply = networkAccessManager.get(networkRequest);

View file

@ -2405,7 +2405,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
QString currentDomain = DependencyManager::get<AddressManager>()->getDomainURL().host(); QString currentDomain = DependencyManager::get<AddressManager>()->getDomainURL().host();
QString domainSafeIP = nodeList->getDomainHandler().getHostname(); QString domainSafeIP = nodeList->getDomainHandler().getHostname();
QString domainSafeURL = URL_SCHEME_VIRCADIA + "://" + currentDomain; QString domainSafeURL = URL_SCHEME_OVERTE + "://" + currentDomain;
for (const auto& str : safeURLPrefixes) { for (const auto& str : safeURLPrefixes) {
if (domainSafeURL.startsWith(str) || domainSafeIP.startsWith(str)) { if (domainSafeURL.startsWith(str) || domainSafeIP.startsWith(str)) {
qCDebug(scriptengine) << whitelistPrefix << "Whitelist Bypassed, entire domain is whitelisted. Current Domain Host: " qCDebug(scriptengine) << whitelistPrefix << "Whitelist Bypassed, entire domain is whitelisted. Current Domain Host: "

View file

@ -192,7 +192,7 @@ void ScriptsModel::requestDefaultFiles(QString marker) {
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest request(url); QNetworkRequest request(url);
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); 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); QNetworkReply* reply = networkAccessManager.get(request);
connect(reply, SIGNAL(finished()), SLOT(downloadFinished())); connect(reply, SIGNAL(finished()), SLOT(downloadFinished()));
} }

View file

@ -62,7 +62,7 @@ void XMLHttpRequestClass::abort() {
} }
void XMLHttpRequestClass::setRequestHeader(const QString& name, const QString& value) { 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())); _request.setRawHeader(QByteArray(name.toLatin1()), QByteArray(value.toLatin1()));
} }

View file

@ -45,7 +45,7 @@ LogHandler& LogHandler::getInstance() {
} }
LogHandler::LogHandler() { LogHandler::LogHandler() {
QString logOptions = qgetenv("VIRCADIA_LOG_OPTIONS").toLower(); QString logOptions = qgetenv("OVERTE_LOG_OPTIONS").toLower();
#ifdef Q_OS_UNIX #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) // 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; _useJournald = true;
#endif #endif
parseOptions(logOptions, "VIRCADIA_LOG_OPTIONS"); parseOptions(logOptions, "OVERTE_LOG_OPTIONS");
} }
const char* stringForLogType(LogMsgType msgType) { const char* stringForLogType(LogMsgType msgType) {

View file

@ -8,17 +8,17 @@ set -x
# group in container to match the docker.sock GID mounted from the host. # group in container to match the docker.sock GID mounted from the host.
if [ -f /var/lib/overte/.local -a "$(id -u)" = "0" ]; then if [ -f /var/lib/overte/.local -a "$(id -u)" = "0" ]; then
# realign gid # realign gid
THIS_VIRCADIA_GID=`ls -ngd /var/lib/overte/.local | cut -f3 -d' '` THIS_OVERTE_GID=`ls -ngd /var/lib/overte/.local | cut -f3 -d' '`
CUR_VIRCADIA_GID=`getent group overte | cut -f3 -d: || true` CUR_OVERTE_GID=`getent group overte | cut -f3 -d: || true`
if [ ! -z "$THIS_VIRCADIA_GID" -a "$THIS_VIRCADIA_GID" != "$CUR_VIRCADIA_GID" ]; then if [ ! -z "$THIS_OVERTE_GID" -a "$THIS_OVERTE_GID" != "$CUR_OVERTE_GID" ]; then
groupmod -g ${THIS_VIRCADIA_GID} -o overte groupmod -g ${THIS_OVERTE_GID} -o overte
fi fi
# realign pid # realign pid
THIS_VIRCADIA_PID=`ls -nd /var/lib/overte/.local | cut -f3 -d' '` THIS_OVERTE_PID=`ls -nd /var/lib/overte/.local | cut -f3 -d' '`
CUR_VIRCADIA_PID=`getent passwd overte | cut -f3 -d: || true` CUR_OVERTE_PID=`getent passwd overte | cut -f3 -d: || true`
if [ ! -z "$THIS_VIRCADIA_PID" -a "$THIS_VIRCADIA_PID" != "$CUR_VIRCADIA_PID" ]; then if [ ! -z "$THIS_OVERTE_PID" -a "$THIS_OVERTE_PID" != "$CUR_OVERTE_PID" ]; then
usermod -u ${THIS_VIRCADIA_PID} -o overte usermod -u ${THIS_OVERTE_PID} -o overte
fi fi
if ! groups overte | grep -q overte; then if ! groups overte | grep -q overte; then

View file

@ -1,51 +1,51 @@
#!/bin/sh #!/bin/sh
if [ "$VIRCADIA" = "" ]; then if [ "$OVERTE" = "" ]; then
VIRCADIA=`realpath ../..` OVERTE=`realpath ../..`
fi fi
GITSRC=`git -C $VIRCADIA/source config --get remote.origin.url | cut -d':' -f 2` GITSRC=`git -C $OVERTE/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"` 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 $VIRCADIA/source rev-parse HEAD | cut -c 1-7` GITCOMMIT=`git -C $OVERTE/source rev-parse HEAD | cut -c 1-7`
sudo apt-get install chrpath binutils sudo apt-get install chrpath binutils
DOCK_BUILD_ROOT=temp-make-dock DOCK_BUILD_ROOT=temp-make-dock
rm -r temp-make-dock rm -r temp-make-dock
mkdir -p $DOCK_BUILD_ROOT mkdir -p $DOCK_BUILD_ROOT
cp $VIRCADIA/source/pkg-scripts/Dockerfile.templ $DOCK_BUILD_ROOT/Dockerfile cp $OVERTE/source/pkg-scripts/Dockerfile.templ $DOCK_BUILD_ROOT/Dockerfile
cp $VIRCADIA/source/pkg-scripts/docker-entrypoint.sh $DOCK_BUILD_ROOT/entrypoint.sh cp $OVERTE/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/docker-overte-supervisor.conf $DOCK_BUILD_ROOT/overte.conf
# copy the files over # copy the files over
mkdir -p $DOCK_BUILD_ROOT/opt mkdir -p $DOCK_BUILD_ROOT/opt
cp $VIRCADIA/build/assignment-client/assignment-client $DOCK_BUILD_ROOT/opt cp $OVERTE/build/assignment-client/assignment-client $DOCK_BUILD_ROOT/opt
cp $VIRCADIA/build/domain-server/domain-server $DOCK_BUILD_ROOT/opt cp $OVERTE/build/domain-server/domain-server $DOCK_BUILD_ROOT/opt
cp $VIRCADIA/build/tools/oven/oven $DOCK_BUILD_ROOT/opt cp $OVERTE/build/tools/oven/oven $DOCK_BUILD_ROOT/opt
#cp $VIRCADIA/build/ice-server/ice-server $DOCK_BUILD_ROOT/opt #cp $OVERTE/build/ice-server/ice-server $DOCK_BUILD_ROOT/opt
strip --strip-all $DOCK_BUILD_ROOT/opt/* strip --strip-all $DOCK_BUILD_ROOT/opt/*
chrpath -d $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 strip --strip-all $DOCK_BUILD_ROOT/opt/plugins/*.so
chrpath -d $DOCK_BUILD_ROOT/opt/plugins/*.so chrpath -d $DOCK_BUILD_ROOT/opt/plugins/*.so
strip --strip-all $DOCK_BUILD_ROOT/opt/plugins/*/*.so strip --strip-all $DOCK_BUILD_ROOT/opt/plugins/*/*.so
chrpath -d $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 -name ".gitignore" -delete
find $DOCK_BUILD_ROOT/opt/resources -type f -executable -exec sh -c 'chmod -x {}' \; find $DOCK_BUILD_ROOT/opt/resources -type f -executable -exec sh -c 'chmod -x {}' \;
mkdir -p $DOCK_BUILD_ROOT/lib mkdir -p $DOCK_BUILD_ROOT/lib
cp $VIRCADIA/build/libraries/*/*.so $DOCK_BUILD_ROOT/lib cp $OVERTE/build/libraries/*/*.so $DOCK_BUILD_ROOT/lib
cp $VIRCADIA/qt5-install/lib/libQt5Network.so.*.*.* $DOCK_BUILD_ROOT/lib cp $OVERTE/qt5-install/lib/libQt5Network.so.*.*.* $DOCK_BUILD_ROOT/lib
cp $VIRCADIA/qt5-install/lib/libQt5Core.so.*.*.* $DOCK_BUILD_ROOT/lib cp $OVERTE/qt5-install/lib/libQt5Core.so.*.*.* $DOCK_BUILD_ROOT/lib
cp $VIRCADIA/qt5-install/lib/libQt5Widgets.so.*.*.* $DOCK_BUILD_ROOT/lib cp $OVERTE/qt5-install/lib/libQt5Widgets.so.*.*.* $DOCK_BUILD_ROOT/lib
cp $VIRCADIA/qt5-install/lib/libQt5Gui.so.*.*.* $DOCK_BUILD_ROOT/lib cp $OVERTE/qt5-install/lib/libQt5Gui.so.*.*.* $DOCK_BUILD_ROOT/lib
cp $VIRCADIA/qt5-install/lib/libQt5Script.so.*.*.* $DOCK_BUILD_ROOT/lib cp $OVERTE/qt5-install/lib/libQt5Script.so.*.*.* $DOCK_BUILD_ROOT/lib
cp $VIRCADIA/qt5-install/lib/libQt5WebSockets.so.*.*.* $DOCK_BUILD_ROOT/lib cp $OVERTE/qt5-install/lib/libQt5WebSockets.so.*.*.* $DOCK_BUILD_ROOT/lib
cp $VIRCADIA/qt5-install/lib/libQt5Qml.so.*.*.* $DOCK_BUILD_ROOT/lib cp $OVERTE/qt5-install/lib/libQt5Qml.so.*.*.* $DOCK_BUILD_ROOT/lib
cp $VIRCADIA/qt5-install/lib/libQt5ScriptTools.so.*.*.* $DOCK_BUILD_ROOT/lib cp $OVERTE/qt5-install/lib/libQt5ScriptTools.so.*.*.* $DOCK_BUILD_ROOT/lib
chmod +x $DOCK_BUILD_ROOT/lib/* chmod +x $DOCK_BUILD_ROOT/lib/*
strip --strip-all $DOCK_BUILD_ROOT/lib/* strip --strip-all $DOCK_BUILD_ROOT/lib/*
chrpath -d $DOCK_BUILD_ROOT/lib/* chrpath -d $DOCK_BUILD_ROOT/lib/*

View file

@ -128,7 +128,7 @@ def main():
qt.installQt() qt.installQt()
qt.writeConfig() qt.writeConfig()
else: else:
if (os.environ["VIRCADIA_USE_SYSTEM_QT"]): if (os.environ["OVERTE_USE_SYSTEM_QT"]):
print("System Qt selected") print("System Qt selected")
else: else:
raise Exception("Internal error: System Qt not selected, but hifi_qt.py failed to return a cmake path") raise Exception("Internal error: System Qt not selected, but hifi_qt.py failed to return a cmake path")

View file

@ -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) { function getRandomFloat(min, max) {
return Math.random() * (max - min) + min; return Math.random() * (max - min) + min;

View file

@ -29,9 +29,9 @@
lightTimeoutID = undefined, lightTimeoutID = undefined,
audioInjector = null; audioInjector = null;
var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
var cannonSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "philip/cannonShot.wav"); var cannonSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "philip/cannonShot.wav");
var explosionSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "philip/explosion.wav"); var explosionSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "philip/explosion.wav");
var NO_SHOOT_COLOR = { red: 100, green: 100, blue: 100 }; var NO_SHOOT_COLOR = { red: 100, green: 100, blue: 100 };

View file

@ -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 panelWall = false;
var orbShell = 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 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_PANEL_WALL_URL = OVERTE_PUBLIC_CDN + "models/sets/Lobby/PanelWallForInterface.fbx";
var LOBBY_BLANK_PANEL_TEXTURE_URL = VIRCADIA_PUBLIC_CDN + "models/sets/Lobby/Texture.jpg"; var LOBBY_BLANK_PANEL_TEXTURE_URL = OVERTE_PUBLIC_CDN + "models/sets/Lobby/Texture.jpg";
var LOBBY_SHELL_URL = VIRCADIA_PUBLIC_CDN + "models/sets/Lobby/LobbyShellForInterface.fbx"; 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 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 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 elevatorInjector = null;
var currentMuzakInjector = null; var currentMuzakInjector = null;
var currentSound = null; var currentSound = null;

View file

@ -20,7 +20,7 @@ var blocks = [];
var blockSpawner; 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, { var floorPos = Vec3.sum(MyAvatar.position, {
@ -62,7 +62,7 @@ var offButton = Overlays.addOverlay("image", {
y: screenSize.y - (BUTTON_SIZE + PADDING), y: screenSize.y - (BUTTON_SIZE + PADDING),
width: BUTTON_SIZE, width: BUTTON_SIZE,
height: BUTTON_SIZE, height: BUTTON_SIZE,
imageURL: VIRCADIA_PUBLIC_CDN + "images/close.png", imageURL: OVERTE_PUBLIC_CDN + "images/close.png",
color: { color: {
red: 255, red: 255,
green: 255, green: 255,
@ -76,7 +76,7 @@ var deleteButton = Overlays.addOverlay("image", {
y: screenSize.y - (BUTTON_SIZE + PADDING), y: screenSize.y - (BUTTON_SIZE + PADDING),
width: BUTTON_SIZE, width: BUTTON_SIZE,
height: BUTTON_SIZE, height: BUTTON_SIZE,
imageURL: VIRCADIA_PUBLIC_CDN + "images/delete.png", imageURL: OVERTE_PUBLIC_CDN + "images/delete.png",
color: { color: {
red: 255, red: 255,
green: 255, green: 255,

View file

@ -16,11 +16,11 @@ Script.include([
"libraries/overlayManager.js", "libraries/overlayManager.js",
]); ]);
var BG_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/card-bg.svg"; var BG_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/card-bg.svg";
var CLOSE_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/tools/close.svg"; var CLOSE_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/tools/close.svg";
var MIC_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/tools/mic-toggle.svg"; var MIC_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/tools/mic-toggle.svg";
var FACE_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/tools/face-toggle.svg"; var FACE_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/tools/face-toggle.svg";
var ADDRESS_BAR_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/tools/address-bar-toggle.svg"; var ADDRESS_BAR_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/tools/address-bar-toggle.svg";
var panel = new OverlayPanel({ var panel = new OverlayPanel({
anchorPositionBinding: { avatar: "MyAvatar" }, anchorPositionBinding: { avatar: "MyAvatar" },

View file

@ -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) { function length(v) {
return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z); 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 // 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 // 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(); var chords = new Array();
// Nylon string guitar // Nylon string guitar
chords[1] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+A.raw"); chords[1] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+A.raw");
chords[2] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+B.raw"); chords[2] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+B.raw");
chords[3] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+E.raw"); chords[3] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+E.raw");
chords[4] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+G.raw"); chords[4] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+G.raw");
// Electric guitar // Electric guitar
chords[5] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+A+short.raw"); chords[5] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+A+short.raw");
chords[6] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+B+short.raw"); chords[6] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+B+short.raw");
chords[7] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+E+short.raw"); chords[7] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+E+short.raw");
chords[8] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+G+short.raw"); chords[8] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+G+short.raw");
// Steel Guitar // Steel Guitar
chords[9] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+A.raw"); chords[9] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+A.raw");
chords[10] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+B.raw"); chords[10] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+B.raw");
chords[11] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+E.raw"); chords[11] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+E.raw");
chords[12] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+G.raw"); chords[12] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+G.raw");
var NUM_CHORDS = 4; var NUM_CHORDS = 4;
var NUM_GUITARS = 3; var NUM_GUITARS = 3;

View file

@ -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) { function length(v) {
return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z); 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 // First, load two percussion sounds to be used on the sticks
var drum1 = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Drums/RackTomHi.raw"); var drum1 = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Drums/RackTomHi.raw");
var drum2 = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Drums/RackTomLo.raw"); var drum2 = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Drums/RackTomLo.raw");
// State Machine: // State Machine:
// 0 = not triggered // 0 = not triggered

View file

@ -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"); Script.include("../../libraries/toolBars.js");
const LEFT_PALM = 0; 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 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 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 = []; var simulatedFrisbees = [];

View file

@ -23,7 +23,7 @@ Script.include("../../libraries/constants.js");
Script.include("../../libraries/toolBars.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 LASER_WIDTH = 2;
var POSE_CONTROLS = [ Controller.Standard.LeftHand, Controller.Standard.RightHand ]; 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 MIN_THROWER_DELAY = 1000;
var MAX_THROWER_DELAY = 1000; var MAX_THROWER_DELAY = 1000;
var RELOAD_INTERVAL = 5; 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 BULLET_VELOCITY = 10.0;
var GUN_OFFSETS = [ { var GUN_OFFSETS = [ {
x: -0.04, x: -0.04,
@ -85,11 +85,11 @@ function getRandomFloat(min, max) {
var showScore = false; var showScore = false;
// Load some sound to use for loading and firing // Load some sound to use for loading and firing
var fireSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guns/GUN-SHOT2.raw"); var fireSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guns/GUN-SHOT2.raw");
var loadSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guns/Gun_Reload_Weapon22.raw"); var loadSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guns/Gun_Reload_Weapon22.raw");
var impactSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guns/BulletImpact2.raw"); var impactSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Guns/BulletImpact2.raw");
var targetHitSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/hit.raw"); var targetHitSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/hit.raw");
var targetLaunchSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/shoot.raw"); var targetLaunchSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/shoot.raw");
var audioOptions = { var audioOptions = {
volume: 0.9 volume: 0.9
@ -119,7 +119,7 @@ var toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.gun.toolbar",
var offButton = toolBar.addOverlay("image", { var offButton = toolBar.addOverlay("image", {
width: BUTTON_SIZE, width: BUTTON_SIZE,
height: BUTTON_SIZE, height: BUTTON_SIZE,
imageURL: VIRCADIA_PUBLIC_CDN + "images/gun/close.svg", imageURL: OVERTE_PUBLIC_CDN + "images/gun/close.svg",
alpha: 1 alpha: 1
}); });
@ -129,7 +129,7 @@ var platformButton = toolBar.addOverlay("image", {
y: screenSize.y - (BUTTON_SIZE + PADDING), y: screenSize.y - (BUTTON_SIZE + PADDING),
width: BUTTON_SIZE, width: BUTTON_SIZE,
height: 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 alpha: 1
}); });
@ -139,7 +139,7 @@ var gridButton = toolBar.addOverlay("image", {
y: screenSize.y - (BUTTON_SIZE + PADDING), y: screenSize.y - (BUTTON_SIZE + PADDING),
width: BUTTON_SIZE, width: BUTTON_SIZE,
height: 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 alpha: 1
}); });

View file

@ -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"); hitSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav");
var rightHandAnimation = VIRCADIA_PUBLIC_CDN + "animations/RightHandAnimPhilip.fbx"; var rightHandAnimation = OVERTE_PUBLIC_CDN + "animations/RightHandAnimPhilip.fbx";
var leftHandAnimation = VIRCADIA_PUBLIC_CDN + "animations/LeftHandAnimPhilip.fbx"; var leftHandAnimation = OVERTE_PUBLIC_CDN + "animations/LeftHandAnimPhilip.fbx";
var BALL_SIZE = 0.08; var BALL_SIZE = 0.08;
var PADDLE_SIZE = 0.20; var PADDLE_SIZE = 0.20;
@ -44,7 +44,7 @@ var offButton = Overlays.addOverlay("image", {
y: 96, y: 96,
width: 32, width: 32,
height: 32, height: 32,
imageURL: VIRCADIA_PUBLIC_CDN + "images/close.png", imageURL: OVERTE_PUBLIC_CDN + "images/close.png",
color: { red: 255, green: 255, blue: 255}, color: { red: 255, green: 255, blue: 255},
alpha: 1 alpha: 1
}); });

View file

@ -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... // maybe we should make these constants...
var LEFT_PALM = 0; 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 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 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; var targetRadius = 0.25;

View file

@ -72,7 +72,7 @@ function Instructions(imageURL, originalWidth, originalHeight) {
this.rescale(); 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; var firstControllerPlugged = false;
@ -86,7 +86,7 @@ var locationURL = "";
var randomSounds = new SoundArray({}, true); var randomSounds = new SoundArray({}, true);
var numberOfSounds = 7; var numberOfSounds = 7;
for (var i = 1; i <= numberOfSounds; i++) { 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) { function appendChar(char) {

View file

@ -38,7 +38,7 @@ var textSizeMeasureOverlay = Overlays.addOverlay("text3d", {visible: false});
var randomSounds = new SoundArray({}, true); var randomSounds = new SoundArray({}, true);
var numberOfSounds = 7; var numberOfSounds = 7;
for (var i = 1; i <= numberOfSounds; i++) { 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) { function appendChar(char) {

View file

@ -12,7 +12,7 @@
Script.include("http://s3.amazonaws.com/hifi-public/scripts/libraries/toolBars.js"); 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, dimensions: TABLE_DIMENSIONS,
rotation: MyAvatar.orientation, rotation: MyAvatar.orientation,
// color: { red: 102, green: 51, blue: 0 }, // 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" collisionSoundURL: "http://public.highfidelity.io/sounds/dice/diceCollide.wav"
}); });

View file

@ -11,15 +11,15 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
Script.include(VIRCADIA_PUBLIC_CDN + "scripts/libraries/toolBars.js"); Script.include(OVERTE_PUBLIC_CDN + "scripts/libraries/toolBars.js");
Script.include(VIRCADIA_PUBLIC_CDN + "scripts/libraries/utils.js"); Script.include(OVERTE_PUBLIC_CDN + "scripts/libraries/utils.js");
var rotation = Quat.safeEulerAngles(Camera.getOrientation()); var rotation = Quat.safeEulerAngles(Camera.getOrientation());
rotation = Quat.fromPitchYawRollDegrees(0, rotation.y, 0); rotation = Quat.fromPitchYawRollDegrees(0, rotation.y, 0);
var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1, Quat.getFront(rotation))); 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_ON = 1.0;
var ALPHA_OFF = 0.7; var ALPHA_OFF = 0.7;
var COLOR_TOOL_BAR = { red: 0, green: 0, blue: 0 }; var COLOR_TOOL_BAR = { red: 0, green: 0, blue: 0 };

View file

@ -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 CHANCE_OF_PLAYING_SOUND = 0.01;
var FACTOR = 0.05; var FACTOR = 0.05;

View file

@ -15,12 +15,12 @@
// Declare HiFi public bucket. // 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. // Declare variables and set up new WebWindow.
var stream; var stream;
var volume = 1; 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. // Set up toggleStreamURLButton overlay.
var toggleStreamURLButton = Overlays.addOverlay("text", { var toggleStreamURLButton = Overlays.addOverlay("text", {

View file

@ -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 modelURL = OVERTE_PUBLIC_CDN + "models/entities/radio/Speakers.fbx";
var soundURL = VIRCADIA_PUBLIC_CDN + "sounds/family.stereo.raw"; var soundURL = OVERTE_PUBLIC_CDN + "sounds/family.stereo.raw";
var AudioRotationOffset = Quat.fromPitchYawRollDegrees(0, -90, 0); var AudioRotationOffset = Quat.fromPitchYawRollDegrees(0, -90, 0);
var audioOptions = { var audioOptions = {

View file

@ -1,6 +1,6 @@
var var
var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
var SOUND_PATH = VIRCADIA_PUBLIC_CDN + "sounds/Collisions-hitsandslaps/"; var SOUND_PATH = OVERTE_PUBLIC_CDN + "sounds/Collisions-hitsandslaps/";
var soundURLS = ["67LCollision01.wav", "67LCollision02.wav", "airhockey_hit1.wav"]; var soundURLS = ["67LCollision01.wav", "67LCollision02.wav", "airhockey_hit1.wav"];
var FLOOR_SIZE = 10; var FLOOR_SIZE = 10;
var center = Vec3.sum(MyAvatar.position, Vec3.multiply(FLOOR_SIZE * 1.5, Quat.getFront(Camera.getOrientation()))); 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), y: screenSize.y - (BUTTON_SIZE + PADDING),
width: BUTTON_SIZE, width: BUTTON_SIZE,
height: BUTTON_SIZE, height: BUTTON_SIZE,
imageURL: VIRCADIA_PUBLIC_CDN + "images/blocks.png", imageURL: OVERTE_PUBLIC_CDN + "images/blocks.png",
color: buttonOffColor, color: buttonOffColor,
alpha: 1 alpha: 1
}); });

View file

@ -11,8 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var OVERTE_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
Script.include(VIRCADIA_PUBLIC_CDN + 'scripts/utilities.js') Script.include(OVERTE_PUBLIC_CDN + 'scripts/utilities.js')
var NUM_ROWS = 10; var NUM_ROWS = 10;
var CUBE_SIZE = 1; var CUBE_SIZE = 1;

View file

@ -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 count = 0;
var moveUntil = 2000; var moveUntil = 2000;
@ -38,7 +38,7 @@ type: "Model",
green: 255, green: 255,
blue: 0 }, blue: 0 },
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/Feisar_Ship.FBX", modelURL: OVERTE_PUBLIC_CDN + "meshes/Feisar_Ship.FBX",
rotation: rotation rotation: rotation

View file

@ -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 count = 0;
var stopAfter = 1000; var stopAfter = 1000;
@ -27,7 +27,7 @@ var modelPropertiesA = {
y: 3.34, y: 3.34,
z: 0.54 z: 0.54
}, },
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/Feisar_Ship.FBX", modelURL: OVERTE_PUBLIC_CDN + "meshes/Feisar_Ship.FBX",
lifetime: 20 lifetime: 20
}; };

View file

@ -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 count = 0;
var stopAfter = 1000; var stopAfter = 1000;

View file

@ -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 count = 0;
var stopAfter = 600; var stopAfter = 600;

View file

@ -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 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 screenSize = Controller.getViewportDimensions();
var BUTTON_SIZE = 32; var BUTTON_SIZE = 32;
var PADDING = 3; var PADDING = 3;
@ -114,7 +114,7 @@ var deleteButton = Overlays.addOverlay("image", {
y: screenSize.y - (BUTTON_SIZE * 2 + PADDING), y: screenSize.y - (BUTTON_SIZE * 2 + PADDING),
width: BUTTON_SIZE, width: BUTTON_SIZE,
height: BUTTON_SIZE, height: BUTTON_SIZE,
imageURL: VIRCADIA_PUBLIC_CDN + "images/delete.png", imageURL: OVERTE_PUBLIC_CDN + "images/delete.png",
color: { color: {
red: 255, red: 255,
green: 255, green: 255,
@ -128,7 +128,7 @@ var spawnButton = Overlays.addOverlay("image", {
y: screenSize.y - (BUTTON_SIZE * 2 + PADDING), y: screenSize.y - (BUTTON_SIZE * 2 + PADDING),
width: BUTTON_SIZE, width: BUTTON_SIZE,
height: BUTTON_SIZE, height: BUTTON_SIZE,
imageURL: VIRCADIA_PUBLIC_CDN + "images/puck.png", imageURL: OVERTE_PUBLIC_CDN + "images/puck.png",
color: { color: {
red: 255, red: 255,
green: 255, green: 255,

View file

@ -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 tableParts = [];
var balls = []; var balls = [];
@ -34,18 +34,18 @@ var cuePosition;
var startStroke = 0; var startStroke = 0;
// Sounds to use // 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); 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 screenSize = Controller.getViewportDimensions();
var reticle = Overlays.addOverlay("image", { var reticle = Overlays.addOverlay("image", {
x: screenSize.x / 2 - 16, x: screenSize.x / 2 - 16,
y: screenSize.y / 2 - 16, y: screenSize.y / 2 - 16,
width: 32, width: 32,
height: 32, height: 32,
imageURL: VIRCADIA_PUBLIC_CDN + "images/billiardsReticle.png", imageURL: OVERTE_PUBLIC_CDN + "images/billiardsReticle.png",
color: { red: 255, green: 255, blue: 255}, color: { red: 255, green: 255, blue: 255},
alpha: 1 alpha: 1
}); });

View file

@ -15,14 +15,14 @@
/*jslint vars: true*/ /*jslint vars: true*/
var Overlays, Entities, Controller, Script, MyAvatar, Vec3; // Referenced globals provided by High Fidelity. 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", { var rezButton = Overlays.addOverlay("image", {
x: 100, x: 100,
y: 350, y: 350,
width: 32, width: 32,
height: 32, height: 32,
imageURL: VIRCADIA_PUBLIC_CDN + "images/close.png", imageURL: OVERTE_PUBLIC_CDN + "images/close.png",
color: { color: {
red: 255, red: 255,
green: 255, green: 255,

View file

@ -10,7 +10,7 @@
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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'); Script.include('/~/system/libraries/toolBars.js');
@ -190,7 +190,7 @@ PlankyStack = function() {
if (!_this.ground) { if (!_this.ground) {
_this.ground = Entities.addEntity({ _this.ground = Entities.addEntity({
type: 'Model', type: 'Model',
modelURL: VIRCADIA_PUBLIC_CDN + 'eric/models/woodFloor.fbx', modelURL: OVERTE_PUBLIC_CDN + 'eric/models/woodFloor.fbx',
dimensions: _this.options.baseDimension, dimensions: _this.options.baseDimension,
position: Vec3.sum(_this.basePosition, {y: -(_this.options.baseDimension.y / 2)}), position: Vec3.sum(_this.basePosition, {y: -(_this.options.baseDimension.y / 2)}),
rotation: _this.baseRotation, rotation: _this.baseRotation,
@ -247,7 +247,7 @@ PlankyStack = function() {
}); });
var newProperties = { var newProperties = {
type: 'Model', type: 'Model',
modelURL: VIRCADIA_PUBLIC_CDN + 'marketplace/hificontent/Games/blocks/block.fbx', modelURL: OVERTE_PUBLIC_CDN + 'marketplace/hificontent/Games/blocks/block.fbx',
shapeType: 'box', shapeType: 'box',
name: 'PlankyBlock' + layer + '-' + row, 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}), 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({ button = toolBar.addTool({
width: BUTTON_DIMENSIONS.width, width: BUTTON_DIMENSIONS.width,
height: BUTTON_DIMENSIONS.height, 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, alpha: 0.8,
visible: true visible: true
}); });
@ -342,7 +342,7 @@ button = toolBar.addTool({
cogButton = toolBar.addTool({ cogButton = toolBar.addTool({
width: BUTTON_DIMENSIONS.width, width: BUTTON_DIMENSIONS.width,
height: BUTTON_DIMENSIONS.height, 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 }, subImage: { x: 0, y: BUTTON_DIMENSIONS.height, width: BUTTON_DIMENSIONS.width, height: BUTTON_DIMENSIONS.height },
alpha: 0.8, alpha: 0.8,
visible: true visible: true

View file

@ -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; var iteration = 0;
@ -94,13 +94,13 @@ var maxInvaderRowOffset=stepsToGround;
var myMissile; var myMissile;
// sounds // sounds
var hitSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/hit.raw"); var hitSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/hit.raw");
var shootSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/shoot.raw"); var shootSound = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/shoot.raw");
var moveSounds = new Array(); var moveSounds = new Array();
moveSounds[0] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/Lo1.raw"); moveSounds[0] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/Lo1.raw");
moveSounds[1] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/Lo2.raw"); moveSounds[1] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/Lo2.raw");
moveSounds[2] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/Lo3.raw"); moveSounds[2] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/Lo3.raw");
moveSounds[3] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/Lo4.raw"); moveSounds[3] = SoundCache.getSound(OVERTE_PUBLIC_CDN + "sounds/Space%20Invaders/Lo4.raw");
var currentMoveSound = 0; var currentMoveSound = 0;
var numberOfSounds = 4; var numberOfSounds = 4;
var stepsPerSound = invaderStepsPerCycle / numberOfSounds; var stepsPerSound = invaderStepsPerCycle / numberOfSounds;
@ -111,36 +111,36 @@ var soundInMyHead = true;
// models... // models...
var invaderModels = new Array(); var invaderModels = new Array();
invaderModels[0] = { invaderModels[0] = {
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx", modelURL: OVERTE_PUBLIC_CDN + "meshes/space_invader.fbx",
modelScale: 450, modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 }, modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
}; };
invaderModels[1] = { invaderModels[1] = {
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx", modelURL: OVERTE_PUBLIC_CDN + "meshes/space_invader.fbx",
modelScale: 450, modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 }, modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
}; };
invaderModels[2] = { invaderModels[2] = {
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx", modelURL: OVERTE_PUBLIC_CDN + "meshes/space_invader.fbx",
modelScale: 450, modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 }, modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
}; };
invaderModels[3] = { invaderModels[3] = {
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx", modelURL: OVERTE_PUBLIC_CDN + "meshes/space_invader.fbx",
modelScale: 450, modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 }, modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
}; };
invaderModels[4] = { invaderModels[4] = {
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx", modelURL: OVERTE_PUBLIC_CDN + "meshes/space_invader.fbx",
modelScale: 450, modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 }, modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
}; };
//modelURL: VIRCADIA_PUBLIC_CDN + "meshes/Feisar_Ship.FBX", //modelURL: OVERTE_PUBLIC_CDN + "meshes/Feisar_Ship.FBX",
//modelURL: VIRCADIA_PUBLIC_CDN + "meshes/invader.svo", //modelURL: OVERTE_PUBLIC_CDN + "meshes/invader.svo",
// VIRCADIA_PUBLIC_CDN + "meshes/spaceInvader3.fbx" // OVERTE_PUBLIC_CDN + "meshes/spaceInvader3.fbx"
function initializeMyShip() { function initializeMyShip() {
myShipProperties = { myShipProperties = {
@ -151,7 +151,7 @@ function initializeMyShip() {
damping: 0, damping: 0,
dimensions: { x: shipSize * 2, y: shipSize * 2, z: shipSize * 2 }, dimensions: { x: shipSize * 2, y: shipSize * 2, z: shipSize * 2 },
color: { red: 0, green: 255, blue: 0 }, 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 lifetime: itemLifetimes
}; };
myShip = Entities.addEntity(myShipProperties); myShip = Entities.addEntity(myShipProperties);

View file

@ -9,7 +9,7 @@
var Camera, Vec3, Quat, Entities, Script; // Globals defined by HiFi, var'ed here to keep jslint happy. var Camera, Vec3, Quat, Entities, Script; // Globals defined by HiFi, var'ed here to keep jslint happy.
var 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 SOUND_BUCKET = "http://public.highfidelity.io/sounds/Collisions-hitsandslaps/";
var MAX_ANGULAR_SPEED = Math.PI; var MAX_ANGULAR_SPEED = Math.PI;
var N_EACH_OBJECTS = 3; var N_EACH_OBJECTS = 3;
@ -23,8 +23,8 @@ function makeAll() {
right = Vec3.multiply(0.6, Quat.getRight(Camera.getOrientation())), right = Vec3.multiply(0.6, Quat.getRight(Camera.getOrientation())),
currentDimensions, currentDimensions,
data = [ data = [
["models/props/Dice/goldDie.fbx", VIRCADIA_PUBLIC_CDN + "sounds/dice/diceCollide.wav"], ["models/props/Dice/goldDie.fbx", OVERTE_PUBLIC_CDN + "sounds/dice/diceCollide.wav"],
["models/props/Pool/ball_8.fbx", VIRCADIA_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav"], ["models/props/Pool/ball_8.fbx", OVERTE_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav"],
["eric/models/woodFloor.fbx", SOUND_BUCKET + "67LCollision05.wav"] ["eric/models/woodFloor.fbx", SOUND_BUCKET + "67LCollision05.wav"]
]; ];
currentPosition = Vec3.sum(currentPosition, Vec3.multiply(-1 * data.length * N_EACH_OBJECTS / 2, right)); currentPosition = Vec3.sum(currentPosition, Vec3.multiply(-1 * data.length * N_EACH_OBJECTS / 2, right));
@ -36,7 +36,7 @@ function makeAll() {
} }
thisEntity = Entities.addEntity({ thisEntity = Entities.addEntity({
type: "Model", type: "Model",
modelURL: VIRCADIA_PUBLIC_CDN + model, modelURL: OVERTE_PUBLIC_CDN + model,
collisionSoundURL: sound, collisionSoundURL: sound,
dynamic: true, dynamic: true,
shapeType: "box", shapeType: "box",

View file

@ -14,9 +14,9 @@ Script.include([
"../../libraries/overlayManager.js", "../../libraries/overlayManager.js",
]); ]);
var BG_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/card-bg.svg"; var BG_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/card-bg.svg";
var RED_DOT_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/red-dot.svg"; var RED_DOT_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/red-dot.svg";
var BLUE_SQUARE_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/blue-square.svg"; var BLUE_SQUARE_IMAGE_URL = OVERTE_PUBLIC_CDN + "images/blue-square.svg";
var mainPanel = new OverlayPanel({ var mainPanel = new OverlayPanel({
anchorPositionBinding: { avatar: "MyAvatar" }, anchorPositionBinding: { avatar: "MyAvatar" },