Explorar el Código

Editor: Materials browser code clean up.

Mr.doob hace 5 años
padre
commit
86335608ca
Se han modificado 3 ficheros con 25 adiciones y 15 borrados
  1. 7 5
      editor/js/Editor.js
  2. 16 9
      editor/js/Sidebar.Project.js
  3. 2 1
      editor/js/Strings.js

+ 7 - 5
editor/js/Editor.js

@@ -247,16 +247,18 @@ Editor.prototype = {
 
 	},
 
-	getMaterialById ( id ) {
+	getMaterialById: function ( id ) {
 
 		var material;
 		var materials = Object.values( this.materials );
 
-		for( var i = 0; i < materials.length; i ++ ) {
-			
-			if ( materials[i].id === id ) {
-				material = materials[i];
+		for ( var i = 0; i < materials.length; i ++ ) {
+
+			if ( materials[ i ].id === id ) {
+
+				material = materials[ i ];
 				break;
+
 			}
 
 		}

+ 16 - 9
editor/js/Sidebar.Project.js

@@ -174,11 +174,11 @@ Sidebar.Project = function ( editor ) {
 	var materialbrowserpanel = new UI.Panel();
 
 	var headerRow = new UI.Row();
-	headerRow.add( new UI.Text( strings.getKey( 'sidebar/project/materialbrowser' ) ) );
-	
+	headerRow.add( new UI.Text( strings.getKey( 'sidebar/project/materials' ) ) );
+
 	materialbrowserpanel.add( headerRow );
 
-	var listbox = new UI.Listbox(  );
+	var listbox = new UI.Listbox();
 	signals.materialAdded.add( function () {
 
 		var materials = Object.values( editor.materials );
@@ -187,26 +187,33 @@ Sidebar.Project = function ( editor ) {
 	} );
 	materialbrowserpanel.add( listbox );
 
-	var buttonsRow = new UI.Row(  );
+	var buttonsRow = new UI.Row();
 	buttonsRow.setPadding( '10px 0px' );
 	materialbrowserpanel.add( buttonsRow );
 
-	var addButton = new UI.Button(  ).setLabel( 'Add' ).setMarginRight( '5px' );
-	addButton.onClick( function ( ) {
+	/*
+	var addButton = new UI.Button().setLabel( 'Add' ).setMarginRight( '5px' );
+	addButton.onClick( function () {
 
-		editor.addMaterial( new THREE.MeshStandardMaterial({ color: 0xffffff }) );
+		editor.addMaterial( new THREE.MeshStandardMaterial() );
 
 	} );
 	buttonsRow.add( addButton );
+	*/
 
-	var assignMaterial = new UI.Button(  ).setLabel( 'Assign' ).setMargin( '0px 5px' );
+	var assignMaterial = new UI.Button().setLabel( 'Assign' ).setMargin( '0px 5px' );
 	assignMaterial.onClick( function ( ) {
-		
+
 		if ( typeof editor.selected !== 'undefined' ) {
+
 			var material = editor.getMaterialById( parseInt( listbox.getValue( ) ) );
+
 			if ( typeof material !== 'undefined' ) {
+
 				editor.execute( new SetMaterialCommand( editor, editor.selected, material ) );
+
 			}
+
 		}
 
 	} );

+ 2 - 1
editor/js/Strings.js

@@ -274,13 +274,13 @@ var Strings = function ( config ) {
 			'sidebar/script/remove': 'Remove',
 
 			'sidebar/project': 'Project',
-			'sidebar/project/materialbrowser': 'MATERIAL BROWSER',
 			'sidebar/project/title': 'Title',
 			'sidebar/project/editable': 'Editable',
 			'sidebar/project/vr': 'VR',
 			'sidebar/project/renderer': 'Renderer',
 			'sidebar/project/antialias': 'antialias',
 			'sidebar/project/shadows': 'shadows',
+			'sidebar/project/materials': 'Materials',
 
 			'sidebar/settings': 'Settings',
 			'sidebar/settings/language': 'Language',
@@ -556,6 +556,7 @@ var Strings = function ( config ) {
 			'sidebar/project/renderer': '渲染器',
 			'sidebar/project/antialias': '抗锯齿',
 			'sidebar/project/shadows': '阴影',
+			'sidebar/project/materials': 'Materials',
 
 			'sidebar/settings': '设置',
 			'sidebar/settings/language': '语言',