Просмотр исходного кода

Change `horizonPitch` and `horizonRoll` parameters from radians to degrees to match other parameters.

pull/234/head
Matthew Petroff 8 лет назад
Родитель
Сommit
f21d3b614d
2 измененных файлов: 6 добавлений и 5 удалений
  1. +2
    -1
      doc/json-config-parameters.md
  2. +4
    -4
      src/js/pannellum.js

+ 2
- 1
doc/json-config-parameters.md Просмотреть файл

@@ -137,7 +137,8 @@ Specifies a URL for a preview image to display before the panorama is loaded.

### `horizonPitch` and `horizonRoll` (number)

Specifies pitch / roll of image horizon (for correcting non-leveled panoramas).
Specifies pitch / roll of image horizon, in degrees (for correcting
non-leveled panoramas).


### `hotSpots` (array)


+ 4
- 4
src/js/pannellum.js Просмотреть файл

@@ -491,9 +491,9 @@ function parseGPanoXMP(image) {
}
if (xmp.horizonPitch !== null && xmp.horizonRoll !== null) {
if (specifiedPhotoSphereExcludes.indexOf('horizonPitch') < 0)
config.horizonPitch = xmp.horizonPitch / 180 * Math.PI;
config.horizonPitch = xmp.horizonPitch;
if (specifiedPhotoSphereExcludes.indexOf('horizonRoll') < 0)
config.horizonRoll = xmp.horizonRoll / 180 * Math.PI;
config.horizonRoll = xmp.horizonRoll;
}
// TODO: add support for initial view settings
@@ -1388,9 +1388,9 @@ function renderInit() {
try {
var params = {};
if (config.horizonPitch !== undefined)
params.horizonPitch = config.horizonPitch;
params.horizonPitch = config.horizonPitch * Math.PI / 180;
if (config.horizonRoll !== undefined)
params.horizonRoll = config.horizonRoll;
params.horizonRoll = config.horizonRoll * Math.PI / 180;
renderer.init(panoImage, config.type, config.dynamic, config.haov * Math.PI / 180, config.vaov * Math.PI / 180, config.vOffset * Math.PI / 180, renderInitCallback, params);
if (config.dynamic !== true) {
// Allow image to be garbage collected


Загрузка…
Отмена
Сохранить