diff --git a/examples/css3d_sandbox.html b/examples/css3d_sandbox.html index 6b601ccdc6ebe325b374952b0fbdb5daa86b1ddd..fbe7c6e6437e300880d9fd7db6d6e169c2587b55 100644 --- a/examples/css3d_sandbox.html +++ b/examples/css3d_sandbox.html @@ -52,8 +52,6 @@ camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 1000 ); camera.position.set( 200, 200, 200 ); - controls = new THREE.TrackballControls( camera ); - scene = new THREE.Scene(); scene.background = new THREE.Color( 0xf0f0f0 ); @@ -104,6 +102,8 @@ renderer2.domElement.style.top = 0; document.body.appendChild( renderer2.domElement ); + controls = new THREE.TrackballControls( camera, renderer2.domElement ); + } function animate() { diff --git a/examples/css3d_youtube.html b/examples/css3d_youtube.html index 785dcb7fd714bf82046778edee4d325cf7a85477..d356f87fe2a14074f4b1149fb5df16518e8fb5ac 100644 --- a/examples/css3d_youtube.html +++ b/examples/css3d_youtube.html @@ -76,7 +76,7 @@ group.add( new Element( '9ubytEsCaS0', - 240, 0, 0, - Math.PI / 2 ) ); scene.add( group ); - controls = new THREE.TrackballControls( camera ); + controls = new THREE.TrackballControls( camera, renderer.domElement ); controls.rotateSpeed = 4; window.addEventListener( 'resize', onWindowResize, false ); diff --git a/examples/misc_controls_trackball.html b/examples/misc_controls_trackball.html index 38e4515fcdea583f28089d17a3b5f76109bad5af..186f1c5564734e81f40a049479aaf2351d915b7f 100644 --- a/examples/misc_controls_trackball.html +++ b/examples/misc_controls_trackball.html @@ -10,7 +10,7 @@ height: 100%; overflow: hidden; } - + body { color: #000; font-family:Monospace; @@ -67,22 +67,6 @@ camera = new THREE.PerspectiveCamera( 60, window.innerWidth / window.innerHeight, 1, 1000 ); camera.position.z = 500; - controls = new THREE.TrackballControls( camera ); - - controls.rotateSpeed = 1.0; - controls.zoomSpeed = 1.2; - controls.panSpeed = 0.8; - - controls.noZoom = false; - controls.noPan = false; - - controls.staticMoving = true; - controls.dynamicDampingFactor = 0.3; - - controls.keys = [ 65, 83, 68 ]; - - controls.addEventListener( 'change', render ); - // world scene = new THREE.Scene(); @@ -126,6 +110,22 @@ renderer.setSize( window.innerWidth, window.innerHeight ); document.body.appendChild( renderer.domElement ); + controls = new THREE.TrackballControls( camera, renderer.domElement ); + + controls.rotateSpeed = 1.0; + controls.zoomSpeed = 1.2; + controls.panSpeed = 0.8; + + controls.noZoom = false; + controls.noPan = false; + + controls.staticMoving = true; + controls.dynamicDampingFactor = 0.3; + + controls.keys = [ 65, 83, 68 ]; + + controls.addEventListener( 'change', render ); + stats = new Stats(); document.body.appendChild( stats.dom ); @@ -154,9 +154,9 @@ function animate() { requestAnimationFrame( animate ); - + controls.update(); - + stats.update(); } diff --git a/examples/software_sandbox.html b/examples/software_sandbox.html index 017f05b576fbe586a55a12772c82f5520664407b..e7a2f0c3a125f0212a0ce57a2993b984d3bc4d15 100644 --- a/examples/software_sandbox.html +++ b/examples/software_sandbox.html @@ -57,8 +57,6 @@ camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 2000 ); camera.position.z = 600; - controls = new THREE.TrackballControls( camera ); - scene = new THREE.Scene(); // Torus @@ -157,9 +155,10 @@ renderer = new THREE.SoftwareRenderer(); renderer.setSize( window.innerWidth, window.innerHeight ); - container.appendChild( renderer.domElement ); + controls = new THREE.TrackballControls( camera, renderer.domElement ); + stats = new Stats(); container.appendChild( stats.dom ); diff --git a/examples/webgl_buffergeometry_instancing2.html b/examples/webgl_buffergeometry_instancing2.html index ef027c2890a80238727c2cf859bf88cca07397f1..d59af7e6dbee255c89da61bae00594f32f1888a1 100644 --- a/examples/webgl_buffergeometry_instancing2.html +++ b/examples/webgl_buffergeometry_instancing2.html @@ -116,8 +116,6 @@ camera = new THREE.PerspectiveCamera( 50, window.innerWidth / window.innerHeight, 0.01, 100 ); camera.position.z = 4; - controls = new THREE.TrackballControls( camera ); - scene = new THREE.Scene(); // @@ -204,6 +202,8 @@ renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); + controls = new THREE.TrackballControls( camera, renderer.domElement ); + if ( renderer.extensions.get( 'ANGLE_instanced_arrays' ) === null ) { document.getElementById( 'notSupported' ).style.display = ''; diff --git a/examples/webgl_effects_ascii.html b/examples/webgl_effects_ascii.html index 0d2267184ade425c56ce87fecfdfc75c8b5a27b8..36db3aebea536fce3b61cfa57e69d5ab060bf38c 100644 --- a/examples/webgl_effects_ascii.html +++ b/examples/webgl_effects_ascii.html @@ -63,8 +63,6 @@ camera.position.y = 150; camera.position.z = 500; - controls = new THREE.TrackballControls( camera ); - scene = new THREE.Scene(); var light = new THREE.PointLight( 0xffffff ); @@ -75,7 +73,7 @@ light.position.set( - 500, - 500, - 500 ); scene.add( light ); - sphere = new THREE.Mesh( new THREE.SphereBufferGeometry( 200, 20, 10 ), new THREE.MeshPhongMaterial( { flatShading: true }) ); + sphere = new THREE.Mesh( new THREE.SphereBufferGeometry( 200, 20, 10 ), new THREE.MeshPhongMaterial( { flatShading: true } ) ); scene.add( sphere ); // Plane @@ -98,6 +96,8 @@ document.body.appendChild( effect.domElement ); + controls = new THREE.TrackballControls( camera, effect.domElement ); + // window.addEventListener( 'resize', onWindowResize, false ); diff --git a/examples/webgl_interactive_cubes_gpu.html b/examples/webgl_interactive_cubes_gpu.html index 962454f46497f5b9c4a2a789ca1dcb8d5538691f..1e2ea1bb5318bcb39f4a9e4edb5762eb1517cad2 100644 --- a/examples/webgl_interactive_cubes_gpu.html +++ b/examples/webgl_interactive_cubes_gpu.html @@ -61,15 +61,6 @@ camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 10000 ); camera.position.z = 1000; - controls = new THREE.TrackballControls( camera ); - controls.rotateSpeed = 1.0; - controls.zoomSpeed = 1.2; - controls.panSpeed = 0.8; - controls.noZoom = false; - controls.noPan = false; - controls.staticMoving = true; - controls.dynamicDampingFactor = 0.3; - scene = new THREE.Scene(); scene.background = new THREE.Color( 0xffffff ); @@ -171,6 +162,15 @@ renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); + controls = new THREE.TrackballControls( camera, renderer.domElement ); + controls.rotateSpeed = 1.0; + controls.zoomSpeed = 1.2; + controls.panSpeed = 0.8; + controls.noZoom = false; + controls.noPan = false; + controls.staticMoving = true; + controls.dynamicDampingFactor = 0.3; + stats = new Stats(); container.appendChild( stats.dom ); diff --git a/examples/webgl_interactive_draggablecubes.html b/examples/webgl_interactive_draggablecubes.html index a489fd0e26837ec4d03cf3ecf601b5e05563fe48..85b08c3507a39bcbffe88ea2d646c0ea25cc08e0 100644 --- a/examples/webgl_interactive_draggablecubes.html +++ b/examples/webgl_interactive_draggablecubes.html @@ -39,15 +39,6 @@ camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 5000 ); camera.position.z = 1000; - controls = new THREE.TrackballControls( camera ); - controls.rotateSpeed = 1.0; - controls.zoomSpeed = 1.2; - controls.panSpeed = 0.8; - controls.noZoom = false; - controls.noPan = false; - controls.staticMoving = true; - controls.dynamicDampingFactor = 0.3; - scene = new THREE.Scene(); scene.background = new THREE.Color( 0xf0f0f0 ); @@ -101,6 +92,15 @@ container.appendChild( renderer.domElement ); + controls = new THREE.TrackballControls( camera, renderer.domElement ); + controls.rotateSpeed = 1.0; + controls.zoomSpeed = 1.2; + controls.panSpeed = 0.8; + controls.noZoom = false; + controls.noPan = false; + controls.staticMoving = true; + controls.dynamicDampingFactor = 0.3; + var dragControls = new THREE.DragControls( objects, camera, renderer.domElement ); dragControls.addEventListener( 'dragstart', function () { diff --git a/examples/webgl_lights_pointlights2.html b/examples/webgl_lights_pointlights2.html index 78c092704eb3a97e057b90cae5bddc8992771585..be231fc5872076167357c38a38bdf86f23b86678 100644 --- a/examples/webgl_lights_pointlights2.html +++ b/examples/webgl_lights_pointlights2.html @@ -79,22 +79,6 @@ scene.background = new THREE.Color( 0x040306 ); scene.fog = new THREE.Fog( 0x040306, 10, 300 ); - // CONTROLS - - controls = new THREE.TrackballControls( camera ); - - controls.rotateSpeed = 1.0; - controls.zoomSpeed = 1.2; - controls.panSpeed = 0.8; - - controls.noZoom = false; - controls.noPan = false; - - controls.staticMoving = false; - controls.dynamicDampingFactor = 0.15; - - controls.keys = [ 65, 83, 68 ]; - // TEXTURES var textureLoader = new THREE.TextureLoader(); @@ -185,6 +169,22 @@ renderer.gammaInput = true; renderer.gammaOutput = true; + // CONTROLS + + controls = new THREE.TrackballControls( camera, renderer.domElement ); + + controls.rotateSpeed = 1.0; + controls.zoomSpeed = 1.2; + controls.panSpeed = 0.8; + + controls.noZoom = false; + controls.noPan = false; + + controls.staticMoving = false; + controls.dynamicDampingFactor = 0.15; + + controls.keys = [ 65, 83, 68 ]; + // STATS stats = new Stats(); diff --git a/examples/webgl_loader_3ds.html b/examples/webgl_loader_3ds.html index 95e2f4467b415c6ac5c442bbc552a651847acf98..26794ceb9a4d106b24fe6606b8653be678e81f44 100644 --- a/examples/webgl_loader_3ds.html +++ b/examples/webgl_loader_3ds.html @@ -50,8 +50,6 @@ camera = new THREE.PerspectiveCamera( 60, window.innerWidth / window.innerHeight, 0.1, 10 ); camera.position.z = 2; - controls = new THREE.TrackballControls( camera ); - scene = new THREE.Scene(); scene.add( new THREE.HemisphereLight() ); @@ -86,6 +84,8 @@ renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); + controls = new THREE.TrackballControls( camera, renderer.domElement ); + window.addEventListener( 'resize', resize, false ); } diff --git a/examples/webgl_loader_babylon.html b/examples/webgl_loader_babylon.html index f8f19c7c4bbfee33f97b21a3b93abaa79cbf3b25..c0dfc029f8f7dc4e8f5cfe591cb41e7141afbcd9 100644 --- a/examples/webgl_loader_babylon.html +++ b/examples/webgl_loader_babylon.html @@ -45,8 +45,6 @@ camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 2000 ); camera.position.z = 100; - controls = new THREE.TrackballControls( camera ); - // scene scene = new THREE.Scene(); @@ -103,6 +101,10 @@ // + controls = new THREE.TrackballControls( camera, renderer.domElement ); + + // + window.addEventListener( 'resize', onWindowResize, false ); } diff --git a/examples/webgl_loader_pcd.html b/examples/webgl_loader_pcd.html index 7699c7f637505fab094e072edca2570468da608e..d34acbc3454d3af6c99f0b6e994d48183ff48b94 100644 --- a/examples/webgl_loader_pcd.html +++ b/examples/webgl_loader_pcd.html @@ -74,21 +74,6 @@ camera.position.z = - 2; camera.up.set( 0, 0, 1 ); - controls = new THREE.TrackballControls( camera ); - - controls.rotateSpeed = 2.0; - controls.zoomSpeed = 0.3; - controls.panSpeed = 0.2; - - controls.noZoom = false; - controls.noPan = false; - - controls.staticMoving = true; - controls.dynamicDampingFactor = 0.3; - - controls.minDistance = 0.3; - controls.maxDistance = 0.3 * 100; - scene.add( camera ); renderer = new THREE.WebGLRenderer( { antialias: true } ); @@ -110,6 +95,21 @@ document.body.appendChild( container ); container.appendChild( renderer.domElement ); + controls = new THREE.TrackballControls( camera, renderer.domElement ); + + controls.rotateSpeed = 2.0; + controls.zoomSpeed = 0.3; + controls.panSpeed = 0.2; + + controls.noZoom = false; + controls.noPan = false; + + controls.staticMoving = true; + controls.dynamicDampingFactor = 0.3; + + controls.minDistance = 0.3; + controls.maxDistance = 0.3 * 100; + stats = new Stats(); container.appendChild( stats.dom ); diff --git a/examples/webgl_loader_vtk.html b/examples/webgl_loader_vtk.html index d94a44ec60b83d3b575adffb61595b10666d0ad7..e4ada874049e1f0e9c3e6a84e1d1dd072f6a8c55 100644 --- a/examples/webgl_loader_vtk.html +++ b/examples/webgl_loader_vtk.html @@ -62,18 +62,6 @@ camera = new THREE.PerspectiveCamera( 60, window.innerWidth / window.innerHeight, 0.01, 1e10 ); camera.position.z = 0.2; - controls = new THREE.TrackballControls( camera ); - - controls.rotateSpeed = 5.0; - controls.zoomSpeed = 5; - controls.panSpeed = 2; - - controls.noZoom = false; - controls.noPan = false; - - controls.staticMoving = true; - controls.dynamicDampingFactor = 0.3; - scene = new THREE.Scene(); scene.add( camera ); @@ -162,6 +150,20 @@ document.body.appendChild( container ); container.appendChild( renderer.domElement ); + // controls + + controls = new THREE.TrackballControls( camera, renderer.domElement ); + + controls.rotateSpeed = 5.0; + controls.zoomSpeed = 5; + controls.panSpeed = 2; + + controls.noZoom = false; + controls.noPan = false; + + controls.staticMoving = true; + controls.dynamicDampingFactor = 0.3; + stats = new Stats(); container.appendChild( stats.dom ); diff --git a/examples/webgl_modifier_tessellation.html b/examples/webgl_modifier_tessellation.html index aa5b4ed0de8add94c0bb86ec2e9e7f8f4b48843a..effe593e3e755c169c23a4722ea74aa48cde5e16 100644 --- a/examples/webgl_modifier_tessellation.html +++ b/examples/webgl_modifier_tessellation.html @@ -114,8 +114,6 @@ camera = new THREE.PerspectiveCamera( 40, WIDTH / HEIGHT, 1, 10000 ); camera.position.set( - 100, 100, 200 ); - controls = new THREE.TrackballControls( camera ); - scene = new THREE.Scene(); scene.background = new THREE.Color( 0x050505 ); @@ -214,6 +212,8 @@ var container = document.getElementById( 'container' ); container.appendChild( renderer.domElement ); + controls = new THREE.TrackballControls( camera, renderer.domElement ); + stats = new Stats(); container.appendChild( stats.dom );