Explorar el Código

Removed TransformControls deprecation warnings for setter functions.

Aki Rodic hace 7 años
padre
commit
eb39591bd7

+ 4 - 4
editor/js/Viewport.js

@@ -92,7 +92,7 @@ var Viewport = function ( editor ) {
 
 		if ( object !== undefined ) {
 
-			switch ( transformControls.mode ) {
+			switch ( transformControls.getMode() ) {
 
 				case 'translate':
 
@@ -284,19 +284,19 @@ var Viewport = function ( editor ) {
 
 	signals.transformModeChanged.add( function ( mode ) {
 
-		transformControls.mode = mode;
+		transformControls.setMode( mode );
 
 	} );
 
 	signals.snapChanged.add( function ( dist ) {
 
-		transformControls.translationSnap = dist;
+		transformControls.setTranslationSnap( dist );
 
 	} );
 
 	signals.spaceChanged.add( function ( space ) {
 
-		transformControls.space = space;
+		transformControls.setSpace( space );
 
 	} );
 

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

@@ -576,48 +576,36 @@ THREE.TransformControls = function ( camera, domElement ) {
 
 		return scope.mode;
 
-		console.warn( 'THREE.TransformControls: getMode function has been depricated.' );
-
 	};
 
 	this.setMode = function ( mode ) {
 
 		scope.mode = mode;
 
-		console.warn( 'THREE.TransformControls: setMode function has been depricated.' );
-
 	};
 
 	this.setTranslationSnap = function ( translationSnap ) {
 
 		scope.translationSnap = translationSnap;
 
-		console.warn( 'THREE.TransformControls: setTranslationSnap function has been depricated.' );
-
 	};
 
 	this.setRotationSnap = function ( rotationSnap ) {
 
 		scope.rotationSnap = rotationSnap;
 
-		console.warn( 'THREE.TransformControls: setRotationSnap function has been depricated.' );
-
 	};
 
 	this.setSize = function ( size ) {
 
 		scope.size = size;
 
-		console.warn( 'THREE.TransformControls: setSize function has been depricated.' );
-
 	};
 
 	this.setSpace = function ( space ) {
 
 		scope.space = space;
 
-		console.warn( 'THREE.TransformControls: setSpace function has been depricated.' );
-
 	};
 
 	this.update = function () {
@@ -1397,12 +1385,6 @@ THREE.TransformControlsGizmo = function () {
 
 	};
 
-	this.setMode = function() {
-
-		console.warn( 'THREE.TransformControlsGizmo: setMode function has been depricated.' );
-
-	};
-
 };
 
 THREE.TransformControlsGizmo.prototype = Object.assign( Object.create( THREE.Object3D.prototype ), {

+ 10 - 10
examples/misc_animation_authoring.html

@@ -87,34 +87,34 @@
 					switch ( event.keyCode ) {
 
 						case 81: // Q
-							control.space = control.space === "local" ? "world" : "local";
+							control.setSpace( control.space === "local" ? "world" : "local" );
 							break;
 
 						case 17: // Ctrl
-							control.translationSnap = 100;
-							control.rotationSnap = THREE.Math.degToRad( 15 );
+							control.setTranslationSnap( 100 );
+							control.setRotationSnap( THREE.Math.degToRad( 15 ) );
 							break;
 
 						case 87: // W
-							control.mode = "translate";
+							control.setMode( "translate" );
 							break;
 
 						case 69: // E
-							control.mode = "rotate";
+							control.setMode( "rotate" );
 							break;
 
 						case 82: // R
-							control.mode = "scale";
+							control.setMode( "scale" );
 							break;
 
 						case 187:
 						case 107: // +, =, num+
-							control.size = control.size + 0.1;
+							control.setSize( control.size + 0.1 );
 							break;
 
 						case 189:
 						case 109: // -, _, num-
-							control.size = Math.max( control.size - 0.1, 0.1 );
+							control.setSize( Math.max( control.size - 0.1, 0.1 ) );
 							break;
 
 					}
@@ -126,8 +126,8 @@
 					switch ( event.keyCode ) {
 
 						case 17: // Ctrl
-							control.translationSnap = null;
-							control.rotationSnap = null;
+							control.setTranslationSnap( null );
+							control.setRotationSnap( null );
 							break;
 
 					}

+ 17 - 23
examples/misc_controls_transform.html

@@ -27,7 +27,7 @@
 
 		<div id="info">
 		"W" translate | "E" rotate | "R" scale | "+" increase size | "-" decrease size<br />
-		Press "Q" to toggle world/local space, keep "Shift" down to snap to grid
+		Press "Q" to toggle world/local space, keep "Ctrl" down to snap to grid
 		</div>
 
 		<script src="../build/three.js"></script>
@@ -49,9 +49,9 @@
 
 				//
 
-				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 100000 );
+				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 3000 );
 				camera.position.set( 1000, 500, 1000 );
-				camera.lookAt( new THREE.Vector3( 0, 0, 0 ) );
+				camera.lookAt( new THREE.Vector3( 0, 200, 0 ) );
 
 				scene = new THREE.Scene();
 				scene.add( new THREE.GridHelper( 1000, 10 ) );
@@ -67,18 +67,12 @@
 				var geometry = new THREE.BoxBufferGeometry( 200, 200, 200 );
 				var material = new THREE.MeshLambertMaterial( { map: texture } );
 
-				var group = new THREE.Group();
-				scene.add( group );
+				control = new THREE.TransformControls( camera, renderer.domElement );
+				control.addEventListener( 'change', render );
 
 				var mesh = new THREE.Mesh( geometry, material );
-
 				scene.add( mesh );
 
-				control = new THREE.TransformControls( camera, renderer.domElement );
-				control.addEventListener( 'change', render );
-				control.mode = 'rotate'
-				control.space = 'local'
-
 				control.attach( mesh );
 				scene.add( control );
 
@@ -89,34 +83,34 @@
 					switch ( event.keyCode ) {
 
 						case 81: // Q
-							control.space = control.space === "local" ? "world" : "local";
+							control.setSpace( control.space === "local" ? "world" : "local" );
 							break;
 
-						case 16: // Shift
-							control.translationSnap = 100;
-							control.rotationSnap = THREE.Math.degToRad( 45 );
+						case 17: // Ctrl
+							control.setTranslationSnap( 100 );
+							control.setRotationSnap( THREE.Math.degToRad( 15 ) );
 							break;
 
 						case 87: // W
-							control.mode = "translate";
+							control.setMode( "translate" );
 							break;
 
 						case 69: // E
-							control.mode = "rotate";
+							control.setMode( "rotate" );
 							break;
 
 						case 82: // R
-							control.mode = "scale";
+							control.setMode( "scale" );
 							break;
 
 						case 187:
 						case 107: // +, =, num+
-							control.size = control.size + 0.1;
+							control.setSize( control.size + 0.1 );
 							break;
 
 						case 189:
 						case 109: // -, _, num-
-							control.size = Math.max( control.size - 0.1, 0.1 );
+							control.setSize( Math.max( control.size - 0.1, 0.1 ) );
 							break;
 
 					}
@@ -127,9 +121,9 @@
 
 					switch ( event.keyCode ) {
 
-						case 16: // Shift
-							control.translationSnap = null;
-							control.rotationSnap = null;
+						case 17: // Ctrl
+							control.setTranslationSnap( null );
+							control.setRotationSnap( null );
 							break;
 
 					}