|
@@ -134,7 +134,8 @@ Sidebar.Material = function ( editor ) {
|
|
// vertex shader
|
|
// vertex shader
|
|
|
|
|
|
var materialVertexShaderRow = new UI.Panel();
|
|
var materialVertexShaderRow = new UI.Panel();
|
|
- var materialVertexShader = new UI.TextArea().setWidth( '150px' ).setHeight( '40px' ).onChange( update );
|
|
|
|
|
|
+ var materialVertexShader = new UI.TextArea().setWidth( '150px' ).setHeight( '40px' );
|
|
|
|
+ materialVertexShader.setValue( 'void main() {\n\tgl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n}' ).onChange( update );
|
|
|
|
|
|
materialVertexShaderRow.add( new UI.Text( 'Vertex Shader' ).setWidth( '90px' ) );
|
|
materialVertexShaderRow.add( new UI.Text( 'Vertex Shader' ).setWidth( '90px' ) );
|
|
materialVertexShaderRow.add( materialVertexShader );
|
|
materialVertexShaderRow.add( materialVertexShader );
|
|
@@ -144,7 +145,8 @@ Sidebar.Material = function ( editor ) {
|
|
// fragment shader
|
|
// fragment shader
|
|
|
|
|
|
var materialFragmentShaderRow = new UI.Panel();
|
|
var materialFragmentShaderRow = new UI.Panel();
|
|
- var materialFragmentShader = new UI.TextArea().setWidth( '150px' ).setHeight( '40px' ).onChange( update );
|
|
|
|
|
|
+ var materialFragmentShader = new UI.TextArea().setWidth( '150px' ).setHeight( '40px' );
|
|
|
|
+ materialFragmentShader.setValue( 'void main() {\n\tgl_FragColor = vec4( 1.0, 0.0, 0.0, 1.0 );\n}' ).onChange( update );
|
|
|
|
|
|
materialFragmentShaderRow.add( new UI.Text( 'Fragment Shader' ).setWidth( '90px' ) );
|
|
materialFragmentShaderRow.add( new UI.Text( 'Fragment Shader' ).setWidth( '90px' ) );
|
|
materialFragmentShaderRow.add( materialFragmentShader );
|
|
materialFragmentShaderRow.add( materialFragmentShader );
|
|
@@ -379,6 +381,18 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if ( material.vertexShader !== undefined ) {
|
|
|
|
+
|
|
|
|
+ material.vertexShader = materialVertexShader.getValue();
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if ( material.fragmentShader !== undefined ) {
|
|
|
|
+
|
|
|
|
+ material.fragmentShader = materialFragmentShader.getValue();
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
if ( material.vertexColors !== undefined ) {
|
|
if ( material.vertexColors !== undefined ) {
|
|
|
|
|
|
geometry.buffersNeedUpdate = true;
|
|
geometry.buffersNeedUpdate = true;
|