Skip to content

Commit 9f3972b

Browse files
committed
Added conditional stopPropagation to transformControls.
Added OrbitControls to TransformControls example.
1 parent fb86748 commit 9f3972b

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

examples/js/controls/TransformControls.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,6 @@ THREE.TransformControls = function ( camera, domElement ) {
524524

525525
function onPointerHover( event ) {
526526

527-
// event.preventDefault();
528-
529527
scope.pointerHover( getPointer( event ) );
530528

531529
}
@@ -537,6 +535,8 @@ THREE.TransformControls = function ( camera, domElement ) {
537535
scope.pointerHover( getPointer( event ) );
538536
scope.pointerDown( getPointer( event ) );
539537

538+
if (scope.axis) event.stopPropagation();
539+
540540
}
541541

542542
function onPointerMove( event ) {
@@ -545,6 +545,8 @@ THREE.TransformControls = function ( camera, domElement ) {
545545

546546
scope.pointerMove( getPointer( event ) );
547547

548+
if (scope.axis) event.stopPropagation();
549+
548550
}
549551

550552
function onPointerUp( event ) {

examples/misc_controls_transform.html

Lines changed: 7 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,6 +68,11 @@
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 );
7278

0 commit comments

Comments
 (0)