提交 294246bf 编写于 作者: M Mr.doob

Editor: Materials browser code clean up.

上级 3b9016bf
...@@ -171,25 +171,26 @@ Sidebar.Project = function ( editor ) { ...@@ -171,25 +171,26 @@ Sidebar.Project = function ( editor ) {
createRenderer( config.getKey( 'project/renderer' ), config.getKey( 'project/renderer/antialias' ), config.getKey( 'project/renderer/shadows' ) ); createRenderer( config.getKey( 'project/renderer' ), config.getKey( 'project/renderer/antialias' ), config.getKey( 'project/renderer/shadows' ) );
var materialbrowserpanel = new UI.Panel(); // Materials
var materials = new UI.Panel();
var headerRow = new UI.Row(); var headerRow = new UI.Row();
headerRow.add( new UI.Text( strings.getKey( 'sidebar/project/materials' ) ) ); headerRow.add( new UI.Text( strings.getKey( 'sidebar/project/materials' ) ) );
materialbrowserpanel.add( headerRow ); materials.add( headerRow );
var listbox = new UI.Listbox(); var listbox = new UI.Listbox();
signals.materialAdded.add( function () { signals.materialAdded.add( function () {
var materials = Object.values( editor.materials ); listbox.setItems( Object.values( editor.materials ) );
listbox.setItems( materials );
} ); } );
materialbrowserpanel.add( listbox ); materials.add( listbox );
var buttonsRow = new UI.Row(); var buttonsRow = new UI.Row();
buttonsRow.setPadding( '10px 0px' ); buttonsRow.setPadding( '10px 0px' );
materialbrowserpanel.add( buttonsRow ); materials.add( buttonsRow );
/* /*
var addButton = new UI.Button().setLabel( 'Add' ).setMarginRight( '5px' ); var addButton = new UI.Button().setLabel( 'Add' ).setMarginRight( '5px' );
...@@ -202,13 +203,13 @@ Sidebar.Project = function ( editor ) { ...@@ -202,13 +203,13 @@ Sidebar.Project = function ( editor ) {
*/ */
var assignMaterial = new UI.Button().setLabel( 'Assign' ).setMargin( '0px 5px' ); var assignMaterial = new UI.Button().setLabel( 'Assign' ).setMargin( '0px 5px' );
assignMaterial.onClick( function ( ) { assignMaterial.onClick( function () {
if ( typeof editor.selected !== 'undefined' ) { if ( editor.selected !== null ) {
var material = editor.getMaterialById( parseInt( listbox.getValue( ) ) ); var material = editor.getMaterialById( parseInt( listbox.getValue() ) );
if ( typeof material !== 'undefined' ) { if ( material !== undefined ) {
editor.execute( new SetMaterialCommand( editor, editor.selected, material ) ); editor.execute( new SetMaterialCommand( editor, editor.selected, material ) );
...@@ -219,7 +220,7 @@ Sidebar.Project = function ( editor ) { ...@@ -219,7 +220,7 @@ Sidebar.Project = function ( editor ) {
} ); } );
buttonsRow.add( assignMaterial ); buttonsRow.add( assignMaterial );
container.add( materialbrowserpanel ); container.add( materials );
return container; return container;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册