Editor: Add option for toggle rendering of helpers.

mrdoob · Jul 16, 2020 · 612fe6f · 612fe6f
1 parent 0aa4a84
commit 612fe6f
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 25 deletions.
diff --git a/editor/js/Editor.js b/editor/js/Editor.js
@@ -79,6 +79,7 @@ function Editor() {
 		windowResize: new Signal(),
 
 		showGridChanged: new Signal(),
+		showHelpersChanged: new Signal(),
 		refreshSidebarObject3D: new Signal(),
 		historyChanged: new Signal(),
 

diff --git a/editor/js/Sidebar.Settings.Viewport.js b/editor/js/Sidebar.Settings.Viewport.js
@@ -2,7 +2,7 @@
  * @author mrdoob / http://mrdoob.com/
  */
 
-import { UIDiv, UIBreak, UIText } from './libs/ui.js';
+import { UIDiv, UIText, UIRow } from './libs/ui.js';
 import { UIBoolean } from './libs/ui.three.js';
 
 
@@ -12,28 +12,34 @@ function SidebarSettingsViewport( editor ) {
 	var strings = editor.strings;
 
 	var container = new UIDiv();
-	container.add( new UIBreak() );
 
-	container.add( new UIText( strings.getKey( 'sidebar/settings/viewport/grid' ) ).setWidth( '90px' ) );
+	// grid
 
-	var show = new UIBoolean( true ).onChange( update );
-	container.add( show );
+	var showGridRow = new UIRow();
 
-	/*
-	var snapSize = new UI.Number( 25 ).setWidth( '40px' ).onChange( update );
-	container.add( snapSize );
+	showGridRow.add( new UIText( strings.getKey( 'sidebar/settings/viewport/grid' ) ).setWidth( '90px' ) );
 
-	var snap = new UI.THREE.Boolean( false, 'snap' ).onChange( update );
-	container.add( snap );
-	*/
+	var showGrid = new UIBoolean( true ).onChange( function () {
 
-	function update() {
+		signals.showGridChanged.dispatch( showGrid.getValue() );
 
-		signals.showGridChanged.dispatch( show.getValue() );
+	} );
+	showGridRow.add( showGrid );
+	container.add( showGridRow );
 
-		// signals.snapChanged.dispatch( snap.getValue() === true ? snapSize.getValue() : null );
+	// helpers
 
-	}
+	var showHelpersRow = new UIRow();
+
+	showHelpersRow.add( new UIText( strings.getKey( 'sidebar/settings/viewport/helpers' ) ).setWidth( '90px' ) );
+
+	var showHelpers = new UIBoolean( true ).onChange( function () {
+
+		signals.showHelpersChanged.dispatch( showHelpers.getValue() );
+
+	} );
+	showHelpersRow.add( showHelpers );
+	container.add( showHelpersRow );
 
 	return container;
 

diff --git a/editor/js/Strings.js b/editor/js/Strings.js
@@ -310,6 +310,7 @@ function Strings( config ) {
 			'sidebar/settings/shortcuts/focus': 'Focus',
 
 			'sidebar/settings/viewport/grid': 'Grid',
+			'sidebar/settings/viewport/helpers': 'Helpers',
 
 			'sidebar/history': 'History',
 			'sidebar/history/persistent': 'persistent',
@@ -628,6 +629,7 @@ function Strings( config ) {
 			'sidebar/settings/shortcuts/focus': 'Focus',
 
 			'sidebar/settings/viewport/grid': 'Grille',
+			'sidebar/settings/viewport/helpers': 'Helpers',
 
 			'sidebar/history': 'Historique',
 			'sidebar/history/persistent': 'permanent',
@@ -920,6 +922,7 @@ function Strings( config ) {
 			'sidebar/settings/shortcuts/focus': '聚焦',
 
 			'sidebar/settings/viewport/grid': '网格',
+			'sidebar/settings/viewport/helpers': 'Helpers',
 
 			'sidebar/history': '历史记录',
 			'sidebar/history/persistent': '本地存储',

diff --git a/editor/js/Viewport.js b/editor/js/Viewport.js
@@ -406,26 +406,30 @@ function Viewport( editor ) {
 
 	signals.objectSelected.add( function ( object ) {
 
-		selectionBox.visible = false;
-		transformControls.detach();
+		if ( transformControls.enabled === true ) {
 
-		if ( object !== null && object !== scene && object !== camera ) {
+			selectionBox.visible = false;
+			transformControls.detach();
+
+			if ( object !== null && object !== scene && object !== camera ) {
 
-			box.setFromObject( object );
+				box.setFromObject( object );
 
-			if ( box.isEmpty() === false ) {
+				if ( box.isEmpty() === false ) {
 
-				selectionBox.setFromObject( object );
-				selectionBox.visible = true;
+					selectionBox.setFromObject( object );
+					selectionBox.visible = true;
+
+				}
+
+				transformControls.attach( object );
 
 			}
 
-			transformControls.attach( object );
+			render();
 
 		}
 
-		render();
-
 	} );
 
 	signals.objectFocused.add( function ( object ) {
@@ -688,6 +692,30 @@ function Viewport( editor ) {
 
 	} );
 
+	signals.showHelpersChanged.add( function ( showHelpers ) {
+
+		for ( var i = 0, l = sceneHelpers.children.length; i < l; i ++ ) {
+
+			var helper = sceneHelpers.children[ i ];
+
+			if ( helper.isTransformControls ) {
+
+				helper.enabled = showHelpers;
+
+				if ( helper.object !== undefined ) helper.visible = showHelpers;
+
+			} else {
+
+				helper.visible = showHelpers;
+
+			}
+
+		}
+
+		render();
+
+	} );
+
 	signals.cameraResetted.add( updateAspectRatio );
 
 	// animations