From 5f5e4a92879d16389a14d1545714af8cc9be12e5 Mon Sep 17 00:00:00 2001 From: caizhitao Date: Fri, 20 Dec 2019 12:32:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=86=85=E5=8F=91=E5=85=89?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/effects/glow-inner.effect | 119 +++++++++------ assets/effects/glow-inner.effect.meta | 4 +- assets/materials/glow-inner.mtl | 12 +- assets/scenes/GlowInnerEffectScene.fire | 195 +++--------------------- assets/scripts/GlowInnerEffectScene.ts | 2 +- 5 files changed, 97 insertions(+), 235 deletions(-) diff --git a/assets/effects/glow-inner.effect b/assets/effects/glow-inner.effect index aaa0e69..f3eccd8 100644 --- a/assets/effects/glow-inner.effect +++ b/assets/effects/glow-inner.effect @@ -1,5 +1,6 @@ // Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. -// 外发光特效 +// 内发光特效 +// 原理: 采样周边像素alpha取平均值，叠加发光效果 CCEffect %{ techniques: - passes: @@ -13,8 +14,8 @@ CCEffect %{ properties: texture: { value: white } alphaThreshold: { value: 0.5 } - outlineColor: { value: [1.0, 1.0, 0.0, 1.0], editor: { type: color } } - outlineSize: { value: 0.01 } + glowColor: { value: [1.0, 1.0, 0.0, 1.0], editor: { type: color } } + glowColorSize: { value: 0.01 } }% @@ -65,49 +66,72 @@ CCProgram fs %{ uniform sampler2D texture; #endif - #if SHOW_OUT_LINE + #if SHOW_INNER_GLOW - uniform Outline { - // 描边颜色 - vec4 outlineColor; - // 描边偏移大小 - float outlineSize; + uniform glow { + // 发光颜色 + vec4 glowColor; + // 发光范围 + float glowColorSize; // 特别地，必须是 vec4 先于 float 声明 }; - float getAlpha(float size) { - vec4 color_up = texture(texture, v_uv0 + vec2(0, size)); - vec4 color_down = texture(texture, v_uv0 - vec2(0, size)); - vec4 color_left = texture(texture, v_uv0 - vec2(size, 0)); - vec4 color_right = texture(texture, v_uv0 + vec2(size, 0)); - vec4 color_up_left = texture(texture, v_uv0 + vec2(size, -size)); - vec4 color_up_right = texture(texture, v_uv0 + vec2(size, size)); - vec4 color_down_left = texture(texture, v_uv0 + vec2(-size, -size)); - vec4 color_down_right = texture(texture, v_uv0 + vec2(-size, size)); - float total = color_right.a + color_left.a + color_down.a + color_up.a + color_up_left.a + color_up_right.a + color_down_left.a + color_down_right.a; - return step(0.000000001, total); + /** + * 获取指定角度方向，距离为xxx的像素的透明度 + * + * @param angle 角度 [0.0, 360.0] + * @param distance 距离 [0.0, 1.0] + * + * @return alpha [0.0, 1.0] + */ + float getColorAlpha(float angle, float distance) { + // 角度转弧度，公式为：弧度 = 角度 * (pi / 180) + float radian = angle * 0.01745329252; // 这个浮点数是 pi / 180 + vec4 color = texture(texture, v_uv0 + vec2(distance * cos(radian), distance * sin(radian))); + return 1.0 - color.a; } - // 将图像往8个方向偏移后，得到一个类放大效果，然后取放大后的图像的透明度，即可得到一个放大后的区域，可以很方便填充（描边）颜色 - // 取当前点上、下、左、右、上左、上右、下左、下右共计8个方向，距离为 outlineSize 的8个点，求他们的透明度之和 - // 由此可以得到当前点是否属于图像往八个方向做偏移后得到的放大图区域，并且能得到该点最终透明度值 - // 最终对应的为图像偏移/放大后的背景区域 - float getBgAlpha() { - vec4 color_cur = texture(texture, v_uv0); - float alpha = step(0.000000001, color_cur.a); - if (alpha > 0.000000001) { - return 1.0; - } else { - float total = 0.0; - for (float i = 0.0; i <= 1.0; i += 0.01) { - total += getAlpha(outlineSize * i); - } - total *= 0.01; - return clamp(total, 0.0, 1.0); - } + /** + * 获取指定距离的周边像素的透明度平均值 + * + * @param distance 距离 [0.0, 1.0] + * + * @return average alpha [0.0, 1.0] + */ + float getDistanceAverageAlpha(float distance) { + float totalAlpha = 0.0; + totalAlpha += getColorAlpha(0.0, distance); + totalAlpha += getColorAlpha(30.0, distance); + totalAlpha += getColorAlpha(60.0, distance); + totalAlpha += getColorAlpha(90.0, distance); + totalAlpha += getColorAlpha(120.0, distance); + totalAlpha += getColorAlpha(150.0, distance); + totalAlpha += getColorAlpha(180.0, distance); + totalAlpha += getColorAlpha(210.0, distance); + totalAlpha += getColorAlpha(240.0, distance); + totalAlpha += getColorAlpha(270.0, distance); + totalAlpha += getColorAlpha(300.0, distance); + totalAlpha += getColorAlpha(330.0, distance); + return totalAlpha * (1.0 / 12.0); } - + /** + * 获取发光的透明度 + */ + float getGlowAlpha() { + float totalAlpha = 0.0; + totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.1); + totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.2); + totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.3); + totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.4); + totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.5); + totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.6); + totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.7); + totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.8); + totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.9); + totalAlpha += getDistanceAverageAlpha(glowColorSize * 1.0); + return totalAlpha * (1.0 / 10.0); + } #endif @@ -127,24 +151,27 @@ CCProgram fs %{ gl_FragColor = o; - #if SHOW_OUT_LINE - // 先画背景色 - vec4 color_dest = outlineColor * getBgAlpha(); + #if SHOW_INNER_GLOW + // 先画图案 + vec4 color_dest = o; - // 然后在背景色上方画图案颜色 - vec4 color_src = o; + // 然后在图案上叠加内发光 + vec4 color_src = glowColor * getGlowAlpha(); - // 按照这个顺序，源颜色就是图案颜色，目标颜色就是背景色 + // 按照这个顺序，源颜色就是内发光颜色，目标颜色就是图案颜色色 // 所以命名就是 color_src, color_dest // 按照混合颜色规则 http://docs.cocos.com/creator/manual/zh/advanced-topics/ui-auto-batch.html#blend-%E6%A8%A1%E5%BC%8F - // 要在底色上方，画一个图案，图案完全挡住底色，那么最终选择的混合模式如下： + // 要在图案上方，叠加一个内发光，将两者颜色混合起来，那么最终选择的混合模式如下： // color_src: GL_SRC_ALPHA // color_dest: GL_ONE_MINUS_SRC_ALPHA // 即最终颜色如下： // color_src * GL_SRC_ALPHA + color_dest * GL_ONE_MINUS_SRC_ALPHA gl_FragColor = color_src * color_src.a + color_dest * (1.0 - color_src.a); - // gl_FragColor = color_dest; + // gl_FragColor = color_src + color_dest * (1.0 - color_src.a); + // gl_FragColor = color_src * (1.0 - color_src.a) + color_dest * color_src.a; + // gl_FragColor = color_src; + // gl_FragColor = color_dest * color_dest.a + color_src * (1.0 - color_dest.a); #endif } }% diff --git a/assets/effects/glow-inner.effect.meta b/assets/effects/glow-inner.effect.meta index cef30ab..8d480f4 100644 --- a/assets/effects/glow-inner.effect.meta +++ b/assets/effects/glow-inner.effect.meta @@ -5,11 +5,11 @@ { "glsl1": { "vert": "\nprecision highp float;\nuniform mat4 cc_matViewProj;\nuniform mat4 cc_matWorld;\n\nattribute vec3 a_position;\nattribute vec4 a_color;\nvarying vec4 v_color;\n\n#if USE_TEXTURE\nattribute vec2 a_uv0;\nvarying vec2 v_uv0;\n#endif\n\nvoid main () {\n vec4 pos = vec4(a_position, 1);\n\n #if CC_USE_MODEL\n pos = cc_matViewProj * cc_matWorld * pos;\n #else\n pos = cc_matViewProj * pos;\n #endif\n\n #if USE_TEXTURE\n v_uv0 = a_uv0;\n #endif\n\n v_color = a_color;\n\n gl_Position = pos;\n}\n", - "frag": "\nprecision highp float;\n\n#if USE_ALPHA_TEST\n \n uniform float alphaThreshold;\n#endif\n\nvoid ALPHA_TEST (in vec4 color) {\n #if USE_ALPHA_TEST\n if (color.a < alphaThreshold) discard;\n #endif\n}\n\nvoid ALPHA_TEST (in float alpha) {\n #if USE_ALPHA_TEST\n if (alpha < alphaThreshold) discard;\n #endif\n}\n\nvarying vec4 v_color;\n\n#if USE_TEXTURE\nvarying vec2 v_uv0;\nuniform sampler2D texture;\n#endif\n\n#if SHOW_OUT_LINE\n\nuniform vec4 outlineColor;\nuniform float outlineSize;\n\nfloat getAlpha(float size) {\n vec4 color_up = texture2D(texture, v_uv0 + vec2(0, size)); \n vec4 color_down = texture2D(texture, v_uv0 - vec2(0, size)); \n vec4 color_left = texture2D(texture, v_uv0 - vec2(size, 0)); \n vec4 color_right = texture2D(texture, v_uv0 + vec2(size, 0)); \n vec4 color_up_left = texture2D(texture, v_uv0 + vec2(size, -size)); \n vec4 color_up_right = texture2D(texture, v_uv0 + vec2(size, size)); \n vec4 color_down_left = texture2D(texture, v_uv0 + vec2(-size, -size)); \n vec4 color_down_right = texture2D(texture, v_uv0 + vec2(-size, size)); \n float total = color_right.a + color_left.a + color_down.a + color_up.a + color_up_left.a + color_up_right.a + color_down_left.a + color_down_right.a; \n return step(0.000000001, total);\n}\n\nfloat getBgAlpha() {\n vec4 color_cur = texture2D(texture, v_uv0);\n float alpha = step(0.000000001, color_cur.a);\n if (alpha > 0.000000001) {\n return 1.0;\n } else {\n float total = 0.0;\n for (float i = 0.0; i <= 1.0; i += 0.01) {\n total += getAlpha(outlineSize * i);\n }\n total *= 0.01;\n return clamp(total, 0.0, 1.0);\n }\n}\n\n#endif\n\nvoid main () {\n vec4 o = vec4(1, 1, 1, 1);\n\n #if USE_TEXTURE\n o *= texture2D(texture, v_uv0);\n #if CC_USE_ALPHA_ATLAS_TEXTURE\n o.a *= texture2D(texture, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #endif\n\n o *= v_color;\n\n ALPHA_TEST(o);\n\n gl_FragColor = o;\n\n #if SHOW_OUT_LINE\n\n vec4 color_dest = outlineColor * getBgAlpha();\n\n vec4 color_src = o;\n\n gl_FragColor = color_src * color_src.a + color_dest * (1.0 - color_src.a);\n\n #endif\n}\n" + "frag": "\nprecision highp float;\n\n#if USE_ALPHA_TEST\n \n uniform float alphaThreshold;\n#endif\n\nvoid ALPHA_TEST (in vec4 color) {\n #if USE_ALPHA_TEST\n if (color.a < alphaThreshold) discard;\n #endif\n}\n\nvoid ALPHA_TEST (in float alpha) {\n #if USE_ALPHA_TEST\n if (alpha < alphaThreshold) discard;\n #endif\n}\n\nvarying vec4 v_color;\n\n#if USE_TEXTURE\nvarying vec2 v_uv0;\nuniform sampler2D texture;\n#endif\n\n#if SHOW_INNER_GLOW\n\nuniform vec4 glowColor;\nuniform float glowColorSize;\n\n/**\n * 获取指定角度方向，距离为xxx的像素的透明度\n *\n * @param angle 角度 [0.0, 360.0]\n * @param distance 距离 [0.0, 1.0]\n *\n * @return alpha [0.0, 1.0]\n */\nfloat getColorAlpha(float angle, float distance) {\n\n float radian = angle * 0.01745329252;\n\n vec4 color = texture2D(texture, v_uv0 + vec2(distance * cos(radian), distance * sin(radian))); \n return 1.0 - color.a;\n}\n\n/**\n * 获取指定距离的周边像素的透明度平均值\n *\n * @param distance 距离 [0.0, 1.0]\n *\n * @return average alpha [0.0, 1.0]\n */\nfloat getDistanceAverageAlpha(float distance) {\n float totalAlpha = 0.0;\n totalAlpha += getColorAlpha(0.0, distance);\n totalAlpha += getColorAlpha(30.0, distance);\n totalAlpha += getColorAlpha(60.0, distance);\n totalAlpha += getColorAlpha(90.0, distance);\n totalAlpha += getColorAlpha(120.0, distance);\n totalAlpha += getColorAlpha(150.0, distance);\n totalAlpha += getColorAlpha(180.0, distance);\n totalAlpha += getColorAlpha(210.0, distance);\n totalAlpha += getColorAlpha(240.0, distance);\n totalAlpha += getColorAlpha(270.0, distance);\n totalAlpha += getColorAlpha(300.0, distance);\n totalAlpha += getColorAlpha(330.0, distance);\n return totalAlpha * (1.0 / 12.0);\n}\n\n/**\n * 获取发光的透明度\n */\nfloat getGlowAlpha() {\n float totalAlpha = 0.0;\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.1);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.2);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.3);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.4);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.5);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.6);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.7);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.8);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.9);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 1.0);\n return 1.0 - totalAlpha * (1.0 / 10.0);\n\n}\n\n#endif\n\nvoid main () {\n vec4 o = vec4(1, 1, 1, 1);\n\n #if USE_TEXTURE\n o *= texture2D(texture, v_uv0);\n #if CC_USE_ALPHA_ATLAS_TEXTURE\n o.a *= texture2D(texture, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #endif\n\n o *= v_color;\n\n ALPHA_TEST(o);\n\n gl_FragColor = o;\n\n #if SHOW_INNER_GLOW\n\n vec4 color_dest = o;\n\n vec4 color_src = glowColor * getGlowAlpha();\n\n gl_FragColor = color_src * color_src.a + color_dest * (1.0 - color_src.a);\n\n #endif\n}\n" }, "glsl3": { "vert": "\nprecision highp float;\nuniform CCGlobal {\n vec4 cc_time;\n\n vec4 cc_screenSize;\n\n vec4 cc_screenScale;\n\n vec4 cc_nativeSize;\n\n mat4 cc_matView;\n mat4 cc_matViewInv;\n mat4 cc_matProj;\n mat4 cc_matProjInv;\n mat4 cc_matViewProj;\n mat4 cc_matViewProjInv;\n vec4 cc_cameraPos;\n\n vec4 cc_exposure;\n\n vec4 cc_mainLitDir;\n\n vec4 cc_mainLitColor;\n\n vec4 cc_ambientSky;\n vec4 cc_ambientGround;\n};\nuniform CCLocal {\n mat4 cc_matWorld;\n mat4 cc_matWorldIT;\n};\n\nin vec3 a_position;\nin vec4 a_color;\nout vec4 v_color;\n\n#if USE_TEXTURE\nin vec2 a_uv0;\nout vec2 v_uv0;\n#endif\n\nvoid main () {\n vec4 pos = vec4(a_position, 1);\n\n #if CC_USE_MODEL\n pos = cc_matViewProj * cc_matWorld * pos;\n #else\n pos = cc_matViewProj * pos;\n #endif\n\n #if USE_TEXTURE\n v_uv0 = a_uv0;\n #endif\n\n v_color = a_color;\n\n gl_Position = pos;\n}\n", - "frag": "\nprecision highp float;\n\n#if USE_ALPHA_TEST\n \n uniform ALPHA_TEST {\n float alphaThreshold;\n }\n#endif\n\nvoid ALPHA_TEST (in vec4 color) {\n #if USE_ALPHA_TEST\n if (color.a < alphaThreshold) discard;\n #endif\n}\n\nvoid ALPHA_TEST (in float alpha) {\n #if USE_ALPHA_TEST\n if (alpha < alphaThreshold) discard;\n #endif\n}\n\nin vec4 v_color;\n\n#if USE_TEXTURE\nin vec2 v_uv0;\nuniform sampler2D texture;\n#endif\n\n#if SHOW_OUT_LINE\n\nuniform Outline {\n\n vec4 outlineColor;\n\n float outlineSize;\n\n};\n\nfloat getAlpha(float size) {\n vec4 color_up = texture(texture, v_uv0 + vec2(0, size)); \n vec4 color_down = texture(texture, v_uv0 - vec2(0, size)); \n vec4 color_left = texture(texture, v_uv0 - vec2(size, 0)); \n vec4 color_right = texture(texture, v_uv0 + vec2(size, 0)); \n vec4 color_up_left = texture(texture, v_uv0 + vec2(size, -size)); \n vec4 color_up_right = texture(texture, v_uv0 + vec2(size, size)); \n vec4 color_down_left = texture(texture, v_uv0 + vec2(-size, -size)); \n vec4 color_down_right = texture(texture, v_uv0 + vec2(-size, size)); \n float total = color_right.a + color_left.a + color_down.a + color_up.a + color_up_left.a + color_up_right.a + color_down_left.a + color_down_right.a; \n return step(0.000000001, total);\n}\n\nfloat getBgAlpha() {\n vec4 color_cur = texture(texture, v_uv0);\n float alpha = step(0.000000001, color_cur.a);\n if (alpha > 0.000000001) {\n return 1.0;\n } else {\n float total = 0.0;\n for (float i = 0.0; i <= 1.0; i += 0.01) {\n total += getAlpha(outlineSize * i);\n }\n total *= 0.01;\n return clamp(total, 0.0, 1.0);\n }\n}\n\n#endif\n\nvoid main () {\n vec4 o = vec4(1, 1, 1, 1);\n\n #if USE_TEXTURE\n o *= texture(texture, v_uv0);\n #if CC_USE_ALPHA_ATLAS_TEXTURE\n o.a *= texture2D(texture, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #endif\n\n o *= v_color;\n\n ALPHA_TEST(o);\n\n gl_FragColor = o;\n\n #if SHOW_OUT_LINE\n\n vec4 color_dest = outlineColor * getBgAlpha();\n\n vec4 color_src = o;\n\n gl_FragColor = color_src * color_src.a + color_dest * (1.0 - color_src.a);\n\n #endif\n}\n" + "frag": "\nprecision highp float;\n\n#if USE_ALPHA_TEST\n \n uniform ALPHA_TEST {\n float alphaThreshold;\n }\n#endif\n\nvoid ALPHA_TEST (in vec4 color) {\n #if USE_ALPHA_TEST\n if (color.a < alphaThreshold) discard;\n #endif\n}\n\nvoid ALPHA_TEST (in float alpha) {\n #if USE_ALPHA_TEST\n if (alpha < alphaThreshold) discard;\n #endif\n}\n\nin vec4 v_color;\n\n#if USE_TEXTURE\nin vec2 v_uv0;\nuniform sampler2D texture;\n#endif\n\n#if SHOW_INNER_GLOW\n\nuniform glow {\n\n vec4 glowColor;\n\n float glowColorSize;\n\n};\n\n/**\n * 获取指定角度方向，距离为xxx的像素的透明度\n *\n * @param angle 角度 [0.0, 360.0]\n * @param distance 距离 [0.0, 1.0]\n *\n * @return alpha [0.0, 1.0]\n */\nfloat getColorAlpha(float angle, float distance) {\n\n float radian = angle * 0.01745329252;\n\n vec4 color = texture(texture, v_uv0 + vec2(distance * cos(radian), distance * sin(radian))); \n return 1.0 - color.a;\n}\n\n/**\n * 获取指定距离的周边像素的透明度平均值\n *\n * @param distance 距离 [0.0, 1.0]\n *\n * @return average alpha [0.0, 1.0]\n */\nfloat getDistanceAverageAlpha(float distance) {\n float totalAlpha = 0.0;\n totalAlpha += getColorAlpha(0.0, distance);\n totalAlpha += getColorAlpha(30.0, distance);\n totalAlpha += getColorAlpha(60.0, distance);\n totalAlpha += getColorAlpha(90.0, distance);\n totalAlpha += getColorAlpha(120.0, distance);\n totalAlpha += getColorAlpha(150.0, distance);\n totalAlpha += getColorAlpha(180.0, distance);\n totalAlpha += getColorAlpha(210.0, distance);\n totalAlpha += getColorAlpha(240.0, distance);\n totalAlpha += getColorAlpha(270.0, distance);\n totalAlpha += getColorAlpha(300.0, distance);\n totalAlpha += getColorAlpha(330.0, distance);\n return totalAlpha * (1.0 / 12.0);\n}\n\n/**\n * 获取发光的透明度\n */\nfloat getGlowAlpha() {\n float totalAlpha = 0.0;\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.1);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.2);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.3);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.4);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.5);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.6);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.7);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.8);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 0.9);\n totalAlpha += getDistanceAverageAlpha(glowColorSize * 1.0);\n return 1.0 - totalAlpha * (1.0 / 10.0);\n\n}\n\n#endif\n\nvoid main () {\n vec4 o = vec4(1, 1, 1, 1);\n\n #if USE_TEXTURE\n o *= texture(texture, v_uv0);\n #if CC_USE_ALPHA_ATLAS_TEXTURE\n o.a *= texture2D(texture, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #endif\n\n o *= v_color;\n\n ALPHA_TEST(o);\n\n gl_FragColor = o;\n\n #if SHOW_INNER_GLOW\n\n vec4 color_dest = o;\n\n vec4 color_src = glowColor * getGlowAlpha();\n\n gl_FragColor = color_src * color_src.a + color_dest * (1.0 - color_src.a);\n\n #endif\n}\n" } } ], diff --git a/assets/materials/glow-inner.mtl b/assets/materials/glow-inner.mtl index 0dfb81c..e5e525d 100644 --- a/assets/materials/glow-inner.mtl +++ b/assets/materials/glow-inner.mtl @@ -9,17 +9,9 @@ "_defines": { "USE_TEXTURE": true, "USE_ALPHA_TEST": false, - "SHOW_OUT_LINE": true + "SHOW_INNER_GLOW": true }, "_props": { - "texture": null, - "outlineColor": { - "__type__": "cc.Vec4", - "x": 1, - "y": 1, - "z": 0, - "w": 1 - }, - "outlineSize": 0.1 + "texture": null } } \ No newline at end of file diff --git a/assets/scenes/GlowInnerEffectScene.fire b/assets/scenes/GlowInnerEffectScene.fire index 8e42e28..bacb883 100755 --- a/assets/scenes/GlowInnerEffectScene.fire +++ b/assets/scenes/GlowInnerEffectScene.fire @@ -15,9 +15,6 @@ "_children": [ { "__id__": 2 - }, - { - "__id__": 35 } ], "_active": true, @@ -87,7 +84,10 @@ "_active": true, "_components": [ { - "__id__": 34 + "__id__": 32 + }, + { + "__id__": 33 } ], "_prefab": null, @@ -892,7 +892,7 @@ "__id__": 2 }, "component": "", - "_componentId": "408f4mR69xEbpzjsYAGu3vL", + "_componentId": "eebe5Fr5bhMO7IsowoLW/Yp", "handler": "onSideCallBack", "customEventData": "" }, @@ -975,18 +975,15 @@ }, { "__id__": 28 - }, - { - "__id__": 30 } ], "_active": true, "_components": [ { - "__id__": 32 + "__id__": 30 }, { - "__id__": 33 + "__id__": 31 } ], "_prefab": null, @@ -1109,7 +1106,7 @@ "_enabled": true, "_materials": [ { - "__uuid__": "b878db1a-68e4-460d-95f8-83fdb34c11e6" + "__uuid__": "2c760728-404d-4553-a1d0-7ab18263845c" } ], "_srcBlendFactor": 770, @@ -1131,98 +1128,6 @@ "_atlas": null, "_id": "c5wu68mipC4qBjTD+u0rFa" }, - { - "__type__": "cc.Node", - "_name": "ExampleLabel", - "_objFlags": 0, - "_parent": { - "__id__": 21 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 25 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 342.33, - "height": 100.8 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 18.50000000000003, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "31f1bH7V69Ajr1iXhluMpTB" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 24 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "b878db1a-68e4-460d-95f8-83fdb34c11e6" - } - ], - "_useOriginalSize": false, - "_string": "Hello, World!", - "_N$string": "Hello, World!", - "_fontSize": 60, - "_lineHeight": 80, - "_enableWrapText": true, - "_N$file": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_batchAsBitmap": false, - "_N$horizontalAlign": 1, - "_N$verticalAlign": 1, - "_N$fontFamily": "Arial", - "_N$overflow": 0, - "_N$cacheMode": 0, - "_id": "9fH5zrVThO/I9ly3o3xhIT" - }, { "__type__": "cc.Node", "_name": "start_0", @@ -1234,7 +1139,7 @@ "_active": true, "_components": [ { - "__id__": 27 + "__id__": 25 } ], "_prefab": null, @@ -1290,12 +1195,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 26 + "__id__": 24 }, "_enabled": true, "_materials": [ { - "__uuid__": "b878db1a-68e4-460d-95f8-83fdb34c11e6" + "__uuid__": "2c760728-404d-4553-a1d0-7ab18263845c" } ], "_srcBlendFactor": 770, @@ -1328,7 +1233,7 @@ "_active": true, "_components": [ { - "__id__": 29 + "__id__": 27 } ], "_prefab": null, @@ -1384,12 +1289,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 26 }, "_enabled": true, "_materials": [ { - "__uuid__": "b878db1a-68e4-460d-95f8-83fdb34c11e6" + "__uuid__": "2c760728-404d-4553-a1d0-7ab18263845c" } ], "_srcBlendFactor": 770, @@ -1422,7 +1327,7 @@ "_active": true, "_components": [ { - "__id__": 31 + "__id__": 29 } ], "_prefab": null, @@ -1478,12 +1383,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 30 + "__id__": 28 }, "_enabled": true, "_materials": [ { - "__uuid__": "b878db1a-68e4-460d-95f8-83fdb34c11e6" + "__uuid__": "2c760728-404d-4553-a1d0-7ab18263845c" } ], "_srcBlendFactor": 770, @@ -1582,79 +1487,17 @@ "_fitHeight": true, "_id": "4bz2+ak99DBYVlSVIMFGN0" }, - { - "__type__": "cc.Node", - "_name": "GlowInnerEffectScene", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 36 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 0, - "height": 0 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "72kx+DcCxEba4H6yf1snJe" - }, { "__type__": "eebe5Fr5bhMO7IsowoLW/Yp", "_name": "", "_objFlags": 0, "node": { - "__id__": 35 + "__id__": 2 }, "_enabled": true, "examplesParentNode": { "__id__": 21 }, - "_id": "2buo5DYrlF7akjHTPl2qgk" + "_id": "1a7ypfDW1DQqGMHUC5Sf0L" } ] \ No newline at end of file diff --git a/assets/scripts/GlowInnerEffectScene.ts b/assets/scripts/GlowInnerEffectScene.ts index 007410b..a67bff4 100644 --- a/assets/scripts/GlowInnerEffectScene.ts +++ b/assets/scripts/GlowInnerEffectScene.ts @@ -26,7 +26,7 @@ export default class GlowInnerEffectScene extends cc.Component { this.examplesParentNode.children.forEach(childNode => { childNode.getComponents(cc.RenderComponent).forEach(renderComponent => { let material: cc.Material = renderComponent.getMaterial(0); - material.setProperty("outlineSize", size); + material.setProperty("glowColorSize", size); renderComponent.setMaterial(0, material); }); });