浏览代码

Editor: Gamma UI clean up.

Mr.doob 9 年之前
父节点
当前提交
fc66a1e0f7
共有 3 个文件被更改,包括 16 次插入16 次删除
  1. 1 2
      editor/js/Config.js
  2. 2 2
      editor/js/Editor.js
  3. 13 12
      editor/js/Sidebar.Project.js

+ 1 - 2
editor/js/Config.js

@@ -10,10 +10,9 @@ var Config = function ( name ) {
 
 		'project/renderer': 'WebGLRenderer',
 		'project/renderer/antialias': true,
-		'project/renderer/shadows': true,
-		'project/renderer/softShadows': false,
 		'project/renderer/gammaInput': false,
 		'project/renderer/gammaOutput': false,
+		'project/renderer/shadows': true,
 		'project/editable': false,
 		'project/vr': false,
 

+ 2 - 2
editor/js/Editor.js

@@ -484,10 +484,10 @@ Editor.prototype = {
 
 			metadata: {},
 			project: {
-				shadows: this.config.getKey( 'project/renderer/shadows' ),
-				editable: this.config.getKey( 'project/editable' ),
 				gammaInput: this.config.getKey( 'project/renderer/gammaInput' ),
 				gammaOutput: this.config.getKey( 'project/renderer/gammaOutput' ),
+				shadows: this.config.getKey( 'project/renderer/shadows' ),
+				editable: this.config.getKey( 'project/editable' ),
 				vr: this.config.getKey( 'project/vr' )
 			},
 			camera: this.camera.toJSON(),

+ 13 - 12
editor/js/Sidebar.Project.js

@@ -57,8 +57,7 @@ Sidebar.Project = function ( editor ) {
 
 	// antialiasing
 
-	var rendererPropertiesRow = new UI.Row();
-	rendererPropertiesRow.add( new UI.Text( '' ).setWidth( '90px' ) );
+	var rendererPropertiesRow = new UI.Row().setMarginLeft( '90px' );
 
 	var rendererAntialias = new UI.THREE.Boolean( config.getKey( 'project/renderer/antialias' ), 'antialias' ).onChange( function () {
 
@@ -67,7 +66,7 @@ Sidebar.Project = function ( editor ) {
 
 	} );
 	rendererPropertiesRow.add( rendererAntialias );
-	
+
 	// shadow
 
 	var rendererShadows = new UI.THREE.Boolean( config.getKey( 'project/renderer/shadows' ), 'shadows' ).onChange( function () {
@@ -78,28 +77,30 @@ Sidebar.Project = function ( editor ) {
 	} );
 	rendererPropertiesRow.add( rendererShadows );
 
-	container.add( rendererPropertiesRow );
+	rendererPropertiesRow.add( new UI.Break() );
 
-	//gamma input
-	
-	var rendererGammaInput = new UI.THREE.Boolean( config.getKey( 'project/renderer/gammaInput' ), 'gammaInput' ).onChange( function () {
+	// gamma input
+
+	var rendererGammaInput = new UI.THREE.Boolean( config.getKey( 'project/renderer/gammaInput' ), 'γ input' ).onChange( function () {
 
 		config.setKey( 'project/renderer/gammaInput', this.getValue() );
 		updateRenderer();
 
 	} );
 	rendererPropertiesRow.add( rendererGammaInput );
-	
-	//gamma output
-	
-	var rendererGammaOutput = new UI.THREE.Boolean( config.getKey( 'project/renderer/gammaOutput' ), 'gammaOutput' ).onChange( function () {
+
+	// gamma output
+
+	var rendererGammaOutput = new UI.THREE.Boolean( config.getKey( 'project/renderer/gammaOutput' ), 'γ output' ).onChange( function () {
 
 		config.setKey( 'project/renderer/gammaOutput', this.getValue() );
 		updateRenderer();
 
 	} );
 	rendererPropertiesRow.add( rendererGammaOutput );
-	
+
+	container.add( rendererPropertiesRow );
+
 	// Editable
 
 	var editableRow = new UI.Row();