|
@@ -284,6 +284,38 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
container.add( materialEnvMapRow );
|
|
container.add( materialEnvMapRow );
|
|
|
|
|
|
|
|
+ // side
|
|
|
|
+
|
|
|
|
+ var materialSideRow = new UI.Panel();
|
|
|
|
+ var materialSide = new UI.Select().setOptions( {
|
|
|
|
+
|
|
|
|
+ 0: 'Front',
|
|
|
|
+ 1: 'Back',
|
|
|
|
+ 2: 'Double'
|
|
|
|
+
|
|
|
|
+ } ).setWidth( '150px' ).setColor( '#444' ).setFontSize( '12px' ).onChange( update );
|
|
|
|
+
|
|
|
|
+ materialSideRow.add( new UI.Text( 'Side' ).setWidth( '90px' ) );
|
|
|
|
+ materialSideRow.add( materialSide );
|
|
|
|
+
|
|
|
|
+ container.add( materialSideRow );
|
|
|
|
+
|
|
|
|
+ // shading
|
|
|
|
+
|
|
|
|
+ var materialShadingRow = new UI.Panel();
|
|
|
|
+ var materialShading = new UI.Select().setOptions( {
|
|
|
|
+
|
|
|
|
+ 0: 'No',
|
|
|
|
+ 1: 'Flat',
|
|
|
|
+ 2: 'Smooth'
|
|
|
|
+
|
|
|
|
+ } ).setWidth( '150px' ).setColor( '#444' ).setFontSize( '12px' ).onChange( update );
|
|
|
|
+
|
|
|
|
+ materialShadingRow.add( new UI.Text( 'Shading' ).setWidth( '90px' ) );
|
|
|
|
+ materialShadingRow.add( materialShading );
|
|
|
|
+
|
|
|
|
+ container.add( materialShadingRow );
|
|
|
|
+
|
|
// blending
|
|
// blending
|
|
|
|
|
|
var materialBlendingRow = new UI.Panel();
|
|
var materialBlendingRow = new UI.Panel();
|
|
@@ -302,23 +334,6 @@ Sidebar.Material = function ( editor ) {
|
|
materialBlendingRow.add( materialBlending );
|
|
materialBlendingRow.add( materialBlending );
|
|
|
|
|
|
container.add( materialBlendingRow );
|
|
container.add( materialBlendingRow );
|
|
-
|
|
|
|
- // side
|
|
|
|
-
|
|
|
|
- var materialSideRow = new UI.Panel();
|
|
|
|
- var materialSide = new UI.Select().setOptions( {
|
|
|
|
-
|
|
|
|
- 0: 'Front',
|
|
|
|
- 1: 'Back',
|
|
|
|
- 2: 'Double'
|
|
|
|
-
|
|
|
|
- } ).setWidth( '150px' ).setColor( '#444' ).setFontSize( '12px' ).onChange( update );
|
|
|
|
-
|
|
|
|
- materialSideRow.add( new UI.Text( 'Side' ).setWidth( '90px' ) );
|
|
|
|
- materialSideRow.add( materialSide );
|
|
|
|
-
|
|
|
|
- container.add( materialSideRow );
|
|
|
|
-
|
|
|
|
// opacity
|
|
// opacity
|
|
|
|
|
|
var materialOpacityRow = new UI.Panel();
|
|
var materialOpacityRow = new UI.Panel();
|
|
@@ -596,15 +611,21 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- if ( material.blending !== undefined ) {
|
|
|
|
|
|
+ if ( material.side !== undefined ) {
|
|
|
|
|
|
- material.blending = parseInt( materialBlending.getValue() );
|
|
|
|
|
|
+ material.side = parseInt( materialSide.getValue() );
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- if ( material.side !== undefined ) {
|
|
|
|
|
|
+ if ( material.shading !== undefined ) {
|
|
|
|
|
|
- material.side = parseInt( materialSide.getValue() );
|
|
|
|
|
|
+ material.shading = parseInt( materialShading.getValue() );
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if ( material.blending !== undefined ) {
|
|
|
|
+
|
|
|
|
+ material.blending = parseInt( materialBlending.getValue() );
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -667,8 +688,9 @@ Sidebar.Material = function ( editor ) {
|
|
'normalMap': materialNormalMapRow,
|
|
'normalMap': materialNormalMapRow,
|
|
'specularMap': materialSpecularMapRow,
|
|
'specularMap': materialSpecularMapRow,
|
|
'envMap': materialEnvMapRow,
|
|
'envMap': materialEnvMapRow,
|
|
- 'blending': materialBlendingRow,
|
|
|
|
'side': materialSideRow,
|
|
'side': materialSideRow,
|
|
|
|
+ 'shading': materialShadingRow,
|
|
|
|
+ 'blending': materialBlendingRow,
|
|
'opacity': materialOpacityRow,
|
|
'opacity': materialOpacityRow,
|
|
'transparent': materialTransparentRow,
|
|
'transparent': materialTransparentRow,
|
|
'wireframe': materialWireframeRow
|
|
'wireframe': materialWireframeRow
|
|
@@ -821,15 +843,21 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- if ( material.blending !== undefined ) {
|
|
|
|
|
|
+ if ( material.side !== undefined ) {
|
|
|
|
|
|
- materialBlending.setValue( material.blending );
|
|
|
|
|
|
+ materialSide.setValue( material.side );
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- if ( material.side !== undefined ) {
|
|
|
|
|
|
+ if ( material.shading !== undefined ) {
|
|
|
|
|
|
- materialSide.setValue( material.side );
|
|
|
|
|
|
+ materialShading.setValue( material.shading );
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if ( material.blending !== undefined ) {
|
|
|
|
+
|
|
|
|
+ materialBlending.setValue( material.blending );
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|