Merge pull request #13162 from mrdoob/editor-improvements

Editor: Moved grid to settings.

editor/index.html

@@ -107,6 +107,7 @@
 		<script src="js/Sidebar.Project.js"></script>
 		<script src="js/Sidebar.Settings.js"></script>
 		<script src="js/Sidebar.Settings.Shortcuts.js"></script>
+		<script src="js/Sidebar.Settings.Viewport.js"></script>
 		<script src="js/Sidebar.Properties.js"></script>
 		<script src="js/Sidebar.Object.js"></script>
 		<script src="js/Sidebar.Geometry.js"></script>

editor/js/Sidebar.Settings.Viewport.js

@@ -0,0 +1,41 @@
+/**
+ * @author mrdoob / http://mrdoob.com/
+ */
+
+Sidebar.Settings.Viewport = function ( editor ) {
+
+	var signals = editor.signals;
+
+	var container = new UI.Div();
+	container.add( new UI.Break() );
+
+	container.add( new UI.Text( 'Grid' ).setWidth( '90px' ) );
+
+	var show = new UI.THREE.Boolean( true ).onChange( update );
+	container.add( show );
+
+	/*
+	var snapSize = new UI.Number( 25 ).setWidth( '40px' ).onChange( update );
+	container.add( snapSize );
+
+	var snap = new UI.THREE.Boolean( false, 'snap' ).onChange( update );
+	container.add( snap );
+
+	var local = new UI.THREE.Boolean( false, 'local' ).onChange( update );
+	container.add( local );
+	*/
+
+	function update() {
+
+		signals.showGridChanged.dispatch( show.getValue() );
+
+		/*
+		signals.snapChanged.dispatch( snap.getValue() === true ? snapSize.getValue() : null );
+		signals.spaceChanged.dispatch( local.getValue() === true ? "local" : "world" );
+		*/
+
+	}
+
+	return container;
+
+};

editor/js/Sidebar.Settings.js

@@ -10,6 +10,7 @@ Sidebar.Settings = function ( editor ) {
 	var container = new UI.Panel();
 	container.setBorderTop( '0' );
 	container.setPaddingTop( '20px' );
+	container.setPaddingBottom( '20px' );
 
 	// class
 
@@ -43,6 +44,7 @@ Sidebar.Settings = function ( editor ) {
 	container.add( themeRow );
 
 	container.add( new Sidebar.Settings.Shortcuts( editor ) );
+	container.add( new Sidebar.Settings.Viewport( editor ) );
 
 	return container;
 

editor/js/Toolbar.js

@@ -58,29 +58,6 @@ var Toolbar = function ( editor ) {
 
 	} );
 
-	// grid
-
-	var grid = new UI.Number( 25 ).setWidth( '40px' ).onChange( update );
-	buttons.add( new UI.Text( 'grid: ' ) );
-	buttons.add( grid );
-
-	var snap = new UI.THREE.Boolean( false, 'snap' ).onChange( update );
-	buttons.add( snap );
-
-	var local = new UI.THREE.Boolean( false, 'local' ).onChange( update );
-	buttons.add( local );
-
-	var showGrid = new UI.THREE.Boolean( true, 'show' ).onChange( update );
-	buttons.add( showGrid );
-
-	function update() {
-
-		signals.snapChanged.dispatch( snap.getValue() === true ? grid.getValue() : null );
-		signals.spaceChanged.dispatch( local.getValue() === true ? "local" : "world" );
-		signals.showGridChanged.dispatch( showGrid.getValue() );
-
-	}
-
 	return container;
 
 };