diff --git a/cocos/2d/cocos2d.vcxproj b/cocos/2d/cocos2d.vcxproj index 55f16dd01b..33a199b37e 100644 --- a/cocos/2d/cocos2d.vcxproj +++ b/cocos/2d/cocos2d.vcxproj @@ -235,6 +235,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -242,7 +243,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - @@ -413,6 +413,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -421,30 +422,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - - - - - - - - - - - - - - - - - - - - - - - @@ -549,6 +527,25 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + + + + + + + + + + + + + + + diff --git a/cocos/2d/cocos2d.vcxproj.filters b/cocos/2d/cocos2d.vcxproj.filters index 381aca0050..7c04d6a9f0 100644 --- a/cocos/2d/cocos2d.vcxproj.filters +++ b/cocos/2d/cocos2d.vcxproj.filters @@ -100,8 +100,8 @@ {02a21a86-8f65-441b-ae13-11dec1c45ee5} - - {406577df-e0cd-4148-8e00-9bc159e0a799} + + {438e71df-3684-4619-9659-10e07ed6cd62} @@ -576,10 +576,10 @@ renderer - + renderer - + renderer @@ -1115,72 +1115,6 @@ renderer - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - - - renderer\Shaders - renderer @@ -1190,10 +1124,10 @@ renderer - + renderer - + renderer @@ -1224,5 +1158,62 @@ math + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + + + renderer\shaders + \ No newline at end of file diff --git a/cocos/renderer/ccShader_Label.vert b/cocos/renderer/ccShader_Label.vert index 02b3790504..3e39b68c20 100644 --- a/cocos/renderer/ccShader_Label.vert +++ b/cocos/renderer/ccShader_Label.vert @@ -29,13 +29,13 @@ attribute vec4 a_position; attribute vec2 a_texCoord; attribute vec4 a_color; -#ifdef GL_ES +#ifdef GL_ES\n varying lowp vec4 v_fragmentColor; varying mediump vec2 v_texCoord; -#else +#else\n varying vec4 v_fragmentColor; varying vec2 v_texCoord; -#endif +#endif\n void main() { diff --git a/cocos/renderer/ccShader_Label_df.frag b/cocos/renderer/ccShader_Label_df.frag index 31c9ec0336..29b3b95669 100644 --- a/cocos/renderer/ccShader_Label_df.frag +++ b/cocos/renderer/ccShader_Label_df.frag @@ -1,8 +1,8 @@ const char* ccLabelDistanceFieldNormal_frag = STRINGIFY( -#ifdef GL_ES +#ifdef GL_ES\n precision lowp float; -#endif +#endif\n varying vec4 v_fragmentColor; varying vec2 v_texCoord; diff --git a/cocos/renderer/ccShader_Label_df_glow.frag b/cocos/renderer/ccShader_Label_df_glow.frag index 9d6ab500af..0c7dbef1f0 100644 --- a/cocos/renderer/ccShader_Label_df_glow.frag +++ b/cocos/renderer/ccShader_Label_df_glow.frag @@ -1,8 +1,8 @@ const char* ccLabelDistanceFieldGlow_frag = STRINGIFY( -#ifdef GL_ES +#ifdef GL_ES\n precision lowp float; -#endif +#endif\n varying vec4 v_fragmentColor; varying vec2 v_texCoord; diff --git a/cocos/renderer/ccShader_Label_normal.frag b/cocos/renderer/ccShader_Label_normal.frag index 0d4d2788d1..42d68c4b8e 100644 --- a/cocos/renderer/ccShader_Label_normal.frag +++ b/cocos/renderer/ccShader_Label_normal.frag @@ -24,9 +24,9 @@ */ const char* ccLabelNormal_frag = STRINGIFY( -#ifdef GL_ES +#ifdef GL_ES\n precision lowp float; -#endif +#endif\n varying vec4 v_fragmentColor; varying vec2 v_texCoord; diff --git a/cocos/renderer/ccShader_Label_outline.frag b/cocos/renderer/ccShader_Label_outline.frag index 967f83c0b9..cc94cdc499 100644 --- a/cocos/renderer/ccShader_Label_outline.frag +++ b/cocos/renderer/ccShader_Label_outline.frag @@ -1,7 +1,7 @@ const char* ccLabelOutline_frag = STRINGIFY( -#ifdef GL_ES +#ifdef GL_ES\n precision lowp float; -#endif +#endif\n varying vec4 v_fragmentColor; varying vec2 v_texCoord; diff --git a/cocos/renderer/ccShader_PositionColor.frag b/cocos/renderer/ccShader_PositionColor.frag index a42854f1fb..0ad897f79d 100644 --- a/cocos/renderer/ccShader_PositionColor.frag +++ b/cocos/renderer/ccShader_PositionColor.frag @@ -25,9 +25,9 @@ const char* ccPositionColor_frag = STRINGIFY( -#ifdef GL_ES +#ifdef GL_ES\n precision lowp float; -#endif +#endif\n varying vec4 v_fragmentColor; diff --git a/cocos/renderer/ccShader_PositionColor.vert b/cocos/renderer/ccShader_PositionColor.vert index fd1694df4e..4e23b6aa9c 100644 --- a/cocos/renderer/ccShader_PositionColor.vert +++ b/cocos/renderer/ccShader_PositionColor.vert @@ -28,11 +28,11 @@ const char* ccPositionColor_vert = STRINGIFY( attribute vec4 a_position; attribute vec4 a_color; -#ifdef GL_ES +#ifdef GL_ES\n varying lowp vec4 v_fragmentColor; -#else +#else\n varying vec4 v_fragmentColor; -#endif +#endif\n void main() { diff --git a/cocos/renderer/ccShader_PositionColorLengthTexture.frag b/cocos/renderer/ccShader_PositionColorLengthTexture.frag index e47ebf20c3..e4bba63b31 100644 --- a/cocos/renderer/ccShader_PositionColorLengthTexture.frag +++ b/cocos/renderer/ccShader_PositionColorLengthTexture.frag @@ -21,22 +21,22 @@ const char* ccPositionColorLengthTexture_frag = STRINGIFY( -#ifdef GL_ES +#ifdef GL_ES\n // #extension GL_OES_standard_derivatives : enable - +\n varying mediump vec4 v_color; varying mediump vec2 v_texcoord; -#else +#else\n varying vec4 v_color; varying vec2 v_texcoord; -#endif +#endif\n void main() { // #if defined GL_OES_standard_derivatives // gl_FragColor = v_color*smoothstep(0.0, length(fwidth(v_texcoord)), 1.0 - length(v_texcoord)); -// #else +// #else\n gl_FragColor = v_color*step(0.0, 1.0 - length(v_texcoord)); -// #endif +// #endif\n } ); diff --git a/cocos/renderer/ccShader_PositionColorLengthTexture.vert b/cocos/renderer/ccShader_PositionColorLengthTexture.vert index 0693b74659..68276f83fe 100644 --- a/cocos/renderer/ccShader_PositionColorLengthTexture.vert +++ b/cocos/renderer/ccShader_PositionColorLengthTexture.vert @@ -21,7 +21,7 @@ const char* ccPositionColorLengthTexture_vert = STRINGIFY( -#ifdef GL_ES +#ifdef GL_ES\n attribute mediump vec4 a_position; attribute mediump vec2 a_texcoord; attribute mediump vec4 a_color; @@ -29,7 +29,7 @@ attribute mediump vec4 a_color; varying mediump vec4 v_color; varying mediump vec2 v_texcoord; -#else +#else\n attribute vec4 a_position; attribute vec2 a_texcoord; @@ -37,7 +37,7 @@ attribute vec4 a_color; varying vec4 v_color; varying vec2 v_texcoord; -#endif +#endif\n void main() { diff --git a/cocos/renderer/ccShader_PositionTexture.frag b/cocos/renderer/ccShader_PositionTexture.frag index bb072775bd..80d901d43e 100644 --- a/cocos/renderer/ccShader_PositionTexture.frag +++ b/cocos/renderer/ccShader_PositionTexture.frag @@ -25,9 +25,9 @@ const char* ccPositionTexture_frag = STRINGIFY( -#ifdef GL_ES +#ifdef GL_ES\n precision lowp float; -#endif +#endif\n varying vec2 v_texCoord; uniform sampler2D CC_Texture0; diff --git a/cocos/renderer/ccShader_PositionTexture.vert b/cocos/renderer/ccShader_PositionTexture.vert index 288e860505..df8b8c5606 100644 --- a/cocos/renderer/ccShader_PositionTexture.vert +++ b/cocos/renderer/ccShader_PositionTexture.vert @@ -28,11 +28,11 @@ const char* ccPositionTexture_vert = STRINGIFY( attribute vec4 a_position; attribute vec2 a_texCoord; -#ifdef GL_ES +#ifdef GL_ES\n varying mediump vec2 v_texCoord; -#else +#else\n varying vec2 v_texCoord; -#endif +#endif\n void main() { diff --git a/cocos/renderer/ccShader_PositionTextureA8Color.frag b/cocos/renderer/ccShader_PositionTextureA8Color.frag index 6c5e6cdd0a..44e3e9d9aa 100644 --- a/cocos/renderer/ccShader_PositionTextureA8Color.frag +++ b/cocos/renderer/ccShader_PositionTextureA8Color.frag @@ -25,9 +25,9 @@ const char* ccPositionTextureA8Color_frag = STRINGIFY( -#ifdef GL_ES +#ifdef GL_ES\n precision lowp float; -#endif +#endif\n varying vec4 v_fragmentColor; varying vec2 v_texCoord; diff --git a/cocos/renderer/ccShader_PositionTextureA8Color.vert b/cocos/renderer/ccShader_PositionTextureA8Color.vert index a4d8a833d1..bd250628c7 100644 --- a/cocos/renderer/ccShader_PositionTextureA8Color.vert +++ b/cocos/renderer/ccShader_PositionTextureA8Color.vert @@ -29,13 +29,13 @@ attribute vec4 a_position; attribute vec2 a_texCoord; attribute vec4 a_color; -#ifdef GL_ES +#ifdef GL_ES\n varying lowp vec4 v_fragmentColor; varying mediump vec2 v_texCoord; -#else +#else\n varying vec4 v_fragmentColor; varying vec2 v_texCoord; -#endif +#endif\n void main() { diff --git a/cocos/renderer/ccShader_PositionTextureColor.frag b/cocos/renderer/ccShader_PositionTextureColor.frag index d31c530775..e3f2b93ff5 100644 --- a/cocos/renderer/ccShader_PositionTextureColor.frag +++ b/cocos/renderer/ccShader_PositionTextureColor.frag @@ -24,9 +24,9 @@ */ const char* ccPositionTextureColor_frag = STRINGIFY( -#ifdef GL_ES +\n#ifdef GL_ES\n precision lowp float; -#endif +\n#endif\n varying vec4 v_fragmentColor; varying vec2 v_texCoord; diff --git a/cocos/renderer/ccShader_PositionTextureColor.vert b/cocos/renderer/ccShader_PositionTextureColor.vert index 1c3128eece..bf73900da8 100644 --- a/cocos/renderer/ccShader_PositionTextureColor.vert +++ b/cocos/renderer/ccShader_PositionTextureColor.vert @@ -28,13 +28,13 @@ attribute vec4 a_position; attribute vec2 a_texCoord; attribute vec4 a_color; -#ifdef GL_ES +\n#ifdef GL_ES\n varying lowp vec4 v_fragmentColor; varying mediump vec2 v_texCoord; -#else +\n#else\n varying vec4 v_fragmentColor; varying vec2 v_texCoord; -#endif +\n#endif\n void main() { diff --git a/cocos/renderer/ccShader_PositionTexture_uColor.frag b/cocos/renderer/ccShader_PositionTexture_uColor.frag index 8b13f64bab..12ea811d46 100644 --- a/cocos/renderer/ccShader_PositionTexture_uColor.frag +++ b/cocos/renderer/ccShader_PositionTexture_uColor.frag @@ -25,9 +25,9 @@ const char* ccPositionTexture_uColor_frag = STRINGIFY( -#ifdef GL_ES +#ifdef GL_ES\n precision lowp float; -#endif +#endif\n uniform vec4 u_color; diff --git a/cocos/renderer/ccShader_PositionTexture_uColor.vert b/cocos/renderer/ccShader_PositionTexture_uColor.vert index d24fbd61f8..33f56d1c50 100644 --- a/cocos/renderer/ccShader_PositionTexture_uColor.vert +++ b/cocos/renderer/ccShader_PositionTexture_uColor.vert @@ -28,11 +28,11 @@ const char* ccPositionTexture_uColor_vert = STRINGIFY( attribute vec4 a_position; attribute vec2 a_texCoord; -#ifdef GL_ES +#ifdef GL_ES\n varying mediump vec2 v_texCoord; -#else +#else\n varying vec2 v_texCoord; -#endif +#endif\n void main() { diff --git a/cocos/renderer/ccShader_Position_uColor.frag b/cocos/renderer/ccShader_Position_uColor.frag index 268e36ec7d..ce71bbe1e7 100644 --- a/cocos/renderer/ccShader_Position_uColor.frag +++ b/cocos/renderer/ccShader_Position_uColor.frag @@ -25,9 +25,9 @@ const char* ccPosition_uColor_frag = STRINGIFY( -#ifdef GL_ES +#ifdef GL_ES\n precision lowp float; -#endif +#endif\n varying vec4 v_fragmentColor; diff --git a/cocos/renderer/ccShader_Position_uColor.vert b/cocos/renderer/ccShader_Position_uColor.vert index 63301dc1b6..7470142216 100644 --- a/cocos/renderer/ccShader_Position_uColor.vert +++ b/cocos/renderer/ccShader_Position_uColor.vert @@ -29,11 +29,11 @@ attribute vec4 a_position; uniform vec4 u_color; uniform float u_pointSize; -#ifdef GL_ES +#ifdef GL_ES\n varying lowp vec4 v_fragmentColor; -#else +#else\n varying vec4 v_fragmentColor; -#endif +#endif\n void main() {