Browse Source

Fixed broken pointerevent handling when pointerType = "pen"

Aki Rodic 4 years ago
parent
commit
9f788d8973

+ 3 - 0
examples/js/controls/OrbitControls.js

@@ -773,6 +773,7 @@ THREE.OrbitControls = function ( object, domElement ) {
 		switch ( event.pointerType ) {
 		switch ( event.pointerType ) {
 
 
 			case 'mouse':
 			case 'mouse':
+			case 'pen':
 				onMouseDown( event );
 				onMouseDown( event );
 				break;
 				break;
 
 
@@ -789,6 +790,7 @@ THREE.OrbitControls = function ( object, domElement ) {
 		switch ( event.pointerType ) {
 		switch ( event.pointerType ) {
 
 
 			case 'mouse':
 			case 'mouse':
+			case 'pen':
 				onMouseMove( event );
 				onMouseMove( event );
 				break;
 				break;
 
 
@@ -805,6 +807,7 @@ THREE.OrbitControls = function ( object, domElement ) {
 		switch ( event.pointerType ) {
 		switch ( event.pointerType ) {
 
 
 			case 'mouse':
 			case 'mouse':
+			case 'pen':
 				onMouseUp( event );
 				onMouseUp( event );
 				break;
 				break;
 
 

+ 3 - 0
examples/js/controls/TrackballControls.js

@@ -402,6 +402,7 @@ THREE.TrackballControls = function ( object, domElement ) {
 		switch ( event.pointerType ) {
 		switch ( event.pointerType ) {
 
 
 			case 'mouse':
 			case 'mouse':
+			case 'pen':
 				onMouseDown( event );
 				onMouseDown( event );
 				break;
 				break;
 
 
@@ -418,6 +419,7 @@ THREE.TrackballControls = function ( object, domElement ) {
 		switch ( event.pointerType ) {
 		switch ( event.pointerType ) {
 
 
 			case 'mouse':
 			case 'mouse':
+			case 'pen':
 				onMouseMove( event );
 				onMouseMove( event );
 				break;
 				break;
 
 
@@ -434,6 +436,7 @@ THREE.TrackballControls = function ( object, domElement ) {
 		switch ( event.pointerType ) {
 		switch ( event.pointerType ) {
 
 
 			case 'mouse':
 			case 'mouse':
+			case 'pen':
 				onMouseUp( event );
 				onMouseUp( event );
 				break;
 				break;
 
 

+ 1 - 0
examples/js/controls/TransformControls.js

@@ -616,6 +616,7 @@ THREE.TransformControls = function ( camera, domElement ) {
 		switch ( event.pointerType ) {
 		switch ( event.pointerType ) {
 
 
 			case 'mouse':
 			case 'mouse':
+			case 'pen':
 				scope.pointerHover( getPointer( event ) );
 				scope.pointerHover( getPointer( event ) );
 				break;
 				break;
 
 

+ 3 - 0
examples/jsm/controls/OrbitControls.js

@@ -781,6 +781,7 @@ var OrbitControls = function ( object, domElement ) {
 		switch ( event.pointerType ) {
 		switch ( event.pointerType ) {
 
 
 			case 'mouse':
 			case 'mouse':
+			case 'pen':
 				onMouseDown( event );
 				onMouseDown( event );
 				break;
 				break;
 
 
@@ -797,6 +798,7 @@ var OrbitControls = function ( object, domElement ) {
 		switch ( event.pointerType ) {
 		switch ( event.pointerType ) {
 
 
 			case 'mouse':
 			case 'mouse':
+			case 'pen':
 				onMouseMove( event );
 				onMouseMove( event );
 				break;
 				break;
 
 
@@ -813,6 +815,7 @@ var OrbitControls = function ( object, domElement ) {
 		switch ( event.pointerType ) {
 		switch ( event.pointerType ) {
 
 
 			case 'mouse':
 			case 'mouse':
+			case 'pen':
 				onMouseUp( event );
 				onMouseUp( event );
 				break;
 				break;
 
 

+ 3 - 0
examples/jsm/controls/TrackballControls.js

@@ -408,6 +408,7 @@ var TrackballControls = function ( object, domElement ) {
 		switch ( event.pointerType ) {
 		switch ( event.pointerType ) {
 
 
 			case 'mouse':
 			case 'mouse':
+			case 'pen':
 				onMouseDown( event );
 				onMouseDown( event );
 				break;
 				break;
 
 
@@ -424,6 +425,7 @@ var TrackballControls = function ( object, domElement ) {
 		switch ( event.pointerType ) {
 		switch ( event.pointerType ) {
 
 
 			case 'mouse':
 			case 'mouse':
+			case 'pen':
 				onMouseMove( event );
 				onMouseMove( event );
 				break;
 				break;
 
 
@@ -440,6 +442,7 @@ var TrackballControls = function ( object, domElement ) {
 		switch ( event.pointerType ) {
 		switch ( event.pointerType ) {
 
 
 			case 'mouse':
 			case 'mouse':
+			case 'pen':
 				onMouseUp( event );
 				onMouseUp( event );
 				break;
 				break;
 
 

+ 1 - 0
examples/jsm/controls/TransformControls.js

@@ -637,6 +637,7 @@ var TransformControls = function ( camera, domElement ) {
 		switch ( event.pointerType ) {
 		switch ( event.pointerType ) {
 
 
 			case 'mouse':
 			case 'mouse':
+			case 'pen':
 				scope.pointerHover( getPointer( event ) );
 				scope.pointerHover( getPointer( event ) );
 				break;
 				break;