Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-05 18:19:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Bunch of URL updates later...

Browse source
This commit is contained in:
Kalila L 2020-09-21 00:54:49 -04:00
parent d3a97832a3
commit 7b7038fae1
16 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/build.gradle
View file

@ -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://hifi-public.s3.amazonaws.com/dependencies/android/'
def baseUrl = 'https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dependencies/android/'
def breakpadDumpSymsDir = new File("${appDir}/build/tmp/breakpadDumpSyms")
task extractGvrBinaries() {

2
android/setupGVR.gradle
View file

@ -11,7 +11,7 @@ buildscript {
def file='gvrsdk_v1.101.0.tgz'
def url='https://hifi-public.s3.amazonaws.com/austin/android/' + file
def url='https://cdn-1.vircadia.com/eu-c-1/vircadia-public/austin/android/' + file
def destFile = new File(HIFI_ANDROID_PRECOMPILED, file)
// FIXME find a way to only download if the file doesn't exist

2
interface/resources/qml/hifi/avatarapp/Settings.qml
View file

@ -456,7 +456,7 @@ Rectangle {
id: avatarCollisionSoundUrlInputText
font.pixelSize: 17
Layout.fillWidth: true
placeholderText: 'https://hifi-public.s3.amazonaws.com/sounds/Collisions-'
placeholderText: ExternalResource.getUrl(ExternalResource.HF_Public, '/sounds/Collisions-')
onFocusChanged: {
keyboardRaised = (avatarAnimationUrlInputText.focus || avatarCollisionSoundUrlInputText.focus);

2
interface/resources/qml/hifi/models/S3Model.qml
View file

@ -25,7 +25,7 @@ XmlListModel {
readonly property string realPrefix: prefix.match('.*/$') ? prefix : (prefix + "/")
readonly property string nameRegex: realPrefix + (filter ? (".*" + filter) : "") + ".*\." + extension
readonly property string nameQuery: "Key/substring-before(substring-after(string(), '" + prefix + "'), '." + extension + "')"
readonly property string baseUrl: "http://s3.amazonaws.com/hifi-public"
readonly property string baseUrl: ExternalResource.HF_Public
// FIXME need to urlencode prefix?
source: baseUrl + "?prefix=" + realPrefix

5
interface/src/scripting/TestScriptingInterface.cpp
View file

@ -20,6 +20,7 @@
#include <Trace.h>
#include "Application.h"
#include "NetworkingConstants.h"
Q_LOGGING_CATEGORY(trace_test, "trace.test")
@ -66,8 +67,8 @@ bool TestScriptingInterface::loadTestScene(QString scene) {
return result;
}
static const QString TEST_ROOT = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/";
static const QString TEST_BINARY_ROOT = "https://hifi-public.s3.amazonaws.com/test_scene_data/";
static const QString TEST_ROOT = "https://raw.githubusercontent.com/hifi-archive/hifi_tests/master/";
static const QString TEST_BINARY_ROOT = NetworkingConstants::HF_CONTENT_CDN_URL + "/test_scene_data/";
static const QString TEST_SCRIPTS_ROOT = TEST_ROOT + "scripts/";
static const QString TEST_SCENES_ROOT = TEST_ROOT + "scenes/";

4
interface/src/ui/ModelsBrowser.cpp
View file

@ -32,8 +32,8 @@
const char* MODEL_TYPE_NAMES[] = { "entities", "heads", "skeletons", "skeletons", "attachments" };
static const QString S3_URL = "http://s3.amazonaws.com/hifi-public";
static const QString PUBLIC_URL = "http://public.highfidelity.io";
static const QString S3_URL = NetworkingConstants::HF_PUBLIC_CDN_URL;
static const QString PUBLIC_URL = "http://public.highfidelity.io"; // Needs to change to Vircadia...?
static const QString MODELS_LOCATION = "models/";
static const QString PREFIX_PARAMETER_NAME = "prefix";

2
libraries/networking/src/ResourceCache.h
View file

@ -358,7 +358,7 @@ public:
* // Replace AnimationCache with MaterialCache, ModelCache, SoundCache, or TextureCache as appropriate.
* // TextureCache has its own version of this function.
*
* var resourceURL = "https://s3-us-west-1.amazonaws.com/hifi-content/clement/production/animations/sitting_idle.fbx";
* var resourceURL = "https://cdn-1.vircadia.com/eu-c-1/vircadia-public/clement/production/animations/sitting_idle.fbx";
* var resourceObject = AnimationCache.prefetch(resourceURL);
*
* function checkIfResourceLoaded(state) {

2
libraries/script-engine/src/AudioScriptingInterface.h
View file

@ -169,7 +169,7 @@ protected:
* audio file.
* @returns {AudioInjector} The audio injector that plays the audio file.
* @example <caption>Play a sound.</caption>
* var sound = SoundCache.getSound("http://hifi-content.s3.amazonaws.com/ken/samples/forest_ambiX.wav");
* var sound = SoundCache.getSound("https://cdn-1.vircadia.com/us-c-1/ken/samples/forest_ambiX.wav");
*
* function playSound() {
* var injectorOptions = {

2
scripts/system/html/users.html
View file

@ -252,7 +252,7 @@
<body>
<div class="top-bar">
<div>Users Online</div>
<img id="refresh-button" onclick="pollUsers()" src="https://hifi-content.s3.amazonaws.com/faye/tablet-dev/refresh-icon.svg"></img>
<img id="refresh-button" onclick="pollUsers()" src="https://cdn-1.vircadia.com/eu-c-1/vircadia-public/faye/tablet-dev/refresh-icon.svg"></img>
</div>
<div class="main">
<div id="user-info-div">

3
tests-manual/render-texture-load/src/main.cpp
View file

@ -52,6 +52,7 @@
#include <GenericThread.h>
#include <AddressManager.h>
#include <ExternalResource.h>
#include <NodeList.h>
#include <TextureCache.h>
#include <FramebufferCache.h>
@ -62,7 +63,7 @@
extern QThread* RENDER_THREAD;
static const QString DATA_SET = "https://hifi-content.s3.amazonaws.com/austin/textures.zip";
static const QString DATA_SET = ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Content, "/austin/textures.zip");
static QDir DATA_DIR = QDir(QString("h:/textures"));
static QTemporaryDir* DOWNLOAD_DIR = nullptr;

7
tests/animation/src/AnimTests.cpp
View file

@ -15,6 +15,7 @@
#include <AnimVariant.h>
#include <AnimExpression.h>
#include <AnimUtil.h>
#include <ExternalResource.h>
#include <NodeList.h>
#include <AddressManager.h>
#include <AccountManager.h>
@ -46,7 +47,7 @@ void AnimTests::cleanupTestCase() {
void AnimTests::testClipInternalState() {
QString id = "my anim clip";
QString url = "https://hifi-public.s3.amazonaws.com/ozan/support/FightClubBotTest1/Animations/standard_idle.fbx";
QString url = ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Content, "/ozan/support/FightClubBotTest1/Animations/standard_idle.fbx");
float startFrame = 2.0f;
float endFrame = 20.0f;
float timeScale = 1.1f;
@ -74,7 +75,7 @@ static float framesToSec(float secs) {
void AnimTests::testClipEvaulate() {
AnimContext context(false, false, false, glm::mat4(), glm::mat4(), 0);
QString id = "myClipNode";
QString url = "https://hifi-public.s3.amazonaws.com/ozan/support/FightClubBotTest1/Animations/standard_idle.fbx";
QString url = ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Content, "/ozan/support/FightClubBotTest1/Animations/standard_idle.fbx");
float startFrame = 2.0f;
float endFrame = 22.0f;
float timeScale = 1.0f;
@ -111,7 +112,7 @@ void AnimTests::testClipEvaulate() {
void AnimTests::testClipEvaulateWithVars() {
AnimContext context(false, false, false, glm::mat4(), glm::mat4(), 0);
QString id = "myClipNode";
QString url = "https://hifi-public.s3.amazonaws.com/ozan/support/FightClubBotTest1/Animations/standard_idle.fbx";
QString url = ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Content, "/ozan/support/FightClubBotTest1/Animations/standard_idle.fbx";
float startFrame = 2.0f;
float endFrame = 22.0f;
float timeScale = 1.0f;

4
tests/gpu/src/TextureTest.cpp
View file

@ -23,12 +23,14 @@
#include <test-utils/QTestExtensions.h>
#include <test-utils/Utils.h>
#include <ExternalResource.h>
QTEST_MAIN(TextureTest)
#define LOAD_TEXTURE_COUNT 100
#define FAIL_AFTER_SECONDS 30
static const QString TEST_DATA("https://hifi-public.s3.amazonaws.com/austin/test_data/test_ktx.zip");
static const QString TEST_DATA(ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Public, "/austin/test_data/test_ktx.zip"));
static const QString TEST_DIR_NAME("{630b8f02-52af-4cdf-a896-24e472b94b28}");
static const QString KTX_TEST_DIR_ENV("HIFI_KTX_TEST_DIR");

5
tests/networking/src/ResourceTests.cpp
View file

@ -11,6 +11,7 @@
#include <QNetworkDiskCache>
#include <ExternalResource.h>
#include <ResourceCache.h>
#include <LimitedNodeList.h>
#include <NodeList.h>
@ -50,7 +51,7 @@ static QSharedPointer<Resource> resource;
void ResourceTests::downloadFirst() {
// download the Mery fst file
QUrl meryUrl = QUrl("http://hifi-public.s3.amazonaws.com/marketplace/contents/e21c0b95-e502-4d15-8c41-ea2fc40f1125/3585ddf674869a67d31d5964f7b52de1.fst");
QUrl meryUrl = QUrl(ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Public, "/marketplace/contents/e21c0b95-e502-4d15-8c41-ea2fc40f1125/3585ddf674869a67d31d5964f7b52de1.fst"));
resource = QSharedPointer<Resource>::create(meryUrl);
resource->setSelf(resource);
@ -73,7 +74,7 @@ void ResourceTests::downloadFirst() {
void ResourceTests::downloadAgain() {
// download the Mery fst file
QUrl meryUrl = QUrl("http://hifi-public.s3.amazonaws.com/marketplace/contents/e21c0b95-e502-4d15-8c41-ea2fc40f1125/3585ddf674869a67d31d5964f7b52de1.fst");
QUrl meryUrl = QUrl(ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Public, "/marketplace/contents/e21c0b95-e502-4d15-8c41-ea2fc40f1125/3585ddf674869a67d31d5964f7b52de1.fst"));
resource = QSharedPointer<Resource>::create(meryUrl);
resource->setSelf(resource);

2
tools/nitpick/src/AWSInterface.cpp
View file

@ -7,6 +7,8 @@
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
// ##### NOTICE: THIS FILE NEEDS TO BE UPDATED WITH THE CORRECT LATEST BUCKET.
//
#include "AWSInterface.h"
#include "common.h"

4
tools/qt-builder/README.md
View file

@ -156,7 +156,7 @@ The *.prl* files have an absolute path that needs to be removed (see http://www.
1. Copy *qt.conf* to *qt5-install\bin*
#### Uploading
Create a tar file called qt5-install-5.12.3-windows.tar.gz from the qt5-install folder.
Upload qt5-install-5.12.3-windows.tar.gz to our Amazon S3 hifi-public bucket, under the dependencies/vckpg directory.
Upload qt5-install-5.12.3-windows.tar.gz to our Amazon S3 vircadia-public bucket, under the dependencies/vckpg directory.
Update hifi_vcpkg.py to use this new URL. Additionally, you should make a small change to any file in the hifi/cmake/ports directory to force the re-download of the qt-install.tar.gz during the build process for hifi.
#### Preparing Symbols
Run `python3 prepare-windows-symbols-for-backtrace.py qt5-install` to scan the qt5-install directory for any dlls and pdbs. After running this command the backtrace directory will be created. Zip this directory up, but make sure that all dlls and pdbs are in the root of the zip file, not under a sub-directory. This file can then be uploaded to backtrace here: https://highfidelity.sp.backtrace.io/p/Interface/settings/symbol/upload
@ -243,7 +243,7 @@ git clone --recursive git://code.qt.io/qt/qt5.git -b 5.12.3 --single-branch
1. Copy *qt.conf* to *qt5-install\bin*
#### Uploading
`tar -zcvf qt5-install-5.13.2-macos.tar.gz qt5-install`
Upload qt5-install-5.13.2-macos.tar.gz to our Amazon S3 hifi-public bucket, under the dependencies/vckpg directory
Upload qt5-install-5.13.2-macos.tar.gz to our Amazon S3 vircadia-public bucket, under the dependencies/vckpg directory
#### Creating symbols
Run `python3 prepare-mac-symbols-for-backtrace.py qt5-install` to scan the qt5-build directory for any dylibs and execute dsymutil to create dSYM bundles. After running this command the backtrace directory will be created. Zip this directory up, but make sure that all dylibs and dSYM fiels are in the root of the zip file, not under a sub-directory. This file can then be uploaded to backtrace here: https://highfidelity.sp.backtrace.io/p/Interface/settings/symbol/upload
## Problems

4
tools/qt-builder/qt-lite-build-steps.md
View file

@ -30,7 +30,7 @@ cd qt-build
```
Download ssl-static.zip and unzip to ssl-static folder next to qt5 folder
`https://hifi-content.s3.amazonaws.com/dante/ssl-static-windows.zip`
`https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dante/ssl-static-windows.zip`
remove config.opt in the build folder
copy over the config file from qt-builder
```
@ -71,7 +71,7 @@ cd qt-build
```
Download ssl-static.zip and unzip to ssl-static folder next to qt5 folder
`https://hifi-content.s3.amazonaws.com/dante/openssl-static-osx.zip`
`https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dante/openssl-static-osx.zip`
copy over the config file from qt-builder
```
cp path-to-your-hifi-directory/tools/qt-builder/qt-lite-osx-config ./config.opt