Version Description
= 7.5.09 =
- This version addresses various bug fixes and feature requests.
Download this release
Release Info
| Developer | opajaap |
| Plugin |  WP Photo Album Plus |
| Version | 7.5.09.010 |
| Comparing to | |
| See all releases | |
Code changes from version 7.5.09.009 to 7.5.09.010
- js/wppa-all.js +1 -1
- js/wppa-spheric.js +4 -1
- js/wppa-spheric.min.js +1 -1
- wppa-picture.php +3 -3
- wppa.php +2 -2
js/wppa-all.js
CHANGED
|
@@ -15,4 +15,4 @@ var wppaJsTouchVersion="7.5.03",wppaTriggerElementID=null,wppaFingerCount=0,wppa
|
|
| 15 |
// wppa-zoom
|
| 16 |
function wppaDoZoomPan(e){var p=jQuery,o=w(e);if(!o.initialized&&!o.abort){if(o.isLightbox&&p("#wppa-ovl-spin").show(),!o.image.complete)return wppaConsoleLog("Loading image "+e),void setTimeout(function(){wppaDoZoomPan(e)},200);wppaConsoleLog("Loading image "+e+" complete"),p(image).css({width:image.naturalWidth,height:image.naturalHeight,maxWidth:image.naturalWidth,maxHeight:image.naturalHeight}),o.manual=!1,o.deltaX=0,o.deltaY=0,o.deltaFactor=1,o.busy=!1,o.div=p("#wppa-pan-div-"+o.itemId),o.canvas=document.getElementById("wppa-pan-canvas-"+o.itemId),o.left=p("#wppa-pctl-left-"+o.itemId),o.right=p("#wppa-pctl-right-"+o.itemId),o.up=p("#wppa-pctl-up-"+o.itemId),o.down=p("#wppa-pctl-down-"+o.itemId),o.zoomin=p("#wppa-pctl-zoomin-"+o.itemId),o.zoomout=p("#wppa-pctl-zoomout-"+o.itemId),o.prev=p("#wppa-pctl-prev-"+o.itemId),o.next=p("#wppa-pctl-next-"+o.itemId),o.exit=p("#wppa-exit-btn-2"),o.canvasWidth=o.width,o.canvasHeight=o.height,o.savedCanvasX=0,o.savedCanvasY=0,o.fromHeight=o.image.height,o.fromWidth=o.image.width,o.imageRatio=o.image.width/o.image.height,o.fromX=0,o.fromY=0,o.centerX=o.fromX+o.fromWidth/2,o.centerY=o.fromY+o.fromHeight/2,o.ctx=null,o.buttondown=!1,o.enableManual=!0,o.ctrlbarUpdate=!0,o.pause=!1,o.time=0,wppaIsMobile?(o.right.on("touchstart",function(t){n(e)}),o.right.on("touchend",function(t){m(e)}),o.left.on("touchstart",function(t){i(e)}),o.left.on("touchend",function(t){m(e)}),o.up.on("touchstart",function(t){s(e)}),o.up.on("touchend",function(t){m(e)}),o.down.on("touchstart",function(t){r(e)}),o.down.on("touchend",function(t){m(e)}),o.zoomin.on("touchstart",function(t){c(e)}),o.zoomin.on("touchend",function(t){m(e)}),o.zoomout.on("touchstart",function(t){u(e)}),o.zoomout.on("touchend",function(t){m(e)}),o.canvas.addEventListener("touchstart",function(t){f(e,t)}),o.canvas.addEventListener("touchmove",function(t){l(e,t)}),o.canvas.addEventListener("touchend",function(t){g(e)})):(o.canvas.addEventListener("mousedown",function(t){f(e,t)}),o.canvas.addEventListener("mousemove",function(t){l(e,t)}),o.canvas.addEventListener("mouseup",function(t){g(e)}),o.canvas.addEventListener("mouseleave",function(t){(o=w(e)).manual&&w(e,{pause:!0})}),o.canvas.addEventListener("mouseenter",function(t){var a;w(a=e,{pause:!1}).manual&&h(a)}),document.getElementById("wppa-pan-canvas-"+o.itemId).addEventListener("wheel",function(t){var a,n;a=e,(n=t).preventDefault(),n.stopPropagation(),o=w(a),w(a,{deltaFactor:1+n.deltaY*o.zoomsensitivity/(wppaIsChrome?1e4:1e3),manual:!1}),h(a),setTimeout(function(){w(a,{deltaFactor:1})},25)}),o.right.on("mousedown",function(t){n(e)}),o.right.on("mouseup",function(t){m(e)}),o.left.on("mousedown",function(t){i(e)}),o.left.on("mouseup",function(t){m(e)}),o.up.on("mousedown",function(t){s(e)}),o.up.on("mouseup",function(t){m(e)}),o.down.on("mousedown",function(t){r(e)}),o.down.on("mouseup",function(t){m(e)}),o.zoomin.on("mousedown",function(t){c(e)}),o.zoomin.on("mouseup",function(t){m(e)}),o.zoomout.on("mousedown",function(t){u(e)}),o.zoomout.on("mouseup",function(t){m(e)})),o.isLightbox&&(p(".wppa-fulls-btn").on("click",function(){w(0,{abort:!0})}),p(".wppa-exit-fulls-btn").on("click",function(){w(0,{abort:!0})}),o.prev&&(o.prev.on("click",function(t){p("#wppa-ovl-spin").show(),w(0,{abort:!0}),wppaOvlShowPrev()}),o.next.on("click",function(t){p("#wppa-ovl-spin").show(),w(0,{abort:!0}),wppaOvlShowNext()})),o.exit.on("click",function(t){p("#wppa-ovl-spin").hide(),w(0,{abort:!0}),wppaOvlHide()})),p(window).on("DOMContentLoaded load resize orientationchange",function(){setTimeout(function(t){a(e)},25)}),a(e),o.initialized=!0,w(e,o),p("#wppa-ovl-spin").hide()}function h(t){var a,n,e,o,i,s=w(t);L()<s.time+10?wppaConsoleLog("Skipped render "+t):(w(t,{time:L()}),wppaConsoleLog("Zoom render "+t),(s.isLightbox&&!wppaOvlOpen||!s.isLightbox&&wppaOvlOpen)&&(s=w(0,{abort:!0})),s.abort?w(t,{manual:!1,buttondown:!1,pause:!1,ctx:null}):s.busy||(wppaDebugCounter++,(s=w(t,{busy:!0})).manual||(s.fromX+=s.deltaX,s.fromY+=s.deltaY,a=s.fromHeight/s.deltaFactor,n=s.fromWidth/s.deltaFactor,50<a&&1!=s.deltaFactor&&(wppaIsFs()||a<=s.image.height)&&(s.fromX-=(n-s.fromWidth)/2,s.fromY-=(a-s.fromHeight)/2,s.fromWidth=n,s.fromHeight=a)),s.fromX=Math.max(0,Math.min(s.image.width-s.fromWidth,s.fromX)),s.fromY=Math.max(0,Math.min(s.image.height-s.fromHeight,s.fromY)),e=screen.width/screen.height,o=(1-s.image.width/s.fromWidth)*s.canvas.width/2,i=(1-s.image.height/s.fromHeight)*s.canvas.height/2,s.ctx=s.canvas.getContext("2d"),e>s.imageRatio&&a>s.image.height&&wppaIsFs()||e<=s.imageRatio&&n>s.image.width&&wppaIsFs()?(s.enableManual=!1,s.ctx.clearRect(0,0,s.canvas.width,s.canvas.height),s.ctx.drawImage(s.image,s.fromX,s.fromY,s.fromWidth,s.fromHeight,o,i,s.canvas.width,s.canvas.height),jQuery(s.canvas).css({cursor:"default"})):(s.enableManual=!0,s.ctx.drawImage(s.image,s.fromX,s.fromY,s.fromWidth,s.fromHeight,0,0,s.canvas.width,s.canvas.height),jQuery(s.canvas).css({cursor:"grab"})),wppaIsFs()?(s.fsMaskTop=i-(s.canvas.height-screen.height)/2,s.fsMaskLeft=o-(s.canvas.width-screen.width)/2,s.fsMaskBottom=screen.height-s.fsMaskTop,s.fsMaskRight=screen.width-s.fsMaskLeft):(s.fsMaskTop=0,s.fsMaskLeft=0,s.fsMaskBottom=0,s.fsMaskRight=0),s.ctrlbarUpdate&&(wppaAdjustControlbar(),s.ctrlbarUpdate=!1),s.busy=!1,w(t,s),s.pause||!s.manual&&!s.buttondown||setTimeout(function(){h(t)},10),s.pause&&w(t,{pause:!1})))}function a(t){var a,n,e,o,i,s,r,c,d,u=w(t);u&&(u.isLightbox?(p("#wppa-overlay-ic").css("display",""),o=(n=!wppaIsFs())?(e=window.innerWidth?window.innerWidth:screen.width,window.innerHeight?window.innerHeight:screen.height):(e=screen.width,screen.height),r=0,d=(c=8)+(u.controls?u.icsize+10:0)+10,n?(c+=2*u.borderWidth,d+=2*u.borderWidth):c=40,a=n?o-d>(e-c)/u.imageRatio:(screenRatio=screen.width/screen.height,screenRatio<u.imageRatio),n&&a&&(r=(o-(s=(i=e-c)/u.imageRatio)-d)/2+20),n&&!a&&(s=(i=u.imageRatio*(o-(u.controls?u.icsize:0)-48))/u.imageRatio,r=20),!n&&a&&(i=(s=screen.height)*u.imageRatio,r=0),n||a||(s=(i=screen.width)/u.imageRatio,r=(screen.height-s)/2),p("#wppa-ovl-pan-container").css({marginTop:r}),p("#wppa-overlay-ic").css({marginTop:0}),u.canvasWidth=i,u.canvasHeight=s,u.canvas.width=u.canvasWidth,u.canvas.height=u.canvasHeight,n?(p("#wppa-ovl-pan-container").css({backgroundColor:u.backgroundColor,padding:u.padding,borderRadius:u.borderRadius,borderWidth:u.borderWidth,width:i,marginLeft:0}),p("#wppa-pctl-div-"+u.itemId).css({marginLeft:0}),a?p("#wppa-overlay-ic").css({left:4}):p("#wppa-overlay-ic").css({left:(e-i)/2})):(p("#wppa-overlay-ic").css({marginLeft:0}),p("#wppa-ovl-pan-container").css({backgroundColor:"transparent",padding:0,borderRadius:0,borderWidth:0,width:i,left:(e-i)/2,position:"fixed"}),p("#wppa-pctl-div-"+u.itemId).css({marginLeft:0}))):(u.canvasWidth=p(u.div).parent().width(),u.canvasHeight=u.canvasWidth/u.imageRatio,u.canvas.width=u.canvasWidth,u.canvas.height=u.canvasHeight),u.ctrlbarUpdate=!0,w(t,u),setTimeout(function(){h(t)},250))}function n(t){var a=w(t),n=a.image.naturalWidth/a.canvas.width;n<1.5&&(n=1.5),w(t,{deltaX:n*=1.5,buttondown:!0,manual:!1}),h(t)}function i(t){var a=w(t),n=a.image.naturalWidth/a.canvas.width;n<1.5&&(n=1.5),w(t,{deltaX:-(n*=1.5),buttondown:!0,manual:!1}),h(t)}function s(t){var a=w(t),n=a.image.naturalHeight/a.canvas.height;n<1.5&&(n=1.5),w(t,{deltaY:-(n*=1.5),buttondown:!0,manual:!1}),h(t)}function r(t){var a=w(t),n=a.image.naturalHeight/a.canvas.height;n<1.5&&(n=1.5),w(t,{deltaY:n*=1.5,buttondown:!0,manual:!1}),h(t)}function c(t){w(t,{deltaFactor:1.005,buttondown:!0,manual:!1}),h(t)}function u(t){w(t,{deltaFactor:.995,buttondown:!0,manual:!1}),h(t)}function m(t){w(t,{deltaX:0,deltaY:0,deltaFactor:1,buttondown:!1})}function f(t,a){var n=w(t),e=v(a).X,o=v(a).Y;if(wppaIsFs()&&n.isLightbox&&(e<n.fsMaskLeft||e>n.fsMaskRight||o<n.fsMaskTop||o>n.fsMaskBottom))return w(0,{abort:!0}),void jQuery("#wppa-overlay-bg").trigger("click");n.enableManual&&(w(t,{manual:!0,savedCanvasX:e=b(t,a).X,savedCanvasY:o=b(t,a).Y}),h(t))}function l(t,a){var n,e,o,i=w(t),s=b(t,a).X,r=b(t,a).Y;i.manual&&(n=i.canvas.width/i.fromWidth,e=(i.savedCanvasX-s)/n+i.fromX,o=(i.savedCanvasY-r)/n+i.fromY,0<e&&0<o&&e+i.fromWidth<i.image.width&&o+i.fromHeight<i.image.height&&w(t,{fromX:e,fromY:o,savedCanvasX:s,savedCanvasY:r}))}function g(t){w(t,{manual:!1})}function w(t,a){if(!wppaZoomData[t])return!1;if(a)for(var n in a)wppaZoomData[t][n]=a[n];return wppaZoomData[t]}function v(t){var a,n;return n=wppaIsMobile?(a=t.touches[0].screenX,t.touches[0].screenY):(a=t.screenX,t.screenY),{X:a,Y:n}}function b(t,a){var n,e,o;return o=wppaIsMobile?(n=w(t),e=a.touches[0].screenX-n.fsMaskLeft,a.touches[0].screenY-n.fsMaskTop):(e=a.offsetX,a.offsetY),{X:e,Y:o}}function L(){return d=new Date,d.getTime()}}
|
| 17 |
// wppa-spheric
|
| 18 |
-
function wppaDoSphericPan(t){var s=jQuery,w=v(t);if(!w.initialized&&!w.abort){if(w.isLightbox&&s("#wppa-ovl-spin").show(),!w.image.complete)return wppaConsoleLog("Loading image "+t),void setTimeout(function(){wppaDoSphericPan(t)},200);wppaConsoleLog("Loading image "+t+" complete"),s(image).css({width:image.naturalWidth,height:image.naturalHeight,maxWidth:image.naturalWidth,maxHeight:image.naturalHeight}),w.manCtrl=!1,w.butDown=!1,w.lon=180,w.lat=0,w.dFov=0,w.fov=75,w.abort=!1,w.aspect=2,w.div=s("#wppa-pan-div-"+t),w.left=s("#wppa-pctl-left-"+t),w.right=s("#wppa-pctl-right-"+t),w.up=s("#wppa-pctl-up-"+t),w.down=s("#wppa-pctl-down-"+t),w.zoomin=s("#wppa-pctl-zoomin-"+t),w.zoomout=s("#wppa-pctl-zoomout-"+t),w.prev=s("#wppa-pctl-prev-"+t),w.next=s("#wppa-pctl-next-"+t),w.pause=!1,w.mFakt=wppaIsMobile?"2":"1",w.time=0,w.isLightbox&&(wppaGlobalOvlPanoramaId++,w.uId=wppaGlobalOvlPanoramaId),s(w.div).html(""),w.wppaRenderer=new THREE.WebGLRenderer,w.wppaRenderer.setSize(w.width,w.height),s(w.div).append(w.wppaRenderer.domElement),w.wppaScene=new THREE.Scene,w.wppaSphere=new THREE.SphereGeometry(100,100,40),w.wppaSphere.applyMatrix((new THREE.Matrix4).makeScale(-1,1,1)),w.wppaSphereMaterial=new THREE.MeshBasicMaterial,w.wppaSphereMaterial.map=THREE.ImageUtils.loadTexture(w.url),w.wppaSphereMesh=new THREE.Mesh(w.wppaSphere,w.wppaSphereMaterial),w.wppaScene.add(w.wppaSphereMesh),wppaIsMobile?(w.right.on("touchstart",function(n){u(t)}),w.right.on("touchend",function(n){f(t)}),w.left.on("touchstart",function(n){c(t)}),w.left.on("touchend",function(n){f(t)}),w.up.on("touchstart",function(n){h(t)}),w.up.on("touchend",function(n){f(t)}),w.down.on("touchstart",function(n){m(t)}),w.down.on("touchend",function(n){f(t)}),w.zoomin.on("touchstart",function(n){i(t)}),w.zoomin.on("touchend",function(n){f(t)}),w.zoomout.on("touchstart",function(n){r(t)}),w.zoomout.on("touchend",function(n){f(t)}),w.enableManual&&(s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("touchstart",function(n){a(t,n)}),s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("touchmove",function(n){e(t,n)}),s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("touchend",function(n){p(t)}))):(w.right.on("mousedown",function(n){u(t)}),w.right.on("mouseup",function(n){f(t)}),w.left.on("mousedown",function(n){c(t)}),w.left.on("mouseup",function(n){f(t)}),w.up.on("mousedown",function(n){h(t)}),w.up.on("mouseup",function(n){f(t)}),w.down.on("mousedown",function(n){m(t)}),w.down.on("mouseup",function(n){f(t)}),w.zoomin.on("mousedown",function(n){i(t)}),w.zoomin.on("mouseup",function(n){f(t)}),w.zoomout.on("mousedown",function(n){r(t)}),w.zoomout.on("mouseup",function(n){f(t)}),w.enableManual&&(s("#wppa-pan-div-"+t+" canvas").on("mousedown",function(n){a(t,n)}),s("#wppa-pan-div-"+t+" canvas").on("mousemove",function(n){e(t,n)}),s("#wppa-pan-div-"+t+" canvas").on("mouseup",function(n){p(t)}),s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("wheel",function(n){var o,a;o=t,(a=n).preventDefault(),a.stopPropagation(),w=v(o),v(o,{manCtrl:!1,butDown:!1,autorun:!1,dX:0,dFov:-a.deltaY*w.zoomsensitivity/(wppaIsChrome?60:6)}),l(o),setTimeout(function(){v(o,{dFov:0})},25)}))),w.isLightbox&&w.prev&&(w.prev.on("click",function(n){s("#wppa-overlay-ic").css({display:"none"}),s("#wppa-ovl-spin").show(),v(t,{abort:!0}),s("body").trigger("quitimage"),wppaOvlShowPrev()}),w.next.on("click",function(n){s("#wppa-overlay-ic").css({display:"none"}),s("#wppa-ovl-spin").show(),v(t,{abort:!0}),s("body").trigger("quitimage"),wppaOvlShowNext()}),s("body").on("quitimage",function(n){var o;o=t,wppaConsoleLog("Quit Image"),(w=v(o,{abort:!0})).wppaRenderer.resetGLState(),w.wppaSphere.dispose(),w.wppaSphereMaterial.dispose()})),v(t,w),s(window).on("DOMContentLoaded load resize orientationchange",function(){setTimeout(function(n){o(t)},25)}),o(t)}function l(n){var o=v(n)
|
| 15 |
// wppa-zoom
|
| 16 |
function wppaDoZoomPan(e){var p=jQuery,o=w(e);if(!o.initialized&&!o.abort){if(o.isLightbox&&p("#wppa-ovl-spin").show(),!o.image.complete)return wppaConsoleLog("Loading image "+e),void setTimeout(function(){wppaDoZoomPan(e)},200);wppaConsoleLog("Loading image "+e+" complete"),p(image).css({width:image.naturalWidth,height:image.naturalHeight,maxWidth:image.naturalWidth,maxHeight:image.naturalHeight}),o.manual=!1,o.deltaX=0,o.deltaY=0,o.deltaFactor=1,o.busy=!1,o.div=p("#wppa-pan-div-"+o.itemId),o.canvas=document.getElementById("wppa-pan-canvas-"+o.itemId),o.left=p("#wppa-pctl-left-"+o.itemId),o.right=p("#wppa-pctl-right-"+o.itemId),o.up=p("#wppa-pctl-up-"+o.itemId),o.down=p("#wppa-pctl-down-"+o.itemId),o.zoomin=p("#wppa-pctl-zoomin-"+o.itemId),o.zoomout=p("#wppa-pctl-zoomout-"+o.itemId),o.prev=p("#wppa-pctl-prev-"+o.itemId),o.next=p("#wppa-pctl-next-"+o.itemId),o.exit=p("#wppa-exit-btn-2"),o.canvasWidth=o.width,o.canvasHeight=o.height,o.savedCanvasX=0,o.savedCanvasY=0,o.fromHeight=o.image.height,o.fromWidth=o.image.width,o.imageRatio=o.image.width/o.image.height,o.fromX=0,o.fromY=0,o.centerX=o.fromX+o.fromWidth/2,o.centerY=o.fromY+o.fromHeight/2,o.ctx=null,o.buttondown=!1,o.enableManual=!0,o.ctrlbarUpdate=!0,o.pause=!1,o.time=0,wppaIsMobile?(o.right.on("touchstart",function(t){n(e)}),o.right.on("touchend",function(t){m(e)}),o.left.on("touchstart",function(t){i(e)}),o.left.on("touchend",function(t){m(e)}),o.up.on("touchstart",function(t){s(e)}),o.up.on("touchend",function(t){m(e)}),o.down.on("touchstart",function(t){r(e)}),o.down.on("touchend",function(t){m(e)}),o.zoomin.on("touchstart",function(t){c(e)}),o.zoomin.on("touchend",function(t){m(e)}),o.zoomout.on("touchstart",function(t){u(e)}),o.zoomout.on("touchend",function(t){m(e)}),o.canvas.addEventListener("touchstart",function(t){f(e,t)}),o.canvas.addEventListener("touchmove",function(t){l(e,t)}),o.canvas.addEventListener("touchend",function(t){g(e)})):(o.canvas.addEventListener("mousedown",function(t){f(e,t)}),o.canvas.addEventListener("mousemove",function(t){l(e,t)}),o.canvas.addEventListener("mouseup",function(t){g(e)}),o.canvas.addEventListener("mouseleave",function(t){(o=w(e)).manual&&w(e,{pause:!0})}),o.canvas.addEventListener("mouseenter",function(t){var a;w(a=e,{pause:!1}).manual&&h(a)}),document.getElementById("wppa-pan-canvas-"+o.itemId).addEventListener("wheel",function(t){var a,n;a=e,(n=t).preventDefault(),n.stopPropagation(),o=w(a),w(a,{deltaFactor:1+n.deltaY*o.zoomsensitivity/(wppaIsChrome?1e4:1e3),manual:!1}),h(a),setTimeout(function(){w(a,{deltaFactor:1})},25)}),o.right.on("mousedown",function(t){n(e)}),o.right.on("mouseup",function(t){m(e)}),o.left.on("mousedown",function(t){i(e)}),o.left.on("mouseup",function(t){m(e)}),o.up.on("mousedown",function(t){s(e)}),o.up.on("mouseup",function(t){m(e)}),o.down.on("mousedown",function(t){r(e)}),o.down.on("mouseup",function(t){m(e)}),o.zoomin.on("mousedown",function(t){c(e)}),o.zoomin.on("mouseup",function(t){m(e)}),o.zoomout.on("mousedown",function(t){u(e)}),o.zoomout.on("mouseup",function(t){m(e)})),o.isLightbox&&(p(".wppa-fulls-btn").on("click",function(){w(0,{abort:!0})}),p(".wppa-exit-fulls-btn").on("click",function(){w(0,{abort:!0})}),o.prev&&(o.prev.on("click",function(t){p("#wppa-ovl-spin").show(),w(0,{abort:!0}),wppaOvlShowPrev()}),o.next.on("click",function(t){p("#wppa-ovl-spin").show(),w(0,{abort:!0}),wppaOvlShowNext()})),o.exit.on("click",function(t){p("#wppa-ovl-spin").hide(),w(0,{abort:!0}),wppaOvlHide()})),p(window).on("DOMContentLoaded load resize orientationchange",function(){setTimeout(function(t){a(e)},25)}),a(e),o.initialized=!0,w(e,o),p("#wppa-ovl-spin").hide()}function h(t){var a,n,e,o,i,s=w(t);L()<s.time+10?wppaConsoleLog("Skipped render "+t):(w(t,{time:L()}),wppaConsoleLog("Zoom render "+t),(s.isLightbox&&!wppaOvlOpen||!s.isLightbox&&wppaOvlOpen)&&(s=w(0,{abort:!0})),s.abort?w(t,{manual:!1,buttondown:!1,pause:!1,ctx:null}):s.busy||(wppaDebugCounter++,(s=w(t,{busy:!0})).manual||(s.fromX+=s.deltaX,s.fromY+=s.deltaY,a=s.fromHeight/s.deltaFactor,n=s.fromWidth/s.deltaFactor,50<a&&1!=s.deltaFactor&&(wppaIsFs()||a<=s.image.height)&&(s.fromX-=(n-s.fromWidth)/2,s.fromY-=(a-s.fromHeight)/2,s.fromWidth=n,s.fromHeight=a)),s.fromX=Math.max(0,Math.min(s.image.width-s.fromWidth,s.fromX)),s.fromY=Math.max(0,Math.min(s.image.height-s.fromHeight,s.fromY)),e=screen.width/screen.height,o=(1-s.image.width/s.fromWidth)*s.canvas.width/2,i=(1-s.image.height/s.fromHeight)*s.canvas.height/2,s.ctx=s.canvas.getContext("2d"),e>s.imageRatio&&a>s.image.height&&wppaIsFs()||e<=s.imageRatio&&n>s.image.width&&wppaIsFs()?(s.enableManual=!1,s.ctx.clearRect(0,0,s.canvas.width,s.canvas.height),s.ctx.drawImage(s.image,s.fromX,s.fromY,s.fromWidth,s.fromHeight,o,i,s.canvas.width,s.canvas.height),jQuery(s.canvas).css({cursor:"default"})):(s.enableManual=!0,s.ctx.drawImage(s.image,s.fromX,s.fromY,s.fromWidth,s.fromHeight,0,0,s.canvas.width,s.canvas.height),jQuery(s.canvas).css({cursor:"grab"})),wppaIsFs()?(s.fsMaskTop=i-(s.canvas.height-screen.height)/2,s.fsMaskLeft=o-(s.canvas.width-screen.width)/2,s.fsMaskBottom=screen.height-s.fsMaskTop,s.fsMaskRight=screen.width-s.fsMaskLeft):(s.fsMaskTop=0,s.fsMaskLeft=0,s.fsMaskBottom=0,s.fsMaskRight=0),s.ctrlbarUpdate&&(wppaAdjustControlbar(),s.ctrlbarUpdate=!1),s.busy=!1,w(t,s),s.pause||!s.manual&&!s.buttondown||setTimeout(function(){h(t)},10),s.pause&&w(t,{pause:!1})))}function a(t){var a,n,e,o,i,s,r,c,d,u=w(t);u&&(u.isLightbox?(p("#wppa-overlay-ic").css("display",""),o=(n=!wppaIsFs())?(e=window.innerWidth?window.innerWidth:screen.width,window.innerHeight?window.innerHeight:screen.height):(e=screen.width,screen.height),r=0,d=(c=8)+(u.controls?u.icsize+10:0)+10,n?(c+=2*u.borderWidth,d+=2*u.borderWidth):c=40,a=n?o-d>(e-c)/u.imageRatio:(screenRatio=screen.width/screen.height,screenRatio<u.imageRatio),n&&a&&(r=(o-(s=(i=e-c)/u.imageRatio)-d)/2+20),n&&!a&&(s=(i=u.imageRatio*(o-(u.controls?u.icsize:0)-48))/u.imageRatio,r=20),!n&&a&&(i=(s=screen.height)*u.imageRatio,r=0),n||a||(s=(i=screen.width)/u.imageRatio,r=(screen.height-s)/2),p("#wppa-ovl-pan-container").css({marginTop:r}),p("#wppa-overlay-ic").css({marginTop:0}),u.canvasWidth=i,u.canvasHeight=s,u.canvas.width=u.canvasWidth,u.canvas.height=u.canvasHeight,n?(p("#wppa-ovl-pan-container").css({backgroundColor:u.backgroundColor,padding:u.padding,borderRadius:u.borderRadius,borderWidth:u.borderWidth,width:i,marginLeft:0}),p("#wppa-pctl-div-"+u.itemId).css({marginLeft:0}),a?p("#wppa-overlay-ic").css({left:4}):p("#wppa-overlay-ic").css({left:(e-i)/2})):(p("#wppa-overlay-ic").css({marginLeft:0}),p("#wppa-ovl-pan-container").css({backgroundColor:"transparent",padding:0,borderRadius:0,borderWidth:0,width:i,left:(e-i)/2,position:"fixed"}),p("#wppa-pctl-div-"+u.itemId).css({marginLeft:0}))):(u.canvasWidth=p(u.div).parent().width(),u.canvasHeight=u.canvasWidth/u.imageRatio,u.canvas.width=u.canvasWidth,u.canvas.height=u.canvasHeight),u.ctrlbarUpdate=!0,w(t,u),setTimeout(function(){h(t)},250))}function n(t){var a=w(t),n=a.image.naturalWidth/a.canvas.width;n<1.5&&(n=1.5),w(t,{deltaX:n*=1.5,buttondown:!0,manual:!1}),h(t)}function i(t){var a=w(t),n=a.image.naturalWidth/a.canvas.width;n<1.5&&(n=1.5),w(t,{deltaX:-(n*=1.5),buttondown:!0,manual:!1}),h(t)}function s(t){var a=w(t),n=a.image.naturalHeight/a.canvas.height;n<1.5&&(n=1.5),w(t,{deltaY:-(n*=1.5),buttondown:!0,manual:!1}),h(t)}function r(t){var a=w(t),n=a.image.naturalHeight/a.canvas.height;n<1.5&&(n=1.5),w(t,{deltaY:n*=1.5,buttondown:!0,manual:!1}),h(t)}function c(t){w(t,{deltaFactor:1.005,buttondown:!0,manual:!1}),h(t)}function u(t){w(t,{deltaFactor:.995,buttondown:!0,manual:!1}),h(t)}function m(t){w(t,{deltaX:0,deltaY:0,deltaFactor:1,buttondown:!1})}function f(t,a){var n=w(t),e=v(a).X,o=v(a).Y;if(wppaIsFs()&&n.isLightbox&&(e<n.fsMaskLeft||e>n.fsMaskRight||o<n.fsMaskTop||o>n.fsMaskBottom))return w(0,{abort:!0}),void jQuery("#wppa-overlay-bg").trigger("click");n.enableManual&&(w(t,{manual:!0,savedCanvasX:e=b(t,a).X,savedCanvasY:o=b(t,a).Y}),h(t))}function l(t,a){var n,e,o,i=w(t),s=b(t,a).X,r=b(t,a).Y;i.manual&&(n=i.canvas.width/i.fromWidth,e=(i.savedCanvasX-s)/n+i.fromX,o=(i.savedCanvasY-r)/n+i.fromY,0<e&&0<o&&e+i.fromWidth<i.image.width&&o+i.fromHeight<i.image.height&&w(t,{fromX:e,fromY:o,savedCanvasX:s,savedCanvasY:r}))}function g(t){w(t,{manual:!1})}function w(t,a){if(!wppaZoomData[t])return!1;if(a)for(var n in a)wppaZoomData[t][n]=a[n];return wppaZoomData[t]}function v(t){var a,n;return n=wppaIsMobile?(a=t.touches[0].screenX,t.touches[0].screenY):(a=t.screenX,t.screenY),{X:a,Y:n}}function b(t,a){var n,e,o;return o=wppaIsMobile?(n=w(t),e=a.touches[0].screenX-n.fsMaskLeft,a.touches[0].screenY-n.fsMaskTop):(e=a.offsetX,a.offsetY),{X:e,Y:o}}function L(){return d=new Date,d.getTime()}}
|
| 17 |
// wppa-spheric
|
| 18 |
+
function wppaDoSphericPan(t){var s=jQuery,w=v(t);if(!w.initialized&&!w.abort){if(w.isLightbox&&s("#wppa-ovl-spin").show(),!w.image.complete)return wppaConsoleLog("Loading image "+t),void setTimeout(function(){wppaDoSphericPan(t)},200);wppaConsoleLog("Loading image "+t+" complete"),s(image).css({width:image.naturalWidth,height:image.naturalHeight,maxWidth:image.naturalWidth,maxHeight:image.naturalHeight}),w.manCtrl=!1,w.butDown=!1,w.lon=180,w.lat=0,w.dFov=0,w.fov=75,w.abort=!1,w.aspect=2,w.div=s("#wppa-pan-div-"+t),w.left=s("#wppa-pctl-left-"+t),w.right=s("#wppa-pctl-right-"+t),w.up=s("#wppa-pctl-up-"+t),w.down=s("#wppa-pctl-down-"+t),w.zoomin=s("#wppa-pctl-zoomin-"+t),w.zoomout=s("#wppa-pctl-zoomout-"+t),w.prev=s("#wppa-pctl-prev-"+t),w.next=s("#wppa-pctl-next-"+t),w.pause=!1,w.mFakt=wppaIsMobile?"2":"1",w.time=0,w.isLightbox&&(wppaGlobalOvlPanoramaId++,w.uId=wppaGlobalOvlPanoramaId),s(w.div).html(""),w.wppaRenderer=new THREE.WebGLRenderer,w.wppaRenderer.setSize(w.width,w.height),s(w.div).append(w.wppaRenderer.domElement),w.wppaScene=new THREE.Scene,w.wppaSphere=new THREE.SphereGeometry(100,100,40),w.wppaSphere.applyMatrix((new THREE.Matrix4).makeScale(-1,1,1)),w.wppaSphereMaterial=new THREE.MeshBasicMaterial,w.wppaSphereMaterial.map=THREE.ImageUtils.loadTexture(w.url),w.wppaSphereMesh=new THREE.Mesh(w.wppaSphere,w.wppaSphereMaterial),w.wppaScene.add(w.wppaSphereMesh),wppaIsMobile?(w.right.on("touchstart",function(n){u(t)}),w.right.on("touchend",function(n){f(t)}),w.left.on("touchstart",function(n){c(t)}),w.left.on("touchend",function(n){f(t)}),w.up.on("touchstart",function(n){h(t)}),w.up.on("touchend",function(n){f(t)}),w.down.on("touchstart",function(n){m(t)}),w.down.on("touchend",function(n){f(t)}),w.zoomin.on("touchstart",function(n){i(t)}),w.zoomin.on("touchend",function(n){f(t)}),w.zoomout.on("touchstart",function(n){r(t)}),w.zoomout.on("touchend",function(n){f(t)}),w.enableManual&&(s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("touchstart",function(n){a(t,n)}),s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("touchmove",function(n){e(t,n)}),s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("touchend",function(n){p(t)}))):(w.right.on("mousedown",function(n){u(t)}),w.right.on("mouseup",function(n){f(t)}),w.left.on("mousedown",function(n){c(t)}),w.left.on("mouseup",function(n){f(t)}),w.up.on("mousedown",function(n){h(t)}),w.up.on("mouseup",function(n){f(t)}),w.down.on("mousedown",function(n){m(t)}),w.down.on("mouseup",function(n){f(t)}),w.zoomin.on("mousedown",function(n){i(t)}),w.zoomin.on("mouseup",function(n){f(t)}),w.zoomout.on("mousedown",function(n){r(t)}),w.zoomout.on("mouseup",function(n){f(t)}),w.enableManual&&(s("#wppa-pan-div-"+t+" canvas").on("mousedown",function(n){a(t,n)}),s("#wppa-pan-div-"+t+" canvas").on("mousemove",function(n){e(t,n)}),s("#wppa-pan-div-"+t+" canvas").on("mouseup",function(n){p(t)}),s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("wheel",function(n){var o,a;o=t,(a=n).preventDefault(),a.stopPropagation(),w=v(o),v(o,{manCtrl:!1,butDown:!1,autorun:!1,dX:0,dFov:-a.deltaY*w.zoomsensitivity/(wppaIsChrome?60:6)}),l(o),setTimeout(function(){v(o,{dFov:0})},25)}))),w.isLightbox&&w.prev&&(w.prev.on("click",function(n){s("#wppa-overlay-ic").css({display:"none"}),s("#wppa-ovl-spin").show(),v(t,{abort:!0}),s("body").trigger("quitimage"),wppaOvlShowPrev()}),w.next.on("click",function(n){s("#wppa-overlay-ic").css({display:"none"}),s("#wppa-ovl-spin").show(),v(t,{abort:!0}),s("body").trigger("quitimage"),wppaOvlShowNext()}),s("body").on("quitimage",function(n){var o;o=t,wppaConsoleLog("Quit Image"),(w=v(o,{abort:!0})).wppaRenderer.resetGLState(),w.wppaSphere.dispose(),w.wppaSphereMaterial.dispose()})),v(t,w),s(window).on("DOMContentLoaded load resize orientationchange",function(){setTimeout(function(n){o(t)},25)}),o(t)}function l(n){var o=v(n);!o.manCtrl&&g()<o.time+25?wppaConsoleLog("Skipped render "+n):(v(n,{time:g()}),wppaConsoleLog("Spheric render "+n+", dFov="+o.dFov+", dX="+o.dX+", dY="+o.dY+", pause="+o.pause+", autorun="+o.autorun),o.isLightbox&&(!wppaOvlOpen||wppaOvlActivePanorama!=o.id||wppaGlobalOvlPanoramaId>o.uId)&&(abort=!0),o.abort||((o.butDown||o.manCtrl)&&o.autorun&&(o.autorun=!1,o.dX=0),0==o.dX&&0==o.dY&&0==o.dFov&&(o.pause=!0),o.butDown&&(o.pause=!1),o.fov+=o.dFov,o.fov=Math.max(20,Math.min(120,o.fov)),o.wppaCamera=new THREE.PerspectiveCamera(o.fov,o.aspect,1,1e3),o.wppaCamera.target=new THREE.Vector3(0,0,0),o.lon+=o.dX,o.lat+=o.dY,o.lat=Math.max(-85,Math.min(85,o.lat)),o.wppaCamera.target.x=500*Math.sin(THREE.Math.degToRad(90-o.lat))*Math.cos(THREE.Math.degToRad(o.lon)),o.wppaCamera.target.y=500*Math.cos(THREE.Math.degToRad(90-o.lat)),o.wppaCamera.target.z=500*Math.sin(THREE.Math.degToRad(90-o.lat))*Math.sin(THREE.Math.degToRad(o.lon)),o.wppaCamera.lookAt(o.wppaCamera.target),o.wppaRenderer.render(o.wppaScene,o.wppaCamera),wppaAdjustControlbar(),s("#wppa-ovl-spin").hide(),o.manCtrl,(o.autorun||!o.pause&&(o.manCtrl||o.butDown))&&setTimeout(function(){l(n)},25)))}function o(n){wppaConsoleLog("Resize mocc "+n);var o,a,t,e,p,i,r,u,c=!wppaIsFs();(w=v(n))&&(w.isLightbox?(s("#wppa-overlay-ic").css("display",""),s("#wppa-overlay-ic").css("width",""),t=(c=!wppaIsFs())?(a=window.innerWidth?window.innerWidth:screen.width,window.innerHeight?window.innerHeight:screen.height):(a=screen.width,screen.height),i=(p=8)+(w.controls?w.icsize+10:0)+30,c&&(p+=2*w.borderWidth,i+=2*w.borderWidth),o=(a-p)/2+i<t,e=c?o?(t-(u=(r=a-p)/2)-i)/2+20:(r=2*(u=t-i),20):(r=screen.width,u=screen.height,0),w.aspect=r/u,s("#wppa-ovl-pan-container").css({top:e}),s("#wppa-overlay-ic").css({top:0}),c?(s("#wppa-ovl-pan-container").css({backgroundColor:w.backgroundColor,padding:w.padding+"px",borderRadius:w.borderRadius+"px",width:r,marginLeft:0}),s("#wppa-pctl-div-"+n).css({marginLeft:0}),o?s("#wppa-overlay-ic").css({left:4}):s("#wppa-overlay-ic").css({left:(a-r)/2,marginLeft:0})):(s("#wppa-overlay-ic").css({marginLeft:0}),s("#wppa-ovl-pan-container").css({backgroundColor:"transparent",padding:0,borderRadius:0,width:r,left:(a-r)/2}),s("#wppa-pctl-div-"+n).css({marginLeft:0}))):u=(r=s(w.div).parent().width())*w.height/w.width,w.wppaRenderer.setSize(r,u),w.width=r,w.height=u,v(n,w),setTimeout(function(){l(n)},250))}function a(n,o){o.preventDefault(),o.stopPropagation(),w=v(n,{manCtrl:!0,butDown:!1,autorun:!1,dX:0}),wppaIsMobile?v(n,{sX:o.touches[0].clientX,sY:o.touches[0].clientY}):v(n,{sX:o.clientX,sY:o.clientY}),v(n,{sLon:w.lon,sLat:w.lat}),l(n)}function e(n,o){o.preventDefault(),o.stopPropagation(),(w=v(n)).manCtrl&&(wppaIsMobile?v(n,{lon:.1*(w.sX-o.touches[0].clientX)+w.sLon,lat:.1*(o.touches[0].clientY-w.sY)+w.sLat,pause:!1}):v(n,{lon:.1*(w.sX-o.clientX)+w.sLon,lat:.1*(o.clientY-w.sY)+w.sLat,pause:!1}),l(n))}function p(n){v(n,{manCtrl:!1})}function i(n){w=v(n),v(n,{dFov:-.4*w.mFakt,butDown:!0}),l(n)}function r(n){w=v(n),v(n,{dFov:.4*w.mFakt,butDown:!0}),l(n)}function u(n){w=v(n),v(n,{dX:.2*w.mFakt,butDown:!0}),l(n)}function c(n){w=v(n),v(n,{dX:-.2*w.mFakt,butDown:!0}),l(n)}function h(n){w=v(n),v(n,{dY:.2*w.mFakt,butDown:!0}),l(n)}function m(n){w=v(n),v(n,{dY:-.2*w.mFakt,butDown:!0}),l(n)}function f(n){w=v(n),v(n,{dX:0,dY:0,dFov:0,butDown:!1})}function v(n,o){if(!wppaSphericData[n])return!1;if(o)for(var a in o)wppaSphericData[n][a]=o[a];return wppaSphericData[n]}function g(){return d=new Date,d.getTime()}}
|
js/wppa-spheric.js
CHANGED
|
@@ -145,7 +145,7 @@ function wppaDoSphericPan(mocc) {
|
|
| 145 |
var data = update(mocc);
|
| 146 |
|
| 147 |
// To prevent multiple invocations - caused by e.g. resize events - see if we were here less than the repeat time ago
|
| 148 |
-
if ( timnow() < data.time + 25 ) {
|
| 149 |
wppaConsoleLog('Skipped render '+mocc);
|
| 150 |
return;
|
| 151 |
}
|
|
@@ -180,6 +180,9 @@ function wppaDoSphericPan(mocc) {
|
|
| 180 |
|
| 181 |
wppaAdjustControlbar();
|
| 182 |
$("#wppa-ovl-spin").hide();
|
|
|
|
|
|
|
|
|
|
| 183 |
|
| 184 |
if ( data.autorun || ( ! data.pause && ( data.manCtrl || data.butDown ) ) ) {
|
| 185 |
setTimeout(function(){render(mocc)},25);
|
| 145 |
var data = update(mocc);
|
| 146 |
|
| 147 |
// To prevent multiple invocations - caused by e.g. resize events - see if we were here less than the repeat time ago
|
| 148 |
+
if ( ! data.manCtrl && timnow() < data.time + 25 ) {
|
| 149 |
wppaConsoleLog('Skipped render '+mocc);
|
| 150 |
return;
|
| 151 |
}
|
| 180 |
|
| 181 |
wppaAdjustControlbar();
|
| 182 |
$("#wppa-ovl-spin").hide();
|
| 183 |
+
|
| 184 |
+
var t = 25;
|
| 185 |
+
if ( data.manCtrl ) t = 5;
|
| 186 |
|
| 187 |
if ( data.autorun || ( ! data.pause && ( data.manCtrl || data.butDown ) ) ) {
|
| 188 |
setTimeout(function(){render(mocc)},25);
|
js/wppa-spheric.min.js
CHANGED
|
@@ -1 +1 @@
|
|
| 1 |
-
function wppaDoSphericPan(t){var s=jQuery,w=v(t);if(!w.initialized&&!w.abort){if(w.isLightbox&&s("#wppa-ovl-spin").show(),!w.image.complete)return wppaConsoleLog("Loading image "+t),void setTimeout(function(){wppaDoSphericPan(t)},200);wppaConsoleLog("Loading image "+t+" complete"),s(image).css({width:image.naturalWidth,height:image.naturalHeight,maxWidth:image.naturalWidth,maxHeight:image.naturalHeight}),w.manCtrl=!1,w.butDown=!1,w.lon=180,w.lat=0,w.dFov=0,w.fov=75,w.abort=!1,w.aspect=2,w.div=s("#wppa-pan-div-"+t),w.left=s("#wppa-pctl-left-"+t),w.right=s("#wppa-pctl-right-"+t),w.up=s("#wppa-pctl-up-"+t),w.down=s("#wppa-pctl-down-"+t),w.zoomin=s("#wppa-pctl-zoomin-"+t),w.zoomout=s("#wppa-pctl-zoomout-"+t),w.prev=s("#wppa-pctl-prev-"+t),w.next=s("#wppa-pctl-next-"+t),w.pause=!1,w.mFakt=wppaIsMobile?"2":"1",w.time=0,w.isLightbox&&(wppaGlobalOvlPanoramaId++,w.uId=wppaGlobalOvlPanoramaId),s(w.div).html(""),w.wppaRenderer=new THREE.WebGLRenderer,w.wppaRenderer.setSize(w.width,w.height),s(w.div).append(w.wppaRenderer.domElement),w.wppaScene=new THREE.Scene,w.wppaSphere=new THREE.SphereGeometry(100,100,40),w.wppaSphere.applyMatrix((new THREE.Matrix4).makeScale(-1,1,1)),w.wppaSphereMaterial=new THREE.MeshBasicMaterial,w.wppaSphereMaterial.map=THREE.ImageUtils.loadTexture(w.url),w.wppaSphereMesh=new THREE.Mesh(w.wppaSphere,w.wppaSphereMaterial),w.wppaScene.add(w.wppaSphereMesh),wppaIsMobile?(w.right.on("touchstart",function(n){u(t)}),w.right.on("touchend",function(n){f(t)}),w.left.on("touchstart",function(n){c(t)}),w.left.on("touchend",function(n){f(t)}),w.up.on("touchstart",function(n){h(t)}),w.up.on("touchend",function(n){f(t)}),w.down.on("touchstart",function(n){m(t)}),w.down.on("touchend",function(n){f(t)}),w.zoomin.on("touchstart",function(n){i(t)}),w.zoomin.on("touchend",function(n){f(t)}),w.zoomout.on("touchstart",function(n){r(t)}),w.zoomout.on("touchend",function(n){f(t)}),w.enableManual&&(s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("touchstart",function(n){a(t,n)}),s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("touchmove",function(n){e(t,n)}),s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("touchend",function(n){p(t)}))):(w.right.on("mousedown",function(n){u(t)}),w.right.on("mouseup",function(n){f(t)}),w.left.on("mousedown",function(n){c(t)}),w.left.on("mouseup",function(n){f(t)}),w.up.on("mousedown",function(n){h(t)}),w.up.on("mouseup",function(n){f(t)}),w.down.on("mousedown",function(n){m(t)}),w.down.on("mouseup",function(n){f(t)}),w.zoomin.on("mousedown",function(n){i(t)}),w.zoomin.on("mouseup",function(n){f(t)}),w.zoomout.on("mousedown",function(n){r(t)}),w.zoomout.on("mouseup",function(n){f(t)}),w.enableManual&&(s("#wppa-pan-div-"+t+" canvas").on("mousedown",function(n){a(t,n)}),s("#wppa-pan-div-"+t+" canvas").on("mousemove",function(n){e(t,n)}),s("#wppa-pan-div-"+t+" canvas").on("mouseup",function(n){p(t)}),s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("wheel",function(n){var o,a;o=t,(a=n).preventDefault(),a.stopPropagation(),w=v(o),v(o,{manCtrl:!1,butDown:!1,autorun:!1,dX:0,dFov:-a.deltaY*w.zoomsensitivity/(wppaIsChrome?60:6)}),l(o),setTimeout(function(){v(o,{dFov:0})},25)}))),w.isLightbox&&w.prev&&(w.prev.on("click",function(n){s("#wppa-overlay-ic").css({display:"none"}),s("#wppa-ovl-spin").show(),v(t,{abort:!0}),s("body").trigger("quitimage"),wppaOvlShowPrev()}),w.next.on("click",function(n){s("#wppa-overlay-ic").css({display:"none"}),s("#wppa-ovl-spin").show(),v(t,{abort:!0}),s("body").trigger("quitimage"),wppaOvlShowNext()}),s("body").on("quitimage",function(n){var o;o=t,wppaConsoleLog("Quit Image"),(w=v(o,{abort:!0})).wppaRenderer.resetGLState(),w.wppaSphere.dispose(),w.wppaSphereMaterial.dispose()})),v(t,w),s(window).on("DOMContentLoaded load resize orientationchange",function(){setTimeout(function(n){o(t)},25)}),o(t)}function l(n){var o=v(n)
|
| 1 |
+
function wppaDoSphericPan(t){var s=jQuery,w=v(t);if(!w.initialized&&!w.abort){if(w.isLightbox&&s("#wppa-ovl-spin").show(),!w.image.complete)return wppaConsoleLog("Loading image "+t),void setTimeout(function(){wppaDoSphericPan(t)},200);wppaConsoleLog("Loading image "+t+" complete"),s(image).css({width:image.naturalWidth,height:image.naturalHeight,maxWidth:image.naturalWidth,maxHeight:image.naturalHeight}),w.manCtrl=!1,w.butDown=!1,w.lon=180,w.lat=0,w.dFov=0,w.fov=75,w.abort=!1,w.aspect=2,w.div=s("#wppa-pan-div-"+t),w.left=s("#wppa-pctl-left-"+t),w.right=s("#wppa-pctl-right-"+t),w.up=s("#wppa-pctl-up-"+t),w.down=s("#wppa-pctl-down-"+t),w.zoomin=s("#wppa-pctl-zoomin-"+t),w.zoomout=s("#wppa-pctl-zoomout-"+t),w.prev=s("#wppa-pctl-prev-"+t),w.next=s("#wppa-pctl-next-"+t),w.pause=!1,w.mFakt=wppaIsMobile?"2":"1",w.time=0,w.isLightbox&&(wppaGlobalOvlPanoramaId++,w.uId=wppaGlobalOvlPanoramaId),s(w.div).html(""),w.wppaRenderer=new THREE.WebGLRenderer,w.wppaRenderer.setSize(w.width,w.height),s(w.div).append(w.wppaRenderer.domElement),w.wppaScene=new THREE.Scene,w.wppaSphere=new THREE.SphereGeometry(100,100,40),w.wppaSphere.applyMatrix((new THREE.Matrix4).makeScale(-1,1,1)),w.wppaSphereMaterial=new THREE.MeshBasicMaterial,w.wppaSphereMaterial.map=THREE.ImageUtils.loadTexture(w.url),w.wppaSphereMesh=new THREE.Mesh(w.wppaSphere,w.wppaSphereMaterial),w.wppaScene.add(w.wppaSphereMesh),wppaIsMobile?(w.right.on("touchstart",function(n){u(t)}),w.right.on("touchend",function(n){f(t)}),w.left.on("touchstart",function(n){c(t)}),w.left.on("touchend",function(n){f(t)}),w.up.on("touchstart",function(n){h(t)}),w.up.on("touchend",function(n){f(t)}),w.down.on("touchstart",function(n){m(t)}),w.down.on("touchend",function(n){f(t)}),w.zoomin.on("touchstart",function(n){i(t)}),w.zoomin.on("touchend",function(n){f(t)}),w.zoomout.on("touchstart",function(n){r(t)}),w.zoomout.on("touchend",function(n){f(t)}),w.enableManual&&(s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("touchstart",function(n){a(t,n)}),s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("touchmove",function(n){e(t,n)}),s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("touchend",function(n){p(t)}))):(w.right.on("mousedown",function(n){u(t)}),w.right.on("mouseup",function(n){f(t)}),w.left.on("mousedown",function(n){c(t)}),w.left.on("mouseup",function(n){f(t)}),w.up.on("mousedown",function(n){h(t)}),w.up.on("mouseup",function(n){f(t)}),w.down.on("mousedown",function(n){m(t)}),w.down.on("mouseup",function(n){f(t)}),w.zoomin.on("mousedown",function(n){i(t)}),w.zoomin.on("mouseup",function(n){f(t)}),w.zoomout.on("mousedown",function(n){r(t)}),w.zoomout.on("mouseup",function(n){f(t)}),w.enableManual&&(s("#wppa-pan-div-"+t+" canvas").on("mousedown",function(n){a(t,n)}),s("#wppa-pan-div-"+t+" canvas").on("mousemove",function(n){e(t,n)}),s("#wppa-pan-div-"+t+" canvas").on("mouseup",function(n){p(t)}),s("#wppa-pan-div-"+t+" canvas")[0].addEventListener("wheel",function(n){var o,a;o=t,(a=n).preventDefault(),a.stopPropagation(),w=v(o),v(o,{manCtrl:!1,butDown:!1,autorun:!1,dX:0,dFov:-a.deltaY*w.zoomsensitivity/(wppaIsChrome?60:6)}),l(o),setTimeout(function(){v(o,{dFov:0})},25)}))),w.isLightbox&&w.prev&&(w.prev.on("click",function(n){s("#wppa-overlay-ic").css({display:"none"}),s("#wppa-ovl-spin").show(),v(t,{abort:!0}),s("body").trigger("quitimage"),wppaOvlShowPrev()}),w.next.on("click",function(n){s("#wppa-overlay-ic").css({display:"none"}),s("#wppa-ovl-spin").show(),v(t,{abort:!0}),s("body").trigger("quitimage"),wppaOvlShowNext()}),s("body").on("quitimage",function(n){var o;o=t,wppaConsoleLog("Quit Image"),(w=v(o,{abort:!0})).wppaRenderer.resetGLState(),w.wppaSphere.dispose(),w.wppaSphereMaterial.dispose()})),v(t,w),s(window).on("DOMContentLoaded load resize orientationchange",function(){setTimeout(function(n){o(t)},25)}),o(t)}function l(n){var o=v(n);!o.manCtrl&&g()<o.time+25?wppaConsoleLog("Skipped render "+n):(v(n,{time:g()}),wppaConsoleLog("Spheric render "+n+", dFov="+o.dFov+", dX="+o.dX+", dY="+o.dY+", pause="+o.pause+", autorun="+o.autorun),o.isLightbox&&(!wppaOvlOpen||wppaOvlActivePanorama!=o.id||wppaGlobalOvlPanoramaId>o.uId)&&(abort=!0),o.abort||((o.butDown||o.manCtrl)&&o.autorun&&(o.autorun=!1,o.dX=0),0==o.dX&&0==o.dY&&0==o.dFov&&(o.pause=!0),o.butDown&&(o.pause=!1),o.fov+=o.dFov,o.fov=Math.max(20,Math.min(120,o.fov)),o.wppaCamera=new THREE.PerspectiveCamera(o.fov,o.aspect,1,1e3),o.wppaCamera.target=new THREE.Vector3(0,0,0),o.lon+=o.dX,o.lat+=o.dY,o.lat=Math.max(-85,Math.min(85,o.lat)),o.wppaCamera.target.x=500*Math.sin(THREE.Math.degToRad(90-o.lat))*Math.cos(THREE.Math.degToRad(o.lon)),o.wppaCamera.target.y=500*Math.cos(THREE.Math.degToRad(90-o.lat)),o.wppaCamera.target.z=500*Math.sin(THREE.Math.degToRad(90-o.lat))*Math.sin(THREE.Math.degToRad(o.lon)),o.wppaCamera.lookAt(o.wppaCamera.target),o.wppaRenderer.render(o.wppaScene,o.wppaCamera),wppaAdjustControlbar(),s("#wppa-ovl-spin").hide(),o.manCtrl,(o.autorun||!o.pause&&(o.manCtrl||o.butDown))&&setTimeout(function(){l(n)},25)))}function o(n){wppaConsoleLog("Resize mocc "+n);var o,a,t,e,p,i,r,u,c=!wppaIsFs();(w=v(n))&&(w.isLightbox?(s("#wppa-overlay-ic").css("display",""),s("#wppa-overlay-ic").css("width",""),t=(c=!wppaIsFs())?(a=window.innerWidth?window.innerWidth:screen.width,window.innerHeight?window.innerHeight:screen.height):(a=screen.width,screen.height),i=(p=8)+(w.controls?w.icsize+10:0)+30,c&&(p+=2*w.borderWidth,i+=2*w.borderWidth),o=(a-p)/2+i<t,e=c?o?(t-(u=(r=a-p)/2)-i)/2+20:(r=2*(u=t-i),20):(r=screen.width,u=screen.height,0),w.aspect=r/u,s("#wppa-ovl-pan-container").css({top:e}),s("#wppa-overlay-ic").css({top:0}),c?(s("#wppa-ovl-pan-container").css({backgroundColor:w.backgroundColor,padding:w.padding+"px",borderRadius:w.borderRadius+"px",width:r,marginLeft:0}),s("#wppa-pctl-div-"+n).css({marginLeft:0}),o?s("#wppa-overlay-ic").css({left:4}):s("#wppa-overlay-ic").css({left:(a-r)/2,marginLeft:0})):(s("#wppa-overlay-ic").css({marginLeft:0}),s("#wppa-ovl-pan-container").css({backgroundColor:"transparent",padding:0,borderRadius:0,width:r,left:(a-r)/2}),s("#wppa-pctl-div-"+n).css({marginLeft:0}))):u=(r=s(w.div).parent().width())*w.height/w.width,w.wppaRenderer.setSize(r,u),w.width=r,w.height=u,v(n,w),setTimeout(function(){l(n)},250))}function a(n,o){o.preventDefault(),o.stopPropagation(),w=v(n,{manCtrl:!0,butDown:!1,autorun:!1,dX:0}),wppaIsMobile?v(n,{sX:o.touches[0].clientX,sY:o.touches[0].clientY}):v(n,{sX:o.clientX,sY:o.clientY}),v(n,{sLon:w.lon,sLat:w.lat}),l(n)}function e(n,o){o.preventDefault(),o.stopPropagation(),(w=v(n)).manCtrl&&(wppaIsMobile?v(n,{lon:.1*(w.sX-o.touches[0].clientX)+w.sLon,lat:.1*(o.touches[0].clientY-w.sY)+w.sLat,pause:!1}):v(n,{lon:.1*(w.sX-o.clientX)+w.sLon,lat:.1*(o.clientY-w.sY)+w.sLat,pause:!1}),l(n))}function p(n){v(n,{manCtrl:!1})}function i(n){w=v(n),v(n,{dFov:-.4*w.mFakt,butDown:!0}),l(n)}function r(n){w=v(n),v(n,{dFov:.4*w.mFakt,butDown:!0}),l(n)}function u(n){w=v(n),v(n,{dX:.2*w.mFakt,butDown:!0}),l(n)}function c(n){w=v(n),v(n,{dX:-.2*w.mFakt,butDown:!0}),l(n)}function h(n){w=v(n),v(n,{dY:.2*w.mFakt,butDown:!0}),l(n)}function m(n){w=v(n),v(n,{dY:-.2*w.mFakt,butDown:!0}),l(n)}function f(n){w=v(n),v(n,{dX:0,dY:0,dFov:0,butDown:!1})}function v(n,o){if(!wppaSphericData[n])return!1;if(o)for(var a in o)wppaSphericData[n][a]=o[a];return wppaSphericData[n]}function g(){return d=new Date,d.getTime()}}
|
wppa-picture.php
CHANGED
|
@@ -600,15 +600,15 @@ function wppa_get_spheric_pan_html( $args ) {
|
|
| 600 |
|
| 601 |
if ( $autorun == 'right' ) {
|
| 602 |
$dX = 0.05 * $autorunspeed / 3;
|
| 603 |
-
$run = true;
|
| 604 |
}
|
| 605 |
elseif ( $autorun == 'left' ) {
|
| 606 |
$dX = -0.05 * $autorunspeed / 3;
|
| 607 |
-
$run = true;
|
| 608 |
}
|
| 609 |
else {
|
| 610 |
$dX = 0;
|
| 611 |
-
$run = false;
|
| 612 |
}
|
| 613 |
|
| 614 |
$result .=
|
| 600 |
|
| 601 |
if ( $autorun == 'right' ) {
|
| 602 |
$dX = 0.05 * $autorunspeed / 3;
|
| 603 |
+
$run = 'true';
|
| 604 |
}
|
| 605 |
elseif ( $autorun == 'left' ) {
|
| 606 |
$dX = -0.05 * $autorunspeed / 3;
|
| 607 |
+
$run = 'true';
|
| 608 |
}
|
| 609 |
else {
|
| 610 |
$dX = 0;
|
| 611 |
+
$run = 'false';
|
| 612 |
}
|
| 613 |
|
| 614 |
$result .=
|
wppa.php
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
/*
|
| 3 |
* Plugin Name: WP Photo Album Plus
|
| 4 |
* Description: Easily manage and display your photo albums and slideshows within your WordPress site.
|
| 5 |
-
* Version: 7.5.09.
|
| 6 |
* Author: J.N. Breetvelt a.k.a. OpaJaap
|
| 7 |
* Author URI: http://wppa.opajaap.nl/
|
| 8 |
* Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
|
|
@@ -24,7 +24,7 @@ global $wp_version;
|
|
| 24 |
|
| 25 |
/* WPPA GLOBALS */
|
| 26 |
global $wppa_revno; $wppa_revno = '7509'; // WPPA db version
|
| 27 |
-
global $wppa_api_version; $wppa_api_version = '7.5.09.
|
| 28 |
|
| 29 |
/* Init page js data */
|
| 30 |
global $wppa_js_page_data; $wppa_js_page_data = '';
|
| 2 |
/*
|
| 3 |
* Plugin Name: WP Photo Album Plus
|
| 4 |
* Description: Easily manage and display your photo albums and slideshows within your WordPress site.
|
| 5 |
+
* Version: 7.5.09.010
|
| 6 |
* Author: J.N. Breetvelt a.k.a. OpaJaap
|
| 7 |
* Author URI: http://wppa.opajaap.nl/
|
| 8 |
* Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
|
| 24 |
|
| 25 |
/* WPPA GLOBALS */
|
| 26 |
global $wppa_revno; $wppa_revno = '7509'; // WPPA db version
|
| 27 |
+
global $wppa_api_version; $wppa_api_version = '7.5.09.010'; // WPPA software version
|
| 28 |
|
| 29 |
/* Init page js data */
|
| 30 |
global $wppa_js_page_data; $wppa_js_page_data = '';
|
