Skip to content

Commit 1769fbf

Browse files
committed
Editor: Fixed ShaderMaterial init.
1 parent 364e9aa commit 1769fbf

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

editor/js/Sidebar.Material.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Sidebar.Material = function ( editor ) {
135135

136136
var materialUniformsRow = new UI.Panel();
137137
var materialUniforms = new UI.TextArea().setWidth( '150px' ).setHeight( '80px' );
138-
materialUniforms.setValue( '' ).onChange( update );
138+
materialUniforms.setValue( '{\n "uColor": {\n "type": "3f",\n "value": [1, 0, 0]\n }\n}' ).onChange( update );
139139

140140
materialUniformsRow.add( new UI.Text( 'Uniforms' ).setWidth( '90px' ) );
141141
materialUniformsRow.add( materialUniforms );
@@ -157,7 +157,7 @@ Sidebar.Material = function ( editor ) {
157157

158158
var materialFragmentShaderRow = new UI.Panel();
159159
var materialFragmentShader = new UI.TextArea().setWidth( '150px' ).setHeight( '80px' );
160-
materialFragmentShader.setValue( 'void main() {\n\tgl_FragColor = vec4( 1.0, 0.0, 0.0, 1.0 );\n}' ).onChange( update );
160+
materialFragmentShader.setValue( 'uniform vec3 uColor;\n\nvoid main() {\n\tgl_FragColor = vec4( uColor, 1.0 );\n}' ).onChange( update );
161161

162162
materialFragmentShaderRow.add( new UI.Text( 'Fragment Shader' ).setWidth( '90px' ) );
163163
materialFragmentShaderRow.add( materialFragmentShader );

0 commit comments

Comments
 (0)