mirror of
https://github.com/AleziaKurdis/overte.git
synced 2025-04-05 14:51:52 +02:00
Rebranding and fixing URLs
This commit is contained in:
parent
619e36e9a9
commit
9b6d202a21
122 changed files with 273 additions and 274 deletions
2
.github/workflows/master_build.yml
vendored
2
.github/workflows/master_build.yml
vendored
|
|
@ -74,7 +74,7 @@ jobs:
|
|||
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 "::set-output name=symbols_archive::${BUILD_NUMBER}-${{ matrix.build_type }}-mac-symbols.zip"
|
||||
echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV
|
||||
echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV
|
||||
fi
|
||||
# Windows build variables
|
||||
if [ "${{ matrix.os }}" = "windows-2019" ]; then
|
||||
|
|
|
|||
6
.github/workflows/pr_build.yml
vendored
6
.github/workflows/pr_build.yml
vendored
|
|
@ -110,7 +110,7 @@ jobs:
|
|||
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
|
||||
fi
|
||||
echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV
|
||||
echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV
|
||||
fi
|
||||
# Windows build variables
|
||||
if [ "${{ matrix.os }}" = "windows-2019" ]; then
|
||||
|
|
@ -226,9 +226,9 @@ jobs:
|
|||
fi
|
||||
|
||||
if [ ${{ env.CI_WORKSPACE }} ]; then
|
||||
find "$CI_WORKSPACE/vircadia-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
|
||||
find "$CI_WORKSPACE/overte-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
|
||||
else
|
||||
find "$HOME/vircadia-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
|
||||
find "$HOME/overte-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
|
||||
fi
|
||||
|
||||
- name: Archive cmake logs
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ If Android Studio pops open the "Plugin Update Recommeded" dialog, do not click
|
|||
## Environment
|
||||
|
||||
### Create a keystore in Android Studio
|
||||
Follow the directions [here](https://developer.android.com/studio/publish/app-signing#generate-key) to create a keystore file. You can save it anywhere (preferably not in the `vircadia` folder).
|
||||
Follow the directions [here](https://developer.android.com/studio/publish/app-signing#generate-key) to create a keystore file. You can save it anywhere (preferably not in the `overte` folder).
|
||||
|
||||
### Set up machine specific Gradle properties
|
||||
|
||||
|
|
@ -87,12 +87,12 @@ SUPPRESS_QUEST_FRAME_PLAYER
|
|||
|
||||
* Open Android Studio
|
||||
* Choose _Open an existing Android Studio project_
|
||||
* Navigate to the `vircadia` repository that had you cloned and choose the `android` folder and select _OK_
|
||||
* Navigate to the `overte` repository that had you cloned and choose the `android` folder and select _OK_
|
||||
* Wait for Gradle to sync (this should take around 20 minutes the first time)
|
||||
* If a dialog pops open saying "Plugin Update Recommeded" dialog, do not click update, just click X on the top right to close.
|
||||
* In the _Project_ window click on the project you wish to build (i.e. "questInterface") then click _Build_ in the top menu and choose _Make Module 'questInterface'_
|
||||
* By default this will build the "debug" apk, you can change this by opening the _Build Variants_ window along the left side and select other build types such as "release".
|
||||
* Your newly build APK should reside in `vircadia\android\apps\questInterface\release` (if you chose release).
|
||||
* Your newly build APK should reside in `overte\android\apps\questInterface\release` (if you chose release).
|
||||
|
||||
### Running a Module
|
||||
|
||||
|
|
@ -140,7 +140,7 @@ With your start menu, search for 'Edit the System Environment Variables' and ope
|
|||
|
||||
Some things you can try if you want to do a clean build
|
||||
|
||||
* Delete the `build` and `.externalNativeBuild` folders from the folder for each module you're building (for example, `vircadia/android/apps/interface`)
|
||||
* Delete the `build` and `.externalNativeBuild` folders from the folder for each module you're building (for example, `overte/android/apps/interface`)
|
||||
* If you have set your `HIFI_VCPKG_ROOT` environment variable, delete the contents of that directory; otherwise, delete `AppData/Local/Temp/hifi`
|
||||
* In Android Studio, click _File > Invalidate Caches / Restart_ and select _Invalidate and Restart_
|
||||
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ Prepare makefiles:
|
|||
cmake ..
|
||||
```
|
||||
|
||||
If cmake fails with a vcpkg error, then delete `~/vircadia-files/vcpkg/`.
|
||||
If cmake fails with a vcpkg error, then delete `~/overte-files/vcpkg/`.
|
||||
|
||||
#### Server
|
||||
|
||||
|
|
@ -190,4 +190,4 @@ Go to "localhost" in the running Interface to visit your newly launched Domain s
|
|||
If your goal is to set up a development environment, it is desirable to set the directory that vcpkg builds into with the `HIFI_VCPKG_BASE` environment variable.
|
||||
For example, you might set `HIFI_VCPKG_BASE` to `/home/$USER/vcpkg`.
|
||||
|
||||
By default, vcpkg will build in the `~/vircadia-files/vcpkg/` directory.
|
||||
By default, vcpkg will build in the `~/overte-files/vcpkg/` directory.
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer
|
|||
cmake ../ -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G Xcode -DOSX_SDK=10.12 ..
|
||||
```
|
||||
|
||||
After running CMake, you will have the make files or Xcode project file necessary to build all of the components. Open the `vircadia.xcodeproj` file, choose `ALL_BUILD` from the Product > Scheme menu (or target drop down), and click Run.
|
||||
After running CMake, you will have the make files or Xcode project file necessary to build all of the components. Open the `overte.xcodeproj` file, choose `ALL_BUILD` from the Product > Scheme menu (or target drop down), and click Run.
|
||||
|
||||
If the build completes successfully, you will have built targets for all components located in the `build/${target_name}/Debug` directories.
|
||||
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ Where `%VIRCADIA_DIR%` is the directory for the Overte repository.
|
|||
|
||||
## Step 8. Making a Build
|
||||
|
||||
Open `%VIRCADIA_DIR%\build\vircadia.sln` using Visual Studio.
|
||||
Open `%VIRCADIA_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.
|
||||
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ endif()
|
|||
|
||||
option(VCPKG_APPLOCAL_DEPS OFF)
|
||||
|
||||
project(vircadia)
|
||||
project(overte)
|
||||
include("cmake/init.cmake")
|
||||
include("cmake/compiler.cmake")
|
||||
option(VCPKG_APPLOCAL_DEPS OFF)
|
||||
|
|
@ -391,20 +391,20 @@ GroupSources("unpublishedScripts")
|
|||
unset(JS_SRC)
|
||||
|
||||
# Include Overte Web app files if cloned into a subdirectory.
|
||||
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web")
|
||||
file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*)
|
||||
list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" )
|
||||
add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC})
|
||||
GroupSources("vircadia-web")
|
||||
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/overte-web")
|
||||
file(GLOB_RECURSE WEB_APP_SRC overte-web/*.*)
|
||||
list(FILTER WEB_APP_SRC EXCLUDE REGEX "overte-web/(dist|node_modules|public)/*" )
|
||||
overte(overte-web SOURCES ${WEB_APP_SRC})
|
||||
GroupSources("overte-web")
|
||||
unset(WEB_APP_SRC)
|
||||
endif()
|
||||
|
||||
# Include Overte Web SDK files if cloned into a subdirectory.
|
||||
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web-sdk")
|
||||
file(GLOB_RECURSE WEB_SDK_SRC vircadia-web-sdk/*.*)
|
||||
list(FILTER WEB_SDK_SRC EXCLUDE REGEX "vircadia-web-sdk/(dist|node_modules|public)/*" )
|
||||
add_custom_target(vircadia-web-sdk SOURCES ${WEB_SDK_SRC})
|
||||
GroupSources("vircadia-web-sdk")
|
||||
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/overte-web-sdk")
|
||||
file(GLOB_RECURSE WEB_SDK_SRC overte-web-sdk/*.*)
|
||||
list(FILTER WEB_SDK_SRC EXCLUDE REGEX "overte-web-sdk/(dist|node_modules|public)/*" )
|
||||
add_custom_target(overte-web-sdk SOURCES ${WEB_SDK_SRC})
|
||||
GroupSources("overte-web-sdk")
|
||||
unset(WEB_SDK_SRC)
|
||||
endif()
|
||||
|
||||
|
|
@ -471,7 +471,7 @@ endif()
|
|||
if (BUILD_CLIENT)
|
||||
add_subdirectory(interface)
|
||||
if (APPLE)
|
||||
set_target_properties(Vircadia PROPERTIES FOLDER "Apps")
|
||||
set_target_properties(Overte PROPERTIES FOLDER "Apps")
|
||||
else()
|
||||
set_target_properties(interface PROPERTIES FOLDER "Apps")
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ For code signing to work, you will need to set the `HF_PFX_FILE` and `HF_PFX_PAS
|
|||
#### Creating the Installer
|
||||
|
||||
1. Perform a clean cmake from a new terminal.
|
||||
1. Open the `vircadia.sln` solution with elevated (administrator) permissions on Visual Studio and select the **Release** configuration.
|
||||
1. Open the `overte.sln` solution with elevated (administrator) permissions on Visual Studio and select the **Release** configuration.
|
||||
1. Build the solution.
|
||||
1. Build `packaged-server-console-npm-install` (found under **hidden/Server Console**)
|
||||
1. Build `packaged-server-console` (found under **Server Console**)
|
||||
|
|
@ -140,7 +140,7 @@ rm -rf *
|
|||
```
|
||||
Add `PRODUCTION_BUILD=1` to below command for release and release candidate builds.
|
||||
```bash
|
||||
VIRCADIA_USE_SYSTEM_QT=true cmake .. -DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DVCPKG_BUILD_TYPE=release -DSERVER_ONLY=true -DBUILD_TOOLS=true
|
||||
OVERTE_USE_SYSTEM_QT=true cmake .. -DOVERTE_CPU_ARCHITECTURE=-msse3 -DVCPKG_BUILD_TYPE=release -DSERVER_ONLY=true -DBUILD_TOOLS=true
|
||||
```
|
||||
|
||||
4. Build
|
||||
|
|
@ -179,7 +179,7 @@ rm -rf *
|
|||
```
|
||||
Add `PRODUCTION_BUILD=1` to below command for release and release candidate builds.
|
||||
```bash
|
||||
VIRCADIA_USE_SYSTEM_QT=true cmake .. -DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DVCPKG_BUILD_TYPE=release -DSERVER_ONLY=true -DBUILD_TOOLS=true
|
||||
OVERTE_USE_SYSTEM_QT=true cmake .. -DOVERTE_CPU_ARCHITECTURE=-msse3 -DVCPKG_BUILD_TYPE=release -DSERVER_ONLY=true -DBUILD_TOOLS=true
|
||||
```
|
||||
|
||||
4. Build
|
||||
|
|
|
|||
|
|
@ -43,20 +43,20 @@ Overte is a 3D social software project seeking to incrementally bring about a tr
|
|||
- [For Windows](https://github.com/overte-org/overte/blob/master/BUILD_WIN.md)
|
||||
- [For Mac](https://github.com/overte-org/overte/blob/master/BUILD_OSX.md)
|
||||
- [For Linux](https://github.com/overte-org/overte/blob/master/BUILD_LINUX.md)
|
||||
- [For Linux - Vircadia Builder](https://github.com/overte-org/overte-builder)
|
||||
- [For Linux - Overte Builder](https://github.com/overte-org/overte-builder)
|
||||
|
||||
#### How to build a Server
|
||||
|
||||
- [For Windows](https://github.com/overte-org/overte/blob/master/BUILD_WIN.md)
|
||||
- [For Linux](https://github.com/overte-org/overte/blob/master/BUILD_LINUX.md)
|
||||
- [For Linux - Vircadia Builder](https://github.com/overte-org/overte-builder)
|
||||
- [For Linux - Overte Builder](https://github.com/overte-org/overte-builder)
|
||||
|
||||
#### How to generate an Installer
|
||||
|
||||
- [For Windows - Interface & Server](https://github.com/overte-org/overte/blob/master/INSTALLER.md)
|
||||
- [For Mac - Interface](https://github.com/overte-org/overte/blob/master/INSTALLER.md#os-x)
|
||||
- [For Linux - Server .deb - Vircadia Builder](INSTALLER.md#ubuntu-1804--deb)
|
||||
- [For Linux - Interface AppImage - Vircadia Builder](https://github.com/overte-org/overte-builder/blob/master/README.md#building-appimages)
|
||||
- [For Linux - Server .deb - Overte Builder](INSTALLER.md#ubuntu-1804--deb)
|
||||
- [For Linux - Interface AppImage - Overte Builder](https://github.com/overte-org/overte-builder/blob/master/README.md#building-appimages)
|
||||
|
||||
### Boot to Metaverse: The Goal
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ ext {
|
|||
|
||||
def appDir = new File(projectDir, 'apps/interface')
|
||||
def jniFolder = new File(appDir, 'src/main/jniLibs/arm64-v8a')
|
||||
def baseUrl = 'https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dependencies/android/'
|
||||
def baseUrl = 'https://build-deps.overte.org/dependencies/android/'
|
||||
def breakpadDumpSymsDir = new File("${appDir}/build/tmp/breakpadDumpSyms")
|
||||
|
||||
task extractGvrBinaries() {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ fi
|
|||
ANDROID_APP=interface
|
||||
ANDROID_OUTPUT_DIR=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_TYPE}
|
||||
ANDROID_OUTPUT_FILE=${ANDROID_APP}-${ANDROID_BUILD_TYPE}.apk
|
||||
ANDROID_APK_NAME=Vircadia-${ANDROID_APK_SUFFIX}
|
||||
ANDROID_APK_NAME=Overte-${ANDROID_APK_SUFFIX}
|
||||
./gradlew -PHIFI_ANDROID_PRECOMPILED=${HIFI_ANDROID_PRECOMPILED} -PVERSION_CODE=${VERSION_CODE} -PRELEASE_NUMBER=${RELEASE_NUMBER} -PRELEASE_TYPE=${RELEASE_TYPE} ${ANDROID_APP}:${ANDROID_BUILD_TARGET}
|
||||
cp ${ANDROID_OUTPUT_DIR}/${ANDROID_OUTPUT_FILE} ./${ANDROID_APK_NAME}
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ cp ${ANDROID_OUTPUT_DIR}/${ANDROID_OUTPUT_FILE} ./${ANDROID_APK_NAME}
|
|||
ANDROID_APP=questInterface
|
||||
ANDROID_OUTPUT_DIR=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_TYPE}
|
||||
ANDROID_OUTPUT_FILE=${ANDROID_APP}-${ANDROID_BUILD_TYPE}.apk
|
||||
ANDROID_APK_NAME=Vircadia-Quest-Alpha-${ANDROID_APK_SUFFIX}
|
||||
ANDROID_APK_NAME=Overte-Quest-Alpha-${ANDROID_APK_SUFFIX}
|
||||
./gradlew -PHIFI_ANDROID_PRECOMPILED=${HIFI_ANDROID_PRECOMPILED} -PVERSION_CODE=${VERSION_CODE} -PRELEASE_NUMBER=${RELEASE_NUMBER} -PRELEASE_TYPE=${RELEASE_TYPE} ${ANDROID_APP}:${ANDROID_BUILD_TARGET} || true
|
||||
cp ${ANDROID_OUTPUT_DIR}/${ANDROID_OUTPUT_FILE} ./${ANDROID_APK_NAME}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
set -xeuo pipefail
|
||||
|
||||
DOCKER_IMAGE_NAME="vircadia_androidbuild"
|
||||
DOCKER_IMAGE_NAME="overte_androidbuild"
|
||||
|
||||
docker build --build-arg BUILD_UID=`id -u` -t "${DOCKER_IMAGE_NAME}" -f ./android/docker/Dockerfile ./android/docker
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ test -z "$STABLE_BUILD" && export STABLE_BUILD=0
|
|||
docker run \
|
||||
--rm \
|
||||
--security-opt seccomp:unconfined \
|
||||
-v "${WORKSPACE}":/home/gha/vircadia \
|
||||
-v "${WORKSPACE}":/home/gha/overte \
|
||||
-e RELEASE_NUMBER \
|
||||
-e RELEASE_TYPE \
|
||||
-e ANDROID_APP \
|
||||
|
|
|
|||
|
|
@ -62,8 +62,8 @@ RUN echo "gha ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
|
|||
USER gha
|
||||
WORKDIR /home/gha
|
||||
|
||||
# Vircadia dependencies
|
||||
ENV HIFI_BASE="/home/gha/vircadia_android"
|
||||
# Overte dependencies
|
||||
ENV HIFI_BASE="/home/gha/overte_android"
|
||||
ENV HIFI_ANDROID_PRECOMPILED="$HIFI_BASE/dependencies"
|
||||
ENV HIFI_VCPKG_BASE="$HIFI_BASE/vcpkg"
|
||||
|
||||
|
|
@ -72,17 +72,17 @@ RUN mkdir "$HIFI_BASE" && \
|
|||
mkdir "$HIFI_ANDROID_PRECOMPILED"
|
||||
|
||||
# Download the repo
|
||||
RUN git clone https://github.com/vircadia/vircadia.git
|
||||
RUN git clone https://github.com/overte-org/overte.git
|
||||
|
||||
WORKDIR /home/gha/vircadia
|
||||
WORKDIR /home/gha/overte
|
||||
|
||||
RUN mkdir build
|
||||
|
||||
# Pre-cache the vcpkg managed dependencies
|
||||
WORKDIR /home/gha/vircadia/build
|
||||
WORKDIR /home/gha/overte/build
|
||||
RUN python3 ../prebuild.py --build-root `pwd` --android interface
|
||||
|
||||
# Pre-cache the gradle dependencies
|
||||
WORKDIR /home/gha/vircadia/android
|
||||
WORKDIR /home/gha/overte/android
|
||||
RUN ./gradlew -m tasks -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED
|
||||
#RUN ./gradlew extractDependencies -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ buildscript {
|
|||
|
||||
|
||||
def file='gvrsdk_v1.101.0.tgz'
|
||||
def url='https://cdn-1.vircadia.com/eu-c-1/vircadia-public/austin/android/' + file
|
||||
def url='https://build-deps.overte.org/dependencies/android/' + file
|
||||
def destFile = new File(HIFI_ANDROID_PRECOMPILED, file)
|
||||
|
||||
// FIXME find a way to only download if the file doesn't exist
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ macro(SET_PACKAGING_PARAMETERS)
|
|||
set(SERVER_COMPONENT server)
|
||||
|
||||
if (APPLE)
|
||||
set(INTERFACE_BUNDLE_NAME "Vircadia")
|
||||
set(INTERFACE_BUNDLE_NAME "Overte")
|
||||
else()
|
||||
set(INTERFACE_BUNDLE_NAME "interface")
|
||||
endif()
|
||||
|
|
@ -188,7 +188,7 @@ macro(SET_PACKAGING_PARAMETERS)
|
|||
set(INTERFACE_SHORTCUT_NAME "Overte")
|
||||
set(CONSOLE_SHORTCUT_NAME "Console")
|
||||
set(SANDBOX_SHORTCUT_NAME "Server")
|
||||
set(APP_USER_MODEL_ID "com.vircadia.console")
|
||||
set(APP_USER_MODEL_ID "com.overte.console")
|
||||
else ()
|
||||
set(INTERFACE_SHORTCUT_NAME "Overte - ${BUILD_VERSION_NO_SHA}")
|
||||
set(CONSOLE_SHORTCUT_NAME "Console - ${BUILD_VERSION_NO_SHA}")
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ macro(SETUP_HIFI_CLIENT_SERVER_PLUGIN)
|
|||
|
||||
if (BUILD_CLIENT)
|
||||
if (APPLE)
|
||||
add_dependencies(Vircadia ${TARGET_NAME})
|
||||
add_dependencies(Overte ${TARGET_NAME})
|
||||
else()
|
||||
add_dependencies(interface ${TARGET_NAME})
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ macro(SETUP_HIFI_PLUGIN)
|
|||
setup_hifi_library(${ARGV})
|
||||
if (BUILD_CLIENT)
|
||||
if (APPLE)
|
||||
add_dependencies(Vircadia ${TARGET_NAME})
|
||||
add_dependencies(Overte ${TARGET_NAME})
|
||||
else()
|
||||
add_dependencies(interface ${TARGET_NAME})
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ endif()
|
|||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO vircadia/draco
|
||||
REPO overte-org/draco
|
||||
REF 1.3.5-fixed
|
||||
SHA512 68bb15de013093077946d431ab1f4080b84a66d45d20873f2c0dc44aa28034fb4ec1f6e24f9300fde563da53943b73d47163b9c6acf2667312128c50c6d075bd
|
||||
HEAD_REF master
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ endif()
|
|||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO vircadia/etc2comp
|
||||
REPO overte-org/etc2comp
|
||||
REF 7f1843bf07825c21cab711360c1ddbad04641036
|
||||
SHA512 d747076acda8537d39585858c793a35c3dcc9ef283d723619a47f8c81ec1454c95b3340ad35f0655a939eae5b8271c801c48a9a7568311a01903a344c44af25b
|
||||
HEAD_REF master
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
|||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO vircadia/scribe
|
||||
REPO overte-org/scribe
|
||||
REF 1bd638a36ca771e5a68d01985b6389b71835cbd2
|
||||
SHA512 dbe241d86df3912e544f6b9839873f9875df54efc93822b145e7b13243eaf2e3d690bc8a28b1e52d05bdcd7e68fca6b0b2f5c43ffd0f56a9b7a50d54dcf9e31e
|
||||
HEAD_REF master
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ https://bugs.webrtc.org/9213#c13
|
|||
```
|
||||
|
||||
#### Exclude BoringSSL
|
||||
A separate OpenSSL VCPKG is used for building Vircadia.
|
||||
A separate OpenSSL VCPKG is used for building Overte.
|
||||
The following patches are needed even though SSL is excluded in the `gn gen` build commands.
|
||||
- Rename *third_party\boringssl* to *third_party\boringssl-NO*.
|
||||
- Edit *third_party\libsrtp\BUILD.gn:\
|
||||
|
|
@ -158,9 +158,9 @@ The following patches are needed even though SSL is excluded in the `gn gen` bui
|
|||
### Set Up OpenSSL
|
||||
|
||||
Do one of the following to provide OpenSSL for building against:
|
||||
a. If you have built Vircadia, find the **HIFI_VCPKG_BASE** subdirectory used in your build and make note of the path to and
|
||||
a. If you have built Overte, find the **HIFI_VCPKG_BASE** subdirectory used in your build and make note of the path to and
|
||||
including the *installed\x64-windows\include* directory (which includes an *openssl* directory).
|
||||
a. Follow https://github.com/vircadia/vcpkg to install *vcpkg* and then *openssl*. Make note of the path to and including the
|
||||
a. Follow https://github.com/overte-org/vcpkg to install *vcpkg* and then *openssl*. Make note of the path to and including the
|
||||
*packages\openssl-windows_x64-windows\include* directory (which includes an *openssl* directory).
|
||||
|
||||
Copy the *\<path\>\openssl* directory to the following locations (i.e., add as *openssl* subdirectories):
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ namespace BuildInfo {
|
|||
const QString DOMAIN_SERVER_NAME = "domain-server";
|
||||
const QString AC_CLIENT_SERVER_NAME = "ac-client";
|
||||
const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@";
|
||||
const QString ORGANIZATION_DOMAIN = "vircadia.com";
|
||||
const QString ORGANIZATION_DOMAIN = "overte.org";
|
||||
const QString VERSION = "@BUILD_VERSION@";
|
||||
const QString RELEASE_NAME = "@RELEASE_NAME@";
|
||||
const QString BUILD_NUMBER = "@BUILD_NUMBER@";
|
||||
|
|
|
|||
|
|
@ -1133,7 +1133,7 @@ Function HandlePostInstallOptions
|
|||
ClearErrors
|
||||
|
||||
; copy the data from production build to this PR build
|
||||
CopyFiles "$APPDATA\Vircadia\*" $0
|
||||
CopyFiles "$APPDATA\Overte\*" $0
|
||||
|
||||
; handle an error in copying files
|
||||
IfErrors 0 NoError
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@
|
|||
{
|
||||
"name": "enable_webrtc_websocket_ssl",
|
||||
"label": "Enable WebRTC WebSocket SSL",
|
||||
"help": "Use secure WebSocket (wss:// protocol) for WebRTC signaling channel. If \"on\", the key, cert, and CA files are expected to be in the local Overte app directory, in a /domain-server/ subdirectory with filenames vircadia-cert.key, vircadia-cert.crt, and vircadia-crt-ca.crt.",
|
||||
"help": "Use secure WebSocket (wss:// protocol) for WebRTC signaling channel. If \"on\", the key, cert, and CA files are expected to be in the local Overte app directory, in a /domain-server/ subdirectory with filenames overte-cert.key, overte-cert.crt, and overte-crt-ca.crt.",
|
||||
"type": "checkbox",
|
||||
"default": false,
|
||||
"advanced": true
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<span class='step-description'>
|
||||
<a target='_blank' href='https://docs.vircadia.com/create-and-explore/start-working-in-your-sandbox/place-names'>Place names</a> are similar to web addresses. Users who want to visit your domain can
|
||||
<a target='_blank' href='https://docs.overte.org/create-and-explore/start-working-in-your-sandbox/place-names'>Place names</a> are similar to web addresses. Users who want to visit your domain can
|
||||
enter its Place Name in Overte's Interface. You can choose a Place Name for your domain.</br>
|
||||
Your domain may also be reachable by <b>IP address</b>.
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ using namespace std::chrono;
|
|||
|
||||
Q_LOGGING_CATEGORY(domain_server, "hifi.domain_server")
|
||||
Q_LOGGING_CATEGORY(domain_server_ice, "hifi.domain_server.ice")
|
||||
Q_LOGGING_CATEGORY(domain_server_auth, "vircadia.domain_server.auth")
|
||||
Q_LOGGING_CATEGORY(domain_server_auth, "overte.domain_server.auth")
|
||||
|
||||
const QString ACCESS_TOKEN_KEY_PATH = "metaverse.access_token";
|
||||
const QString DomainServer::REPLACEMENT_FILE_EXTENSION = ".replace";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import zipfile
|
|||
|
||||
print = functools.partial(print, flush=True)
|
||||
|
||||
ANDROID_PACKAGE_URL = 'https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dependencies/android/'
|
||||
ANDROID_PACKAGE_URL = 'https://build-deps.overte.org/dependencies/android/'
|
||||
|
||||
ANDROID_PACKAGES = {
|
||||
'qt' : {
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ endif()
|
|||
# For a pre-built qt, however, we have to unpack it. The archive is required to contain
|
||||
# a qt5-install directory in it.
|
||||
|
||||
self.path = os.path.expanduser("~/vircadia-files/qt")
|
||||
self.path = os.path.expanduser("~/overte-files/qt")
|
||||
self.fullPath = os.path.join(self.path, 'qt5-install')
|
||||
self.cmakePath = os.path.join(self.fullPath, 'lib', 'cmake')
|
||||
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@ endif()
|
|||
self.path = args.vcpkg_root
|
||||
self.noClean = True
|
||||
else:
|
||||
defaultBasePath = os.path.expanduser('~/vircadia-files/vcpkg')
|
||||
defaultBasePath = os.path.expanduser('~/overte-files/vcpkg')
|
||||
if 'CI_WORKSPACE' in os.environ:
|
||||
self.basePath = os.path.join(os.getenv('CI_WORKSPACE'), 'vircadia-files/vcpkg')
|
||||
self.basePath = os.path.join(os.getenv('CI_WORKSPACE'), 'overte-files/vcpkg')
|
||||
else:
|
||||
self.basePath = os.getenv('HIFI_VCPKG_BASE', defaultBasePath)
|
||||
if self.args.android:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
if (APPLE)
|
||||
# Make the OSX DMG app be Vircadia.app.
|
||||
set(TARGET_NAME Vircadia)
|
||||
# Make the OSX DMG app be Overte.app.
|
||||
set(TARGET_NAME Overte)
|
||||
else()
|
||||
set(TARGET_NAME interface)
|
||||
endif()
|
||||
|
|
@ -121,14 +121,14 @@ if (APPLE)
|
|||
# configure CMake to use a custom Info.plist
|
||||
set_target_properties(${this_target} PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.in)
|
||||
|
||||
set(MACOSX_BUNDLE_BUNDLE_NAME "Vircadia")
|
||||
set(MACOSX_BUNDLE_BUNDLE_NAME "Overte")
|
||||
if (PRODUCTION_BUILD)
|
||||
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface)
|
||||
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.overte.interface)
|
||||
else ()
|
||||
if (DEV_BUILD)
|
||||
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface-dev)
|
||||
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.overte.interface-dev)
|
||||
elseif (PR_BUILD)
|
||||
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface-pr)
|
||||
set(MACOSX_BUNDLE_GUI_IDENTIFIER com.overte.interface-pr)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
|
|
@ -159,7 +159,7 @@ elseif (WIN32)
|
|||
set(CONFIGURE_ICON_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc")
|
||||
configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT})
|
||||
|
||||
set(APP_FULL_NAME "Vircadia")
|
||||
set(APP_FULL_NAME "Overte")
|
||||
set(CONFIGURE_VERSION_INFO_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.rc")
|
||||
configure_file("${HF_CMAKE_DIR}/templates/VersionInfo.rc.in" ${CONFIGURE_VERSION_INFO_RC_OUTPUT})
|
||||
|
||||
|
|
|
|||
|
|
@ -596,7 +596,7 @@
|
|||
|
||||
<h2>Want to learn more?</h2>
|
||||
<p>You can find out much more about the blockchain and about commerce in High Fidelity by visiting our Docs site:</p>
|
||||
<p><a href="http://docs.vircadia.dev" class="btn">Visit High Fidelity's Docs</a></p>
|
||||
<p><a href="http://docs.overte.org" class="btn">Visit High Fidelity's Docs</a></p>
|
||||
<hr>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -77,9 +77,9 @@
|
|||
var handControllerImageURL = null;
|
||||
var index = 0;
|
||||
var count = 3;
|
||||
var handControllerRefURL = "https://docs.vircadia.com/explore/get-started/vr-controls.html#vr-controls";
|
||||
var keyboardRefURL = "https://docs.vircadia.com/explore/get-started/desktop.html#movement-controls";
|
||||
var gamepadRefURL = "https://docs.vircadia.com/explore/get-started/vr-controls.html#gamepad";
|
||||
var handControllerRefURL = "https://docs.overte.org/explore/get-started/vr-controls.html#vr-controls";
|
||||
var keyboardRefURL = "https://docs.overte.org/explore/get-started/desktop.html#movement-controls";
|
||||
var gamepadRefURL = "https://docs.overte.org/explore/get-started/vr-controls.html#gamepad";
|
||||
|
||||
function showKbm() {
|
||||
document.getElementById("main_image").setAttribute("src", "img/tablet-help-keyboard.jpg");
|
||||
|
|
@ -189,7 +189,7 @@
|
|||
<a href="#" id="right_button" onmousedown="cycleRight()"></a>
|
||||
<a href="#" id="image_button"></a>
|
||||
</div>
|
||||
<a href="mailto:support@vircadia.com" id="report_problem">Report Problem</a>
|
||||
<a href="mailto:support@overte.org" id="report_problem">Report Problem</a>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -395,7 +395,7 @@ Item {
|
|||
text: signUpBody.termsContainerText
|
||||
Component.onCompleted: {
|
||||
// with the link.
|
||||
termsText.text = qsTr("By signing up, you agree to <a href='https://overte.org/termsofservice'>Vircadia's Terms of Service</a>")
|
||||
termsText.text = qsTr("By signing up, you agree to <a href='https://overte.org/legal/privacy/'>Overte Terms of Service</a>")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ Item {
|
|||
webViewCore.profile.offTheRecord = false;
|
||||
webViewCore.profile.storageName = "qmlWebEngine";
|
||||
} else {
|
||||
webViewCore.profile.httpUserAgent += " (VircadiaInterface)";
|
||||
webViewCore.profile.httpUserAgent += " (OverteInterface)";
|
||||
}
|
||||
// Ensure the JS from the web-engine makes it to our logging
|
||||
webViewCore.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@ Item {
|
|||
}
|
||||
|
||||
function openDocs() {
|
||||
Qt.openUrlExternally("https://docs.vircadia.com/create/avatars/package-avatar.html");
|
||||
Qt.openUrlExternally("https://docs.overte.org/create/avatars/package-avatar.html");
|
||||
}
|
||||
|
||||
function openVideo() {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ MessageBox {
|
|||
popup.onButton2Clicked = callback;
|
||||
popup.titleText = 'Specify Avatar URL'
|
||||
popup.bodyText = 'This will not overwrite your existing favorite if you are wearing one.<br>' +
|
||||
'<a href="https://docs.vircadia.com/create/avatars/create-avatars.html">' +
|
||||
'<a href="https://docs.overte.org/create/avatars/create-avatars.html">' +
|
||||
'Learn to make a custom avatar by opening this link on your desktop.' +
|
||||
'</a>'
|
||||
popup.inputText.visible = true;
|
||||
|
|
|
|||
|
|
@ -779,7 +779,7 @@ Rectangle {
|
|||
lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " +
|
||||
"If you want to save the state of the content in this domain, create a backup before proceeding.<br><br>" +
|
||||
"For more information about backing up and restoring content, " +
|
||||
"<a href='https://docs.vircadia.com/host/maintain-domain/backup-domain.html'>" +
|
||||
"<a href='https://docs.overte.org/host/maintain-domain/backup-domain.html'>" +
|
||||
"click here to open info on your desktop browser.";
|
||||
lightboxPopup.button1text = "CANCEL";
|
||||
lightboxPopup.button1method = function() {
|
||||
|
|
|
|||
|
|
@ -603,7 +603,7 @@ Rectangle {
|
|||
lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " +
|
||||
"If you want to save the state of the content in this domain, create a backup before proceeding.<br><br>" +
|
||||
"For more information about backing up and restoring content, " +
|
||||
"<a href='https://docs.vircadia.com/host/maintain-domain/backup-domain.html'>" +
|
||||
"<a href='https://docs.overte.org/host/maintain-domain/backup-domain.html'>" +
|
||||
"click here to open info on your desktop browser.";
|
||||
lightboxPopup.button1text = "CANCEL";
|
||||
lightboxPopup.button1method = function() {
|
||||
|
|
|
|||
|
|
@ -7884,7 +7884,7 @@ bool Application::askToReplaceDomainContent(const QString& url) {
|
|||
static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. "
|
||||
"If you want to save what you have now, create a backup before proceeding. For more information about backing up "
|
||||
"and restoring content, visit the documentation page at: ", MAX_CHARACTERS_PER_LINE) +
|
||||
"\nhttps://docs.vircadia.com/host/maintain-domain/backup-domain.html";
|
||||
"\nhttps://docs.overte.org/host/maintain-domain/backup-domain.html";
|
||||
|
||||
ModalDialogListener* dig = OffscreenUi::asyncQuestion("Are you sure you want to replace this domain's content set?",
|
||||
infoText, QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
#include "CrashHandler.h"
|
||||
|
||||
Q_LOGGING_CATEGORY(crash_handler, "vircadia.crash_handler")
|
||||
Q_LOGGING_CATEGORY(crash_handler, "overte.crash_handler")
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <QDebug>
|
||||
|
||||
|
||||
Q_LOGGING_CATEGORY(crash_handler, "vircadia.crash_handler")
|
||||
Q_LOGGING_CATEGORY(crash_handler, "overte.crash_handler")
|
||||
|
||||
bool startCrashHandler(std::string appPath) {
|
||||
qCWarning(crash_handler) << "No crash handler available.";
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ signals:
|
|||
* return turnRate;
|
||||
* }
|
||||
*
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.speechRecognizer";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.speechRecognizer";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
*
|
||||
* mapping.from(getTurnRate).to(Controller.Actions.Yaw);
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ static QStringList HAND_MAPPING_SUFFIXES = {
|
|||
"HandThumb1",
|
||||
};
|
||||
|
||||
const QUrl PACKAGE_AVATAR_DOCS_BASE_URL = QUrl("https://docs.vircadia.com/create/avatars/package-avatar.html");
|
||||
const QUrl PACKAGE_AVATAR_DOCS_BASE_URL = QUrl("https://docs.overte.org/create/avatars/package-avatar.html");
|
||||
|
||||
AvatarDoctor::AvatarDoctor(const QUrl& avatarFSTFileUrl) :
|
||||
_avatarFSTFileUrl(avatarFSTFileUrl) {
|
||||
|
|
|
|||
|
|
@ -682,7 +682,7 @@ public:
|
|||
* <p>Note: When using pre-built animation data, it's critical that the joint orientation of the source animation and target
|
||||
* rig are equivalent, since the animation data applies absolute values onto the joints. If the orientations are different,
|
||||
* the avatar will move in unpredictable ways. For more information about avatar joint orientation standards, see
|
||||
* <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* @function MyAvatar.overrideAnimation
|
||||
* @param {string} url - The URL to the animation file. Animation files may be in glTF or FBX format, but only need to
|
||||
* contain the avatar skeleton and animation data. glTF models may be in JSON or binary format (".gltf" or ".glb" URLs
|
||||
|
|
@ -790,7 +790,7 @@ public:
|
|||
* <p>Note: When using pre-built animation data, it's critical that the joint orientation of the source animation and target
|
||||
* rig are equivalent, since the animation data applies absolute values onto the joints. If the orientations are different,
|
||||
* the avatar will move in unpredictable ways. For more information about avatar joint orientation standards, see
|
||||
* <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.
|
||||
* <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.
|
||||
* @function MyAvatar.overrideRoleAnimation
|
||||
* @param {string} role - The animation role to override
|
||||
* @param {string} url - The URL to the animation file. Animation files need to be in glTF or FBX format, but only need to
|
||||
|
|
@ -1954,7 +1954,7 @@ public:
|
|||
|
||||
/*@jsdoc
|
||||
* Enables and disables flow simulation of physics on the avatar's hair, clothes, and body parts. See
|
||||
* {@link https://docs.vircadia.com/create/avatars/add-flow.html|Add Flow to Your Avatar} for more
|
||||
* {@link https://docs.overte.org/create/avatars/add-flow.html|Add Flow to Your Avatar} for more
|
||||
* information.
|
||||
* @function MyAvatar.useFlow
|
||||
* @param {boolean} isActive - <code>true</code> if flow simulation is enabled on the joint, <code>false</code> if it isn't.
|
||||
|
|
@ -2317,7 +2317,7 @@ public slots:
|
|||
|
||||
/*@jsdoc
|
||||
* Gets the URL of the override animation graph.
|
||||
* <p>See {@link https://docs.vircadia.com/create/avatars/custom-animations.html|Custom Avatar Animations} for
|
||||
* <p>See {@link https://docs.overte.org/create/avatars/custom-animations.html|Custom Avatar Animations} for
|
||||
* information on animation graphs.</p>
|
||||
* @function MyAvatar.getAnimGraphOverrideUrl
|
||||
* @returns {string} The URL of the override animation graph JSON file. <code>""</code> if there is no override animation
|
||||
|
|
@ -2327,7 +2327,7 @@ public slots:
|
|||
|
||||
/*@jsdoc
|
||||
* Sets the animation graph to use in preference to the default animation graph.
|
||||
* <p>See {@link https://docs.vircadia.com/create/avatars/custom-animations.html|Custom Avatar Animations} for
|
||||
* <p>See {@link https://docs.overte.org/create/avatars/custom-animations.html|Custom Avatar Animations} for
|
||||
* information on animation graphs.</p>
|
||||
* @function MyAvatar.setAnimGraphOverrideUrl
|
||||
* @param {string} url - The URL of the animation graph JSON file to use. Set to <code>""</code> to clear an override.
|
||||
|
|
@ -2336,7 +2336,7 @@ public slots:
|
|||
|
||||
/*@jsdoc
|
||||
* Gets the URL of animation graph (i.e., the avatar animation JSON) that's currently being used for avatar animations.
|
||||
* <p>See {@link https://docs.vircadia.com/create/avatars/custom-animations.html|Custom Avatar Animations} for
|
||||
* <p>See {@link https://docs.overte.org/create/avatars/custom-animations.html|Custom Avatar Animations} for
|
||||
* information on animation graphs.</p>
|
||||
* @function MyAvatar.getAnimGraphUrl
|
||||
* @returns {string} The URL of the current animation graph JSON file.
|
||||
|
|
@ -2347,7 +2347,7 @@ public slots:
|
|||
|
||||
/*@jsdoc
|
||||
* Sets the current animation graph (i.e., the avatar animation JSON) to use for avatar animations and makes it the default.
|
||||
* <p>See {@link https://docs.vircadia.com/create/avatars/custom-animations.html|Custom Avatar Animations} for
|
||||
* <p>See {@link https://docs.overte.org/create/avatars/custom-animations.html|Custom Avatar Animations} for
|
||||
* information on animation graphs.</p>
|
||||
* @function MyAvatar.setAnimGraphUrl
|
||||
* @param {string} url - The URL of the animation graph JSON file to use.
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
const char* MODEL_TYPE_NAMES[] = { "entities", "heads", "skeletons", "skeletons", "attachments" };
|
||||
|
||||
static const QString S3_URL = NetworkingConstants::HF_PUBLIC_CDN_URL;
|
||||
static const QString PUBLIC_URL = "http://public.vircadia.com"; // Changed to Vircadia but not entirely sure what to do with this yet.
|
||||
static const QString PUBLIC_URL = "http://public.overte.org"; // Changed to Overte but not entirely sure what to do with this yet.
|
||||
static const QString MODELS_LOCATION = "models/";
|
||||
|
||||
static const QString PREFIX_PARAMETER_NAME = "prefix";
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ set(CPACK_PACKAGE_FILE_NAME "HQ Launcher")
|
|||
|
||||
set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
|
||||
|
||||
set(DMG_SUBFOLDER_NAME "Vircadia")
|
||||
set(DMG_SUBFOLDER_NAME "Overte")
|
||||
set(ESCAPED_DMG_SUBFOLDER_NAME "")
|
||||
set(DMG_SUBFOLDER_ICON "${CMAKE_SOURCE_DIR}/cmake/installer/install-folder.rsrc")
|
||||
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ public:
|
|||
/*@jsdoc
|
||||
* Gets the default rotation of a joint (in the current avatar) relative to its parent.
|
||||
* <p>For information on the joint hierarchy used, see
|
||||
* <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* @function MyAvatar.getDefaultJointRotation
|
||||
* @param {number} index - The joint index.
|
||||
* @returns {Quat} The default rotation of the joint if the joint index is valid, otherwise {@link Quat(0)|Quat.IDENTITY}.
|
||||
|
|
@ -219,7 +219,7 @@ public:
|
|||
* Gets the default translation of a joint (in the current avatar) relative to its parent, in model coordinates.
|
||||
* <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
|
||||
* <p>For information on the joint hierarchy used, see
|
||||
* <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* @function MyAvatar.getDefaultJointTranslation
|
||||
* @param {number} index - The joint index.
|
||||
* @returns {Vec3} The default translation of the joint (in model coordinates) if the joint index is valid, otherwise
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ public slots:
|
|||
/*@jsdoc
|
||||
* Gets the default rotation of a joint in the avatar relative to its parent.
|
||||
* <p>For information on the joint hierarchy used, see
|
||||
* <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* @function ScriptAvatar.getDefaultJointRotation
|
||||
* @param {number} index - The joint index.
|
||||
* @returns {Quat} The default rotation of the joint if avatar data are available and the joint index is valid, otherwise
|
||||
|
|
@ -100,7 +100,7 @@ public slots:
|
|||
* Gets the default translation of a joint in the avatar relative to its parent, in model coordinates.
|
||||
* <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
|
||||
* <p>For information on the joint hierarchy used, see
|
||||
* <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* @function ScriptAvatar.getDefaultJointTranslation
|
||||
* @param {number} index - The joint index.
|
||||
* @returns {Vec3} The default translation of the joint (in model coordinates) if avatar data are available and the joint
|
||||
|
|
|
|||
|
|
@ -862,7 +862,7 @@ public:
|
|||
|
||||
/*@jsdoc
|
||||
* Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see
|
||||
* <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.
|
||||
* <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.
|
||||
* @function Avatar.getJointRotation
|
||||
* @param {number} index - The index of the joint.
|
||||
* @returns {Quat} The rotation of the joint relative to its parent.
|
||||
|
|
@ -873,7 +873,7 @@ public:
|
|||
* Gets the translation of a joint relative to its parent, in model coordinates.
|
||||
* <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
|
||||
* <p>For information on the joint hierarchy used, see
|
||||
* <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* @function Avatar.getJointTranslation
|
||||
* @param {number} index - The index of the joint.
|
||||
* @returns {Vec3} The translation of the joint relative to its parent, in model coordinates.
|
||||
|
|
@ -983,7 +983,7 @@ public:
|
|||
|
||||
/*@jsdoc
|
||||
* Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see
|
||||
* <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.
|
||||
* <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.
|
||||
* @function Avatar.getJointRotation
|
||||
* @param {string} name - The name of the joint.
|
||||
* @returns {Quat} The rotation of the joint relative to its parent.
|
||||
|
|
@ -998,7 +998,7 @@ public:
|
|||
* Gets the translation of a joint relative to its parent, in model coordinates.
|
||||
* <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
|
||||
* <p>For information on the joint hierarchy used, see
|
||||
* <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* @function Avatar.getJointTranslation
|
||||
* @param {number} name - The name of the joint.
|
||||
* @returns {Vec3} The translation of the joint relative to its parent, in model coordinates.
|
||||
|
|
@ -1140,7 +1140,7 @@ public:
|
|||
* set <code>hasScriptedBlendshapes</code> back to <code>false</code> when the animation is complete.
|
||||
* @function Avatar.setBlendshape
|
||||
* @param {string} name - The name of the blendshape, per the
|
||||
* {@link https://docs.vircadia.com/create/avatars/avatar-standards.html#blendshapes Avatar Standards}.
|
||||
* {@link https://docs.overte.org/create/avatars/avatar-standards.html#blendshapes Avatar Standards}.
|
||||
* @param {number} value - A value between <code>0.0</code> and <code>1.0</code>.
|
||||
* @example <caption>Open your avatar's mouth wide.</caption>
|
||||
* MyAvatar.hasScriptedBlendshapes = true;
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ public:
|
|||
|
||||
/*@jsdoc
|
||||
* Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see
|
||||
* <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.
|
||||
* <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.
|
||||
* @function ScriptAvatar.getJointRotation
|
||||
* @param {number} index - The index of the joint.
|
||||
* @returns {Quat} The rotation of the joint relative to its parent, or {@link Quat(0)|Quat.IDENTITY} if the avatar data
|
||||
|
|
@ -130,7 +130,7 @@ public:
|
|||
* Gets the translation of a joint relative to its parent, in model coordinates.
|
||||
* <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
|
||||
* <p>For information on the joint hierarchy used, see
|
||||
* <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* @function ScriptAvatar.getJointTranslation
|
||||
* @param {number} index - The index of the joint.
|
||||
* @returns {Vec3} The translation of the joint relative to its parent, in model coordinates, or {@link Vec3(0)|Vec3.ZERO}
|
||||
|
|
@ -140,7 +140,7 @@ public:
|
|||
|
||||
/*@jsdoc
|
||||
* Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see
|
||||
* <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.
|
||||
* <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.
|
||||
* @function ScriptAvatar.getJointRotation
|
||||
* @param {string} name - The name of the joint.
|
||||
* @returns {Quat} The rotation of the joint relative to its parent, or {@link Quat(0)|Quat.IDENTITY} if the avatar data
|
||||
|
|
@ -152,7 +152,7 @@ public:
|
|||
* Gets the translation of a joint relative to its parent, in model coordinates.
|
||||
* <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
|
||||
* <p>For information on the joint hierarchy used, see
|
||||
* <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
|
||||
* @function ScriptAvatar.getJointTranslation
|
||||
* @param {number} name - The name of the joint.
|
||||
* @returns {Vec3} The translation of the joint relative to its parent, in model coordinates, or {@link Vec3(0)|Vec3.ZERO}
|
||||
|
|
|
|||
|
|
@ -276,7 +276,7 @@ namespace controller {
|
|||
* by {@link Uuid(0).generate|Uuid.generate} is used.
|
||||
* @returns {MappingObject} A controller mapping object.
|
||||
* @example <caption>Create a simple mapping that makes the right trigger move your avatar up.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
*
|
||||
* mapping.from(Controller.Standard.RT).to(Controller.Actions.TranslateY);
|
||||
|
|
@ -311,7 +311,7 @@ namespace controller {
|
|||
* @returns {MappingObject} A controller mapping object.
|
||||
* @example <caption>Create a simple mapping that makes the right trigger move your avatar up.</caption>
|
||||
* var mappingJSON = {
|
||||
* "name": "com.vircadia.controllers.example.jsonMapping",
|
||||
* "name": "com.overte.controllers.example.jsonMapping",
|
||||
* "channels": [
|
||||
* { "from": "Standard.RT", "to": "Actions.TranslateY" }
|
||||
* ]
|
||||
|
|
@ -463,7 +463,7 @@ namespace controller {
|
|||
* {@link Controller.Hardware|Controller.Hardware.Keyboard} outputs.
|
||||
* @function Controller.captureMouseEvents
|
||||
* @example <caption>Disable Controller.Hardware.Keyboard mouse events for a short period.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
* mapping.from(Controller.Hardware.Keyboard.MouseX).to(function (x) {
|
||||
* print("Mouse x = " + x);
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ class UserInputMapper;
|
|||
* @property {Controller.MappingJSONRoute[]} channels - An array of routes.
|
||||
* @example <caption>A simple mapping JSON that makes the right trigger move your avatar up after a dead zone.</caption>
|
||||
* {
|
||||
* "name": "com.vircadia.controllers.example.jsonMapping",
|
||||
* "name": "com.overte.controllers.example.jsonMapping",
|
||||
* "channels": [
|
||||
* {
|
||||
* "from": "Standard.RT",
|
||||
|
|
@ -176,7 +176,7 @@ public:
|
|||
* @returns {RouteObject} A route ready for mapping to an action or function using {@link RouteObject} methods. The data
|
||||
* value passed to the route is the combined value of <code>source2 - source1</code>.
|
||||
* @example <caption>Make the Oculus Touch triggers move your avatar up and down.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
* mapping
|
||||
* .makeAxis(Controller.Hardware.OculusTouch.LT, Controller.Hardware.OculusTouch.RT)
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ class RouteBuilderProxy : public QObject {
|
|||
* an in-line function definition.
|
||||
*
|
||||
* @example <caption>Make the right trigger move your avatar up.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
*
|
||||
* mapping.from(Controller.Standard.RT).to(Controller.Actions.TranslateY);
|
||||
|
|
@ -105,7 +105,7 @@ class RouteBuilderProxy : public QObject {
|
|||
* print("Trigger value: " + value);
|
||||
* }
|
||||
*
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
*
|
||||
* mapping.from(Controller.Standard.RT).to(onRightTrigger);
|
||||
|
|
@ -124,7 +124,7 @@ class RouteBuilderProxy : public QObject {
|
|||
* otherwise it is disabled.
|
||||
* @returns {RouteObject} The <code>RouteObject</code> with debug output enabled or disabled.
|
||||
* @example <caption>Write debug information to the program log for a right trigger mapping.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
*
|
||||
* mapping.from(Controller.Standard.RT).debug().to(function (value) {
|
||||
|
|
@ -175,7 +175,7 @@ class RouteBuilderProxy : public QObject {
|
|||
* calls.</p>
|
||||
* @returns {RouteObject} The <code>RouteObject</code> with the condition added.
|
||||
* @example <caption>Process the right trigger differently in HMD and desktop modes.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
*
|
||||
* // Processed only if in HMD mode.
|
||||
|
|
@ -203,7 +203,7 @@ class RouteBuilderProxy : public QObject {
|
|||
* @param {number} max - The maximum value to pass through.
|
||||
* @returns {RouteObject} The route object with the clamp filter added.
|
||||
* @example <caption>Clamp right trigger values to between 0.3 and 0.7.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
* mapping.from(Controller.Standard.RT).clamp(0.3, 0.7).to(function (value) {
|
||||
* print("Value: " + value);
|
||||
|
|
@ -225,7 +225,7 @@ class RouteBuilderProxy : public QObject {
|
|||
* @param {number} max - When the input value rises above this value the output value changes to <code>1</code>.
|
||||
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
|
||||
* @example <caption>Round the right joystick forward/back values to 0 or 1 with hysteresis.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
* mapping.from(Controller.Standard.RY).peek().to(function (value) {
|
||||
* print("Raw value: " + value); // 0.0 - 1.0.
|
||||
|
|
@ -247,7 +247,7 @@ class RouteBuilderProxy : public QObject {
|
|||
* @param {number} interval - The interval between sending values, in seconds.
|
||||
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
|
||||
* @example <caption>Send right trigger values every half second.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
* mapping.from(Controller.Standard.RT).pulse(0.5).to(function (value) {
|
||||
* print("Value: " + value);
|
||||
|
|
@ -266,7 +266,7 @@ class RouteBuilderProxy : public QObject {
|
|||
* @param {number} multiplier - The scale to multiply the value by.
|
||||
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
|
||||
* @example <caption>Scale the value of the right joystick forward/back values by 10.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
* mapping.from(Controller.Standard.LY).to(function (value) {
|
||||
* print("L value: " + value); // -1.0 to 1.0 values.
|
||||
|
|
@ -288,7 +288,7 @@ class RouteBuilderProxy : public QObject {
|
|||
* @function RouteObject#invert
|
||||
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
|
||||
* @example <caption>Invert the value of the right joystick forward/back values.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
* mapping.from(Controller.Standard.LY).to(function (value) {
|
||||
* print("L value: " + value); // -1.0 to 1.0 values, forward to back.
|
||||
|
|
@ -313,7 +313,7 @@ class RouteBuilderProxy : public QObject {
|
|||
* negative of this value is used.
|
||||
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
|
||||
* @example <caption>Apply a dead-zone to the right joystick forward/back values.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
* mapping.from(Controller.Standard.RY).deadZone(0.2).to(function (value) {
|
||||
* print("Value: " + value); // 0.0 - 1.0 values once outside the dead-zone.
|
||||
|
|
@ -334,7 +334,7 @@ class RouteBuilderProxy : public QObject {
|
|||
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
|
||||
* @example <caption>Round the right joystick forward/back values to <code>-1</code>, <code>0</code>, or
|
||||
* <code>1</code>.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
* mapping.from(Controller.Standard.RY).constrainToInteger().to(function (value) {
|
||||
* print("Value: " + value); // -1, 0, or 1
|
||||
|
|
@ -353,7 +353,7 @@ class RouteBuilderProxy : public QObject {
|
|||
* @function RouteObject#constrainToPositiveInteger
|
||||
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
|
||||
* @example <caption>Round the right joystick forward/back values to <code>0</code> or <code>1</code>.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
* mapping.from(Controller.Standard.RY).constrainToPositiveInteger().to(function (value) {
|
||||
* print("Value: " + value); // 0, or 1
|
||||
|
|
@ -436,7 +436,7 @@ class RouteBuilderProxy : public QObject {
|
|||
* @function RouteObject#logicalNot
|
||||
* @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
|
||||
* @example <caption>Logical NOT of LSTouch value.</caption>
|
||||
* var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
|
||||
* var MAPPING_NAME = "com.overte.controllers.example.newMapping";
|
||||
* var mapping = Controller.newMapping(MAPPING_NAME);
|
||||
*
|
||||
* mapping.from(Controller.Standard.RSTouch).peek().to(function (value) {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ namespace TextureUsage {
|
|||
/*@jsdoc
|
||||
* <p>Describes the type of texture.</p>
|
||||
* <p>See also: {@link Material} and
|
||||
* {@link https://docs.vircadia.com/create/3d-models/pbr-materials-guide.html|PBR Materials Guide}.</p>
|
||||
* {@link https://docs.overte.org/create/3d-models/pbr-materials-guide.html|PBR Materials Guide}.</p>
|
||||
* <table>
|
||||
* <thead>
|
||||
* <tr><th>Value</th><th>Name</th><th>Description</th></tr>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
/*@jsdoc
|
||||
* The <code>Midi</code> API provides the ability to connect Interface with musical instruments and other external or virtual
|
||||
* devices via the MIDI protocol. For further information and examples, see the tutorial:
|
||||
* <a href="https://docs.vircadia.com/script/midi-tutorial.html">Use MIDI to Control Your Environment</a>.
|
||||
* <a href="https://docs.overte.org/script/midi-tutorial.html">Use MIDI to Control Your Environment</a>.
|
||||
*
|
||||
* <p><strong>Note:</strong> Only works on Windows.</p>
|
||||
*
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
#include <QDebug>
|
||||
#include <QLoggingCategory>
|
||||
|
||||
Q_LOGGING_CATEGORY(external_resource, "vircadia.networking.external_resource")
|
||||
Q_LOGGING_CATEGORY(external_resource, "overte.networking.external_resource")
|
||||
|
||||
ExternalResource::ExternalResource(QObject* parent) : QObject(parent) {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
|
||||
#ifndef vircadia_ExternalResource_h
|
||||
#define vircadia_ExternalResource_h
|
||||
#ifndef overte_ExternalResource_h
|
||||
#define overte_ExternalResource_h
|
||||
|
||||
#include <QObject>
|
||||
#include <QUrl>
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ public:
|
|||
* from an assignment client script it is received only by that same assignment client script.</p>
|
||||
* @example <caption>Send and receive a message.</caption>
|
||||
* // Receiving script.
|
||||
* var channelName = "com.vircadia.example.messages-example";
|
||||
* var channelName = "com.overte.example.messages-example";
|
||||
*
|
||||
* function onMessageReceived(channel, message, sender, localOnly) {
|
||||
* print("Message received:");
|
||||
|
|
@ -84,7 +84,7 @@ public:
|
|||
*
|
||||
*
|
||||
* // Sending script.
|
||||
* var channelName = "com.vircadia.example.messages-example";
|
||||
* var channelName = "com.overte.example.messages-example";
|
||||
* var message = "Hello";
|
||||
* Messages.sendMessage(channelName, message);
|
||||
*/
|
||||
|
|
@ -112,7 +112,7 @@ public:
|
|||
* from an assignment client script it is received only by that same assignment client script.</p>
|
||||
* @example <caption>Send and receive data.</caption>
|
||||
* // Receiving script.
|
||||
* var channelName = "com.vircadia.example.messages-example";
|
||||
* var channelName = "com.overte.example.messages-example";
|
||||
*
|
||||
* function onDataReceived(channel, data, sender, localOnly) {
|
||||
* var int8data = new Int8Array(data);
|
||||
|
|
@ -140,7 +140,7 @@ public:
|
|||
*
|
||||
*
|
||||
* // Sending script.
|
||||
* var channelName = "com.vircadia.example.messages-example";
|
||||
* var channelName = "com.overte.example.messages-example";
|
||||
* var int8data = new Int8Array([1, 1, 2, 3, 5, 8, 13]);
|
||||
* Messages.sendData(channelName, int8data.buffer);
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ namespace NetworkingConstants {
|
|||
const QStringList IS_AUTHABLE_HOSTNAME = { "overte.org" };
|
||||
|
||||
// Use a custom User-Agent to avoid ModSecurity filtering, e.g. by hosting providers.
|
||||
const QByteArray VIRCADIA_USER_AGENT = "Mozilla/5.0 (VircadiaInterface)";
|
||||
const QByteArray VIRCADIA_USER_AGENT = "Mozilla/5.0 (OverteInterface)";
|
||||
|
||||
const QString WEB_ENGINE_USER_AGENT = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) " + WEB_ENGINE_VERSION + " Mobile Safari/537.36";
|
||||
const QString MOBILE_USER_AGENT = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) " + WEB_ENGINE_VERSION + " Mobile Safari/537.36";
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
#ifndef vircadia_SocketType_h
|
||||
#define vircadia_SocketType_h
|
||||
#ifndef overte_SocketType_h
|
||||
#define overte_SocketType_h
|
||||
|
||||
/// @addtogroup Networking
|
||||
/// @{
|
||||
|
|
@ -38,4 +38,4 @@ public:
|
|||
|
||||
/// @}
|
||||
|
||||
#endif // vircadia_SocketType_h
|
||||
#endif // overte_SocketType_h
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
// Copyright 2021 Vircadia contributors.
|
||||
//
|
||||
|
||||
#ifndef vircadia_NetworkSocket_h
|
||||
#define vircadia_NetworkSocket_h
|
||||
#ifndef overte_NetworkSocket_h
|
||||
#define overte_NetworkSocket_h
|
||||
|
||||
#include <QObject>
|
||||
#include <QUdpSocket>
|
||||
|
|
@ -167,4 +167,4 @@ private:
|
|||
|
||||
/// @}
|
||||
|
||||
#endif // vircadia_NetworkSocket_h
|
||||
#endif // overte_NetworkSocket_h
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
// Copyright 2021 Vircadia contributors.
|
||||
//
|
||||
|
||||
#ifndef vircadia_WebRTCDataChannels_h
|
||||
#define vircadia_WebRTCDataChannels_h
|
||||
#ifndef overte_WebRTCDataChannels_h
|
||||
#define overte_WebRTCDataChannels_h
|
||||
|
||||
#include <shared/WebRTC.h>
|
||||
|
||||
|
|
@ -337,4 +337,4 @@ private:
|
|||
|
||||
#endif // WEBRTC_DATA_CHANNELS
|
||||
|
||||
#endif // vircadia_WebRTCDataChannels_h
|
||||
#endif // overte_WebRTCDataChannels_h
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@ WebRTCSignalingServer::WebRTCSignalingServer(QObject* parent, bool isWSSEnabled)
|
|||
this));
|
||||
|
||||
auto dsDirPath = PathUtils::getAppLocalDataPath();
|
||||
const QString KEY_FILENAME = "vircadia-cert.key";
|
||||
const QString CRT_FILENAME = "vircadia-cert.crt";
|
||||
const QString CA_CRT_FILENAME = "vircadia-cert-ca.crt";
|
||||
const QString KEY_FILENAME = "overte-cert.key";
|
||||
const QString CRT_FILENAME = "overte-cert.crt";
|
||||
const QString CA_CRT_FILENAME = "overte-cert-ca.crt";
|
||||
qCDebug(networking_webrtc) << "WebSocket WSS key file:" << dsDirPath + KEY_FILENAME;
|
||||
qCDebug(networking_webrtc) << "WebSocket WSS cert file:" << dsDirPath + CRT_FILENAME;
|
||||
qCDebug(networking_webrtc) << "WebSocket WSS CA cert file:" << dsDirPath + CA_CRT_FILENAME;
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
// Copyright 2021 Vircadia contributors.
|
||||
//
|
||||
|
||||
#ifndef vircadia_WebRTCSignalingServer_h
|
||||
#define vircadia_WebRTCSignalingServer_h
|
||||
#ifndef overte_WebRTCSignalingServer_h
|
||||
#define overte_WebRTCSignalingServer_h
|
||||
|
||||
#include <shared/WebRTC.h>
|
||||
|
||||
|
|
@ -110,4 +110,4 @@ private:
|
|||
|
||||
#endif // WEBRTC_DATA_CHANNELS
|
||||
|
||||
#endif // vircadia_WebRTCSignalingServer_h
|
||||
#endif // overte_WebRTCSignalingServer_h
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
// Copyright 2021 Vircadia contributors.
|
||||
//
|
||||
|
||||
#ifndef vircadia_WebRTCSocket_h
|
||||
#define vircadia_WebRTCSocket_h
|
||||
#ifndef overte_WebRTCSocket_h
|
||||
#define overte_WebRTCSocket_h
|
||||
|
||||
#include <shared/WebRTC.h>
|
||||
|
||||
|
|
@ -168,4 +168,4 @@ private:
|
|||
|
||||
#endif // WEBRTC_DATA_CHANNELS
|
||||
|
||||
#endif // vircadia_WebRTCSocket_h
|
||||
#endif // overte_WebRTCSocket_h
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
* @hifi-server-entity
|
||||
* @hifi-assignment-client
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/Assets.html">Assets</a></code> scripting API
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/Assets.html">Assets</a></code> scripting API
|
||||
class AssetScriptingInterface : public BaseAssetScriptingInterface, QScriptable {
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
class ScriptAudioInjector;
|
||||
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/Audio.html">Audio</a></code> scripting API
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/Audio.html">Audio</a></code> scripting API
|
||||
class AudioScriptingInterface : public QObject, public Dependency {
|
||||
Q_OBJECT
|
||||
SINGLETON_DEPENDENCY
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
* @hifi-server-entity
|
||||
* @hifi-assignment-client
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/console.html">console</a></code> scripting API
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/console.html">console</a></code> scripting API
|
||||
class ConsoleScriptingInterface : public QObject, protected QScriptable {
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
* @hifi-server-entity
|
||||
* @hifi-assignment-client
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/File.html">File</a></code> scripting API
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/File.html">File</a></code> scripting API
|
||||
class FileScriptingInterface : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <QKeyEvent>
|
||||
#include <QScriptValue>
|
||||
|
||||
/// Represents a keyboard event to the scripting engine. Exposed as <code><a href="https://apidocs.vircadia.dev/global.html#KeyEvent">KeyEvent</a></code>
|
||||
/// Represents a keyboard event to the scripting engine. Exposed as <code><a href="https://apidocs.overte.org/global.html#KeyEvent">KeyEvent</a></code>
|
||||
class KeyEvent {
|
||||
public:
|
||||
KeyEvent();
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
* @hifi-server-entity
|
||||
* @hifi-assignment-client
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/Mat4.html">Mat4</a></code> scripting interface
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/Mat4.html">Mat4</a></code> scripting interface
|
||||
class Mat4 : public QObject, protected QScriptable {
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include "KeyEvent.h"
|
||||
|
||||
|
||||
/// Represents a menu item a script may declare and bind events to. Exposed as <code><a href="https://apidocs.vircadia.dev/Menu.html#.MenuItemProperties">MenuItemProperties</a></code>
|
||||
/// Represents a menu item a script may declare and bind events to. Exposed as <code><a href="https://apidocs.overte.org/Menu.html#.MenuItemProperties">MenuItemProperties</a></code>
|
||||
class MenuItemProperties {
|
||||
public:
|
||||
MenuItemProperties() {}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ class QScriptEngine;
|
|||
*
|
||||
* @deprecated This API is deprecated. Use the {@link Graphics} API instead.
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/Model.html">Model</a></code> scripting interface
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/Model.html">Model</a></code> scripting interface
|
||||
class ModelScriptingInterface : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
class QScriptEngine;
|
||||
|
||||
/// Represents a mouse event to the scripting engine. Exposed as <code><a href="https://apidocs.vircadia.dev/global.html#MouseEvent">MouseEvent</a></code>
|
||||
/// Represents a mouse event to the scripting engine. Exposed as <code><a href="https://apidocs.overte.org/global.html#MouseEvent">MouseEvent</a></code>
|
||||
class MouseEvent {
|
||||
public:
|
||||
MouseEvent();
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
* print(JSON.stringify(Quat.IDENTITY)); // { x: 0, y: 0, z: 0, w: 1 }
|
||||
* print(JSON.stringify(Quat.safeEulerAngles(Quat.IDENTITY))); // { x: 0, y: 0, z: 0 }
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/Quat.html">Quat</a></code> scripting interface
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/Quat.html">Quat</a></code> scripting interface
|
||||
class Quat : public QObject, protected QScriptable {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(glm::quat IDENTITY READ IDENTITY CONSTANT)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ class QScriptValue;
|
|||
* @hifi-avatar
|
||||
* @hifi-assignment-client
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/Recording.html">Recording</a></code> scripting interface
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/Recording.html">Recording</a></code> scripting interface
|
||||
class RecordingScriptingInterface : public QObject, public Dependency {
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
* @property {boolean} shouldRenderEntities - <code>true</code> if entities (domain, avatar, and local) are rendered,
|
||||
* <code>false</code> if they aren't.
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/Scene.html">Scene</a></code> scripting interface
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/Scene.html">Scene</a></code> scripting interface
|
||||
class SceneScriptingInterface : public QObject, public Dependency {
|
||||
Q_OBJECT
|
||||
SINGLETON_DEPENDENCY
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
* <em>Read-only.</em>
|
||||
* @property {AudioInjector.AudioInjectorOptions} options - Configures how the injector plays the audio.
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/AudioInjector.html">AudioInjector</a></code> scripting interface
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/AudioInjector.html">AudioInjector</a></code> scripting interface
|
||||
class ScriptAudioInjector : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ public:
|
|||
* <em>Read-only.</em>
|
||||
* @property {Script.ResourceBuckets} ExternalPaths - External resource buckets.
|
||||
*/
|
||||
/// The main class managing a scripting engine. Also provides the <code><a href="https://apidocs.vircadia.dev/Script.html">Script</a></code> scripting interface
|
||||
/// The main class managing a scripting engine. Also provides the <code><a href="https://apidocs.overte.org/Script.html">Script</a></code> scripting interface
|
||||
class ScriptEngine : public BaseScriptEngine, public EntitiesScriptEngineProvider {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QString context READ getContext)
|
||||
|
|
@ -444,7 +444,7 @@ public:
|
|||
|
||||
/*@jsdoc
|
||||
* Provides access to methods or objects provided in an external JavaScript or JSON file.
|
||||
* See {@link https://docs.vircadia.com/script/js-tips.html} for further details.
|
||||
* See {@link https://docs.overte.org/script/js-tips.html} for further details.
|
||||
* @function Script.require
|
||||
* @param {string} module - The module to use. May be a JavaScript file, a JSON file, or the name of a system module such
|
||||
* as <code>"appUi"</code> (i.e., the "appUi.js" system module JavaScript file).
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ class ScriptEngine;
|
|||
* scripts directory of the Interface installation.
|
||||
* <em>Read-only.</em>
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/ScriptDiscoveryService.html">ScriptDiscoveryService</a></code> scripting interface
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/ScriptDiscoveryService.html">ScriptDiscoveryService</a></code> scripting interface
|
||||
class ScriptEngines : public QObject, public Dependency, public ScriptInitializerMixin<ScriptEnginePointer> {
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
/// @addtogroup ScriptEngine
|
||||
/// @{
|
||||
|
||||
#ifndef vircadia_ScriptGatekeeper_h
|
||||
#define vircadia_ScriptGatekeeper_h
|
||||
#ifndef overte_ScriptGatekeeper_h
|
||||
#define overte_ScriptGatekeeper_h
|
||||
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
|
@ -30,6 +30,6 @@ private:
|
|||
bool _initialized { false };
|
||||
};
|
||||
|
||||
#endif // vircadia_ScriptGatekeeper_h
|
||||
#endif // overte_ScriptGatekeeper_h
|
||||
|
||||
/// @}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* @property {Uuid} NULL - The null UUID, <code>"{00000000-0000-0000-0000-000000000000}"</code>.
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/Uuid.html">Uuid</a></code> scripting interface
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/Uuid.html">Uuid</a></code> scripting interface
|
||||
class ScriptUUID : public QObject, protected QScriptable {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QString NULL READ NULL_UUID CONSTANT) // String for use in scripts.
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ public:
|
|||
* print("Scripts:");
|
||||
* printDirectory(null, 0, ""); // null index for the root directory.
|
||||
*/
|
||||
/// Provides script file information available from the <code><a href="https://apidocs.vircadia.dev/ScriptDiscoveryService.html">ScriptDiscoveryService</a></code> scripting interface
|
||||
/// Provides script file information available from the <code><a href="https://apidocs.overte.org/ScriptDiscoveryService.html">ScriptDiscoveryService</a></code> scripting interface
|
||||
class ScriptsModel : public QAbstractItemModel {
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
* print("Edit scripts:");
|
||||
* printDirectory(null, 0, ""); // null index for the root directory.
|
||||
*/
|
||||
/// Provides script file information available from the <code><a href="https://apidocs.vircadia.dev/ScriptDiscoveryService.html">ScriptDiscoveryService</a></code> scripting interface
|
||||
/// Provides script file information available from the <code><a href="https://apidocs.overte.org/ScriptDiscoveryService.html">ScriptDiscoveryService</a></code> scripting interface
|
||||
class ScriptsModelFilter : public QSortFilterProxyModel {
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
class QScriptValue;
|
||||
class QScriptEngine;
|
||||
|
||||
/// Represents a display or device event to the scripting engine. Exposed as <code><a href="https://apidocs.vircadia.dev/global.html#TouchEvent">TouchEvent</a></code>
|
||||
/// Represents a display or device event to the scripting engine. Exposed as <code><a href="https://apidocs.overte.org/global.html#TouchEvent">TouchEvent</a></code>
|
||||
class TouchEvent {
|
||||
public:
|
||||
TouchEvent();
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
* @property {BanFlags} BAN_BY_FINGERPRINT - Ban user by fingerprint. <em>Read-only.</em>
|
||||
* @property {BanFlags} BAN_BY_IP - Ban user by IP address. <em>Read-only.</em>
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/Users.html">Users</a></code> scripting interface
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/Users.html">Users</a></code> scripting interface
|
||||
class UsersScriptingInterface : public QObject, public Dependency {
|
||||
Q_OBJECT
|
||||
SINGLETON_DEPENDENCY
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
/*@jsdoc
|
||||
* The <code>Vec3</code> API provides facilities for generating and manipulating 3-dimensional vectors. Overte uses a
|
||||
* right-handed Cartesian coordinate system where the y-axis is the "up" and the negative z-axis is the "front" direction.
|
||||
* <img alt="Overte coordinate system" src="https://apidocs.vircadia.dev/images/opengl-coord-system.jpg" />
|
||||
* <img alt="Overte coordinate system" src="https://apidocs.overte.org/images/opengl-coord-system.jpg" />
|
||||
*
|
||||
* @namespace Vec3
|
||||
* @variation 0
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
* @property {Vec3} FRONT - <code>{ x: 0, y: 0, z: -1 }</code> : Unit vector in the "front" direction. Synonym for
|
||||
* <code>UNIT_NEG_Z</code>. <em>Read-only.</em>
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/Vec3.html">Vec3</a></code> scripting interface
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/Vec3.html">Vec3</a></code> scripting interface
|
||||
class Vec3 : public QObject, protected QScriptable {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(glm::vec3 UNIT_X READ UNIT_X CONSTANT)
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@
|
|||
* webSocket.send("Test message");
|
||||
* };
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/WebSocket.html">WebSocket</a></code> scripting interface
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/WebSocket.html">WebSocket</a></code> scripting interface
|
||||
class WebSocketClass : public QObject {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QString binaryType READ getBinaryType WRITE setBinaryType)
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
* webSocket.send(TEST_MESSAGE);
|
||||
* };
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/WebSocketServer.html">WebSocketServer</a></code> scripting interface
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/WebSocketServer.html">WebSocketServer</a></code> scripting interface
|
||||
class WebSocketServerClass : public QObject {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QString url READ getURL)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
class QScriptValue;
|
||||
class QScriptEngine;
|
||||
|
||||
/// Represents a mouse wheel event to the scripting engine. Exposed as <code><a href="https://apidocs.vircadia.dev/global.html#WheelEvent">WheelEvent</a></code>
|
||||
/// Represents a mouse wheel event to the scripting engine. Exposed as <code><a href="https://apidocs.overte.org/global.html#WheelEvent">WheelEvent</a></code>
|
||||
class WheelEvent {
|
||||
public:
|
||||
WheelEvent();
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ XMlHttpRequest.getResponseHeader(QString) function
|
|||
* req.open("GET", URL);
|
||||
* req.send();
|
||||
*/
|
||||
/// Provides the <code><a href="https://apidocs.vircadia.dev/XMLHttpRequest.html">XMLHttpRequest</a></code> scripting interface
|
||||
/// Provides the <code><a href="https://apidocs.overte.org/XMLHttpRequest.html">XMLHttpRequest</a></code> scripting interface
|
||||
class XMLHttpRequestClass : public QObject {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QScriptValue response READ getResponse)
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
#ifndef vircadia_ModerationFlags_h
|
||||
#define vircadia_ModerationFlags_h
|
||||
#ifndef overte_ModerationFlags_h
|
||||
#define overte_ModerationFlags_h
|
||||
|
||||
class ModerationFlags {
|
||||
public:
|
||||
|
|
@ -42,4 +42,4 @@ public:
|
|||
static constexpr unsigned int getDefaultBanFlags() { return (BanFlags::BAN_BY_USERNAME | BanFlags::BAN_BY_FINGERPRINT); };
|
||||
};
|
||||
|
||||
#endif // vircadia_ModerationFlags_h
|
||||
#endif // overte_ModerationFlags_h
|
||||
|
|
|
|||
|
|
@ -19,25 +19,25 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
|
|||
apt-get install -y tzdata supervisor ${DEPENDS} && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/* && \
|
||||
mkdir -p /var/lib/vircadia
|
||||
RUN groupadd -r vircadia ; \
|
||||
useradd -Nr vircadia -d /var/lib/vircadia ; \
|
||||
usermod -aG vircadia vircadia ; \
|
||||
chown vircadia.vircadia /var/lib/vircadia ; \
|
||||
mkdir -p /var/lib/overte
|
||||
RUN groupadd -r overte ; \
|
||||
useradd -Nr overte -d /var/lib/overte ; \
|
||||
usermod -aG overte overte ; \
|
||||
chown overte.overte /var/lib/overte ; \
|
||||
exit 0
|
||||
|
||||
VOLUME /var/lib/vircadia
|
||||
VOLUME /var/lib/overte
|
||||
|
||||
RUN mkdir -p /var/run ; chmod 777 /var/run
|
||||
COPY vircadia.conf /etc/supervisor/conf.d/vircadia.conf
|
||||
COPY overte.conf /etc/supervisor/conf.d/overte.conf
|
||||
|
||||
COPY entrypoint.sh /
|
||||
COPY opt /opt/vircadia
|
||||
COPY lib /opt/vircadia/lib
|
||||
COPY opt /opt/overte
|
||||
COPY lib /opt/overte/lib
|
||||
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/vircadia.conf"]
|
||||
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/overte.conf"]
|
||||
LABEL \
|
||||
net.vircadia.gitsrc="${GITSRC}" \
|
||||
net.vircadia.gitdate="${GITDATE}" \
|
||||
net.vircadia.gitcommit="${GITCOMMIT}"
|
||||
net.overte.gitsrc="${GITSRC}" \
|
||||
net.overte.gitdate="${GITDATE}" \
|
||||
net.overte.gitcommit="${GITCOMMIT}"
|
||||
|
|
|
|||
|
|
@ -6,23 +6,23 @@ set -x
|
|||
# allowing the container to be run directly as Jenkins. In Dev, or on unknown
|
||||
# environments, run the container as root to automatically correct docker
|
||||
# group in container to match the docker.sock GID mounted from the host.
|
||||
if [ -f /var/lib/vircadia/.local -a "$(id -u)" = "0" ]; then
|
||||
if [ -f /var/lib/overte/.local -a "$(id -u)" = "0" ]; then
|
||||
# realign gid
|
||||
THIS_VIRCADIA_GID=`ls -ngd /var/lib/vircadia/.local | cut -f3 -d' '`
|
||||
CUR_VIRCADIA_GID=`getent group vircadia | cut -f3 -d: || true`
|
||||
THIS_VIRCADIA_GID=`ls -ngd /var/lib/overte/.local | cut -f3 -d' '`
|
||||
CUR_VIRCADIA_GID=`getent group overte | cut -f3 -d: || true`
|
||||
if [ ! -z "$THIS_VIRCADIA_GID" -a "$THIS_VIRCADIA_GID" != "$CUR_VIRCADIA_GID" ]; then
|
||||
groupmod -g ${THIS_VIRCADIA_GID} -o vircadia
|
||||
groupmod -g ${THIS_VIRCADIA_GID} -o overte
|
||||
fi
|
||||
|
||||
# realign pid
|
||||
THIS_VIRCADIA_PID=`ls -nd /var/lib/vircadia/.local | cut -f3 -d' '`
|
||||
CUR_VIRCADIA_PID=`getent passwd vircadia | cut -f3 -d: || true`
|
||||
THIS_VIRCADIA_PID=`ls -nd /var/lib/overte/.local | cut -f3 -d' '`
|
||||
CUR_VIRCADIA_PID=`getent passwd overte | cut -f3 -d: || true`
|
||||
if [ ! -z "$THIS_VIRCADIA_PID" -a "$THIS_VIRCADIA_PID" != "$CUR_VIRCADIA_PID" ]; then
|
||||
usermod -u ${THIS_VIRCADIA_PID} -o vircadia
|
||||
usermod -u ${THIS_VIRCADIA_PID} -o overte
|
||||
fi
|
||||
|
||||
if ! groups vircadia | grep -q vircadia; then
|
||||
usermod -aG vircadia vircadia
|
||||
if ! groups overte | grep -q overte; then
|
||||
usermod -aG overte overte
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1,74 +1,74 @@
|
|||
[supervisord]
|
||||
user=vircadia
|
||||
user=overte
|
||||
nodaemon=true
|
||||
environment=HOME="/var/lib/vircadia",USER="vircadia",LD_LIBRARY_PATH="/opt/vircadia/lib"
|
||||
environment=HOME="/var/lib/overte",USER="overte",LD_LIBRARY_PATH="/opt/overte/lib"
|
||||
logfile=/dev/stdout
|
||||
logfile_maxbytes=0
|
||||
pidfile=/var/run/supervisord.pid
|
||||
|
||||
[program:domain-server]
|
||||
command=/opt/vircadia/domain-server --get-temp-name
|
||||
command=/opt/overte/domain-server --get-temp-name
|
||||
autorestart=unexpected
|
||||
directory=/opt/vircadia
|
||||
directory=/opt/overte
|
||||
|
||||
[program:audio-mixer]
|
||||
command=/opt/vircadia/assignment-client -t 0 -a localhost -p 48000
|
||||
command=/opt/overte/assignment-client -t 0 -a localhost -p 48000
|
||||
autorestart=unexpected
|
||||
directory=/opt/vircadia
|
||||
directory=/opt/overte
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:avatar-mixer]
|
||||
command=/opt/vircadia/assignment-client -t 1 -a localhost -p 48001
|
||||
command=/opt/overte/assignment-client -t 1 -a localhost -p 48001
|
||||
autorestart=unexpected
|
||||
directory=/opt/vircadia
|
||||
directory=/opt/overte
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:entities-server]
|
||||
command=/opt/vircadia/assignment-client -t 6 -a localhost -p 48006
|
||||
command=/opt/overte/assignment-client -t 6 -a localhost -p 48006
|
||||
autorestart=unexpected
|
||||
directory=/opt/vircadia
|
||||
directory=/opt/overte
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:asset-server]
|
||||
command=/opt/vircadia/assignment-client -t 3 -a localhost -p 48003
|
||||
command=/opt/overte/assignment-client -t 3 -a localhost -p 48003
|
||||
autorestart=unexpected
|
||||
directory=/opt/vircadia
|
||||
directory=/opt/overte
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:entity-script-server]
|
||||
command=/opt/vircadia/assignment-client -t 5 -a localhost -p 48005
|
||||
command=/opt/overte/assignment-client -t 5 -a localhost -p 48005
|
||||
autorestart=unexpected
|
||||
directory=/opt/vircadia
|
||||
directory=/opt/overte
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:messages-mixer]
|
||||
command=/opt/vircadia/assignment-client -t 4 -a localhost -p 48004
|
||||
command=/opt/overte/assignment-client -t 4 -a localhost -p 48004
|
||||
autorestart=unexpected
|
||||
directory=/opt/vircadia
|
||||
directory=/opt/overte
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:scripted-agent]
|
||||
command=/opt/vircadia/assignment-client -t 2 -a localhost --max 100
|
||||
command=/opt/overte/assignment-client -t 2 -a localhost --max 100
|
||||
autorestart=unexpected
|
||||
directory=/opt/vircadia
|
||||
directory=/opt/overte
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
if [ "$OVERTE" = "" ]; then
|
||||
OVERTE=`realpath ..`
|
||||
QT5_LIBS=`realpath ~/vircadia-files/qt/qt5-install/lib`
|
||||
QT5_LIBS=`realpath ~/overte-files/qt/qt5-install/lib`
|
||||
fi
|
||||
|
||||
sudo apt-get install chrpath binutils dh-make
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ rm -r temp-make-dock
|
|||
mkdir -p $DOCK_BUILD_ROOT
|
||||
cp $VIRCADIA/source/pkg-scripts/Dockerfile.templ $DOCK_BUILD_ROOT/Dockerfile
|
||||
cp $VIRCADIA/source/pkg-scripts/docker-entrypoint.sh $DOCK_BUILD_ROOT/entrypoint.sh
|
||||
cp $VIRCADIA/source/pkg-scripts/docker-vircadia-supervisor.conf $DOCK_BUILD_ROOT/vircadia.conf
|
||||
cp $VIRCADIA/source/pkg-scripts/docker-overte-supervisor.conf $DOCK_BUILD_ROOT/overte.conf
|
||||
|
||||
# copy the files over
|
||||
mkdir -p $DOCK_BUILD_ROOT/opt
|
||||
|
|
@ -55,4 +55,4 @@ SOFILES=`ls $DOCK_BUILD_ROOT/lib | sed 's/\./\\\./g' | paste -d'|' -s`
|
|||
DEPENDS=`find $DOCK_BUILD_ROOT/opt $DOCK_BUILD_ROOT/lib -type f -executable -exec sh -c 'objdump -p {} | grep NEEDED' \; | awk '{print $2}' | sort | uniq | egrep -v "^($SOFILES)$" | xargs -n 1 -I {} sh -c 'dpkg -S {} | head -n 1' | cut -d ':' -f 1 | sort | uniq | paste -d' ' -s`
|
||||
|
||||
cd $DOCK_BUILD_ROOT
|
||||
docker build -t odysseus654/vircadia-server --build-arg "DEPENDS=$DEPENDS" --build-arg "GITSRC=$GITSRC" --build-arg "GITDATE=$GITDATE" --build-arg "GITCOMMIT=$GITCOMMIT" .
|
||||
docker build -t odysseus654/overte-server --build-arg "DEPENDS=$DEPENDS" --build-arg "GITSRC=$GITSRC" --build-arg "GITDATE=$GITDATE" --build-arg "GITCOMMIT=$GITCOMMIT" .
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
if [ "$OVERTE" = "" ]; then
|
||||
OVERTE=`realpath ..`
|
||||
QT5_LIBS=`realpath ~/vircadia-files/qt/qt5-install/lib`
|
||||
QT5_LIBS=`realpath ~/overte-files/qt/qt5-install/lib`
|
||||
fi
|
||||
|
||||
VERSION=${RPMVERSION}
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ if [ -d "/var/lib/overte/$1" ]; then
|
|||
fi
|
||||
|
||||
mkdir -p /var/lib/overte/$1/.local/share
|
||||
ln -s ../.. /var/lib/overte/$1/.local/share/Vircadia\ -\ dev
|
||||
ln -s ../.. /var/lib/overte/$1/.local/share/Vircadia
|
||||
ln -s ../.. /var/lib/overte/$1/.local/share/Overte\ -\ dev
|
||||
ln -s ../.. /var/lib/overte/$1/.local/share/Overte
|
||||
mkdir -p /var/lib/overte/$1/domain-server
|
||||
echo "{\"metaverse\": {\"local_port\": $(($2 + 2))},\"version\": 2.4}" > /var/lib/overte/$1/domain-server/config.json
|
||||
chown -R overte.overte /var/lib/overte/$1
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/sh
|
||||
# postrm script for vircadia-server
|
||||
# postrm script for overte-server
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue