Merge pull request #19052 from Mugen87/dev45

Examples: Improve OrbitControls settings.

examples/css2d_label.html

@@ -39,7 +39,7 @@
 				var EARTH_RADIUS = 1;
 				var MOON_RADIUS = 0.27;
 
-				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 1000 );
+				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 0.1, 200 );
 				camera.position.set( 10, 5, 20 );
 
 				scene = new THREE.Scene();
@@ -105,6 +105,8 @@
 				document.body.appendChild( labelRenderer.domElement );
 
 				var controls = new OrbitControls( camera, labelRenderer.domElement );
+				controls.minDistance = 5;
+				controls.maxDistance = 100;
 
 			}
 

examples/css3d_orthographic.html

@@ -92,6 +92,8 @@
 				document.body.appendChild( renderer2.domElement );
 
 				var controls = new OrbitControls( camera, renderer2.domElement );
+				controls.minZoom = 0.5;
+				controls.maxZoom = 2;
 
 				function createPlane( width, height, cssColor, pos, rot ) {
 

examples/physics_ammo_terrain.html

@@ -103,6 +103,7 @@
 				camera.lookAt( 0, 0, 0 );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.enableZoom = false;
 
 				var geometry = new THREE.PlaneBufferGeometry( terrainWidthExtents, terrainDepthExtents, terrainWidth - 1, terrainDepth - 1 );
 				geometry.rotateX( - Math.PI / 2 );

examples/webgl_buffergeometry_drawrange.html

@@ -91,6 +91,8 @@
 				camera.position.z = 1750;
 
 				var controls = new OrbitControls( camera, container );
+				controls.minDistance = 1000;
+				controls.maxDistance = 3000;
 
 				scene = new THREE.Scene();
 

examples/webgl_buffergeometry_morphtargets.html

@@ -37,11 +37,9 @@
 
 				container = document.getElementById( 'container' );
 				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 20 );
-				camera.position.z = 8;
+				camera.position.z = 10;
 				scene.add( camera );
 
-				var controls = new OrbitControls( camera, container );
-
 				var pointLight = new THREE.PointLight( 0xffffff, 1 );
 				camera.add( pointLight );
 
@@ -61,15 +59,15 @@
 				renderer = new THREE.WebGLRenderer( { antialias: true } );
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );
-
 				renderer.setAnimationLoop( function () {
 
 					renderer.render( scene, camera );
 
 				} );
-
 				container.appendChild( renderer.domElement );
 
+				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.enableZoom = false;
 
 				window.addEventListener( 'resize', onWindowResize, false );
 

examples/webgl_geometry_extrude_shapes2.html

@@ -430,6 +430,8 @@
 				//
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 100;
+				controls.maxDistance = 1000;
 
 				//
 

examples/webgl_geometry_extrude_splines.html

@@ -260,6 +260,8 @@
 				folderCamera.open();
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 100;
+				controls.maxDistance = 2000;
 
 				window.addEventListener( 'resize', onWindowResize, false );
 

examples/webgl_geometry_normals.html

@@ -123,6 +123,7 @@
 				//
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.enableZoom = false;
 
 				//
 

examples/webgl_gpgpu_protoplanet.html

@@ -279,6 +279,8 @@
 				container.appendChild( renderer.domElement );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 100;
+				controls.maxDistance = 1000;
 
 				effectController = {
 					// Can be changed dynamically

examples/webgl_gpgpu_water.html

@@ -314,6 +314,8 @@
 				container.appendChild( renderer.domElement );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 100;
+				controls.maxDistance = 1000;
 
 				stats = new Stats();
 				container.appendChild( stats.dom );

examples/webgl_lights_physical.html

@@ -227,6 +227,8 @@
 
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 1;
+				controls.maxDistance = 20;
 
 				window.addEventListener( 'resize', onWindowResize, false );
 

examples/webgl_loader_assimp.html

@@ -55,6 +55,8 @@
 				container.appendChild( renderer.domElement );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 750;
+				controls.maxDistance = 2500;
 
 				stats = new Stats();
 				container.appendChild( stats.dom );

examples/webgl_loader_mmd.html

@@ -141,6 +141,8 @@
 				}, onProgress, null );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 10;
+				controls.maxDistance = 100;
 
 				window.addEventListener( 'resize', onWindowResize, false );
 

examples/webgl_loader_texture_tga.html

@@ -30,7 +30,7 @@
 				var container = document.createElement( 'div' );
 				document.body.appendChild( container );
 
-				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 0.1, 2000 );
+				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 0.1, 1000 );
 				camera.position.set( 0, 50, 250 );
 
 				scene = new THREE.Scene();
@@ -79,6 +79,7 @@
 				//
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.enableZoom = false;
 
 				//
 

examples/webgl_loader_vrml.html

@@ -38,7 +38,7 @@
 
 			function init() {
 
-				camera = new THREE.PerspectiveCamera( 60, window.innerWidth / window.innerHeight, 0.01, 1e10 );
+				camera = new THREE.PerspectiveCamera( 60, window.innerWidth / window.innerHeight, 0.1, 1e10 );
 				camera.position.z = 6;
 
 				scene = new THREE.Scene();
@@ -69,6 +69,8 @@
 				// controls
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 1;
+				controls.maxDistance = 100;
 
 				//
 

examples/webgl_marchingcubes.html

@@ -105,6 +105,8 @@
 			// CONTROLS
 
 			var controls = new OrbitControls( camera, renderer.domElement );
+			controls.minDistance = 500;
+			controls.maxDistance = 5000;
 
 			// STATS
 

examples/webgl_materials_curvature.html

@@ -131,6 +131,8 @@
 				document.body.appendChild( renderer.domElement );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 20;
+				controls.maxDistance = 100;
 
 				var loader = new OBJLoader();
 				//load the obj

examples/webgl_materials_modified.html

@@ -74,6 +74,8 @@
 				document.body.appendChild( renderer.domElement );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 1000;
+				controls.maxDistance = 5000;
 
 				//
 

examples/webgl_materials_parallaxmap.html

@@ -87,6 +87,8 @@
 				//
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 1;
+				controls.maxDistance = 5;
 
 				//
 

examples/webgl_materials_physical_reflectivity.html

@@ -46,7 +46,7 @@
 				container = document.createElement( 'div' );
 				document.body.appendChild( container );
 
-				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 2000 );
+				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 1000 );
 				camera.position.set( 0.0, - 10, 20 * 3.5 );
 
 				scene = new THREE.Scene();
@@ -161,6 +161,8 @@
 				container.appendChild( stats.dom );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 20;
+				controls.maxDistance = 200;
 
 				window.addEventListener( 'resize', onWindowResize, false );
 

examples/webgl_materials_translucency.html

@@ -75,6 +75,8 @@
 			container.appendChild( stats.dom );
 
 			var controls = new OrbitControls( camera, container );
+			controls.minDistance = 500;
+			controls.maxDistance = 3000;
 
 			window.addEventListener( 'resize', onWindowResize, false );
 

examples/webgl_materials_variations_basic.html

@@ -37,7 +37,7 @@
 				container = document.createElement( 'div' );
 				document.body.appendChild( container );
 
-				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 2000 );
+				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 2500 );
 				camera.position.set( 0.0, 400, 400 * 3.5 );
 
 				//
@@ -153,6 +153,8 @@
 				container.appendChild( stats.dom );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 200;
+				controls.maxDistance = 2000;
 
 				window.addEventListener( 'resize', onWindowResize, false );
 

examples/webgl_materials_variations_lambert.html

@@ -37,7 +37,7 @@
 				container = document.createElement( 'div' );
 				document.body.appendChild( container );
 
-				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 2000 );
+				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 2500 );
 				camera.position.set( 0.0, 400, 400 * 3.5 );
 
 				//
@@ -153,6 +153,8 @@
 				container.appendChild( stats.dom );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 200;
+				controls.maxDistance = 2000;
 
 				window.addEventListener( 'resize', onWindowResize, false );
 

examples/webgl_materials_variations_phong.html

@@ -37,7 +37,7 @@
 				container = document.createElement( 'div' );
 				document.body.appendChild( container );
 
-				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 2000 );
+				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 2500 );
 				camera.position.set( 0.0, 400, 400 * 3.5 );
 
 				//
@@ -160,6 +160,8 @@
 				container.appendChild( stats.dom );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 200;
+				controls.maxDistance = 2000;
 
 				window.addEventListener( 'resize', onWindowResize, false );
 

examples/webgl_materials_variations_physical.html

@@ -39,7 +39,7 @@
 				container = document.createElement( 'div' );
 				document.body.appendChild( container );
 
-				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 2000 );
+				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 2500 );
 				camera.position.set( 0.0, 400, 400 * 3.5 );
 
 				//
@@ -172,6 +172,8 @@
 				container.appendChild( stats.dom );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 200;
+				controls.maxDistance = 2000;
 
 				window.addEventListener( 'resize', onWindowResize, false );
 

examples/webgl_materials_variations_standard.html

@@ -39,7 +39,7 @@
 				container = document.createElement( 'div' );
 				document.body.appendChild( container );
 
-				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 2000 );
+				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 2500 );
 				camera.position.set( 0.0, 400, 400 * 3.5 );
 
 				scene = new THREE.Scene();
@@ -177,6 +177,8 @@
 				container.appendChild( stats.dom );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 200;
+				controls.maxDistance = 2000;
 
 				window.addEventListener( 'resize', onWindowResize, false );
 

examples/webgl_materials_variations_toon.html

@@ -38,7 +38,7 @@
 				container = document.createElement( 'div' );
 				document.body.appendChild( container );
 
-				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 2000 );
+				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 2500 );
 				camera.position.set( 0.0, 400, 400 * 3.5 );
 
 				//
@@ -159,6 +159,8 @@
 				container.appendChild( stats.dom );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 200;
+				controls.maxDistance = 2000;
 
 				window.addEventListener( 'resize', onWindowResize, false );
 

examples/webgl_postprocessing_backgrounds.html

@@ -177,6 +177,7 @@
 				composer.addPass( copyPass );
 
 				var controls = new OrbitControls( cameraP, renderer.domElement );
+				controls.enableZoom = false;
 
 				window.addEventListener( 'resize', onWindowResize, false );
 

examples/webgl_postprocessing_sobel.html

@@ -45,7 +45,7 @@
 
 				scene = new THREE.Scene();
 
-				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 1000 );
+				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.1, 200 );
 				camera.position.set( 0, 10, 25 );
 				camera.lookAt( scene.position );
 
@@ -95,6 +95,8 @@
 				composer.addPass( effectSobel );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 10;
+				controls.maxDistance = 100;
 
 				//
 

examples/webgl_raymarching_reflect.html

@@ -298,6 +298,7 @@
 
 				// Controls
 				var controls = new OrbitControls( camera, canvas );
+				controls.enableZoom = false;
 
 				// GUI
 				var gui = new GUI();

examples/webgl_refraction.html

@@ -33,7 +33,7 @@
 
 				// camera
 
-				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 1000 );
+				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 0.1, 200 );
 				camera.position.set( - 10, 0, 15 );
 				camera.lookAt( scene.position );
 
@@ -95,6 +95,8 @@
 				//
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 10;
+				controls.maxDistance = 100;
 
 				//
 

examples/webgl_simple_gi.html

@@ -189,6 +189,8 @@
 				new SimpleGI( renderer, scene );
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 1;
+				controls.maxDistance = 10;
 
 				window.addEventListener( 'resize', onWindowResize, false );
 

examples/webgl_water.html

@@ -43,7 +43,7 @@
 
 				// camera
 
-				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 0.1, 1000 );
+				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 0.1, 200 );
 				camera.position.set( - 15, 7, 15 );
 				camera.lookAt( scene.position );
 
@@ -158,6 +158,8 @@
 				//
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 5;
+				controls.maxDistance = 50;
 
 				//
 

examples/webgl_water_flowmap.html

@@ -34,7 +34,7 @@
 
 				// camera
 
-				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 0.1, 1000 );
+				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 0.1, 200 );
 				camera.position.set( 0, 25, 0 );
 				camera.lookAt( scene.position );
 
@@ -100,6 +100,8 @@
 				//
 
 				var controls = new OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 5;
+				controls.maxDistance = 50;
 
 				//