|
@@ -257,6 +257,20 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
container.add( materialVertexColorsRow );
|
|
|
|
|
|
+ // depth packing
|
|
|
+
|
|
|
+ var materialDepthPackingRow = new UI.Row();
|
|
|
+ var materialDepthPacking = new UI.Select().setOptions( {
|
|
|
+ [ THREE.BasicDepthPacking ]: 'BasicDepthPacking',
|
|
|
+ [ THREE.RGBADepthPacking ]: 'RGBADepthPacking'
|
|
|
+ } );
|
|
|
+ materialDepthPacking.onChange( update );
|
|
|
+
|
|
|
+ materialDepthPackingRow.add( new UI.Text( strings.getKey( 'sidebar/material/depthPacking' ) ).setWidth( '90px' ) );
|
|
|
+ materialDepthPackingRow.add( materialDepthPacking );
|
|
|
+
|
|
|
+ container.add( materialDepthPackingRow );
|
|
|
+
|
|
|
// skinning
|
|
|
|
|
|
var materialSkinningRow = new UI.Row();
|
|
@@ -438,7 +452,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 );
|
|
@@ -610,6 +624,16 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ if ( material.depthPacking !== undefined) {
|
|
|
+
|
|
|
+ var depthPacking = parseInt(materialDepthPacking.getValue());
|
|
|
+ if(material.depthPacking !== depthPacking)
|
|
|
+ {
|
|
|
+ editor.execute( new SetMaterialValueCommand( currentObject, 'depthPacking', depthPacking, currentMaterialSlot ) );
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
if ( material.skinning !== undefined && material.skinning !== materialSkinning.getValue() ) {
|
|
|
|
|
|
editor.execute( new SetMaterialValueCommand( currentObject, 'skinning', materialSkinning.getValue(), currentMaterialSlot ) );
|
|
@@ -945,7 +969,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 ) );
|
|
|
|
|
|
}
|
|
|
|
|
@@ -983,6 +1007,7 @@ Sidebar.Material = function ( editor ) {
|
|
|
'clearCoatRoughness': materialClearCoatRoughnessRow,
|
|
|
'vertexShader': materialProgramRow,
|
|
|
'vertexColors': materialVertexColorsRow,
|
|
|
+ 'depthPacking': materialDepthPackingRow,
|
|
|
'skinning': materialSkinningRow,
|
|
|
'map': materialMapRow,
|
|
|
'alphaMap': materialAlphaMapRow,
|
|
@@ -1122,6 +1147,12 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ if ( material.depthPacking !== undefined ) {
|
|
|
+
|
|
|
+ materialDepthPacking.setValue( material.depthPacking );
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
if ( material.skinning !== undefined ) {
|
|
|
|
|
|
materialSkinning.setValue( material.skinning );
|