From ca974504644ea8169179bbeb7ceb7ce836df37fe Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Mon, 17 Aug 2020 02:44:26 -0400 Subject: [PATCH] Centralizing some more networking constants. --- interface/src/avatar/MyAvatar.cpp | 3 ++- interface/src/ui/ModelsBrowser.cpp | 4 ++-- libraries/entities/src/WebEntityItem.cpp | 3 ++- libraries/networking/src/NetworkingConstants.h | 8 ++++++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 570ac5fce2..27af9b3c14 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -50,6 +50,7 @@ #include #include #include +#include #include "MyHead.h" #include "MySkeletonModel.h" @@ -82,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 = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; +const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = NetworkingConstants::DEFAULT_AVATAR_COLLISION_SOUND_URL; const float MyAvatar::ZOOM_MIN = 0.5f; const float MyAvatar::ZOOM_MAX = 25.0f; diff --git a/interface/src/ui/ModelsBrowser.cpp b/interface/src/ui/ModelsBrowser.cpp index 96c10be212..cccfb6e6d6 100644 --- a/interface/src/ui/ModelsBrowser.cpp +++ b/interface/src/ui/ModelsBrowser.cpp @@ -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::S3_URL; +static const QString PUBLIC_URL = NetworkingConstants::PUBLIC_URL; static const QString MODELS_LOCATION = "models/"; static const QString PREFIX_PARAMETER_NAME = "prefix"; diff --git a/libraries/entities/src/WebEntityItem.cpp b/libraries/entities/src/WebEntityItem.cpp index 57b53bd911..5419dca53c 100644 --- a/libraries/entities/src/WebEntityItem.cpp +++ b/libraries/entities/src/WebEntityItem.cpp @@ -17,13 +17,14 @@ #include #include #include +#include #include "EntitiesLogging.h" #include "EntityItemProperties.h" #include "EntityTree.h" #include "EntityTreeElement.h" -const QString WebEntityItem::DEFAULT_SOURCE_URL = "https://www.vircadia.com"; +const QString WebEntityItem::DEFAULT_SOURCE_URL = NetworkingConstants::WEB_ENTITY_DEFAULT_SOURCE_URL; const uint8_t WebEntityItem::DEFAULT_MAX_FPS = 10; const QString WebEntityItem::DEFAULT_WEB_BACKGROUND_COLOR = "#FFFFFFFF"; diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h index edc1c1a1ef..0e490885cd 100644 --- a/libraries/networking/src/NetworkingConstants.h +++ b/libraries/networking/src/NetworkingConstants.h @@ -41,7 +41,15 @@ namespace NetworkingConstants { const QUrl BUILDS_XML_URL("https://highfidelity.com/builds.xml"); const QUrl MASTER_BUILDS_XML_URL("https://highfidelity.com/dev-builds.xml"); + + // WebEntity Defaults + const QString WEB_ENTITY_DEFAULT_SOURCE_URL = "https://vircadia.com/"; + + const QString DEFAULT_AVATAR_COLLISION_SOUND_URL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; + // CDN URLs + const QString S3_URL = "http://s3.amazonaws.com/hifi-public"; + const QString PUBLIC_URL = "http://public.highfidelity.io"; #if USE_STABLE_GLOBAL_SERVICES const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.highfidelity.com";