From a1285b36b2c67e4917113e991a1604a139048002 Mon Sep 17 00:00:00 2001 From: WestLangley Date: Sat, 19 Aug 2017 22:13:16 -0400 Subject: [PATCH] Limit zooming --- examples/canvas_geometry_panorama.html | 5 ++++- examples/canvas_geometry_panorama_fisheye.html | 5 ++++- examples/css3d_panorama.html | 5 ++++- examples/webgl_materials_cubemap_dynamic2.html | 5 ++++- examples/webgl_panorama_dualfisheye.html | 4 +++- examples/webgl_panorama_equirectangular.html | 5 ++++- examples/webgl_video_panorama_equirectangular.html | 2 ++ 7 files changed, 25 insertions(+), 6 deletions(-) diff --git a/examples/canvas_geometry_panorama.html b/examples/canvas_geometry_panorama.html index d992ec50c7..0c4d728050 100644 --- a/examples/canvas_geometry_panorama.html +++ b/examples/canvas_geometry_panorama.html @@ -164,7 +164,10 @@ function onDocumentMouseWheel( event ) { - camera.fov += event.deltaY * 0.05; + var fov = camera.fov + event.deltaY * 0.05; + + camera.fov = THREE.Math.clamp( fov, 10, 75 ); + camera.updateProjectionMatrix(); } diff --git a/examples/canvas_geometry_panorama_fisheye.html b/examples/canvas_geometry_panorama_fisheye.html index 91d72c7ede..810bd569bb 100644 --- a/examples/canvas_geometry_panorama_fisheye.html +++ b/examples/canvas_geometry_panorama_fisheye.html @@ -172,7 +172,10 @@ function onDocumentMouseWheel( event ) { - camera.fov += event.deltaY * 0.05; + var fov = camera.fov + event.deltaY * 0.05; + + camera.fov = THREE.Math.clamp( fov, 10, 75 ); + camera.updateProjectionMatrix(); } diff --git a/examples/css3d_panorama.html b/examples/css3d_panorama.html index 936c18291d..68edbebd17 100644 --- a/examples/css3d_panorama.html +++ b/examples/css3d_panorama.html @@ -156,7 +156,10 @@ function onDocumentMouseWheel( event ) { - camera.fov += event.deltaY * 0.05; + var fov = camera.fov + event.deltaY * 0.05; + + camera.fov = THREE.Math.clamp( fov, 10, 75 ); + camera.updateProjectionMatrix(); } diff --git a/examples/webgl_materials_cubemap_dynamic2.html b/examples/webgl_materials_cubemap_dynamic2.html index 15a774083d..c14e8d3ae6 100644 --- a/examples/webgl_materials_cubemap_dynamic2.html +++ b/examples/webgl_materials_cubemap_dynamic2.html @@ -142,7 +142,10 @@ function onDocumentMouseWheel( event ) { - camera.fov += ( event.deltaY * 0.05 ); + var fov = camera.fov + event.deltaY * 0.05; + + camera.fov = THREE.Math.clamp( fov, 10, 75 ); + camera.updateProjectionMatrix(); } diff --git a/examples/webgl_panorama_dualfisheye.html b/examples/webgl_panorama_dualfisheye.html index d308274d29..0f1dfe4605 100644 --- a/examples/webgl_panorama_dualfisheye.html +++ b/examples/webgl_panorama_dualfisheye.html @@ -98,7 +98,7 @@ var texture = new THREE.TextureLoader().load( 'textures/ricoh_theta_s.jpg' ); texture.format = THREE.RGBFormat; - var material = new THREE.MeshBasicMaterial( { map: texture } ); + var material = new THREE.MeshBasicMaterial( { map: texture } ); mesh = new THREE.Mesh( geometry, material ); scene.add( mesh ); @@ -163,6 +163,8 @@ distance += event.deltaY * 0.05; + distance = THREE.Math.clamp( distance, 400, 1000 ); + } function animate() { diff --git a/examples/webgl_panorama_equirectangular.html b/examples/webgl_panorama_equirectangular.html index b73c4f6fb8..b602860dd5 100644 --- a/examples/webgl_panorama_equirectangular.html +++ b/examples/webgl_panorama_equirectangular.html @@ -169,7 +169,10 @@ function onDocumentMouseWheel( event ) { - camera.fov += event.deltaY * 0.05; + var fov = camera.fov + event.deltaY * 0.05; + + camera.fov = THREE.Math.clamp( fov, 10, 75 ); + camera.updateProjectionMatrix(); } diff --git a/examples/webgl_video_panorama_equirectangular.html b/examples/webgl_video_panorama_equirectangular.html index 4bf39cd9e5..371db29155 100644 --- a/examples/webgl_video_panorama_equirectangular.html +++ b/examples/webgl_video_panorama_equirectangular.html @@ -146,6 +146,8 @@ distance += event.deltaY * 0.05; + distance = THREE.Math.clamp( distance, 400, 500 ); + } function animate() { -- GitLab