Skip to content

Commit

Permalink
Editor: Simplified Siderbar.Project.
Browse files Browse the repository at this point in the history
  • Loading branch information
mrdoob committed Jun 14, 2020
1 parent 535d94f commit 94ac6fb
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 29 deletions.
31 changes: 11 additions & 20 deletions editor/js/Sidebar.Project.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,28 +105,22 @@ function SidebarProject( editor ) {
shadowsRow.add( new UIText( strings.getKey( 'sidebar/project/shadows' ) ).setWidth( '90px' ) );
shadowsRow.add( shadowsBoolean );

rendererPanel.add( shadowsRow );

// Renderer / Shadow Type

var shadowTypeRow = new UIRow();
var shadowTypeSelect = new UISelect().setOptions( {
0: 'Basic',
1: 'PCF',
2: 'PCF (Soft)',
// 3: 'VSM'
} ).setWidth( '150px' ).onChange( function () {
// 3: 'VSM'
} ).setWidth( '125px' ).onChange( function () {

config.setKey( 'project/renderer/shadowType', parseFloat( this.getValue() ) );
updateRenderer();

} );
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

Expand All @@ -152,7 +146,7 @@ function SidebarProject( editor ) {
2: 'Reinhard',
3: 'Cineon',
4: 'ACESFilmic'
} ).setWidth( '150px' ).onChange( function () {
} ).setWidth( '120px' ).onChange( function () {

var toneMapping = parseFloat( this.getValue() );
config.setKey( 'project/renderer/toneMapping', toneMapping );
Expand All @@ -164,21 +158,18 @@ function SidebarProject( editor ) {
toneMappingRow.add( new UIText( strings.getKey( 'sidebar/project/toneMapping' ) ).setWidth( '90px' ) );
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() );
updateTonemapping();

} );
toneMappingRow.add( toneMappingExposure );

toneMappingExposureRow.add( new UIText( strings.getKey( 'sidebar/project/toneMappingExposure' ) ).setWidth( '90px' ) );
toneMappingExposureRow.add( toneMappingExposure );
rendererPanel.add( toneMappingExposureRow );
rendererPanel.add( toneMappingRow );

//

Expand Down
12 changes: 3 additions & 9 deletions editor/js/Strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -290,10 +290,8 @@ function Strings( config ) {
'sidebar/project/renderer': 'Renderer',
'sidebar/project/antialias': 'Antialias',
'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/toneMappingExposure': 'Exposure',
'sidebar/project/materials': 'Materials',
'sidebar/project/Assign': 'Assign',

Expand Down Expand Up @@ -604,10 +602,8 @@ function Strings( config ) {
'sidebar/project/renderer': 'Rendus',
'sidebar/project/antialias': 'Anticrénelage',
'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/toneMappingExposure': 'Réglage d\'exposition',
'sidebar/project/materials': 'Matériaux',
'sidebar/project/Assign': 'Attribuer',

Expand Down Expand Up @@ -892,10 +888,8 @@ function Strings( config ) {
'sidebar/project/renderer': '渲染器',
'sidebar/project/antialias': '抗锯齿',
'sidebar/project/shadows': '阴影',
'sidebar/project/shadowType': '阴影类型',
'sidebar/project/physicallyCorrectLights': '物理光照',
'sidebar/project/physicallyCorrectLights': 'Physical lights',
'sidebar/project/toneMapping': '色调映射',
'sidebar/project/toneMappingExposure': '曝光',
'sidebar/project/materials': '材质',
'sidebar/project/Assign': '应用',

Expand Down

0 comments on commit 94ac6fb

Please sign in to comment.