|
@@ -42,12 +42,9 @@ var APP = {
|
|
|
stop: [],
|
|
|
keydown: [],
|
|
|
keyup: [],
|
|
|
- mousedown: [],
|
|
|
- mouseup: [],
|
|
|
- mousemove: [],
|
|
|
- touchstart: [],
|
|
|
- touchend: [],
|
|
|
- touchmove: [],
|
|
|
+ pointerdown: [],
|
|
|
+ pointerup: [],
|
|
|
+ pointermove: [],
|
|
|
update: []
|
|
|
};
|
|
|
|
|
@@ -161,7 +158,7 @@ var APP = {
|
|
|
|
|
|
} catch ( e ) {
|
|
|
|
|
|
- console.error( ( e.message || e ), ( e.stack || "" ) );
|
|
|
+ console.error( ( e.message || e ), ( e.stack || '' ) );
|
|
|
|
|
|
}
|
|
|
|
|
@@ -177,14 +174,11 @@ var APP = {
|
|
|
|
|
|
prevTime = performance.now();
|
|
|
|
|
|
- document.addEventListener( 'keydown', onDocumentKeyDown );
|
|
|
- document.addEventListener( 'keyup', onDocumentKeyUp );
|
|
|
- document.addEventListener( 'mousedown', onDocumentMouseDown );
|
|
|
- document.addEventListener( 'mouseup', onDocumentMouseUp );
|
|
|
- document.addEventListener( 'mousemove', onDocumentMouseMove );
|
|
|
- document.addEventListener( 'touchstart', onDocumentTouchStart );
|
|
|
- document.addEventListener( 'touchend', onDocumentTouchEnd );
|
|
|
- document.addEventListener( 'touchmove', onDocumentTouchMove );
|
|
|
+ document.addEventListener( 'keydown', onKeyDown );
|
|
|
+ document.addEventListener( 'keyup', onKeyUp );
|
|
|
+ document.addEventListener( 'pointerdown', onPointerDown );
|
|
|
+ document.addEventListener( 'pointerup', onPointerUp );
|
|
|
+ document.addEventListener( 'pointermove', onPointerMove );
|
|
|
|
|
|
dispatch( events.start, arguments );
|
|
|
|
|
@@ -196,14 +190,11 @@ var APP = {
|
|
|
|
|
|
if ( renderer.xr.enabled ) vrButton.remove();
|
|
|
|
|
|
- document.removeEventListener( 'keydown', onDocumentKeyDown );
|
|
|
- document.removeEventListener( 'keyup', onDocumentKeyUp );
|
|
|
- document.removeEventListener( 'mousedown', onDocumentMouseDown );
|
|
|
- document.removeEventListener( 'mouseup', onDocumentMouseUp );
|
|
|
- document.removeEventListener( 'mousemove', onDocumentMouseMove );
|
|
|
- document.removeEventListener( 'touchstart', onDocumentTouchStart );
|
|
|
- document.removeEventListener( 'touchend', onDocumentTouchEnd );
|
|
|
- document.removeEventListener( 'touchmove', onDocumentTouchMove );
|
|
|
+ document.removeEventListener( 'keydown', onKeyDown );
|
|
|
+ document.removeEventListener( 'keyup', onKeyUp );
|
|
|
+ document.removeEventListener( 'pointerdown', onPointerDown );
|
|
|
+ document.removeEventListener( 'pointerup', onPointerUp );
|
|
|
+ document.removeEventListener( 'pointermove', onPointerMove );
|
|
|
|
|
|
dispatch( events.stop, arguments );
|
|
|
|
|
@@ -222,51 +213,33 @@ var APP = {
|
|
|
|
|
|
//
|
|
|
|
|
|
- function onDocumentKeyDown( event ) {
|
|
|
+ function onKeyDown( event ) {
|
|
|
|
|
|
dispatch( events.keydown, event );
|
|
|
|
|
|
}
|
|
|
|
|
|
- function onDocumentKeyUp( event ) {
|
|
|
+ function onKeyUp( event ) {
|
|
|
|
|
|
dispatch( events.keyup, event );
|
|
|
|
|
|
}
|
|
|
|
|
|
- function onDocumentMouseDown( event ) {
|
|
|
+ function onPointerDown( event ) {
|
|
|
|
|
|
- dispatch( events.mousedown, event );
|
|
|
+ dispatch( events.pointerdown, event );
|
|
|
|
|
|
}
|
|
|
|
|
|
- function onDocumentMouseUp( event ) {
|
|
|
+ function onPointerUp( event ) {
|
|
|
|
|
|
- dispatch( events.mouseup, event );
|
|
|
+ dispatch( events.pointerup, event );
|
|
|
|
|
|
}
|
|
|
|
|
|
- function onDocumentMouseMove( event ) {
|
|
|
+ function onPointerMove( event ) {
|
|
|
|
|
|
- dispatch( events.mousemove, event );
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- function onDocumentTouchStart( event ) {
|
|
|
-
|
|
|
- dispatch( events.touchstart, event );
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- function onDocumentTouchEnd( event ) {
|
|
|
-
|
|
|
- dispatch( events.touchend, event );
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- function onDocumentTouchMove( event ) {
|
|
|
-
|
|
|
- dispatch( events.touchmove, event );
|
|
|
+ dispatch( events.pointermove, event );
|
|
|
|
|
|
}
|
|
|
|