|
@@ -106,6 +106,22 @@ Sidebar.Material = function ( signals ) {
|
|
|
|
|
|
container.add( materialShininessRow );
|
|
container.add( materialShininessRow );
|
|
|
|
|
|
|
|
+ // vertex colors
|
|
|
|
+
|
|
|
|
+ var materialVertexColorsRow = new UI.Panel();
|
|
|
|
+ var materialVertexColors = new UI.Select().setOptions( {
|
|
|
|
+
|
|
|
|
+ 0: 'No',
|
|
|
|
+ 1: 'Face',
|
|
|
|
+ 2: 'Vertex'
|
|
|
|
+
|
|
|
|
+ } ).onChange( update );
|
|
|
|
+
|
|
|
|
+ materialVertexColorsRow.add( new UI.Text( 'Vertex Colors' ).setWidth( '90px' ).setColor( '#666' ) );
|
|
|
|
+ materialVertexColorsRow.add( materialVertexColors );
|
|
|
|
+
|
|
|
|
+ container.add( materialVertexColorsRow );
|
|
|
|
+
|
|
// map
|
|
// map
|
|
|
|
|
|
var materialMapRow = new UI.Panel();
|
|
var materialMapRow = new UI.Panel();
|
|
@@ -267,6 +283,13 @@ Sidebar.Material = function ( signals ) {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if ( material.vertexColors !== undefined ) {
|
|
|
|
+
|
|
|
|
+ material.vertexColors = parseInt( materialVertexColors.getValue() );
|
|
|
|
+ material.needsUpdate = true;
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
if ( material.map !== undefined ) {
|
|
if ( material.map !== undefined ) {
|
|
|
|
|
|
var mapEnabled = materialMapEnabled.getValue() === true;
|
|
var mapEnabled = materialMapEnabled.getValue() === true;
|
|
@@ -275,6 +298,7 @@ Sidebar.Material = function ( signals ) {
|
|
|
|
|
|
material.map = mapEnabled ? materialMap.getValue() : null;
|
|
material.map = mapEnabled ? materialMap.getValue() : null;
|
|
material.needsUpdate = true;
|
|
material.needsUpdate = true;
|
|
|
|
+
|
|
selected.geometry.buffersNeedUpdate = true;
|
|
selected.geometry.buffersNeedUpdate = true;
|
|
selected.geometry.uvsNeedUpdate = true;
|
|
selected.geometry.uvsNeedUpdate = true;
|
|
|
|
|
|
@@ -431,6 +455,7 @@ Sidebar.Material = function ( signals ) {
|
|
'emissive': materialEmissiveRow,
|
|
'emissive': materialEmissiveRow,
|
|
'specular': materialSpecularRow,
|
|
'specular': materialSpecularRow,
|
|
'shininess': materialShininessRow,
|
|
'shininess': materialShininessRow,
|
|
|
|
+ 'vertexColors': materialVertexColorsRow,
|
|
'map': materialMapRow,
|
|
'map': materialMapRow,
|
|
'lightMap': materialLightMapRow,
|
|
'lightMap': materialLightMapRow,
|
|
'bumpMap': materialBumpMapRow,
|
|
'bumpMap': materialBumpMapRow,
|
|
@@ -507,6 +532,12 @@ Sidebar.Material = function ( signals ) {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if ( material.vertexColors !== undefined ) {
|
|
|
|
+
|
|
|
|
+ materialVertexColors.setValue( material.vertexColors );
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
if ( material.map !== undefined ) {
|
|
if ( material.map !== undefined ) {
|
|
|
|
|
|
if ( selectedHasUvs ) {
|
|
if ( selectedHasUvs ) {
|