Browse Source

Fix tile path generation when no extension is specified.

pull/880/head
Nico Höllerich 4 years ago
parent
commit
c14a95df56
1 changed files with 6 additions and 3 deletions
  1. +6
    -3
      src/js/libpannellum.js

+ 6
- 3
src/js/libpannellum.js View File

@@ -276,7 +276,8 @@ function Renderer(container) {
faceImg.onload = onLoad; faceImg.onload = onLoad;
faceImg.onerror = incLoaded; // ignore missing face to support partial fallback image faceImg.onerror = incLoaded; // ignore missing face to support partial fallback image
if (imageType == 'multires') { if (imageType == 'multires') {
faceImg.src = path.replace('%s', sides[s]) + '.' + image.extension;
var extendedPath = image.extension ? path + '.' + image.extension : path;
faceImg.src = extendedPath.replace('%s', sides[s]);
} else { } else {
faceImg.src = image[s].src; faceImg.src = image[s].src;
} }
@@ -1131,7 +1132,8 @@ function Renderer(container) {
} else { } else {
this.path = path.replace('%s', side).replace('%l', level).replace('%x', x).replace('%y', y); this.path = path.replace('%s', side).replace('%l', level).replace('%x', x).replace('%y', y);
} }
this.uri = encodeURI(this.path + '.' + image.extension);
var extendedPath = image.extension ? this.path + '.' + image.extension : this.path;
this.uri = encodeURI(extendedPath);
} }


function getCornerTile(node, dx, dy) { function getCornerTile(node, dx, dy) {
@@ -1940,7 +1942,8 @@ function Renderer(container) {
* @param {MultiresNode} node - Input node. * @param {MultiresNode} node - Input node.
*/ */
function processNextTile(node) { function processNextTile(node) {
loadTexture(node, image.loader || node.path + '.' + image.extension, function (texture, loaded) {
var extendedPath = image.extension ? node.path + '.' + image.extension : node.path;
loadTexture(node, image.loader || extendedPath, function (texture, loaded) {
node.texture = texture; node.texture = texture;
node.textureLoaded = loaded ? 2 : 1; node.textureLoaded = loaded ? 2 : 1;




Loading…
Cancel
Save