소스 검색

Fix regression with CSS fallback renderer.

Regression caused rendering issue for cubemaps (but not multires) when CSS
fallback render was used. The regression was introduced as an optimization in
5eab5366f6.
pull/1055/head
Matthew Petroff 3 년 전
부모
커밋
0967632240
1개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. +3
    -2
      src/js/libpannellum.js

+ 3
- 2
src/js/libpannellum.js 파일 보기

@@ -45,6 +45,7 @@ function Renderer(container) {
var texCoordBuffer, cubeVertBuf, cubeVertTexCoordBuf, cubeVertIndBuf; var texCoordBuffer, cubeVertBuf, cubeVertTexCoordBuf, cubeVertIndBuf;
var globalParams; var globalParams;
var sides = ['f', 'b', 'u', 'd', 'l', 'r']; var sides = ['f', 'b', 'u', 'd', 'l', 'r'];
var fallbackSides = ['f', 'r', 'b', 'l', 'u', 'd'];


/** /**
* Initialize renderer. * Initialize renderer.
@@ -205,7 +206,7 @@ function Renderer(container) {
var onLoad = function() { var onLoad = function() {
// Draw image on canvas // Draw image on canvas
var faceCanvas = document.createElement('canvas'); var faceCanvas = document.createElement('canvas');
faceCanvas.className = 'pnlm-face pnlm-' + sides[this.side] + 'face';
faceCanvas.className = 'pnlm-face pnlm-' + fallbackSides[this.side] + 'face';
world.appendChild(faceCanvas); world.appendChild(faceCanvas);
var faceContext = faceCanvas.getContext('2d'); var faceContext = faceCanvas.getContext('2d');
faceCanvas.style.width = this.width + 4 + 'px'; faceCanvas.style.width = this.width + 4 + 'px';
@@ -284,7 +285,7 @@ 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;
faceImg.src = path.replace('%s', fallbackSides[s]) + '.' + image.extension;
} else { } else {
faceImg.src = image[s].src; faceImg.src = image[s].src;
} }


불러오는 중...
취소
저장