From c10687853d732da145819341d4a80b4010507249 Mon Sep 17 00:00:00 2001 From: Mugen87 Date: Mon, 8 Feb 2021 14:40:51 +0100 Subject: [PATCH] OrbitControls: Introduce listenToPointerEvents(). --- docs/examples/en/controls/OrbitControls.html | 8 ++++- docs/examples/ko/controls/OrbitControls.html | 8 ++++- docs/examples/zh/controls/OrbitControls.html | 8 ++++- examples/css2d_label.html | 3 +- examples/css3d_orthographic.html | 3 +- examples/js/controls/OrbitControls.js | 30 ++++++++++++------- examples/jsm/controls/OrbitControls.js | 30 ++++++++++++------- examples/misc_controls_orbit.html | 3 +- examples/misc_controls_transform.html | 3 +- examples/misc_exporter_collada.html | 3 +- examples/misc_exporter_draco.html | 3 +- examples/misc_exporter_ply.html | 3 +- examples/misc_exporter_stl.html | 3 +- examples/physics_ammo_break.html | 3 +- examples/physics_ammo_cloth.html | 3 +- examples/physics_ammo_instancing.html | 3 +- examples/physics_ammo_rope.html | 3 +- examples/physics_ammo_terrain.html | 3 +- examples/physics_ammo_volume.html | 3 +- examples/webaudio_orientation.html | 3 +- examples/webaudio_timing.html | 3 +- examples/webgl2_materials_texture3d.html | 3 +- examples/webgl2_volume_instancing.html | 3 +- examples/webgl_animation_cloth.html | 3 +- examples/webgl_animation_keyframes.html | 3 +- ..._animation_skinning_additive_blending.html | 3 +- .../webgl_buffergeometry_compression.html | 3 +- examples/webgl_buffergeometry_drawrange.html | 3 +- examples/webgl_clipping.html | 3 +- examples/webgl_clipping_advanced.html | 3 +- examples/webgl_clipping_intersection.html | 3 +- examples/webgl_clipping_stencil.html | 3 +- examples/webgl_decals.html | 3 +- examples/webgl_depth_texture.html | 3 +- examples/webgl_framebuffer_texture.html | 3 +- .../webgl_geometry_colors_lookuptable.html | 3 +- examples/webgl_geometry_convex.html | 3 +- examples/webgl_geometry_extrude_shapes2.html | 3 +- examples/webgl_geometry_extrude_splines.html | 3 +- examples/webgl_geometry_normals.html | 3 +- examples/webgl_geometry_spline_editor.html | 3 +- examples/webgl_geometry_teapot.html | 3 +- examples/webgl_geometry_terrain_raycast.html | 3 +- examples/webgl_geometry_text_shapes.html | 3 +- examples/webgl_geometry_text_stroke.html | 3 +- examples/webgl_gpgpu_protoplanet.html | 3 +- examples/webgl_instancing_performance.html | 3 +- examples/webgl_lightningstrike.html | 9 ++++-- examples/webgl_lightprobe.html | 3 +- examples/webgl_lightprobe_cubecamera.html | 3 +- examples/webgl_lights_physical.html | 3 +- examples/webgl_lights_rectarealight.html | 3 +- examples/webgl_lights_spotlight.html | 3 +- examples/webgl_lights_spotlights.html | 3 +- examples/webgl_lines_fat.html | 3 +- examples/webgl_lines_fat_wireframe.html | 3 +- examples/webgl_loader_3dm.html | 3 +- examples/webgl_loader_3mf.html | 3 +- examples/webgl_loader_3mf_materials.html | 3 +- examples/webgl_loader_amf.html | 3 +- examples/webgl_loader_assimp.html | 3 +- examples/webgl_loader_bvh.html | 3 +- examples/webgl_loader_collada_skinning.html | 3 +- examples/webgl_loader_fbx.html | 3 +- examples/webgl_loader_fbx_nurbs.html | 3 +- examples/webgl_loader_gcode.html | 3 +- examples/webgl_loader_gltf.html | 3 +- examples/webgl_loader_gltf_compressed.html | 3 +- examples/webgl_loader_gltf_extensions.html | 3 +- examples/webgl_loader_gltf_variants.html | 3 +- examples/webgl_loader_kmz.html | 3 +- examples/webgl_loader_ldraw.html | 3 +- examples/webgl_loader_lwo.html | 3 +- examples/webgl_loader_md2.html | 3 +- examples/webgl_loader_md2_control.html | 4 +-- examples/webgl_loader_mmd.html | 3 +- examples/webgl_loader_nodes.html | 3 +- examples/webgl_loader_svg.html | 3 +- examples/webgl_loader_texture_basis.html | 3 +- examples/webgl_loader_texture_ktx2.html | 3 +- examples/webgl_loader_texture_tga.html | 3 +- examples/webgl_loader_tilt.html | 3 +- examples/webgl_loader_vox.html | 3 +- examples/webgl_loader_vrm.html | 3 +- examples/webgl_loader_vrml.html | 3 +- examples/webgl_loader_x.html | 3 +- examples/webgl_marchingcubes.html | 3 +- examples/webgl_materials_car.html | 3 +- examples/webgl_materials_channels.html | 6 ++-- examples/webgl_materials_compile.html | 3 +- examples/webgl_materials_cubemap.html | 3 +- examples/webgl_materials_cubemap_mipmaps.html | 3 +- examples/webgl_materials_curvature.html | 3 +- examples/webgl_materials_displacementmap.html | 3 +- examples/webgl_materials_envmaps.html | 3 +- examples/webgl_materials_envmaps_exr.html | 3 +- examples/webgl_materials_envmaps_hdr.html | 3 +- .../webgl_materials_envmaps_hdr_nodes.html | 3 +- .../webgl_materials_envmaps_parallax.html | 3 +- .../webgl_materials_envmaps_pmrem_nodes.html | 3 +- examples/webgl_materials_lightmap.html | 3 +- examples/webgl_materials_matcap.html | 3 +- examples/webgl_materials_modified.html | 3 +- examples/webgl_materials_nodes.html | 3 +- ...ebgl_materials_normalmap_object_space.html | 3 +- examples/webgl_materials_parallaxmap.html | 3 +- ...webgl_materials_physical_reflectivity.html | 3 +- examples/webgl_materials_physical_sheen.html | 3 +- ...webgl_materials_physical_transmission.html | 3 +- ...webgl_materials_subsurface_scattering.html | 1 + .../webgl_materials_texture_rotation.html | 3 +- .../webgl_materials_variations_basic.html | 3 +- .../webgl_materials_variations_lambert.html | 3 +- .../webgl_materials_variations_phong.html | 3 +- .../webgl_materials_variations_physical.html | 3 +- .../webgl_materials_variations_standard.html | 3 +- examples/webgl_materials_variations_toon.html | 3 +- examples/webgl_materials_video_webcam.html | 3 +- examples/webgl_math_obb.html | 3 +- examples/webgl_mirror.html | 3 +- examples/webgl_mirror_nodes.html | 3 +- examples/webgl_modifier_edgesplit.html | 3 +- examples/webgl_modifier_simplifier.html | 3 +- examples/webgl_morphtargets.html | 3 +- examples/webgl_morphtargets_sphere.html | 3 +- examples/webgl_multiple_elements.html | 3 +- examples/webgl_multiple_elements_text.html | 3 +- .../webgl_multiple_scenes_comparison.html | 3 +- examples/webgl_panorama_cube.html | 3 +- examples/webgl_pmrem_test.html | 3 +- examples/webgl_postprocessing_3dlut.html | 3 +- .../webgl_postprocessing_backgrounds.html | 3 +- examples/webgl_postprocessing_godrays.html | 3 +- examples/webgl_postprocessing_outline.html | 3 +- .../webgl_postprocessing_rgb_halftone.html | 3 +- examples/webgl_postprocessing_sobel.html | 3 +- .../webgl_postprocessing_unreal_bloom.html | 3 +- ...postprocessing_unreal_bloom_selective.html | 3 +- examples/webgl_raycast_sprite.html | 4 +-- examples/webgl_raymarching_reflect.html | 3 +- examples/webgl_refraction.html | 3 +- examples/webgl_shaders_ocean.html | 2 +- examples/webgl_shaders_ocean2.html | 3 +- examples/webgl_shaders_sky.html | 3 +- examples/webgl_shaders_tonemapping.html | 3 +- examples/webgl_shaders_vector.html | 3 +- examples/webgl_shadowmap_csm.html | 3 +- examples/webgl_shadowmap_pcss.html | 3 +- examples/webgl_shadowmap_pointlight.html | 3 +- examples/webgl_shadowmap_viewer.html | 3 +- examples/webgl_shadowmap_vsm.html | 3 +- examples/webgl_simple_gi.html | 3 +- examples/webgl_skinning_simple.html | 3 +- examples/webgl_sprites_nodes.html | 3 +- examples/webgl_tiled_forward.html | 3 +- examples/webgl_tonemapping.html | 3 +- examples/webgl_water.html | 3 +- examples/webgl_water_flowmap.html | 3 +- examples/webxr_vr_dragging.html | 3 +- examples/webxr_vr_handinput.html | 3 +- examples/webxr_vr_handinput_cubes.html | 3 +- examples/webxr_vr_handinput_profiles.html | 3 +- examples/webxr_vr_haptics.html | 3 +- examples/webxr_vr_paint.html | 3 +- examples/webxr_vr_sculpt.html | 3 +- 165 files changed, 385 insertions(+), 187 deletions(-) diff --git a/docs/examples/en/controls/OrbitControls.html b/docs/examples/en/controls/OrbitControls.html index 912af44cda4d0f..157dedd7ac5d6f 100644 --- a/docs/examples/en/controls/OrbitControls.html +++ b/docs/examples/en/controls/OrbitControls.html @@ -28,7 +28,8 @@

Code Example

const camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 10000 ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); //controls.update() must be called after any manual changes to the camera's transform camera.position.set( 0, 20, 100 ); @@ -288,6 +289,11 @@

[method:void listenToKeyEvents] ( [param:HTMLDOMElement domElement] )

Adds key event listeners to the given DOM element. *window* is a recommended argument for using this method.

+

[method:void listenToPointerEvents] ( [param:HTMLDOMElement domElement] )

+

+ Adds pointer event listeners to the given DOM element. *renderer.domElement* is a recommended argument for using this method. +

+

[method:null reset] ()

Reset the controls to their state from either the last time the [page:.saveState] was called, or the initial state. diff --git a/docs/examples/ko/controls/OrbitControls.html b/docs/examples/ko/controls/OrbitControls.html index 3485f9eb592a1e..e06a19ba898ba9 100644 --- a/docs/examples/ko/controls/OrbitControls.html +++ b/docs/examples/ko/controls/OrbitControls.html @@ -27,7 +27,8 @@

코드 예시

const camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 10000 ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); //controls.update()는 카메라 변환설정을 수동으로 변경한 후에 호출해야 합니다. camera.position.set( 0, 20, 100 ); @@ -283,6 +284,11 @@

[method:void listenToKeyEvents] ( [param:HTMLDOMElement domElement] )

Adds key event listeners to the given DOM element. *window* is a recommended argument for using this method.

+

[method:void listenToPointerEvents] ( [param:HTMLDOMElement domElement] )

+

+ Adds pointer event listeners to the given DOM element. *renderer.domElement* is a recommended argument for using this method. +

+

[method:null reset] ()

컨트롤이 마지막으로 호출된 [page:.saveState] 시점으로 돌리거나, 초기상태로 재설정합니다. diff --git a/docs/examples/zh/controls/OrbitControls.html b/docs/examples/zh/controls/OrbitControls.html index de137391238878..a894f9a5728ead 100644 --- a/docs/examples/zh/controls/OrbitControls.html +++ b/docs/examples/zh/controls/OrbitControls.html @@ -28,7 +28,8 @@

代码示例

const camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 10000 ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); //controls.update() must be called after any manual changes to the camera's transform camera.position.set( 0, 20, 100 ); @@ -285,6 +286,11 @@

[method:void listenToKeyEvents] ( [param:HTMLDOMElement domElement] )

为指定的DOM元素添加按键监听。推荐将window作为指定的DOM元素。

+

[method:void listenToPointerEvents] ( [param:HTMLDOMElement domElement] )

+

+ Adds pointer event listeners to the given DOM element. *renderer.domElement* is a recommended argument for using this method. +

+

[method:null reset] ()

将控制器重置为上次调用[page:.saveState]时的状态，或者初始状态。 diff --git a/examples/css2d_label.html b/examples/css2d_label.html index 5bf435145a0c31..e8847a5579163f 100644 --- a/examples/css2d_label.html +++ b/examples/css2d_label.html @@ -104,7 +104,8 @@ labelRenderer.domElement.style.top = '0px'; document.body.appendChild( labelRenderer.domElement ); - const controls = new OrbitControls( camera, labelRenderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( labelRenderer.domElement ); controls.minDistance = 5; controls.maxDistance = 100; diff --git a/examples/css3d_orthographic.html b/examples/css3d_orthographic.html index f4499442e0acc3..9ce400546df51c 100644 --- a/examples/css3d_orthographic.html +++ b/examples/css3d_orthographic.html @@ -92,7 +92,8 @@ renderer2.domElement.style.top = 0; document.body.appendChild( renderer2.domElement ); - const controls = new OrbitControls( camera, renderer2.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer2.domElement ); controls.minZoom = 0.5; controls.maxZoom = 2; diff --git a/examples/js/controls/OrbitControls.js b/examples/js/controls/OrbitControls.js index 54a09ef8815227..46be060f018519 100644 --- a/examples/js/controls/OrbitControls.js +++ b/examples/js/controls/OrbitControls.js @@ -7,11 +7,8 @@ THREE.OrbitControls = function ( object, domElement ) { - if ( domElement === undefined ) console.warn( 'THREE.OrbitControls: The second parameter "domElement" is now mandatory.' ); - if ( domElement === document ) console.error( 'THREE.OrbitControls: "document" should not be used as the target "domElement". Please use "renderer.domElement" instead.' ); - this.object = object; - this.domElement = domElement; + this.domElement = null; // Set to false to disable this control this.enabled = true; @@ -102,6 +99,21 @@ THREE.OrbitControls = function ( object, domElement ) { }; + this.listenToPointerEvents = function ( domElement ) { + + if ( domElement === document ) console.error( 'THREE.OrbitControls: "document" should not be used as the target "domElement". Please use "renderer.domElement" instead.' ); + + domElement.addEventListener( 'contextmenu', onContextMenu ); + domElement.addEventListener( 'pointerdown', onPointerDown ); + domElement.addEventListener( 'wheel', onMouseWheel ); + domElement.addEventListener( 'touchstart', onTouchStart ); + domElement.addEventListener( 'touchend', onTouchEnd ); + domElement.addEventListener( 'touchmove', onTouchMove ); + + this.domElement = domElement; + + }; + this.saveState = function () { scope.target0.copy( scope.target ); @@ -1172,14 +1184,12 @@ THREE.OrbitControls = function ( object, domElement ) { // - scope.domElement.addEventListener( 'contextmenu', onContextMenu ); + if ( domElement !== undefined ) { - scope.domElement.addEventListener( 'pointerdown', onPointerDown ); - scope.domElement.addEventListener( 'wheel', onMouseWheel ); + console.warn( 'THREE.OrbitControls: The domElement constructor param has been deprecated. Use .listenToPointerEvents() instead.' ); + this.listenToPointerEvents( domElement ); - scope.domElement.addEventListener( 'touchstart', onTouchStart ); - scope.domElement.addEventListener( 'touchend', onTouchEnd ); - scope.domElement.addEventListener( 'touchmove', onTouchMove ); + } // force an update at start diff --git a/examples/jsm/controls/OrbitControls.js b/examples/jsm/controls/OrbitControls.js index 91f158f20e4290..63f567f85a5a86 100644 --- a/examples/jsm/controls/OrbitControls.js +++ b/examples/jsm/controls/OrbitControls.js @@ -17,11 +17,8 @@ import { var OrbitControls = function ( object, domElement ) { - if ( domElement === undefined ) console.warn( 'THREE.OrbitControls: The second parameter "domElement" is now mandatory.' ); - if ( domElement === document ) console.error( 'THREE.OrbitControls: "document" should not be used as the target "domElement". Please use "renderer.domElement" instead.' ); - this.object = object; - this.domElement = domElement; + this.domElement = null; // Set to false to disable this control this.enabled = true; @@ -112,6 +109,21 @@ var OrbitControls = function ( object, domElement ) { }; + this.listenToPointerEvents = function ( domElement ) { + + if ( domElement === document ) console.error( 'THREE.OrbitControls: "document" should not be used as the target "domElement". Please use "renderer.domElement" instead.' ); + + domElement.addEventListener( 'contextmenu', onContextMenu ); + domElement.addEventListener( 'pointerdown', onPointerDown ); + domElement.addEventListener( 'wheel', onMouseWheel ); + domElement.addEventListener( 'touchstart', onTouchStart ); + domElement.addEventListener( 'touchend', onTouchEnd ); + domElement.addEventListener( 'touchmove', onTouchMove ); + + this.domElement = domElement; + + }; + this.saveState = function () { scope.target0.copy( scope.target ); @@ -1182,14 +1194,12 @@ var OrbitControls = function ( object, domElement ) { // - scope.domElement.addEventListener( 'contextmenu', onContextMenu ); + if ( domElement !== undefined ) { - scope.domElement.addEventListener( 'pointerdown', onPointerDown ); - scope.domElement.addEventListener( 'wheel', onMouseWheel ); + console.warn( 'THREE.OrbitControls: The domElement constructor param has been deprecated. Use .listenToPointerEvents() instead.' ); + this.listenToPointerEvents( domElement ); - scope.domElement.addEventListener( 'touchstart', onTouchStart ); - scope.domElement.addEventListener( 'touchend', onTouchEnd ); - scope.domElement.addEventListener( 'touchmove', onTouchMove ); + } // force an update at start diff --git a/examples/misc_controls_orbit.html b/examples/misc_controls_orbit.html index 78f8151ed1ca5d..26e3e3979ab43c 100644 --- a/examples/misc_controls_orbit.html +++ b/examples/misc_controls_orbit.html @@ -50,7 +50,8 @@ // controls - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); // mandatory controls.listenToKeyEvents( window ); // optional //controls.addEventListener( 'change', render ); // call this only in static scenes (i.e., if there is no animation loop) diff --git a/examples/misc_controls_transform.html b/examples/misc_controls_transform.html index 2d4a3330abb5db..e8ae4d5a0b0798 100644 --- a/examples/misc_controls_transform.html +++ b/examples/misc_controls_transform.html @@ -57,7 +57,8 @@ const geometry = new THREE.BoxGeometry( 200, 200, 200 ); const material = new THREE.MeshLambertMaterial( { map: texture, transparent: true } ); - orbit = new OrbitControls( currentCamera, renderer.domElement ); + orbit = new OrbitControls( currentCamera ); + orbit.listenToPointerEvents( renderer.domElement ); orbit.update(); orbit.addEventListener( 'change', render ); diff --git a/examples/misc_exporter_collada.html b/examples/misc_exporter_collada.html index fb466ba7d1d931..e0852f1e10fe7d 100644 --- a/examples/misc_exporter_collada.html +++ b/examples/misc_exporter_collada.html @@ -80,7 +80,8 @@ window.addEventListener( 'resize', onWindowResize ); // CONTROLS - cameraControls = new OrbitControls( camera, renderer.domElement ); + cameraControls = new OrbitControls( camera ); + cameraControls.listenToPointerEvents( renderer.domElement ); cameraControls.addEventListener( 'change', render ); // TEXTURE MAP diff --git a/examples/misc_exporter_draco.html b/examples/misc_exporter_draco.html index 744d5c53deca68..c8ad69773ed704 100644 --- a/examples/misc_exporter_draco.html +++ b/examples/misc_exporter_draco.html @@ -98,7 +98,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 25, 0 ); controls.update(); diff --git a/examples/misc_exporter_ply.html b/examples/misc_exporter_ply.html index 0d9979346cfbe4..6e400e93c8f0ee 100644 --- a/examples/misc_exporter_ply.html +++ b/examples/misc_exporter_ply.html @@ -82,7 +82,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 25, 0 ); controls.update(); diff --git a/examples/misc_exporter_stl.html b/examples/misc_exporter_stl.html index b830669f116a18..0854d7e54458f4 100644 --- a/examples/misc_exporter_stl.html +++ b/examples/misc_exporter_stl.html @@ -82,7 +82,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 25, 0 ); controls.update(); diff --git a/examples/physics_ammo_break.html b/examples/physics_ammo_break.html index ea502abb0c1285..92c69ab91c64b7 100644 --- a/examples/physics_ammo_break.html +++ b/examples/physics_ammo_break.html @@ -113,7 +113,8 @@ renderer.shadowMap.enabled = true; container.appendChild( renderer.domElement ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 2, 0 ); controls.update(); diff --git a/examples/physics_ammo_cloth.html b/examples/physics_ammo_cloth.html index 627e04e50a5553..98734285b88815 100644 --- a/examples/physics_ammo_cloth.html +++ b/examples/physics_ammo_cloth.html @@ -80,7 +80,8 @@ renderer.shadowMap.enabled = true; container.appendChild( renderer.domElement ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 2, 0 ); controls.update(); diff --git a/examples/physics_ammo_instancing.html b/examples/physics_ammo_instancing.html index b57f2056c45e41..1fbf6b24dce62c 100644 --- a/examples/physics_ammo_instancing.html +++ b/examples/physics_ammo_instancing.html @@ -118,7 +118,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.y = 0.5; controls.update(); diff --git a/examples/physics_ammo_rope.html b/examples/physics_ammo_rope.html index dd12a9a5a0b11a..e3841a98a1c145 100644 --- a/examples/physics_ammo_rope.html +++ b/examples/physics_ammo_rope.html @@ -83,7 +83,8 @@ renderer.shadowMap.enabled = true; container.appendChild( renderer.domElement ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 2, 0 ); controls.update(); diff --git a/examples/physics_ammo_terrain.html b/examples/physics_ammo_terrain.html index 1d2b7a5f378850..cddf3e7bf322f1 100644 --- a/examples/physics_ammo_terrain.html +++ b/examples/physics_ammo_terrain.html @@ -102,7 +102,8 @@ camera.position.z = terrainDepthExtents / 2; camera.lookAt( 0, 0, 0 ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.enableZoom = false; const geometry = new THREE.PlaneGeometry( terrainWidthExtents, terrainDepthExtents, terrainWidth - 1, terrainDepth - 1 ); diff --git a/examples/physics_ammo_volume.html b/examples/physics_ammo_volume.html index e76b27e4c5fd74..3dcd363d66fefe 100644 --- a/examples/physics_ammo_volume.html +++ b/examples/physics_ammo_volume.html @@ -87,7 +87,8 @@ renderer.shadowMap.enabled = true; container.appendChild( renderer.domElement ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 2, 0 ); controls.update(); diff --git a/examples/webaudio_orientation.html b/examples/webaudio_orientation.html index 6a553babbaf057..8fe9576a81de63 100644 --- a/examples/webaudio_orientation.html +++ b/examples/webaudio_orientation.html @@ -147,7 +147,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 0.1, 0 ); controls.update(); controls.minDistance = 0.5; diff --git a/examples/webaudio_timing.html b/examples/webaudio_timing.html index b333affafdfeaa..c58cb590f30e5a 100644 --- a/examples/webaudio_timing.html +++ b/examples/webaudio_timing.html @@ -136,7 +136,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 1; controls.maxDistance = 25; diff --git a/examples/webgl2_materials_texture3d.html b/examples/webgl2_materials_texture3d.html index ee3bf733dab092..f56fe4179ab9a9 100644 --- a/examples/webgl2_materials_texture3d.html +++ b/examples/webgl2_materials_texture3d.html @@ -56,7 +56,8 @@ camera.up.set( 0, 0, 1 ); // In our data, z is up // Create controls - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); controls.target.set( 64, 64, 128 ); controls.minZoom = 0.5; diff --git a/examples/webgl2_volume_instancing.html b/examples/webgl2_volume_instancing.html index bd6c3ad3d9d287..ff7f895bd75986 100644 --- a/examples/webgl2_volume_instancing.html +++ b/examples/webgl2_volume_instancing.html @@ -43,7 +43,8 @@ camera = new THREE.PerspectiveCamera( 60, window.innerWidth / window.innerHeight, 0.1, 1000 ); camera.position.set( 0, 0, 4 ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.autoRotate = true; controls.autoRotateSpeed = - 1.0; controls.enableDamping = true; diff --git a/examples/webgl_animation_cloth.html b/examples/webgl_animation_cloth.html index d38ece325acea5..64f2ba9b7cc0e4 100644 --- a/examples/webgl_animation_cloth.html +++ b/examples/webgl_animation_cloth.html @@ -560,7 +560,8 @@ renderer.shadowMap.enabled = true; // controls - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.maxPolarAngle = Math.PI * 0.5; controls.minDistance = 1000; controls.maxDistance = 5000; diff --git a/examples/webgl_animation_keyframes.html b/examples/webgl_animation_keyframes.html index d1a63b9e123dfe..ed59a6dd07d0b5 100644 --- a/examples/webgl_animation_keyframes.html +++ b/examples/webgl_animation_keyframes.html @@ -57,7 +57,8 @@ const camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 100 ); camera.position.set( 5, 2, 8 ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 0.5, 0 ); controls.update(); controls.enablePan = false; diff --git a/examples/webgl_animation_skinning_additive_blending.html b/examples/webgl_animation_skinning_additive_blending.html index b6633c297a2408..589e84b3624ba9 100644 --- a/examples/webgl_animation_skinning_additive_blending.html +++ b/examples/webgl_animation_skinning_additive_blending.html @@ -154,7 +154,8 @@ camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 100 ); camera.position.set( - 1, 2, 3 ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.enablePan = false; controls.enableZoom = false; controls.target.set( 0, 1, 0 ); diff --git a/examples/webgl_buffergeometry_compression.html b/examples/webgl_buffergeometry_compression.html index 733b671177f22c..27e26b5d1b2841 100644 --- a/examples/webgl_buffergeometry_compression.html +++ b/examples/webgl_buffergeometry_compression.html @@ -84,7 +84,8 @@ camera.position.y = 2 * radius; camera.position.z = 2 * radius; - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); // diff --git a/examples/webgl_buffergeometry_drawrange.html b/examples/webgl_buffergeometry_drawrange.html index 0d1f4bd092cdf7..c14f35ef0bd7bf 100644 --- a/examples/webgl_buffergeometry_drawrange.html +++ b/examples/webgl_buffergeometry_drawrange.html @@ -85,7 +85,8 @@ camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 4000 ); camera.position.z = 1750; - const controls = new OrbitControls( camera, container ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( container ); controls.minDistance = 1000; controls.maxDistance = 3000; diff --git a/examples/webgl_clipping.html b/examples/webgl_clipping.html index 61608a3727873c..73d36ab61bd354 100644 --- a/examples/webgl_clipping.html +++ b/examples/webgl_clipping.html @@ -115,7 +115,8 @@ // Controls - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 1, 0 ); controls.update(); diff --git a/examples/webgl_clipping_advanced.html b/examples/webgl_clipping_advanced.html index 1e8413c5731f5c..3d1fb635a79033 100644 --- a/examples/webgl_clipping_advanced.html +++ b/examples/webgl_clipping_advanced.html @@ -288,7 +288,8 @@ // Controls - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 1; controls.maxDistance = 8; controls.target.set( 0, 1, 0 ); diff --git a/examples/webgl_clipping_intersection.html b/examples/webgl_clipping_intersection.html index 4c3e49a083fd19..4d235e5e381198 100644 --- a/examples/webgl_clipping_intersection.html +++ b/examples/webgl_clipping_intersection.html @@ -47,7 +47,8 @@ camera.position.set( - 1.5, 2.5, 3.0 ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); // use only if there is no animation loop controls.minDistance = 1; controls.maxDistance = 10; diff --git a/examples/webgl_clipping_stencil.html b/examples/webgl_clipping_stencil.html index 17aad958fdecf1..83f10beda1368f 100644 --- a/examples/webgl_clipping_stencil.html +++ b/examples/webgl_clipping_stencil.html @@ -218,7 +218,8 @@ renderer.localClippingEnabled = true; // Controls - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 2; controls.maxDistance = 20; controls.update(); diff --git a/examples/webgl_decals.html b/examples/webgl_decals.html index 59e8d72483d3ee..ca7047412fea9e 100644 --- a/examples/webgl_decals.html +++ b/examples/webgl_decals.html @@ -92,7 +92,8 @@ camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 1000 ); camera.position.z = 120; - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 50; controls.maxDistance = 200; diff --git a/examples/webgl_depth_texture.html b/examples/webgl_depth_texture.html index 52905fbc83c16a..ba2ea74f4774ae 100644 --- a/examples/webgl_depth_texture.html +++ b/examples/webgl_depth_texture.html @@ -111,7 +111,8 @@ camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.01, 50 ); camera.position.z = 4; - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.enableDamping = true; // Create a render target with depth texture diff --git a/examples/webgl_framebuffer_texture.html b/examples/webgl_framebuffer_texture.html index 969cbd66c79a52..fb9582fd746bf4 100644 --- a/examples/webgl_framebuffer_texture.html +++ b/examples/webgl_framebuffer_texture.html @@ -121,7 +121,8 @@ // const selection = document.getElementById( 'selection' ); - const controls = new OrbitControls( camera, selection ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( selection ); controls.enablePan = false; // diff --git a/examples/webgl_geometry_colors_lookuptable.html b/examples/webgl_geometry_colors_lookuptable.html index 73590d39ac945d..c93506a81b2b48 100644 --- a/examples/webgl_geometry_colors_lookuptable.html +++ b/examples/webgl_geometry_colors_lookuptable.html @@ -94,7 +94,8 @@ window.addEventListener( 'resize', onWindowResize ); - const controls = new OrbitControls( perpCamera, renderer.domElement ); + const controls = new OrbitControls( perpCamera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); const gui = new GUI(); diff --git a/examples/webgl_geometry_convex.html b/examples/webgl_geometry_convex.html index 93eb4ea2965118..d8295b0418dd59 100644 --- a/examples/webgl_geometry_convex.html +++ b/examples/webgl_geometry_convex.html @@ -40,7 +40,8 @@ // controls - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 20; controls.maxDistance = 50; controls.maxPolarAngle = Math.PI / 2; diff --git a/examples/webgl_geometry_extrude_shapes2.html b/examples/webgl_geometry_extrude_shapes2.html index 9cab6038711274..9c92fee0396fc7 100644 --- a/examples/webgl_geometry_extrude_shapes2.html +++ b/examples/webgl_geometry_extrude_shapes2.html @@ -431,7 +431,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 100; controls.maxDistance = 1000; diff --git a/examples/webgl_geometry_extrude_splines.html b/examples/webgl_geometry_extrude_splines.html index 93025d4bdc9ff4..c1a57dbe06841e 100644 --- a/examples/webgl_geometry_extrude_splines.html +++ b/examples/webgl_geometry_extrude_splines.html @@ -259,7 +259,8 @@ } ); folderCamera.open(); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 100; controls.maxDistance = 2000; diff --git a/examples/webgl_geometry_normals.html b/examples/webgl_geometry_normals.html index d74d16b84cfc09..8a71411557533e 100644 --- a/examples/webgl_geometry_normals.html +++ b/examples/webgl_geometry_normals.html @@ -122,7 +122,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.enableZoom = false; // diff --git a/examples/webgl_geometry_spline_editor.html b/examples/webgl_geometry_spline_editor.html index d1dafcf97f3463..36725664630c92 100644 --- a/examples/webgl_geometry_spline_editor.html +++ b/examples/webgl_geometry_spline_editor.html @@ -128,7 +128,8 @@ gui.open(); // Controls - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.damping = 0.2; controls.addEventListener( 'change', render ); diff --git a/examples/webgl_geometry_teapot.html b/examples/webgl_geometry_teapot.html index d28375cd9ecf4a..1ce37788ef4e04 100644 --- a/examples/webgl_geometry_teapot.html +++ b/examples/webgl_geometry_teapot.html @@ -74,7 +74,8 @@ window.addEventListener( 'resize', onWindowResize ); // CONTROLS - cameraControls = new OrbitControls( camera, renderer.domElement ); + cameraControls = new OrbitControls( camera ); + cameraControls.listenToPointerEvents( renderer.domElement ); cameraControls.addEventListener( 'change', render ); // TEXTURE MAP diff --git a/examples/webgl_geometry_terrain_raycast.html b/examples/webgl_geometry_terrain_raycast.html index fc7ff0952dea8f..685a043b28559f 100644 --- a/examples/webgl_geometry_terrain_raycast.html +++ b/examples/webgl_geometry_terrain_raycast.html @@ -61,7 +61,8 @@ camera = new THREE.PerspectiveCamera( 60, window.innerWidth / window.innerHeight, 10, 20000 ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 1000; controls.maxDistance = 10000; controls.maxPolarAngle = Math.PI / 2; diff --git a/examples/webgl_geometry_text_shapes.html b/examples/webgl_geometry_text_shapes.html index 45b6a9ab8dd5a3..b18efa11598e1b 100644 --- a/examples/webgl_geometry_text_shapes.html +++ b/examples/webgl_geometry_text_shapes.html @@ -122,7 +122,8 @@ renderer.setSize( window.innerWidth, window.innerHeight ); document.body.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 0, 0 ); controls.update(); diff --git a/examples/webgl_geometry_text_stroke.html b/examples/webgl_geometry_text_stroke.html index 84a1168a4d9385..01ce65d3150fbd 100644 --- a/examples/webgl_geometry_text_stroke.html +++ b/examples/webgl_geometry_text_stroke.html @@ -126,7 +126,8 @@ renderer.setSize( window.innerWidth, window.innerHeight ); document.body.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 0, 0 ); controls.update(); diff --git a/examples/webgl_gpgpu_protoplanet.html b/examples/webgl_gpgpu_protoplanet.html index ebf1c3f6193d28..90be24148cbe2b 100644 --- a/examples/webgl_gpgpu_protoplanet.html +++ b/examples/webgl_gpgpu_protoplanet.html @@ -278,7 +278,8 @@ renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 100; controls.maxDistance = 1000; diff --git a/examples/webgl_instancing_performance.html b/examples/webgl_instancing_performance.html index 84a5772a9b2281..7398a72b771c1b 100644 --- a/examples/webgl_instancing_performance.html +++ b/examples/webgl_instancing_performance.html @@ -257,7 +257,8 @@ // controls - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.autoRotate = true; // stats diff --git a/examples/webgl_lightningstrike.html b/examples/webgl_lightningstrike.html index ea866a0b1c37de..acd9d6cf9b6c4e 100644 --- a/examples/webgl_lightningstrike.html +++ b/examples/webgl_lightningstrike.html @@ -335,7 +335,8 @@ // Controls - const controls = new OrbitControls( scene.userData.camera, renderer.domElement ); + const controls = new OrbitControls( scene.userData.camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.y = ( conesDistance + coneHeight ) * 0.5; controls.enableDamping = true; controls.dampingFactor = 0.05; @@ -558,7 +559,8 @@ // Controls - const controls = new OrbitControls( scene.userData.camera, renderer.domElement ); + const controls = new OrbitControls( scene.userData.camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.copy( sphereMesh.position ); controls.enableDamping = true; controls.dampingFactor = 0.05; @@ -748,7 +750,8 @@ // Controls - const controls = new OrbitControls( scene.userData.camera, renderer.domElement ); + const controls = new OrbitControls( scene.userData.camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.y = GROUND_SIZE * 0.05; controls.enableDamping = true; controls.dampingFactor = 0.05; diff --git a/examples/webgl_lightprobe.html b/examples/webgl_lightprobe.html index 723fea4d23b188..7b530a19b372fe 100644 --- a/examples/webgl_lightprobe.html +++ b/examples/webgl_lightprobe.html @@ -58,7 +58,8 @@ camera.position.set( 0, 0, 30 ); // controls - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); controls.minDistance = 10; controls.maxDistance = 50; diff --git a/examples/webgl_lightprobe_cubecamera.html b/examples/webgl_lightprobe_cubecamera.html index b6d9dd8344fa0c..c2542488e82a04 100644 --- a/examples/webgl_lightprobe_cubecamera.html +++ b/examples/webgl_lightprobe_cubecamera.html @@ -50,7 +50,8 @@ cubeCamera = new THREE.CubeCamera( 1, 1000, cubeRenderTarget ); // controls - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); controls.minDistance = 10; controls.maxDistance = 50; diff --git a/examples/webgl_lights_physical.html b/examples/webgl_lights_physical.html index 132b8919f9c0ec..9da838b5abac40 100644 --- a/examples/webgl_lights_physical.html +++ b/examples/webgl_lights_physical.html @@ -227,7 +227,8 @@ container.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 1; controls.maxDistance = 20; diff --git a/examples/webgl_lights_rectarealight.html b/examples/webgl_lights_rectarealight.html index 155fafaccd38f0..0b348198fa2eab 100644 --- a/examples/webgl_lights_rectarealight.html +++ b/examples/webgl_lights_rectarealight.html @@ -72,7 +72,8 @@ meshKnot.position.set( 0, 5, 0 ); scene.add( meshKnot ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.copy( meshKnot.position ); controls.update(); diff --git a/examples/webgl_lights_spotlight.html b/examples/webgl_lights_spotlight.html index bd4ec58ae97e21..14713b8174a317 100644 --- a/examples/webgl_lights_spotlight.html +++ b/examples/webgl_lights_spotlight.html @@ -43,7 +43,8 @@ camera = new THREE.PerspectiveCamera( 35, window.innerWidth / window.innerHeight, 1, 1000 ); camera.position.set( 160, 40, 10 ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); controls.minDistance = 20; controls.maxDistance = 500; diff --git a/examples/webgl_lights_spotlights.html b/examples/webgl_lights_spotlights.html index 718edeeeae82be..b6997ce88dbe04 100644 --- a/examples/webgl_lights_spotlights.html +++ b/examples/webgl_lights_spotlights.html @@ -26,7 +26,8 @@ const camera = new THREE.PerspectiveCamera( 35, window.innerWidth / window.innerHeight, 1, 2000 ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); const scene = new THREE.Scene(); diff --git a/examples/webgl_lines_fat.html b/examples/webgl_lines_fat.html index 6a6d4471a858ea..e93f2fb3b029d9 100644 --- a/examples/webgl_lines_fat.html +++ b/examples/webgl_lines_fat.html @@ -55,7 +55,8 @@ camera2 = new THREE.PerspectiveCamera( 40, 1, 1, 1000 ); camera2.position.copy( camera.position ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 10; controls.maxDistance = 500; diff --git a/examples/webgl_lines_fat_wireframe.html b/examples/webgl_lines_fat_wireframe.html index e7b149ecb45cb2..e2ac4a42da2b44 100644 --- a/examples/webgl_lines_fat_wireframe.html +++ b/examples/webgl_lines_fat_wireframe.html @@ -54,7 +54,8 @@ camera2 = new THREE.PerspectiveCamera( 40, 1, 1, 1000 ); camera2.position.copy( camera.position ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 10; controls.maxDistance = 500; diff --git a/examples/webgl_loader_3dm.html b/examples/webgl_loader_3dm.html index 9a2d492c4c5c87..87a2b01de5fd56 100644 --- a/examples/webgl_loader_3dm.html +++ b/examples/webgl_loader_3dm.html @@ -63,7 +63,8 @@ renderer.setSize( width, height ); container.appendChild( renderer.domElement ); - controls = new OrbitControls( camera, container ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( container ); window.addEventListener( 'resize', resize ); diff --git a/examples/webgl_loader_3mf.html b/examples/webgl_loader_3mf.html index 056ebc2dc38155..10b2b832c46824 100644 --- a/examples/webgl_loader_3mf.html +++ b/examples/webgl_loader_3mf.html @@ -62,7 +62,8 @@ camera.position.set( - 100, - 250, 100 ); scene.add( camera ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); controls.minDistance = 50; controls.maxDistance = 400; diff --git a/examples/webgl_loader_3mf_materials.html b/examples/webgl_loader_3mf_materials.html index fffd991e4b45b7..45160932ef7d34 100644 --- a/examples/webgl_loader_3mf_materials.html +++ b/examples/webgl_loader_3mf_materials.html @@ -105,7 +105,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); controls.minDistance = 50; controls.maxDistance = 200; diff --git a/examples/webgl_loader_amf.html b/examples/webgl_loader_amf.html index f694eaaa9708bb..7baaa9355c1d12 100644 --- a/examples/webgl_loader_amf.html +++ b/examples/webgl_loader_amf.html @@ -65,7 +65,8 @@ } ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); controls.target.set( 0, 1.2, 2 ); controls.update(); diff --git a/examples/webgl_loader_assimp.html b/examples/webgl_loader_assimp.html index 75fe874b594556..05d66a9c09db30 100644 --- a/examples/webgl_loader_assimp.html +++ b/examples/webgl_loader_assimp.html @@ -54,7 +54,8 @@ renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 750; controls.maxDistance = 2500; diff --git a/examples/webgl_loader_bvh.html b/examples/webgl_loader_bvh.html index 9c3ff57bd7b1a1..66f4214105d342 100644 --- a/examples/webgl_loader_bvh.html +++ b/examples/webgl_loader_bvh.html @@ -70,7 +70,8 @@ renderer.setSize( window.innerWidth, window.innerHeight ); document.body.appendChild( renderer.domElement ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 300; controls.maxDistance = 700; diff --git a/examples/webgl_loader_collada_skinning.html b/examples/webgl_loader_collada_skinning.html index b55b7f4012b3fc..fe1a3c85599409 100644 --- a/examples/webgl_loader_collada_skinning.html +++ b/examples/webgl_loader_collada_skinning.html @@ -88,7 +88,8 @@ // - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.screenSpacePanning = true; controls.minDistance = 5; controls.maxDistance = 40; diff --git a/examples/webgl_loader_fbx.html b/examples/webgl_loader_fbx.html index f036b96c9e9174..2b796582b553b1 100644 --- a/examples/webgl_loader_fbx.html +++ b/examples/webgl_loader_fbx.html @@ -99,7 +99,8 @@ renderer.shadowMap.enabled = true; container.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 100, 0 ); controls.update(); diff --git a/examples/webgl_loader_fbx_nurbs.html b/examples/webgl_loader_fbx_nurbs.html index 1e782639a230ca..8540c36e1e1feb 100644 --- a/examples/webgl_loader_fbx_nurbs.html +++ b/examples/webgl_loader_fbx_nurbs.html @@ -65,7 +65,8 @@ renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 12, 0 ); controls.update(); diff --git a/examples/webgl_loader_gcode.html b/examples/webgl_loader_gcode.html index 5fa309eb6a0e65..2cc4374e0bcf52 100644 --- a/examples/webgl_loader_gcode.html +++ b/examples/webgl_loader_gcode.html @@ -49,7 +49,8 @@ renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); // use if there is no animation loop controls.minDistance = 10; controls.maxDistance = 100; diff --git a/examples/webgl_loader_gltf.html b/examples/webgl_loader_gltf.html index c77352a99856fe..6de940a51f57e5 100644 --- a/examples/webgl_loader_gltf.html +++ b/examples/webgl_loader_gltf.html @@ -94,7 +94,8 @@ const pmremGenerator = new THREE.PMREMGenerator( renderer ); pmremGenerator.compileEquirectangularShader(); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); // use if there is no animation loop controls.minDistance = 2; controls.maxDistance = 10; diff --git a/examples/webgl_loader_gltf_compressed.html b/examples/webgl_loader_gltf_compressed.html index 14a29b30960d7f..278360d0c8e9aa 100644 --- a/examples/webgl_loader_gltf_compressed.html +++ b/examples/webgl_loader_gltf_compressed.html @@ -80,7 +80,8 @@ } ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); // use if there is no animation loop controls.minDistance = 400; controls.maxDistance = 1000; diff --git a/examples/webgl_loader_gltf_extensions.html b/examples/webgl_loader_gltf_extensions.html index d926f62716b7f3..10c7e53ab4c2d1 100644 --- a/examples/webgl_loader_gltf_extensions.html +++ b/examples/webgl_loader_gltf_extensions.html @@ -237,7 +237,8 @@ // TODO: Reuse existing OrbitControls, GLTFLoaders, and so on - orbitControls = new OrbitControls( camera, renderer.domElement ); + orbitControls = new OrbitControls( camera ); + orbitControls.listenToPointerEvents( renderer.domElement ); if ( sceneInfo.addGround ) { diff --git a/examples/webgl_loader_gltf_variants.html b/examples/webgl_loader_gltf_variants.html index 1e591dcb3fb4e7..1703865c6ac18b 100644 --- a/examples/webgl_loader_gltf_variants.html +++ b/examples/webgl_loader_gltf_variants.html @@ -97,7 +97,8 @@ const pmremGenerator = new THREE.PMREMGenerator( renderer ); pmremGenerator.compileEquirectangularShader(); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); // use if there is no animation loop controls.minDistance = 2; controls.maxDistance = 10; diff --git a/examples/webgl_loader_kmz.html b/examples/webgl_loader_kmz.html index 24eb80c72ca9cf..85f3cb27d8dd33 100644 --- a/examples/webgl_loader_kmz.html +++ b/examples/webgl_loader_kmz.html @@ -57,7 +57,8 @@ } ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); controls.update(); diff --git a/examples/webgl_loader_ldraw.html b/examples/webgl_loader_ldraw.html index 7bfc0376b90302..0a0f5f4447635e 100644 --- a/examples/webgl_loader_ldraw.html +++ b/examples/webgl_loader_ldraw.html @@ -89,7 +89,8 @@ renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); // diff --git a/examples/webgl_loader_lwo.html b/examples/webgl_loader_lwo.html index 979a5f373f4db4..28e98899982e74 100644 --- a/examples/webgl_loader_lwo.html +++ b/examples/webgl_loader_lwo.html @@ -91,7 +91,8 @@ renderer.outputEncoding = THREE.sRGBEncoding; container.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 1.33, 10, - 6.7 ); controls.update(); diff --git a/examples/webgl_loader_md2.html b/examples/webgl_loader_md2.html index 4192b751a815eb..64a9861bbbde36 100644 --- a/examples/webgl_loader_md2.html +++ b/examples/webgl_loader_md2.html @@ -131,7 +131,8 @@ // CONTROLS - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 50, 0 ); controls.update(); diff --git a/examples/webgl_loader_md2_control.html b/examples/webgl_loader_md2_control.html index eade4750675a54..7c6a570777ebec 100644 --- a/examples/webgl_loader_md2_control.html +++ b/examples/webgl_loader_md2_control.html @@ -143,9 +143,9 @@ // CONTROLS - cameraControls = new OrbitControls( camera, renderer.domElement ); + cameraControls = new OrbitControls( camera ); + cameraControls.listenToPointerEvents( renderer.domElement ); cameraControls.target.set( 0, 50, 0 ); - cameraControls.enableKeys = false; cameraControls.update(); // CHARACTER diff --git a/examples/webgl_loader_mmd.html b/examples/webgl_loader_mmd.html index 39f7ce9fcfc073..c152ae439515b7 100644 --- a/examples/webgl_loader_mmd.html +++ b/examples/webgl_loader_mmd.html @@ -140,7 +140,8 @@ }, onProgress, null ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 10; controls.maxDistance = 100; diff --git a/examples/webgl_loader_nodes.html b/examples/webgl_loader_nodes.html index f246bb32ef5c07..73ad307d6b652d 100644 --- a/examples/webgl_loader_nodes.html +++ b/examples/webgl_loader_nodes.html @@ -55,7 +55,8 @@ cloud = new THREE.TextureLoader().load( 'textures/lava/cloud.png' ); cloud.wrapS = cloud.wrapT = THREE.RepeatWrapping; - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 50; controls.maxDistance = 200; diff --git a/examples/webgl_loader_svg.html b/examples/webgl_loader_svg.html index 96dc9c53e3c496..3e76c562ccf3ec 100644 --- a/examples/webgl_loader_svg.html +++ b/examples/webgl_loader_svg.html @@ -54,7 +54,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.screenSpacePanning = true; // diff --git a/examples/webgl_loader_texture_basis.html b/examples/webgl_loader_texture_basis.html index 2f9ae982368d23..eb471e5232b635 100644 --- a/examples/webgl_loader_texture_basis.html +++ b/examples/webgl_loader_texture_basis.html @@ -40,7 +40,8 @@ camera.position.set( 0, 0, 1 ); camera.lookAt( scene.position ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); const geometry = flipY( new THREE.PlaneBufferGeometry() ); diff --git a/examples/webgl_loader_texture_ktx2.html b/examples/webgl_loader_texture_ktx2.html index 0835a1cf684a94..807eb43006f438 100644 --- a/examples/webgl_loader_texture_ktx2.html +++ b/examples/webgl_loader_texture_ktx2.html @@ -37,7 +37,8 @@ camera.lookAt( scene.position ); scene.add( camera ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.autoRotate = true; // PlaneGeometry UVs assume flipY=true, which compressed textures don't support. diff --git a/examples/webgl_loader_texture_tga.html b/examples/webgl_loader_texture_tga.html index a7362ff9e78597..e0a2da0dffdb08 100644 --- a/examples/webgl_loader_texture_tga.html +++ b/examples/webgl_loader_texture_tga.html @@ -78,7 +78,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.enableZoom = false; // diff --git a/examples/webgl_loader_tilt.html b/examples/webgl_loader_tilt.html index 5f96f5b24645a3..d74e493fbb67c1 100644 --- a/examples/webgl_loader_tilt.html +++ b/examples/webgl_loader_tilt.html @@ -51,7 +51,8 @@ } ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); controls.target.y = camera.position.y; controls.update(); diff --git a/examples/webgl_loader_vox.html b/examples/webgl_loader_vox.html index 323003028a4d28..c02884be36db91 100644 --- a/examples/webgl_loader_vox.html +++ b/examples/webgl_loader_vox.html @@ -71,7 +71,8 @@ // controls - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = .1; controls.maxDistance = 0.5; diff --git a/examples/webgl_loader_vrm.html b/examples/webgl_loader_vrm.html index c9791e3891a4ad..3fc70d39ee1f11 100644 --- a/examples/webgl_loader_vrm.html +++ b/examples/webgl_loader_vrm.html @@ -96,7 +96,8 @@ renderer.outputEncoding = THREE.sRGBEncoding; container.appendChild( renderer.domElement ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 1; controls.maxDistance = 5; controls.enableDamping = true; diff --git a/examples/webgl_loader_vrml.html b/examples/webgl_loader_vrml.html index 29867117f6115a..1b664eecbb3d09 100644 --- a/examples/webgl_loader_vrml.html +++ b/examples/webgl_loader_vrml.html @@ -78,7 +78,8 @@ // controls - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 1; controls.maxDistance = 200; controls.enableDamping = true; diff --git a/examples/webgl_loader_x.html b/examples/webgl_loader_x.html index 08b2b2854fa9b8..2eef6b4bf9e4c6 100644 --- a/examples/webgl_loader_x.html +++ b/examples/webgl_loader_x.html @@ -80,7 +80,8 @@ camera.position.set( 2, 10, - 28 ); camera.up.set( 0, 1, 0 ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 5, 0 ); controls.update(); diff --git a/examples/webgl_marchingcubes.html b/examples/webgl_marchingcubes.html index 83b6109369588c..f419d2d4ce4d4f 100644 --- a/examples/webgl_marchingcubes.html +++ b/examples/webgl_marchingcubes.html @@ -99,7 +99,8 @@ // CONTROLS - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 500; controls.maxDistance = 5000; diff --git a/examples/webgl_materials_car.html b/examples/webgl_materials_car.html index 2c96d6bbfd8cea..91c0cc81968a28 100644 --- a/examples/webgl_materials_car.html +++ b/examples/webgl_materials_car.html @@ -75,7 +75,8 @@ camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 0.1, 100 ); camera.position.set( 4.25, 1.4, - 4.5 ); - controls = new OrbitControls( camera, container ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( container ); controls.target.set( 0, 0.5, 0 ); controls.update(); diff --git a/examples/webgl_materials_channels.html b/examples/webgl_materials_channels.html index 1924740dc98f55..98ce4fbc149268 100644 --- a/examples/webgl_materials_channels.html +++ b/examples/webgl_materials_channels.html @@ -87,13 +87,15 @@ camera = cameraPerspective; - controlsPerspective = new OrbitControls( cameraPerspective, renderer.domElement ); + controlsPerspective = new OrbitControls( cameraPerspective ); + controlsPerspective.listenToPointerEvents( renderer.domElement ); controlsPerspective.minDistance = 1000; controlsPerspective.maxDistance = 2400; controlsPerspective.enablePan = false; controlsPerspective.enableDamping = true; - controlsOrtho = new OrbitControls( cameraOrtho, renderer.domElement ); + controlsOrtho = new OrbitControls( cameraOrtho ); + controlsOrtho.listenToPointerEvents( renderer.domElement ); controlsOrtho.minZoom = 0.5; controlsOrtho.maxZoom = 1.5; controlsOrtho.enablePan = false; diff --git a/examples/webgl_materials_compile.html b/examples/webgl_materials_compile.html index 994159b28ceda6..3fa6865903e8d4 100644 --- a/examples/webgl_materials_compile.html +++ b/examples/webgl_materials_compile.html @@ -95,7 +95,8 @@ camera.position.z = - 300; camera.position.y = 200; - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 50; controls.maxDistance = 400; diff --git a/examples/webgl_materials_cubemap.html b/examples/webgl_materials_cubemap.html index aa5ecaaf55c8d0..4bebead3ee3057 100644 --- a/examples/webgl_materials_cubemap.html +++ b/examples/webgl_materials_cubemap.html @@ -99,7 +99,8 @@ container.appendChild( renderer.domElement ); //controls - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.enableZoom = false; controls.enablePan = false; controls.minPolarAngle = Math.PI / 4; diff --git a/examples/webgl_materials_cubemap_mipmaps.html b/examples/webgl_materials_cubemap_mipmaps.html index 6b756798d9ba32..13906210051627 100644 --- a/examples/webgl_materials_cubemap_mipmaps.html +++ b/examples/webgl_materials_cubemap_mipmaps.html @@ -135,7 +135,8 @@ container.appendChild( renderer.domElement ); //controls - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minPolarAngle = Math.PI / 4; controls.maxPolarAngle = Math.PI / 1.5; diff --git a/examples/webgl_materials_curvature.html b/examples/webgl_materials_curvature.html index 6c1de85e6abbea..68b30a5d60d857 100644 --- a/examples/webgl_materials_curvature.html +++ b/examples/webgl_materials_curvature.html @@ -130,7 +130,8 @@ renderer.autoClear = false; document.body.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 20; controls.maxDistance = 100; diff --git a/examples/webgl_materials_displacementmap.html b/examples/webgl_materials_displacementmap.html index 9041435b33ae1c..13fbe6bbfc1fa5 100644 --- a/examples/webgl_materials_displacementmap.html +++ b/examples/webgl_materials_displacementmap.html @@ -117,7 +117,8 @@ camera.position.z = 1500; scene.add( camera ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.enableZoom = false; controls.enableDamping = true; diff --git a/examples/webgl_materials_envmaps.html b/examples/webgl_materials_envmaps.html index d26296b6398841..c8dc7ad14789cc 100644 --- a/examples/webgl_materials_envmaps.html +++ b/examples/webgl_materials_envmaps.html @@ -77,7 +77,8 @@ // - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 500; controls.maxDistance = 2500; diff --git a/examples/webgl_materials_envmaps_exr.html b/examples/webgl_materials_envmaps_exr.html index 7a20ac05bff8fe..69c9d98bd1c9a5 100644 --- a/examples/webgl_materials_envmaps_exr.html +++ b/examples/webgl_materials_envmaps_exr.html @@ -113,7 +113,8 @@ stats = new Stats(); container.appendChild( stats.dom ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 50; controls.maxDistance = 300; diff --git a/examples/webgl_materials_envmaps_hdr.html b/examples/webgl_materials_envmaps_hdr.html index 55d52c21f9d58f..38a743788f332e 100644 --- a/examples/webgl_materials_envmaps_hdr.html +++ b/examples/webgl_materials_envmaps_hdr.html @@ -175,7 +175,8 @@ stats = new Stats(); container.appendChild( stats.dom ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 50; controls.maxDistance = 300; diff --git a/examples/webgl_materials_envmaps_hdr_nodes.html b/examples/webgl_materials_envmaps_hdr_nodes.html index 47c78c741c1635..494787c6a9642f 100644 --- a/examples/webgl_materials_envmaps_hdr_nodes.html +++ b/examples/webgl_materials_envmaps_hdr_nodes.html @@ -181,7 +181,8 @@ stats = new Stats(); container.appendChild( stats.dom ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 50; controls.maxDistance = 300; diff --git a/examples/webgl_materials_envmaps_parallax.html b/examples/webgl_materials_envmaps_parallax.html index f4866843397733..c8429b8950a9b7 100644 --- a/examples/webgl_materials_envmaps_parallax.html +++ b/examples/webgl_materials_envmaps_parallax.html @@ -238,7 +238,8 @@ camera = new THREE.PerspectiveCamera( VIEW_ANGLE, ASPECT, NEAR, FAR ); camera.position.set( 280, 106, - 5 ); - cameraControls = new OrbitControls( camera, renderer.domElement ); + cameraControls = new OrbitControls( camera ); + cameraControls.listenToPointerEvents( renderer.domElement ); cameraControls.target.set( 0, - 10, 0 ); cameraControls.maxDistance = 400; cameraControls.minDistance = 10; diff --git a/examples/webgl_materials_envmaps_pmrem_nodes.html b/examples/webgl_materials_envmaps_pmrem_nodes.html index 3d21098e53d4e7..d7f5087cf6179a 100644 --- a/examples/webgl_materials_envmaps_pmrem_nodes.html +++ b/examples/webgl_materials_envmaps_pmrem_nodes.html @@ -137,7 +137,8 @@ stats = new Stats(); container.appendChild( stats.dom ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 50; controls.maxDistance = 300; diff --git a/examples/webgl_materials_lightmap.html b/examples/webgl_materials_lightmap.html index 4873ed9123edca..fe38e4f321f341 100644 --- a/examples/webgl_materials_lightmap.html +++ b/examples/webgl_materials_lightmap.html @@ -114,7 +114,8 @@ // CONTROLS - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.maxPolarAngle = 0.9 * Math.PI / 2; controls.enableZoom = false; diff --git a/examples/webgl_materials_matcap.html b/examples/webgl_materials_matcap.html index a27b81595dcb27..84a54e05e4276e 100644 --- a/examples/webgl_materials_matcap.html +++ b/examples/webgl_materials_matcap.html @@ -53,7 +53,8 @@ camera.position.set( 0, 0, 13 ); // controls - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); controls.enableZoom = false; controls.enablePan = false; diff --git a/examples/webgl_materials_modified.html b/examples/webgl_materials_modified.html index 41342b1e0c268e..1dfb9596b1379d 100644 --- a/examples/webgl_materials_modified.html +++ b/examples/webgl_materials_modified.html @@ -56,7 +56,8 @@ renderer.setSize( window.innerWidth, window.innerHeight ); document.body.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 10; controls.maxDistance = 50; diff --git a/examples/webgl_materials_nodes.html b/examples/webgl_materials_nodes.html index 495fd54cd8d32a..bd1eb234f333ee 100644 --- a/examples/webgl_materials_nodes.html +++ b/examples/webgl_materials_nodes.html @@ -129,7 +129,8 @@ camera.position.z = - 50; camera.position.y = 30; - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 50; controls.maxDistance = 200; diff --git a/examples/webgl_materials_normalmap_object_space.html b/examples/webgl_materials_normalmap_object_space.html index d1ee51832a28d8..d1b7f2503be7ee 100644 --- a/examples/webgl_materials_normalmap_object_space.html +++ b/examples/webgl_materials_normalmap_object_space.html @@ -44,7 +44,8 @@ scene.add( camera ); // controls - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); controls.minDistance = 10; controls.maxDistance = 50; diff --git a/examples/webgl_materials_parallaxmap.html b/examples/webgl_materials_parallaxmap.html index 78abf476d2b077..e63fef7d083b60 100644 --- a/examples/webgl_materials_parallaxmap.html +++ b/examples/webgl_materials_parallaxmap.html @@ -86,7 +86,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 1; controls.maxDistance = 5; diff --git a/examples/webgl_materials_physical_reflectivity.html b/examples/webgl_materials_physical_reflectivity.html index 068ecdfeea8476..5ea7ed8d599bbf 100644 --- a/examples/webgl_materials_physical_reflectivity.html +++ b/examples/webgl_materials_physical_reflectivity.html @@ -162,7 +162,8 @@ stats = new Stats(); container.appendChild( stats.dom ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 20; controls.maxDistance = 200; diff --git a/examples/webgl_materials_physical_sheen.html b/examples/webgl_materials_physical_sheen.html index 92e5e11e05c643..a747a07c9478ef 100644 --- a/examples/webgl_materials_physical_sheen.html +++ b/examples/webgl_materials_physical_sheen.html @@ -91,7 +91,8 @@ renderer.shadowMap.enabled = true; container.appendChild( renderer.domElement ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 2, 0 ); controls.update(); diff --git a/examples/webgl_materials_physical_transmission.html b/examples/webgl_materials_physical_transmission.html index 4fbb621a34ff5c..c02517407c201d 100644 --- a/examples/webgl_materials_physical_transmission.html +++ b/examples/webgl_materials_physical_transmission.html @@ -145,7 +145,8 @@ stats = new Stats(); container.appendChild( stats.dom ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 10; controls.maxDistance = 150; diff --git a/examples/webgl_materials_subsurface_scattering.html b/examples/webgl_materials_subsurface_scattering.html index 665ef5588e7560..77985abe497a6b 100644 --- a/examples/webgl_materials_subsurface_scattering.html +++ b/examples/webgl_materials_subsurface_scattering.html @@ -75,6 +75,7 @@ container.appendChild( stats.dom ); const controls = new OrbitControls( camera, container ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 500; controls.maxDistance = 3000; diff --git a/examples/webgl_materials_texture_rotation.html b/examples/webgl_materials_texture_rotation.html index 303e0717a5d358..61a979e112b252 100644 --- a/examples/webgl_materials_texture_rotation.html +++ b/examples/webgl_materials_texture_rotation.html @@ -48,7 +48,8 @@ camera.position.set( 10, 15, 25 ); scene.add( camera ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); controls.minDistance = 20; controls.maxDistance = 50; diff --git a/examples/webgl_materials_variations_basic.html b/examples/webgl_materials_variations_basic.html index 823c0c184f2ca7..f851637d8780ac 100644 --- a/examples/webgl_materials_variations_basic.html +++ b/examples/webgl_materials_variations_basic.html @@ -152,7 +152,8 @@ stats = new Stats(); container.appendChild( stats.dom ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 200; controls.maxDistance = 2000; diff --git a/examples/webgl_materials_variations_lambert.html b/examples/webgl_materials_variations_lambert.html index 35633be7a17c10..d3f36d5106e357 100644 --- a/examples/webgl_materials_variations_lambert.html +++ b/examples/webgl_materials_variations_lambert.html @@ -152,7 +152,8 @@ stats = new Stats(); container.appendChild( stats.dom ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 200; controls.maxDistance = 2000; diff --git a/examples/webgl_materials_variations_phong.html b/examples/webgl_materials_variations_phong.html index 9deba522a64735..2f8bd1addb782c 100644 --- a/examples/webgl_materials_variations_phong.html +++ b/examples/webgl_materials_variations_phong.html @@ -159,7 +159,8 @@ stats = new Stats(); container.appendChild( stats.dom ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 200; controls.maxDistance = 2000; diff --git a/examples/webgl_materials_variations_physical.html b/examples/webgl_materials_variations_physical.html index c88c2bfbbed46e..a4a9b4ba0fde5a 100644 --- a/examples/webgl_materials_variations_physical.html +++ b/examples/webgl_materials_variations_physical.html @@ -173,7 +173,8 @@ stats = new Stats(); container.appendChild( stats.dom ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 200; controls.maxDistance = 2000; diff --git a/examples/webgl_materials_variations_standard.html b/examples/webgl_materials_variations_standard.html index 6e68ebae8bfee6..c1e91ce14d2cbf 100644 --- a/examples/webgl_materials_variations_standard.html +++ b/examples/webgl_materials_variations_standard.html @@ -176,7 +176,8 @@ stats = new Stats(); container.appendChild( stats.dom ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 200; controls.maxDistance = 2000; diff --git a/examples/webgl_materials_variations_toon.html b/examples/webgl_materials_variations_toon.html index 2dc793e1bcf090..9508ac39a2e94e 100644 --- a/examples/webgl_materials_variations_toon.html +++ b/examples/webgl_materials_variations_toon.html @@ -149,7 +149,8 @@ stats = new Stats(); container.appendChild( stats.dom ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 200; controls.maxDistance = 2000; diff --git a/examples/webgl_materials_video_webcam.html b/examples/webgl_materials_video_webcam.html index 4a9e35b5d3c3b1..9bc55bd33b65e7 100644 --- a/examples/webgl_materials_video_webcam.html +++ b/examples/webgl_materials_video_webcam.html @@ -60,7 +60,8 @@ renderer.setSize( window.innerWidth, window.innerHeight ); document.body.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.enableZoom = false; controls.enablePan = false; diff --git a/examples/webgl_math_obb.html b/examples/webgl_math_obb.html index f15059871b1b4a..f74226883594e1 100644 --- a/examples/webgl_math_obb.html +++ b/examples/webgl_math_obb.html @@ -101,7 +101,8 @@ // - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.enableDamping = true; // diff --git a/examples/webgl_mirror.html b/examples/webgl_mirror.html index 2c176319da65b3..7b1b9373735f3b 100644 --- a/examples/webgl_mirror.html +++ b/examples/webgl_mirror.html @@ -63,7 +63,8 @@ camera = new THREE.PerspectiveCamera( VIEW_ANGLE, ASPECT, NEAR, FAR ); camera.position.set( 0, 75, 160 ); - cameraControls = new OrbitControls( camera, renderer.domElement ); + cameraControls = new OrbitControls( camera ); + cameraControls.listenToPointerEvents( renderer.domElement ); cameraControls.target.set( 0, 40, 0 ); cameraControls.maxDistance = 400; cameraControls.minDistance = 10; diff --git a/examples/webgl_mirror_nodes.html b/examples/webgl_mirror_nodes.html index 61ac62ae93ad82..f9bc61547b4f03 100644 --- a/examples/webgl_mirror_nodes.html +++ b/examples/webgl_mirror_nodes.html @@ -82,7 +82,8 @@ camera = new THREE.PerspectiveCamera( VIEW_ANGLE, ASPECT, NEAR, FAR ); camera.position.set( 0, 75, 160 ); - cameraControls = new OrbitControls( camera, renderer.domElement ); + cameraControls = new OrbitControls( camera ); + cameraControls.listenToPointerEvents( renderer.domElement ); cameraControls.target.set( 0, 40, 0 ); cameraControls.maxDistance = 400; cameraControls.minDistance = 10; diff --git a/examples/webgl_modifier_edgesplit.html b/examples/webgl_modifier_edgesplit.html index ae74a15db7b817..396edc8659c11c 100644 --- a/examples/webgl_modifier_edgesplit.html +++ b/examples/webgl_modifier_edgesplit.html @@ -52,7 +52,8 @@ camera = new THREE.PerspectiveCamera( 75, window.innerWidth / window.innerHeight ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); // use if there is no animation loop controls.enableDamping = true; controls.dampingFactor = 0.25; diff --git a/examples/webgl_modifier_simplifier.html b/examples/webgl_modifier_simplifier.html index 5523f83b071a5a..2c9ee11f819366 100644 --- a/examples/webgl_modifier_simplifier.html +++ b/examples/webgl_modifier_simplifier.html @@ -40,7 +40,8 @@ camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 1000 ); camera.position.z = 15; - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); // use if there is no animation loop controls.enablePan = false; controls.enableZoom = false; diff --git a/examples/webgl_morphtargets.html b/examples/webgl_morphtargets.html index ba4ecba09ad5c7..45a9b44af69ae3 100644 --- a/examples/webgl_morphtargets.html +++ b/examples/webgl_morphtargets.html @@ -64,7 +64,8 @@ } ); container.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.enableZoom = false; window.addEventListener( 'resize', onWindowResize ); diff --git a/examples/webgl_morphtargets_sphere.html b/examples/webgl_morphtargets_sphere.html index 0f341029d090a9..4e8b1726894d13 100644 --- a/examples/webgl_morphtargets_sphere.html +++ b/examples/webgl_morphtargets_sphere.html @@ -98,7 +98,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 1; controls.maxDistance = 20; diff --git a/examples/webgl_multiple_elements.html b/examples/webgl_multiple_elements.html index dbf0db61ba70a6..0ab27c4bad79d7 100644 --- a/examples/webgl_multiple_elements.html +++ b/examples/webgl_multiple_elements.html @@ -112,7 +112,8 @@ camera.position.z = 2; scene.userData.camera = camera; - const controls = new OrbitControls( scene.userData.camera, scene.userData.element ); + const controls = new OrbitControls( scene.userData.camera ); + controls.listenToPointerEvents( scene.userData.element ); controls.minDistance = 2; controls.maxDistance = 5; controls.enablePan = false; diff --git a/examples/webgl_multiple_elements_text.html b/examples/webgl_multiple_elements_text.html index 6c81527fdd6066..1ae7323858cfb8 100644 --- a/examples/webgl_multiple_elements_text.html +++ b/examples/webgl_multiple_elements_text.html @@ -174,7 +174,8 @@ camera.position.set( 0, 0, 1.2 * balls ); scene.userData.camera = camera; - const controls = new OrbitControls( camera, views[ n ] ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( views[ n ] ); scene.userData.controls = controls; scenes.push( scene ); diff --git a/examples/webgl_multiple_scenes_comparison.html b/examples/webgl_multiple_scenes_comparison.html index 8d8b02c15d3b19..70e49854f30e13 100644 --- a/examples/webgl_multiple_scenes_comparison.html +++ b/examples/webgl_multiple_scenes_comparison.html @@ -64,7 +64,8 @@ camera = new THREE.PerspectiveCamera( 35, window.innerWidth / window.innerHeight, 0.1, 100 ); camera.position.z = 6; - controls = new OrbitControls( camera, container ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( container ); const light = new THREE.HemisphereLight( 0xffffff, 0x444444, 1 ); light.position.set( - 2, 2, 2 ); diff --git a/examples/webgl_panorama_cube.html b/examples/webgl_panorama_cube.html index 590cc8270f1e0b..4ee1312970bbf4 100644 --- a/examples/webgl_panorama_cube.html +++ b/examples/webgl_panorama_cube.html @@ -39,7 +39,8 @@ camera = new THREE.PerspectiveCamera( 90, window.innerWidth / window.innerHeight, 0.1, 100 ); camera.position.z = 0.01; - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.enableZoom = false; controls.enablePan = false; controls.enableDamping = true; diff --git a/examples/webgl_pmrem_test.html b/examples/webgl_pmrem_test.html index 31b2dd0eab5338..1e716e1422447e 100644 --- a/examples/webgl_pmrem_test.html +++ b/examples/webgl_pmrem_test.html @@ -64,7 +64,8 @@ // controls - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); // use if there is no animation loop controls.minDistance = 4; controls.maxDistance = 20; diff --git a/examples/webgl_postprocessing_3dlut.html b/examples/webgl_postprocessing_3dlut.html index 9fac22dd0c02ae..2f4da0b4255c2f 100644 --- a/examples/webgl_postprocessing_3dlut.html +++ b/examples/webgl_postprocessing_3dlut.html @@ -123,7 +123,8 @@ const pmremGenerator = new THREE.PMREMGenerator( renderer ); pmremGenerator.compileEquirectangularShader(); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 2; controls.maxDistance = 10; controls.target.set( 0, 0, - 0.2 ); diff --git a/examples/webgl_postprocessing_backgrounds.html b/examples/webgl_postprocessing_backgrounds.html index 905454a376fab0..e9d9e5bf9ed8d7 100644 --- a/examples/webgl_postprocessing_backgrounds.html +++ b/examples/webgl_postprocessing_backgrounds.html @@ -176,7 +176,8 @@ const copyPass = new ShaderPass( CopyShader ); composer.addPass( copyPass ); - const controls = new OrbitControls( cameraP, renderer.domElement ); + const controls = new OrbitControls( cameraP ); + controls.listenToPointerEvents( renderer.domElement ); controls.enableZoom = false; window.addEventListener( 'resize', onWindowResize ); diff --git a/examples/webgl_postprocessing_godrays.html b/examples/webgl_postprocessing_godrays.html index 761988fdae8e7a..0a1dcbe9d74190 100644 --- a/examples/webgl_postprocessing_godrays.html +++ b/examples/webgl_postprocessing_godrays.html @@ -91,7 +91,8 @@ renderer.autoClear = false; - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 50; controls.maxDistance = 500; diff --git a/examples/webgl_postprocessing_outline.html b/examples/webgl_postprocessing_outline.html index 3b0234af012f72..2d0501c68cf7cf 100644 --- a/examples/webgl_postprocessing_outline.html +++ b/examples/webgl_postprocessing_outline.html @@ -126,7 +126,8 @@ camera = new THREE.PerspectiveCamera( 45, width / height, 0.1, 100 ); camera.position.set( 0, 0, 8 ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 5; controls.maxDistance = 20; controls.enablePan = false; diff --git a/examples/webgl_postprocessing_rgb_halftone.html b/examples/webgl_postprocessing_rgb_halftone.html index 00753d59952e2e..73b4bb721e2822 100644 --- a/examples/webgl_postprocessing_rgb_halftone.html +++ b/examples/webgl_postprocessing_rgb_halftone.html @@ -50,7 +50,8 @@ document.body.appendChild( stats.dom ); // camera controls - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 0, 0 ); controls.update(); diff --git a/examples/webgl_postprocessing_sobel.html b/examples/webgl_postprocessing_sobel.html index 9982ce18c6dddf..5e2bc0e1d9ea59 100644 --- a/examples/webgl_postprocessing_sobel.html +++ b/examples/webgl_postprocessing_sobel.html @@ -94,7 +94,8 @@ effectSobel.uniforms[ 'resolution' ].value.y = window.innerHeight * window.devicePixelRatio; composer.addPass( effectSobel ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 10; controls.maxDistance = 100; diff --git a/examples/webgl_postprocessing_unreal_bloom.html b/examples/webgl_postprocessing_unreal_bloom.html index 44abb5437773de..c6e1cfa0c1f03a 100644 --- a/examples/webgl_postprocessing_unreal_bloom.html +++ b/examples/webgl_postprocessing_unreal_bloom.html @@ -70,7 +70,8 @@ camera.position.set( - 5, 2.5, - 3.5 ); scene.add( camera ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.maxPolarAngle = Math.PI * 0.5; controls.minDistance = 1; controls.maxDistance = 10; diff --git a/examples/webgl_postprocessing_unreal_bloom_selective.html b/examples/webgl_postprocessing_unreal_bloom_selective.html index c5a061b4e28e4a..ad37ff02cb448a 100644 --- a/examples/webgl_postprocessing_unreal_bloom_selective.html +++ b/examples/webgl_postprocessing_unreal_bloom_selective.html @@ -81,7 +81,8 @@ camera.position.set( 0, 0, 20 ); camera.lookAt( 0, 0, 0 ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.maxPolarAngle = Math.PI * 0.5; controls.minDistance = 1; controls.maxDistance = 100; diff --git a/examples/webgl_raycast_sprite.html b/examples/webgl_raycast_sprite.html index c4ffa578567b7c..30dfe985857081 100644 --- a/examples/webgl_raycast_sprite.html +++ b/examples/webgl_raycast_sprite.html @@ -50,8 +50,8 @@ camera.position.set( 15, 15, 15 ); camera.lookAt( scene.position ); - controls = new OrbitControls( camera, renderer.domElement ); - controls.enableRotate = true; + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); // add sprites diff --git a/examples/webgl_raymarching_reflect.html b/examples/webgl_raymarching_reflect.html index 952d44225a4d9f..514f9a31ff19a5 100644 --- a/examples/webgl_raymarching_reflect.html +++ b/examples/webgl_raymarching_reflect.html @@ -299,7 +299,8 @@ scene.add( mesh ); // Controls - const controls = new OrbitControls( camera, canvas ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( canvas ); controls.enableZoom = false; // GUI diff --git a/examples/webgl_refraction.html b/examples/webgl_refraction.html index 04578de99f7eaf..70470caa92811d 100644 --- a/examples/webgl_refraction.html +++ b/examples/webgl_refraction.html @@ -94,7 +94,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 10; controls.maxDistance = 100; diff --git a/examples/webgl_shaders_ocean.html b/examples/webgl_shaders_ocean.html index d3abbcbbb2fb16..5f81d2c767dba9 100644 --- a/examples/webgl_shaders_ocean.html +++ b/examples/webgl_shaders_ocean.html @@ -128,7 +128,7 @@ // - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); controls.maxPolarAngle = Math.PI * 0.495; controls.target.set( 0, 10, 0 ); controls.minDistance = 40.0; diff --git a/examples/webgl_shaders_ocean2.html b/examples/webgl_shaders_ocean2.html index 4f0ddf2fc351d0..3f001998c7513d 100644 --- a/examples/webgl_shaders_ocean2.html +++ b/examples/webgl_shaders_ocean2.html @@ -45,7 +45,8 @@ this.ms_Camera.lookAt( 0, 0, 0 ); // Initialize Orbit control - this.ms_Controls = new OrbitControls( this.ms_Camera, this.ms_Renderer.domElement ); + this.ms_Controls = new OrbitControls( this.ms_Camera ); + this.ms_Controls.listenToPointerEvents( this.ms_Renderer.domElement ); this.ms_Controls.userPan = false; this.ms_Controls.userPanSpeed = 0.0; this.ms_Controls.minDistance = 0; diff --git a/examples/webgl_shaders_sky.html b/examples/webgl_shaders_sky.html index e7a2848fd36f4e..eb7f666c715fb9 100644 --- a/examples/webgl_shaders_sky.html +++ b/examples/webgl_shaders_sky.html @@ -101,7 +101,8 @@ renderer.toneMappingExposure = 0.5; document.body.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); //controls.maxPolarAngle = Math.PI / 2; controls.enableZoom = false; diff --git a/examples/webgl_shaders_tonemapping.html b/examples/webgl_shaders_tonemapping.html index d69bcafbd694c8..c6de0fa8076ca1 100644 --- a/examples/webgl_shaders_tonemapping.html +++ b/examples/webgl_shaders_tonemapping.html @@ -97,7 +97,8 @@ cameraBG = new THREE.OrthographicCamera( - windowHalfX, windowHalfX, windowHalfY, - windowHalfY, - 10000, 10000 ); cameraBG.position.z = 100; - orbitControls = new OrbitControls( camera, container ); + orbitControls = new OrbitControls( camera ); + orbitControls.listenToPointerEvents( container ); orbitControls.autoRotate = true; orbitControls.autoRotateSpeed = 1; diff --git a/examples/webgl_shaders_vector.html b/examples/webgl_shaders_vector.html index 3ff865838b03d4..455cc3624e2ea7 100644 --- a/examples/webgl_shaders_vector.html +++ b/examples/webgl_shaders_vector.html @@ -284,7 +284,8 @@ renderer.setSize( window.innerWidth, window.innerHeight ); document.body.appendChild( renderer.domElement ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 50, 100, 0 ); controls.update(); diff --git a/examples/webgl_shadowmap_csm.html b/examples/webgl_shadowmap_csm.html index f85418191e46d7..9253359424dcee 100644 --- a/examples/webgl_shadowmap_csm.html +++ b/examples/webgl_shadowmap_csm.html @@ -76,7 +76,8 @@ renderer.shadowMap.enabled = true; renderer.shadowMap.type = THREE.PCFSoftShadowMap; - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.maxPolarAngle = Math.PI / 2; camera.position.set( 60, 60, 0 ); controls.target = new THREE.Vector3( - 100, 10, 0 ); diff --git a/examples/webgl_shadowmap_pcss.html b/examples/webgl_shadowmap_pcss.html index 34466a42c0fe7b..d871eb8d015d65 100644 --- a/examples/webgl_shadowmap_pcss.html +++ b/examples/webgl_shadowmap_pcss.html @@ -242,7 +242,8 @@ renderer.shadowMap.enabled = true; // controls - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.maxPolarAngle = Math.PI * 0.5; controls.minDistance = 10; controls.maxDistance = 75; diff --git a/examples/webgl_shadowmap_pointlight.html b/examples/webgl_shadowmap_pointlight.html index 4545eea5090560..42c7df83383506 100644 --- a/examples/webgl_shadowmap_pointlight.html +++ b/examples/webgl_shadowmap_pointlight.html @@ -110,7 +110,8 @@ renderer.shadowMap.type = THREE.BasicShadowMap; document.body.appendChild( renderer.domElement ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 10, 0 ); controls.update(); diff --git a/examples/webgl_shadowmap_viewer.html b/examples/webgl_shadowmap_viewer.html index 2c52298e783ae0..254a8e23ba2110 100644 --- a/examples/webgl_shadowmap_viewer.html +++ b/examples/webgl_shadowmap_viewer.html @@ -135,7 +135,8 @@ renderer.shadowMap.type = THREE.BasicShadowMap; // Mouse control - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 2, 0 ); controls.update(); diff --git a/examples/webgl_shadowmap_vsm.html b/examples/webgl_shadowmap_vsm.html index f70dc13fcd5fef..6c9774fd37146b 100644 --- a/examples/webgl_shadowmap_vsm.html +++ b/examples/webgl_shadowmap_vsm.html @@ -166,7 +166,8 @@ renderer.setClearColor( 0xCCCCCC, 1 ); // Mouse control - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.target.set( 0, 2, 0 ); controls.update(); diff --git a/examples/webgl_simple_gi.html b/examples/webgl_simple_gi.html index bc2c56149e6f5e..a0ea362d126e4b 100644 --- a/examples/webgl_simple_gi.html +++ b/examples/webgl_simple_gi.html @@ -187,7 +187,8 @@ new SimpleGI( renderer, scene ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 1; controls.maxDistance = 10; diff --git a/examples/webgl_skinning_simple.html b/examples/webgl_skinning_simple.html index cce16dab618340..97c6344636cab9 100644 --- a/examples/webgl_skinning_simple.html +++ b/examples/webgl_skinning_simple.html @@ -103,7 +103,8 @@ stats = new Stats(); container.appendChild( stats.dom ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.enablePan = false; controls.minDistance = 5; controls.maxDistance = 50; diff --git a/examples/webgl_sprites_nodes.html b/examples/webgl_sprites_nodes.html index 382c1e8dc6366d..d781cd77478737 100644 --- a/examples/webgl_sprites_nodes.html +++ b/examples/webgl_sprites_nodes.html @@ -63,7 +63,8 @@ camera = new THREE.PerspectiveCamera( fov, window.innerWidth / window.innerHeight, 1, 1000 ); camera.position.z = 100; - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 50; controls.maxDistance = 200; diff --git a/examples/webgl_tiled_forward.html b/examples/webgl_tiled_forward.html index 3c916ddb9343c1..0340bd5e102a82 100644 --- a/examples/webgl_tiled_forward.html +++ b/examples/webgl_tiled_forward.html @@ -202,7 +202,8 @@ const stats = new Stats(); container.appendChild( stats.dom ); - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 120; controls.maxDistance = 320; diff --git a/examples/webgl_tonemapping.html b/examples/webgl_tonemapping.html index 700134960ff0e3..06b1f6e425cdda 100644 --- a/examples/webgl_tonemapping.html +++ b/examples/webgl_tonemapping.html @@ -77,7 +77,8 @@ camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 0.25, 20 ); camera.position.set( - 1.8, 0.6, 2.7 ); - controls = new OrbitControls( camera, renderer.domElement ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.addEventListener( 'change', render ); // use if there is no animation loop controls.enableZoom = false; controls.enablePan = false; diff --git a/examples/webgl_water.html b/examples/webgl_water.html index 14f07cd5fd1340..0fe615488302f6 100644 --- a/examples/webgl_water.html +++ b/examples/webgl_water.html @@ -157,7 +157,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 5; controls.maxDistance = 50; diff --git a/examples/webgl_water_flowmap.html b/examples/webgl_water_flowmap.html index 090c68494493aa..464a1116174565 100644 --- a/examples/webgl_water_flowmap.html +++ b/examples/webgl_water_flowmap.html @@ -99,7 +99,8 @@ // - const controls = new OrbitControls( camera, renderer.domElement ); + const controls = new OrbitControls( camera ); + controls.listenToPointerEvents( renderer.domElement ); controls.minDistance = 5; controls.maxDistance = 50; diff --git a/examples/webxr_vr_dragging.html b/examples/webxr_vr_dragging.html index b0f4d9122255ad..b334cc659091d3 100644 --- a/examples/webxr_vr_dragging.html +++ b/examples/webxr_vr_dragging.html @@ -45,7 +45,8 @@ camera = new THREE.PerspectiveCamera( 50, window.innerWidth / window.innerHeight, 0.1, 10 ); camera.position.set( 0, 1.6, 3 ); - controls = new OrbitControls( camera, container ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( container ); controls.target.set( 0, 1.6, 0 ); controls.update(); diff --git a/examples/webxr_vr_handinput.html b/examples/webxr_vr_handinput.html index 13597b7fa9e9bb..3352aa6f8cd5ad 100644 --- a/examples/webxr_vr_handinput.html +++ b/examples/webxr_vr_handinput.html @@ -43,7 +43,8 @@ camera = new THREE.PerspectiveCamera( 50, window.innerWidth / window.innerHeight, 0.1, 10 ); camera.position.set( 0, 1.6, 3 ); - controls = new OrbitControls( camera, container ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( container ); controls.target.set( 0, 1.6, 0 ); controls.update(); diff --git a/examples/webxr_vr_handinput_cubes.html b/examples/webxr_vr_handinput_cubes.html index ef0522baffd5b6..4a394130c248b0 100644 --- a/examples/webxr_vr_handinput_cubes.html +++ b/examples/webxr_vr_handinput_cubes.html @@ -56,7 +56,8 @@ camera = new THREE.PerspectiveCamera( 50, window.innerWidth / window.innerHeight, 0.1, 10 ); camera.position.set( 0, 1.6, 3 ); - controls = new OrbitControls( camera, container ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( container ); controls.target.set( 0, 1.6, 0 ); controls.update(); diff --git a/examples/webxr_vr_handinput_profiles.html b/examples/webxr_vr_handinput_profiles.html index 4fa63932dedb87..cd37bbf962606d 100644 --- a/examples/webxr_vr_handinput_profiles.html +++ b/examples/webxr_vr_handinput_profiles.html @@ -55,7 +55,8 @@ camera = new THREE.PerspectiveCamera( 50, window.innerWidth / window.innerHeight, 0.1, 10 ); camera.position.set( 0, 1.6, 3 ); - controls = new OrbitControls( camera, container ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( container ); controls.target.set( 0, 1.6, 0 ); controls.update(); diff --git a/examples/webxr_vr_haptics.html b/examples/webxr_vr_haptics.html index 4a14e0a8d8e6b9..b15f349557d247 100644 --- a/examples/webxr_vr_haptics.html +++ b/examples/webxr_vr_haptics.html @@ -74,7 +74,8 @@ camera = new THREE.PerspectiveCamera( 50, window.innerWidth / window.innerHeight, 0.1, 10 ); camera.position.set( 0, 1.6, 3 ); - controls = new OrbitControls( camera, container ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( container ); controls.target.set( 0, 1.6, 0 ); controls.update(); diff --git a/examples/webxr_vr_paint.html b/examples/webxr_vr_paint.html index d22b4fef561ac0..8e4963b7a10bb1 100644 --- a/examples/webxr_vr_paint.html +++ b/examples/webxr_vr_paint.html @@ -40,7 +40,8 @@ camera = new THREE.PerspectiveCamera( 50, window.innerWidth / window.innerHeight, 0.01, 50 ); camera.position.set( 0, 1.6, 3 ); - controls = new OrbitControls( camera, container ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( container ); controls.target.set( 0, 1.6, 0 ); controls.update(); diff --git a/examples/webxr_vr_sculpt.html b/examples/webxr_vr_sculpt.html index fbde584a3549f5..b74a17e954ad7d 100644 --- a/examples/webxr_vr_sculpt.html +++ b/examples/webxr_vr_sculpt.html @@ -42,7 +42,8 @@ camera = new THREE.PerspectiveCamera( 50, window.innerWidth / window.innerHeight, 0.01, 50 ); camera.position.set( 0, 1.6, 3 ); - controls = new OrbitControls( camera, container ); + controls = new OrbitControls( camera ); + controls.listenToPointerEvents( container ); controls.target.set( 0, 1.6, 0 ); controls.update();