Merge pull request #20223 from Mugen87/dev35

Examples: Fix controls in webgl_multiple_scenes_comparison.
mrdoob · Aug 31, 2020 · 63b9e6c · 63b9e6c
2 parents 696d783 + d02a197
commit 63b9e6c
Showing 1 changed file with 29 additions and 20 deletions.
diff --git a/examples/webgl_multiple_scenes_comparison.html b/examples/webgl_multiple_scenes_comparison.html
@@ -7,6 +7,10 @@
 		<link type="text/css" rel="stylesheet" href="main.css">
 		<style>
 
+			html, body {
+				touch-action: none;
+			}
+
 			.container {
 				position: absolute;
 				width: 100%;
@@ -137,46 +141,51 @@
 
 				var slider = document.querySelector( '.slider' );
 
-				var clicked = false;
+				var isPointerDown = false;
 
 				function slideReady() {
 
-					clicked = true;
-					controls.enabled = false;
+					if ( event.isPrimary ) {
+
+						isPointerDown = true;
+						controls.enabled = false;
+
+					}
 
 				}
 
 				function slideFinish() {
 
-					clicked = false;
-					controls.enabled = true;
+					if ( event.isPrimary ) {
+
+						isPointerDown = false;
+						controls.enabled = true;
+
+					}
 
 				}
 
 				function slideMove( e ) {
 
-					if ( ! clicked ) return false;
-
-					sliderMoved = true;
+					if ( event.isPrimary && isPointerDown ) {
 
-					sliderPos = ( e.pageX === undefined ) ? e.touches[ 0 ].pageX : e.pageX;
+						sliderMoved = true;
 
-					//prevent the slider from being positioned outside the window bounds
-					if ( sliderPos < 0 ) sliderPos = 0;
-					if ( sliderPos > window.innerWidth ) sliderPos = window.innerWidth;
+						sliderPos = e.pageX;
 
-					slider.style.left = sliderPos - ( slider.offsetWidth / 2 ) + "px";
+						//prevent the slider from being positioned outside the window bounds
+						if ( sliderPos < 0 ) sliderPos = 0;
+						if ( sliderPos > window.innerWidth ) sliderPos = window.innerWidth;
 
-				}
+						slider.style.left = sliderPos - ( slider.offsetWidth / 2 ) + "px";
 
-				slider.addEventListener( 'mousedown', slideReady );
-				slider.addEventListener( 'touchstart', slideReady );
+					}
 
-				window.addEventListener( 'mouseup', slideFinish );
-				window.addEventListener( 'touchend', slideFinish );
+				}
 
-				window.addEventListener( 'mousemove', slideMove );
-				window.addEventListener( 'touchmove', slideMove );
+				slider.addEventListener( 'pointerdown', slideReady );
+				window.addEventListener( 'pointerup', slideFinish );
+				window.addEventListener( 'pointermove', slideMove );
 
 			}