Skip to content

Commit 6d39111

Browse files
committed
Removed stopPropagation from TransformControls.
Added OrbitControls to TransformControls example.
1 parent 3585caf commit 6d39111

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

examples/js/controls/TransformControls.js

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,9 @@ THREE.TransformControls = function ( camera, domElement ) {
100100
domElement.addEventListener( "touchstart", onPointerDown, false );
101101
domElement.addEventListener( "mousemove", onPointerHover, false );
102102
domElement.addEventListener( "touchmove", onPointerHover, false );
103-
domElement.addEventListener( "mousemove", onPointerMove, false );
103+
document.addEventListener( "mousemove", onPointerMove, false );
104104
domElement.addEventListener( "touchmove", onPointerMove, false );
105-
domElement.addEventListener( "mouseup", onPointerUp, false );
106-
domElement.addEventListener( "mouseleave", onPointerUp, false );
107-
domElement.addEventListener( "mouseout", onPointerUp, false );
105+
document.addEventListener( "mouseup", onPointerUp, false );
108106
domElement.addEventListener( "touchend", onPointerUp, false );
109107
domElement.addEventListener( "touchcancel", onPointerUp, false );
110108
domElement.addEventListener( "touchleave", onPointerUp, false );
@@ -118,11 +116,9 @@ THREE.TransformControls = function ( camera, domElement ) {
118116
domElement.removeEventListener( "touchstart", onPointerDown );
119117
domElement.removeEventListener( "mousemove", onPointerHover );
120118
domElement.removeEventListener( "touchmove", onPointerHover );
121-
domElement.removeEventListener( "mousemove", onPointerMove );
119+
document.removeEventListener( "mousemove", onPointerMove );
122120
domElement.removeEventListener( "touchmove", onPointerMove );
123-
domElement.removeEventListener( "mouseup", onPointerUp );
124-
domElement.removeEventListener( "mouseleave", onPointerUp );
125-
domElement.removeEventListener( "mouseout", onPointerUp );
121+
document.removeEventListener( "mouseup", onPointerUp );
126122
domElement.removeEventListener( "touchend", onPointerUp );
127123
domElement.removeEventListener( "touchcancel", onPointerUp );
128124
domElement.removeEventListener( "touchleave", onPointerUp );
@@ -168,6 +164,7 @@ THREE.TransformControls = function ( camera, domElement ) {
168164
_plane[ propName ] = value;
169165
_gizmo[ propName ] = value;
170166

167+
scope.dispatchEvent( { type: propName + "-changed", value: value } );
171168
scope.dispatchEvent( changeEvent );
172169

173170
}
@@ -524,16 +521,13 @@ THREE.TransformControls = function ( camera, domElement ) {
524521

525522
function onPointerHover( event ) {
526523

527-
// event.preventDefault();
528-
529524
scope.pointerHover( getPointer( event ) );
530525

531526
}
532527

533528
function onPointerDown( event ) {
534529

535530
event.preventDefault();
536-
event.stopPropagation();
537531

538532
scope.pointerHover( getPointer( event ) );
539533
scope.pointerDown( getPointer( event ) );
@@ -543,7 +537,6 @@ THREE.TransformControls = function ( camera, domElement ) {
543537
function onPointerMove( event ) {
544538

545539
event.preventDefault();
546-
event.stopPropagation();
547540

548541
scope.pointerMove( getPointer( event ) );
549542

examples/misc_controls_transform.html

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@
3131
</div>
3232

3333
<script src="../build/three.js"></script>
34+
<script src="js/controls/OrbitControls.js"></script>
3435
<script src="js/controls/TransformControls.js"></script>
3536

3637
<script>
3738

38-
var camera, scene, renderer, control;
39+
var camera, scene, renderer, control, orbit;
3940

4041
init();
4142
render();
@@ -67,8 +68,16 @@
6768
var geometry = new THREE.BoxBufferGeometry( 200, 200, 200 );
6869
var material = new THREE.MeshLambertMaterial( { map: texture } );
6970

71+
orbit = new THREE.OrbitControls(camera, renderer.domElement);
72+
orbit.enableZoom = true;
73+
orbit.update();
74+
orbit.addEventListener( 'change', render );
75+
7076
control = new THREE.TransformControls( camera, renderer.domElement );
7177
control.addEventListener( 'change', render );
78+
control.addEventListener( 'dragging-changed', function ( event ) {
79+
orbit.enabled = !event.value
80+
} );
7281

7382
var mesh = new THREE.Mesh( geometry, material );
7483
scene.add( mesh );

examples/webgl_geometry_spline_editor.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@
163163

164164
transformControl = new THREE.TransformControls( camera, renderer.domElement );
165165
transformControl.addEventListener( 'change', render );
166+
transformControl.addEventListener( 'dragging-changed', function ( event ) {
167+
controls.enabled = !event.value
168+
} );
166169
scene.add( transformControl );
167170

168171
// Hiding transform situation is a little in a mess :()

0 commit comments

Comments
 (0)