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

Use 'resource' protocol instead of 'http'

Browse source
This commit is contained in:
Zach Fox 2017-06-07 15:11:53 -07:00
parent 5114fd8e1f
commit 3884287c41
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/model-networking/src/model-networking/TextureCache.cpp
View file

@ -50,7 +50,7 @@ Q_LOGGING_CATEGORY(trace_resource_parse_image_ktx, "trace.resource.parse.image.k
const std::string TextureCache::KTX_DIRNAME { "ktx_cache" }; const std::string TextureCache::KTX_DIRNAME { "ktx_cache" };
const std::string TextureCache::KTX_EXT { "ktx" }; const std::string TextureCache::KTX_EXT { "ktx" };
const std::string TextureCache::SPECTATOR_CAMERA_FRAME_URL { "http://spectatorCameraFrame" }; const std::string TextureCache::SPECTATOR_CAMERA_FRAME_URL { "resource://spectatorCameraFrame" };
static const float SKYBOX_LOAD_PRIORITY { 10.0f }; // Make sure skybox loads first static const float SKYBOX_LOAD_PRIORITY { 10.0f }; // Make sure skybox loads first
static const float HIGH_MIPS_LOAD_PRIORITY { 9.0f }; // Make sure high mips loads after skybox but before models static const float HIGH_MIPS_LOAD_PRIORITY { 9.0f }; // Make sure high mips loads after skybox but before models

2
scripts/system/spectatorCamera.js
View file

@ -105,7 +105,7 @@
}, true); }, true);
// Put an image3d overlay on the near face, as a viewFinder. // Put an image3d overlay on the near face, as a viewFinder.
viewFinderOverlay = Overlays.addOverlay("image3d", { viewFinderOverlay = Overlays.addOverlay("image3d", {
url: "http://spectatorCameraFrame", url: "resource://spectatorCameraFrame",
parentID: camera, parentID: camera,
alpha: 1, alpha: 1,
position: inFrontOf(-0.25, cameraPosition, cameraRotation), position: inFrontOf(-0.25, cameraPosition, cameraRotation),