Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 16:55:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Some updates to URLs in C++

Browse source
This commit is contained in:
Kalila L 2020-09-20 23:37:29 -04:00
parent d423b51e5f
commit 0d08254a07
5 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -7703,7 +7703,7 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
QUrl scriptURL { scriptFilenameOrURL };
if (scriptURL.host().endsWith(NetworkingConstants::MARKETPLACE_CDN_HOSTNAME)) {
if (scriptURL.host().endsWith(NetworkingConstants::HF_MARKETPLACE_CDN_HOSTNAME)) {
int startIndex = shortName.lastIndexOf('/') + 1;
int endIndex = shortName.lastIndexOf('?');
shortName = shortName.mid(startIndex, endIndex - startIndex);
@ -7826,7 +7826,7 @@ bool Application::askToReplaceDomainContent(const QString& url) {
const int MAX_CHARACTERS_PER_LINE = 90;
if (DependencyManager::get<NodeList>()->getThisNodeCanReplaceContent()) {
QUrl originURL { url };
if (originURL.host().endsWith(NetworkingConstants::MARKETPLACE_CDN_HOSTNAME)) {
if (originURL.host().endsWith(NetworkingConstants::HF_MARKETPLACE_CDN_HOSTNAME)) {
// Create a confirmation dialog when this call is made
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 "

2
interface/src/avatar/MyAvatar.cpp
View file

@ -83,7 +83,7 @@ const int SCRIPTED_MOTOR_AVATAR_FRAME = 1;
const int SCRIPTED_MOTOR_WORLD_FRAME = 2;
const int SCRIPTED_MOTOR_SIMPLE_MODE = 0;
const int SCRIPTED_MOTOR_DYNAMIC_MODE = 1;
const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = NetworkingConstants::PUBLIC_BUCKET_CDN_URL + "sounds/Collisions-otherorganic/Body_Hits_Impact.wav";
const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = NetworkingConstants::HF_PUBLIC_CDN_URL + "sounds/Collisions-otherorganic/Body_Hits_Impact.wav";
const float MyAvatar::ZOOM_MIN = 0.5f;
const float MyAvatar::ZOOM_MAX = 25.0f;

16
libraries/networking/src/ExternalResource.h
View file

@ -18,6 +18,8 @@
#include <mutex>
#include "NetworkingConstants.h"
/**
* Flexible management for external resources
*
@ -59,7 +61,9 @@ public:
HF_Marketplace,
/** Vircadia assets */
Assets
Assets,
Public,
Content
};
Q_ENUM(Bucket)
@ -148,10 +152,12 @@ private:
std::mutex _bucketMutex;
QMap<Bucket, QUrl> _bucketBases{
{ Bucket::HF_Public, QUrl("https://public.vircadia.com") },
{ Bucket::HF_Content, QUrl("https://content.vircadia.com") },
{ Bucket::Assets, QUrl("https://assets.vircadia.com") },
{ Bucket::HF_Marketplace, QUrl("https://mpassets.vircadia.com") },
{ Bucket::HF_Public, NetworkingConstants::HF_PUBLIC_CDN_URL },
{ Bucket::HF_Content, NetworkingConstants::HF_CONTENT_CDN_URL },
{ Bucket::HF_Marketplace, NetworkingConstants::HF_MPASSETS_CDN_URL },
{ Bucket::Assets, NetworkingConstants::VIRCADIA_CONTENT_CDN_URL },
{ Bucket::Public, NetworkingConstants::VIRCADIA_CONTENT_CDN_URL },
{ Bucket::Content, NetworkingConstants::VIRCADIA_CONTENT_CDN_URL }
};
};

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

@ -57,7 +57,7 @@ static const size_t DEFAULT_MAX_CONNECTION_RATE { std::numeric_limits<size_t>::m
const char DEFAULT_ASSIGNMENT_SERVER_HOSTNAME[] = "localhost";
const char STUN_SERVER_HOSTNAME = NetworkingConstants::STUN_SERVER_DEFAULT_HOSTNAME.toUtf8().constData();
const char STUN_SERVER_HOSTNAME[] = "stun1.l.google.com";
const unsigned short STUN_SERVER_PORT = NetworkingConstants::STUN_SERVER_DEFAULT_PORT;
const QString DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY = "domain-server.local-port";

14
libraries/networking/src/NetworkingConstants.h
View file

@ -31,8 +31,8 @@ namespace NetworkingConstants {
const QUrl METAVERSE_SERVER_URL_STAGING { "https://metaverse.vircadia.com/live" };
// Web Engine requests to this parent domain have an account authorization header added
const QString AUTH_HOSTNAME_BASE = "highfidelity.com";
const QStringList IS_AUTHABLE_HOSTNAME = { "highfidelity.com", "highfidelity.io" };
const QString AUTH_HOSTNAME_BASE = "vircadia.com";
const QStringList IS_AUTHABLE_HOSTNAME = { "vircadia.com", "vircadia.io" };
// Use a custom User-Agent to avoid ModSecurity filtering, e.g. by hosting providers.
const QByteArray VIRCADIA_USER_AGENT = "Mozilla/5.0 (VircadiaInterface)";
@ -44,8 +44,12 @@ namespace NetworkingConstants {
const QUrl BUILDS_XML_URL("https://highfidelity.com/builds.xml");
const QUrl MASTER_BUILDS_XML_URL("https://highfidelity.com/dev-builds.xml");
const QString CONTENT_CDN_URL = "https://content.highfidelity.com/";
const QString PUBLIC_BUCKET_CDN_URL = "https://hifi-public.s3.amazonaws.com/";
// CDN URLs
const QString HF_CONTENT_CDN_URL = "https://cdn-1.vircadia.com/eu-c-1";
const QString HF_MPASSETS_CDN_URL = "https://cdn-1.vircadia.com/eu-c-1";
const QString HF_PUBLIC_CDN_URL = "https://cdn-1.vircadia.com/eu-c-1";
const QString HF_MARKETPLACE_CDN_HOSTNAME = "mpassets.highfidelity.com";
const QString VIRCADIA_CONTENT_CDN_URL = "https://cdn-1.vircadia.com/us-c-1";
#if USE_STABLE_GLOBAL_SERVICES
const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.vircadia.com";
@ -59,8 +63,6 @@ namespace NetworkingConstants {
const unsigned short STUN_SERVER_DEFAULT_PORT = 19302;
#endif
const QString MARKETPLACE_CDN_HOSTNAME = "mpassets.highfidelity.com";
const QUrl HELP_DOCS_URL { "https://docs.vircadia.dev" };
const QUrl HELP_FORUM_URL { "https://forums.vircadia.dev" };
const QUrl HELP_SCRIPTING_REFERENCE_URL{ "https://apidocs.vircadia.dev/" };