Jelajahi Sumber

Editor: Materials browser code clean up.

Mr.doob 6 tahun lalu
induk
melakukan
294246bf8c
1 mengubah file dengan 12 tambahan dan 11 penghapusan
  1. 12 11
      editor/js/Sidebar.Project.js

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

@@ -171,25 +171,26 @@ Sidebar.Project = function ( editor ) {
 
 	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();
 	headerRow.add( new UI.Text( strings.getKey( 'sidebar/project/materials' ) ) );
 
-	materialbrowserpanel.add( headerRow );
+	materials.add( headerRow );
 
 	var listbox = new UI.Listbox();
 	signals.materialAdded.add( function () {
 
-		var materials = Object.values( editor.materials );
-		listbox.setItems( materials );
+		listbox.setItems( Object.values( editor.materials ) );
 
 	} );
-	materialbrowserpanel.add( listbox );
+	materials.add( listbox );
 
 	var buttonsRow = new UI.Row();
 	buttonsRow.setPadding( '10px 0px' );
-	materialbrowserpanel.add( buttonsRow );
+	materials.add( buttonsRow );
 
 	/*
 	var addButton = new UI.Button().setLabel( 'Add' ).setMarginRight( '5px' );
@@ -202,13 +203,13 @@ Sidebar.Project = function ( editor ) {
 	*/
 
 	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 ) );
 
@@ -219,7 +220,7 @@ Sidebar.Project = function ( editor ) {
 	} );
 	buttonsRow.add( assignMaterial );
 
-	container.add( materialbrowserpanel );
+	container.add( materials );
 
 	return container;