Browse Source

Editor: Simplified Siderbar.Project.

Mr.doob 5 years ago
parent
commit
94ac6fb206
2 changed files with 14 additions and 29 deletions
  1. 11 20
      editor/js/Sidebar.Project.js
  2. 3 9
      editor/js/Strings.js

+ 11 - 20
editor/js/Sidebar.Project.js

@@ -105,17 +105,12 @@ function SidebarProject( editor ) {
 	shadowsRow.add( new UIText( strings.getKey( 'sidebar/project/shadows' ) ).setWidth( '90px' ) );
 	shadowsRow.add( new UIText( strings.getKey( 'sidebar/project/shadows' ) ).setWidth( '90px' ) );
 	shadowsRow.add( shadowsBoolean );
 	shadowsRow.add( shadowsBoolean );
 
 
-	rendererPanel.add( shadowsRow );
-
-	// Renderer / Shadow Type
-
-	var shadowTypeRow = new UIRow();
 	var shadowTypeSelect = new UISelect().setOptions( {
 	var shadowTypeSelect = new UISelect().setOptions( {
 		0: 'Basic',
 		0: 'Basic',
 		1: 'PCF',
 		1: 'PCF',
 		2: 'PCF (Soft)',
 		2: 'PCF (Soft)',
-	//	3: 'VSM'
-	} ).setWidth( '150px' ).onChange( function () {
+		//	3: 'VSM'
+	} ).setWidth( '125px' ).onChange( function () {
 
 
 		config.setKey( 'project/renderer/shadowType', parseFloat( this.getValue() ) );
 		config.setKey( 'project/renderer/shadowType', parseFloat( this.getValue() ) );
 		updateRenderer();
 		updateRenderer();
@@ -123,10 +118,9 @@ function SidebarProject( editor ) {
 	} );
 	} );
 	shadowTypeSelect.setValue( config.getKey( 'project/renderer/shadowType' ) );
 	shadowTypeSelect.setValue( config.getKey( 'project/renderer/shadowType' ) );
 
 
-	shadowTypeRow.add( new UIText( strings.getKey( 'sidebar/project/shadowType' ) ).setWidth( '90px' ) );
-	shadowTypeRow.add( shadowTypeSelect );
+	shadowsRow.add( shadowTypeSelect );
 
 
-	rendererPanel.add( shadowTypeRow );
+	rendererPanel.add( shadowsRow );
 
 
 	// Renderer / Physically Correct lights
 	// Renderer / Physically Correct lights
 
 
@@ -152,7 +146,7 @@ function SidebarProject( editor ) {
 		2: 'Reinhard',
 		2: 'Reinhard',
 		3: 'Cineon',
 		3: 'Cineon',
 		4: 'ACESFilmic'
 		4: 'ACESFilmic'
-	} ).setWidth( '150px' ).onChange( function () {
+	} ).setWidth( '120px' ).onChange( function () {
 
 
 		var toneMapping = parseFloat( this.getValue() );
 		var toneMapping = parseFloat( this.getValue() );
 		config.setKey( 'project/renderer/toneMapping', toneMapping );
 		config.setKey( 'project/renderer/toneMapping', toneMapping );
@@ -164,21 +158,18 @@ function SidebarProject( editor ) {
 	toneMappingRow.add( new UIText( strings.getKey( 'sidebar/project/toneMapping' ) ).setWidth( '90px' ) );
 	toneMappingRow.add( new UIText( strings.getKey( 'sidebar/project/toneMapping' ) ).setWidth( '90px' ) );
 	toneMappingRow.add( toneMappingSelect );
 	toneMappingRow.add( toneMappingSelect );
 
 
-	rendererPanel.add( toneMappingRow );
-
-	// Tonemapping / Exposure
-
-	var toneMappingExposureRow = new UIRow();
-	var toneMappingExposure = new UINumber( config.getKey( 'project/renderer/toneMappingExposure' ) ).setRange( 0, 10 ).onChange( function () {
+	var toneMappingExposure = new UINumber( config.getKey( 'project/renderer/toneMappingExposure' ) );
+	toneMappingExposure.setWidth( '30px' ).setMarginLeft( '10px' );
+	toneMappingExposure.setRange( 0, 10 );
+	toneMappingExposure.onChange( function () {
 
 
 		config.setKey( 'project/renderer/toneMappingExposure', this.getValue() );
 		config.setKey( 'project/renderer/toneMappingExposure', this.getValue() );
 		updateTonemapping();
 		updateTonemapping();
 
 
 	} );
 	} );
+	toneMappingRow.add( toneMappingExposure );
 
 
-	toneMappingExposureRow.add( new UIText( strings.getKey( 'sidebar/project/toneMappingExposure' ) ).setWidth( '90px' ) );
-	toneMappingExposureRow.add( toneMappingExposure );
-	rendererPanel.add( toneMappingExposureRow );
+	rendererPanel.add( toneMappingRow );
 
 
 	//
 	//
 
 

+ 3 - 9
editor/js/Strings.js

@@ -290,10 +290,8 @@ function Strings( config ) {
 			'sidebar/project/renderer': 'Renderer',
 			'sidebar/project/renderer': 'Renderer',
 			'sidebar/project/antialias': 'Antialias',
 			'sidebar/project/antialias': 'Antialias',
 			'sidebar/project/shadows': 'Shadows',
 			'sidebar/project/shadows': 'Shadows',
-			'sidebar/project/shadowType': 'Shadow Type',
-			'sidebar/project/physicallyCorrectLights': 'Physically correct lights',
+			'sidebar/project/physicallyCorrectLights': 'Physical lights',
 			'sidebar/project/toneMapping': 'Tone mapping',
 			'sidebar/project/toneMapping': 'Tone mapping',
-			'sidebar/project/toneMappingExposure': 'Exposure',
 			'sidebar/project/materials': 'Materials',
 			'sidebar/project/materials': 'Materials',
 			'sidebar/project/Assign': 'Assign',
 			'sidebar/project/Assign': 'Assign',
 
 
@@ -604,10 +602,8 @@ function Strings( config ) {
 			'sidebar/project/renderer': 'Rendus',
 			'sidebar/project/renderer': 'Rendus',
 			'sidebar/project/antialias': 'Anticrénelage',
 			'sidebar/project/antialias': 'Anticrénelage',
 			'sidebar/project/shadows': 'Ombres',
 			'sidebar/project/shadows': 'Ombres',
-			'sidebar/project/shadowType': 'Type d\'ombre',
-			'sidebar/project/physicallyCorrectLights': 'Rendu physique lumineux',
+			'sidebar/project/physicallyCorrectLights': 'Physical lights',
 			'sidebar/project/toneMapping': 'Mappage des nuances',
 			'sidebar/project/toneMapping': 'Mappage des nuances',
-			'sidebar/project/toneMappingExposure': 'Réglage d\'exposition',
 			'sidebar/project/materials': 'Matériaux',
 			'sidebar/project/materials': 'Matériaux',
 			'sidebar/project/Assign': 'Attribuer',
 			'sidebar/project/Assign': 'Attribuer',
 
 
@@ -892,10 +888,8 @@ function Strings( config ) {
 			'sidebar/project/renderer': '渲染器',
 			'sidebar/project/renderer': '渲染器',
 			'sidebar/project/antialias': '抗锯齿',
 			'sidebar/project/antialias': '抗锯齿',
 			'sidebar/project/shadows': '阴影',
 			'sidebar/project/shadows': '阴影',
-			'sidebar/project/shadowType': '阴影类型',
-			'sidebar/project/physicallyCorrectLights': '物理光照',
+			'sidebar/project/physicallyCorrectLights': 'Physical lights',
 			'sidebar/project/toneMapping': '色调映射',
 			'sidebar/project/toneMapping': '色调映射',
-			'sidebar/project/toneMappingExposure': '曝光',
 			'sidebar/project/materials': '材质',
 			'sidebar/project/materials': '材质',
 			'sidebar/project/Assign': '应用',
 			'sidebar/project/Assign': '应用',