|
@@ -131,6 +131,17 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
container.add( materialShininessRow );
|
|
container.add( materialShininessRow );
|
|
|
|
|
|
|
|
+ // uniforms
|
|
|
|
+
|
|
|
|
+ var materialUniformsRow = new UI.Panel();
|
|
|
|
+ var materialUniforms = new UI.TextArea().setWidth( '150px' ).setHeight( '40px' );
|
|
|
|
+ materialUniforms.setValue( '' ).onChange( update );
|
|
|
|
+
|
|
|
|
+ materialUniformsRow.add( new UI.Text( 'Uniforms' ).setWidth( '90px' ) );
|
|
|
|
+ materialUniformsRow.add( materialUniforms );
|
|
|
|
+
|
|
|
|
+ container.add( materialUniformsRow );
|
|
|
|
+
|
|
// vertex shader
|
|
// vertex shader
|
|
|
|
|
|
var materialVertexShaderRow = new UI.Panel();
|
|
var materialVertexShaderRow = new UI.Panel();
|
|
@@ -381,6 +392,12 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if ( material.uniforms !== undefined ) {
|
|
|
|
+
|
|
|
|
+ material.uniforms = JSON.parse( materialUniforms.getValue() );
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
if ( material.vertexShader !== undefined ) {
|
|
if ( material.vertexShader !== undefined ) {
|
|
|
|
|
|
material.vertexShader = materialVertexShader.getValue();
|
|
material.vertexShader = materialVertexShader.getValue();
|
|
@@ -596,6 +613,7 @@ Sidebar.Material = function ( editor ) {
|
|
'emissive': materialEmissiveRow,
|
|
'emissive': materialEmissiveRow,
|
|
'specular': materialSpecularRow,
|
|
'specular': materialSpecularRow,
|
|
'shininess': materialShininessRow,
|
|
'shininess': materialShininessRow,
|
|
|
|
+ 'uniforms': materialUniformsRow,
|
|
'vertexShader': materialVertexShaderRow,
|
|
'vertexShader': materialVertexShaderRow,
|
|
'fragmentShader': materialFragmentShaderRow,
|
|
'fragmentShader': materialFragmentShaderRow,
|
|
'vertexColors': materialVertexColorsRow,
|
|
'vertexColors': materialVertexColorsRow,
|
|
@@ -677,6 +695,12 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if ( material.uniforms !== undefined ) {
|
|
|
|
+
|
|
|
|
+ materialUniforms.setValue( JSON.stringify( material.uniforms ) );
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
if ( material.vertexShader !== undefined ) {
|
|
if ( material.vertexShader !== undefined ) {
|
|
|
|
|
|
materialVertexShader.setValue( material.vertexShader );
|
|
materialVertexShader.setValue( material.vertexShader );
|