提交 71fd1c32 编写于 作者: A Aki Rodic

Removed stopPropagation from TransformControls.

Added OrbitControls to TransformControls example.
上级 b22db83f
......@@ -104,11 +104,9 @@ THREE.TransformControls = function ( camera, domElement ) {
domElement.addEventListener( "touchstart", onPointerDown, false );
domElement.addEventListener( "mousemove", onPointerHover, false );
domElement.addEventListener( "touchmove", onPointerHover, false );
domElement.addEventListener( "mousemove", onPointerMove, false );
document.addEventListener( "mousemove", onPointerMove, false );
domElement.addEventListener( "touchmove", onPointerMove, false );
domElement.addEventListener( "mouseup", onPointerUp, false );
domElement.addEventListener( "mouseleave", onPointerUp, false );
domElement.addEventListener( "mouseout", onPointerUp, false );
document.addEventListener( "mouseup", onPointerUp, false );
domElement.addEventListener( "touchend", onPointerUp, false );
domElement.addEventListener( "touchcancel", onPointerUp, false );
domElement.addEventListener( "touchleave", onPointerUp, false );
......@@ -122,11 +120,9 @@ THREE.TransformControls = function ( camera, domElement ) {
domElement.removeEventListener( "touchstart", onPointerDown );
domElement.removeEventListener( "mousemove", onPointerHover );
domElement.removeEventListener( "touchmove", onPointerHover );
domElement.removeEventListener( "mousemove", onPointerMove );
document.removeEventListener( "mousemove", onPointerMove );
domElement.removeEventListener( "touchmove", onPointerMove );
domElement.removeEventListener( "mouseup", onPointerUp );
domElement.removeEventListener( "mouseleave", onPointerUp );
domElement.removeEventListener( "mouseout", onPointerUp );
document.removeEventListener( "mouseup", onPointerUp );
domElement.removeEventListener( "touchend", onPointerUp );
domElement.removeEventListener( "touchcancel", onPointerUp );
domElement.removeEventListener( "touchleave", onPointerUp );
......@@ -172,6 +168,7 @@ THREE.TransformControls = function ( camera, domElement ) {
_plane[ propName ] = value;
_gizmo[ propName ] = value;
scope.dispatchEvent( { type: propName + "-changed", value: value } );
scope.dispatchEvent( changeEvent );
}
......@@ -539,7 +536,6 @@ THREE.TransformControls = function ( camera, domElement ) {
if ( !scope.enabled ) return;
event.preventDefault();
event.stopPropagation();
scope.pointerHover( getPointer( event ) );
scope.pointerDown( getPointer( event ) );
......@@ -551,7 +547,6 @@ THREE.TransformControls = function ( camera, domElement ) {
if ( !scope.enabled ) return;
event.preventDefault();
event.stopPropagation();
scope.pointerMove( getPointer( event ) );
......
......@@ -42,11 +42,12 @@
</div>
<script src="../build/three.js"></script>
<script src="js/controls/OrbitControls.js"></script>
<script src="js/controls/TransformControls.js"></script>
<script>
var camera, scene, renderer, control;
var camera, scene, renderer, control, orbit;
init();
render();
......@@ -77,9 +78,17 @@
var geometry = new THREE.BoxBufferGeometry( 200, 200, 200 );
var material = new THREE.MeshLambertMaterial( { map: texture } );
orbit = new THREE.OrbitControls(camera, renderer.domElement);
orbit.update();
orbit.addEventListener( 'change', render );
control = new THREE.TransformControls( camera, renderer.domElement );
control.addEventListener( 'change', render );
control.addEventListener( 'dragging-changed', function ( event ) {
orbit.enabled = !event.value;
} );
var mesh = new THREE.Mesh( geometry, material );
scene.add( mesh );
......
......@@ -163,6 +163,9 @@
transformControl = new THREE.TransformControls( camera, renderer.domElement );
transformControl.addEventListener( 'change', render );
transformControl.addEventListener( 'dragging-changed', function ( event ) {
controls.enabled = !event.value
} );
scene.add( transformControl );
// Hiding transform situation is a little in a mess :()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册