提交 f9f7d364 编写于 作者: M Mr.doob

Merging with alteredq's branch.

上级 a6c9984a
此差异已折叠。
此差异已折叠。
此差异已折叠。
......@@ -35,10 +35,6 @@ var ShaderUtils = {
vertex_shader: [
"attribute vec3 position;",
"attribute vec3 normal;",
"attribute vec3 uv;",
"uniform float mRefractionRatio;",
"uniform float mFresnelBias;",
"uniform float mFresnelScale;",
......
......@@ -1079,13 +1079,11 @@ THREE.WebGLRenderer = function ( scene ) {
var chunks = [
maxDirLights ? "#define MAX_DIR_LIGHTS " + maxDirLights : "",
maxPointLights ? "#define MAX_POINT_LIGHTS " + maxPointLights : "",
"attribute vec3 position;",
"attribute vec3 normal;",
"attribute vec2 uv;",
"uniform bool enableLighting;",
"uniform bool useRefract;",
......@@ -1195,6 +1193,9 @@ THREE.WebGLRenderer = function ( scene ) {
"uniform mat4 modelViewMatrix;",
"uniform mat4 projectionMatrix;",
"uniform vec3 cameraPosition;",
"attribute vec3 position;",
"attribute vec3 normal;",
"attribute vec2 uv;",
""
].join("\n");
......@@ -1205,10 +1206,8 @@ THREE.WebGLRenderer = function ( scene ) {
if ( !_gl.getProgramParameter( program, _gl.LINK_STATUS ) ) {
alert( "Could not initialise shaders" );
alert( "VALIDATE_STATUS: " + _gl.getProgramParameter( program, _gl.VALIDATE_STATUS ) );
alert( _gl.getError() );
alert( "Could not initialise shaders\n"+
"VALIDATE_STATUS: " + _gl.getProgramParameter( program, _gl.VALIDATE_STATUS ) + ", gl error [" + _gl.getError() + "]" );
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册