|
@@ -133,13 +133,11 @@ function SidebarObject( editor ) {
|
|
|
// scale
|
|
|
|
|
|
var objectScaleRow = new UIRow();
|
|
|
- var objectScaleLock = new UICheckbox( true ).setPosition( 'absolute' ).setLeft( '75px' );
|
|
|
- var objectScaleX = new UINumber( 1 ).setPrecision( 3 ).setWidth( '50px' ).onChange( updateScaleX );
|
|
|
- var objectScaleY = new UINumber( 1 ).setPrecision( 3 ).setWidth( '50px' ).onChange( updateScaleY );
|
|
|
- var objectScaleZ = new UINumber( 1 ).setPrecision( 3 ).setWidth( '50px' ).onChange( updateScaleZ );
|
|
|
+ var objectScaleX = new UINumber( 1 ).setPrecision( 3 ).setWidth( '50px' ).onChange( update );
|
|
|
+ var objectScaleY = new UINumber( 1 ).setPrecision( 3 ).setWidth( '50px' ).onChange( update );
|
|
|
+ var objectScaleZ = new UINumber( 1 ).setPrecision( 3 ).setWidth( '50px' ).onChange( update );
|
|
|
|
|
|
objectScaleRow.add( new UIText( strings.getKey( 'sidebar/object/scale' ) ).setWidth( '90px' ) );
|
|
|
- objectScaleRow.add( objectScaleLock );
|
|
|
objectScaleRow.add( objectScaleX, objectScaleY, objectScaleZ );
|
|
|
|
|
|
container.add( objectScaleRow );
|
|
@@ -391,57 +389,6 @@ function SidebarObject( editor ) {
|
|
|
|
|
|
//
|
|
|
|
|
|
- function updateScaleX() {
|
|
|
-
|
|
|
- var object = editor.selected;
|
|
|
-
|
|
|
- if ( objectScaleLock.getValue() === true ) {
|
|
|
-
|
|
|
- var scale = objectScaleX.getValue() / object.scale.x;
|
|
|
-
|
|
|
- objectScaleY.setValue( objectScaleY.getValue() * scale );
|
|
|
- objectScaleZ.setValue( objectScaleZ.getValue() * scale );
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- update();
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- function updateScaleY() {
|
|
|
-
|
|
|
- var object = editor.selected;
|
|
|
-
|
|
|
- if ( objectScaleLock.getValue() === true ) {
|
|
|
-
|
|
|
- var scale = objectScaleY.getValue() / object.scale.y;
|
|
|
-
|
|
|
- objectScaleX.setValue( objectScaleX.getValue() * scale );
|
|
|
- objectScaleZ.setValue( objectScaleZ.getValue() * scale );
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- update();
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- function updateScaleZ() {
|
|
|
-
|
|
|
- var object = editor.selected;
|
|
|
-
|
|
|
- if ( objectScaleLock.getValue() === true ) {
|
|
|
-
|
|
|
- var scale = objectScaleZ.getValue() / object.scale.z;
|
|
|
-
|
|
|
- objectScaleX.setValue( objectScaleX.getValue() * scale );
|
|
|
- objectScaleY.setValue( objectScaleY.getValue() * scale );
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- update();
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
function update() {
|
|
|
|
|
|
var object = editor.selected;
|