提交 075a3282 编写于 作者: T Temdog007

Add MeshToonMaterial to editor

上级 8794c907
......@@ -84,6 +84,7 @@ Sidebar.Material = function ( editor ) {
'MeshNormalMaterial': 'MeshNormalMaterial',
'MeshLambertMaterial': 'MeshLambertMaterial',
'MeshPhongMaterial': 'MeshPhongMaterial',
'MeshToonMaterial': 'MeshToonMaterial',
'MeshStandardMaterial': 'MeshStandardMaterial',
'MeshPhysicalMaterial': 'MeshPhysicalMaterial',
'ShaderMaterial': 'ShaderMaterial',
......@@ -419,6 +420,18 @@ Sidebar.Material = function ( editor ) {
container.add( materialEmissiveMapRow );
// gradient map
var materialGradientMapRow = new UI.Row();
var materialGradientMapEnabled = new UI.Checkbox( false ).onChange( update );
var materialGradientMap = new UI.Texture().onChange( update );
materialGradientMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/gradientmap' ) ).setWidth( '90px' ) );
materialGradientMapRow.add( materialGradientMapEnabled );
materialGradientMapRow.add( materialGradientMap );
container.add( materialGradientMapRow );
// side
var materialSideRow = new UI.Row();
......@@ -438,7 +451,7 @@ Sidebar.Material = function ( editor ) {
// shading
var materialShadingRow = new UI.Row();
var materialShading = new UI.Checkbox(false).setLeft( '100px' ).onChange( update );
var materialShading = new UI.Checkbox( false ).setLeft( '100px' ).onChange( update );
materialShadingRow.add( new UI.Text( strings.getKey( 'sidebar/material/flatshaded' ) ).setWidth( '90px' ) );
materialShadingRow.add( materialShading );
......@@ -810,6 +823,20 @@ Sidebar.Material = function ( editor ) {
}
if ( material.gradientMap !== undefined ) {
var gradientMapEnabled = materialGradientMap.getValue() === true;
var gradientMap = gradientMapEnabled ? materialGradientMap.getValue() : null;
if ( material.gradientMap !== gradientMap ) {
editor.execute( new SetMaterialMapCommand( currentObject, 'gradientMap', gradientMap, currentMaterialSlot ) );
}
}
if ( material.reflectivity !== undefined ) {
var reflectivity = materialReflectivity.getValue();
......@@ -945,7 +972,7 @@ Sidebar.Material = function ( editor ) {
if ( material.wireframe !== undefined && material.wireframe !== materialWireframe.getValue() ) {
editor.execute( new SetMaterialValueCommand( currentObject, 'wireframe', materialWireframe.getValue(), currentMaterialSlot) );
editor.execute( new SetMaterialValueCommand( currentObject, 'wireframe', materialWireframe.getValue(), currentMaterialSlot ) );
}
......
......@@ -207,6 +207,7 @@ var Strings = function ( config ) {
'sidebar/material/lightmap': 'Light Map',
'sidebar/material/aomap': 'AO Map',
'sidebar/material/emissivemap': 'Emissive Map',
'sidebar/material/gradientmap': 'Gradient Map',
'sidebar/material/side': 'Side',
'sidebar/material/side/front': 'Front',
'sidebar/material/side/back': 'Back',
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册