From 61811ac9ff5cfb012cdc93cc4174a19b7d952502 Mon Sep 17 00:00:00 2001 From: SmallMain Date: Fri, 29 Jul 2022 23:03:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=B3=201.2.0=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README-DEV.md | 1 - README.md | 13 ++ docs/docs/intro.md | 12 ++ docs/docs/start-guide/new-features.md | 7 + docs/docs/theory-guide/tiledmap-theory.md | 12 ++ docs/docs/update-log.md | 9 + docs/docs/user-guide/tiledmap/_category_.json | 9 + .../tiledmap/assets/tiledmap-inspector.png | Bin 0 -> 24629 bytes .../tiledmap/assets/tiledmap-nodetree.png | Bin 0 -> 8728 bytes .../user-guide/tiledmap/tiledmap-culling.md | 37 +++++ .../user-guide/tiledmap/tiledmap-intro.mdx | 12 ++ docs/docusaurus.config.js | 3 + .../inspectors/comps/label.js | 129 +++++++++++++++ .../inspectors/comps/richtext.js | 73 +++++++++ .../inspectors/comps/sprite.js | 155 ++++++++++++++++++ .../inspectors/comps/tiled-layer.js | 15 ++ extension/v1.2.0/enhance-kit-support/main.js | 3 + .../v1.2.0/enhance-kit-support/package.json | 16 ++ .../enhance-kit-support/resources/sp.meta | 12 ++ .../resources/sp/effects.meta | 12 ++ .../sp/effects/multi-2d-universal.effect | 152 +++++++++++++++++ .../sp/effects/multi-2d-universal.effect.meta | 17 ++ 22 files changed, 698 insertions(+), 1 deletion(-) create mode 100644 docs/docs/theory-guide/tiledmap-theory.md create mode 100644 docs/docs/user-guide/tiledmap/_category_.json create mode 100644 docs/docs/user-guide/tiledmap/assets/tiledmap-inspector.png create mode 100644 docs/docs/user-guide/tiledmap/assets/tiledmap-nodetree.png create mode 100644 docs/docs/user-guide/tiledmap/tiledmap-culling.md create mode 100644 docs/docs/user-guide/tiledmap/tiledmap-intro.mdx create mode 100644 extension/v1.2.0/enhance-kit-support/inspectors/comps/label.js create mode 100644 extension/v1.2.0/enhance-kit-support/inspectors/comps/richtext.js create mode 100644 extension/v1.2.0/enhance-kit-support/inspectors/comps/sprite.js create mode 100644 extension/v1.2.0/enhance-kit-support/inspectors/comps/tiled-layer.js create mode 100644 extension/v1.2.0/enhance-kit-support/main.js create mode 100644 extension/v1.2.0/enhance-kit-support/package.json create mode 100644 extension/v1.2.0/enhance-kit-support/resources/sp.meta create mode 100644 extension/v1.2.0/enhance-kit-support/resources/sp/effects.meta create mode 100644 extension/v1.2.0/enhance-kit-support/resources/sp/effects/multi-2d-universal.effect create mode 100644 extension/v1.2.0/enhance-kit-support/resources/sp/effects/multi-2d-universal.effect.meta diff --git a/README-DEV.md b/README-DEV.md index ca56818d..9beb85fc 100644 --- a/README-DEV.md +++ b/README-DEV.md @@ -55,7 +55,6 @@ ## 版本计划 - 原生平台上支持 Spine 与其它组件合批 -- tiledMap 生成的 Label 好像不能使用 CacheMode，然后考虑对其进行一些优化 - 动态图集支持预乘纹理 - 补充原理文档 - Char 模式因为 bleed 问题只能复用完全相同宽高的区域，试着增加一个选项，能够先用空纹理覆盖，之所以做选项是不知道性能消耗大不大 diff --git a/README.md b/README.md index 1c34b507..1ab7eaad 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ - [功能演示](#功能演示) - [使用方法](#使用方法) - [更新日志](#更新日志) + - [Enhance Kit v1.2.0](#enhance-kit-v120) - [Enhance Kit v1.1.0](#enhance-kit-v110) - [Enhance Kit v1.0.0](#enhance-kit-v100) - [贡献指南](#贡献指南) @@ -70,6 +71,12 @@ ## 更新日志 +### Enhance Kit v1.2.0 + +- **[新特性] cc.TiledLayer 支持复用 Culling 数据** +- [修复] 修复 MotionStreak 初始化报错的问题 +- [修复] 修复勾选延迟加载资源时资源不会加载的问题 + ### Enhance Kit v1.1.0 - **[新特性] 动态合图在符合条件的情况下会忽略 padding 将纹理加入动态图集** @@ -123,3 +130,9 @@ ### 启动 Cocos Creator 报 Error: Can not parse this input:undefined 错误 这是你可能忘记安装配套的引擎扩展，所以没有找到增强包的内置资源导致的报错。 + +### 原生平台或模拟器报错：Assertion failed: (_type == Type::String), function toString, file Value.cpp, line 496. + +这是你没有替换引擎的 `jsb-adapter` 部分，或者说没有重启以生效。 + +注意：原生平台构建时可能需要先删除原有的 build 文件，替换操作才会生效。 diff --git a/docs/docs/intro.md b/docs/docs/intro.md index 225bca5a..05ee94c8 100644 --- a/docs/docs/intro.md +++ b/docs/docs/intro.md @@ -59,6 +59,12 @@ hide_title: true ## 更新日志 +### Enhance Kit v1.2.0 + +- **[新特性] cc.TiledLayer 支持复用 Culling 数据** +- [修复] 修复 MotionStreak 初始化报错的问题 +- [修复] 修复勾选延迟加载资源时资源不会加载的问题 + ### Enhance Kit v1.1.0 - **[新特性] 动态合图在符合条件的情况下会忽略 padding 将纹理加入动态图集** @@ -112,3 +118,9 @@ hide_title: true ### 启动 Cocos Creator 报 Error: Can not parse this input:undefined 错误 这是你可能忘记安装配套的引擎扩展，所以没有找到增强包的内置资源导致的报错。 + +### 原生平台或模拟器报错：Assertion failed: (_type == Type::String), function toString, file Value.cpp, line 496. + +这是你没有替换引擎的 `jsb-adapter` 部分，或者说没有重启以生效。 + +注意：原生平台构建时可能需要先删除原有的 build 文件，替换操作才会生效。 diff --git a/docs/docs/start-guide/new-features.md b/docs/docs/start-guide/new-features.md index 054bcd73..94f072bf 100644 --- a/docs/docs/start-guide/new-features.md +++ b/docs/docs/start-guide/new-features.md @@ -57,3 +57,10 @@ skeletonComponent.setRegionData('Head', 'Head', new sp.RegionData(spriteFrame)); 虽然加上去也简单，但这可能是很少用得到的功能，主要还是我们看到几乎所有渲染组件都可以自定义材质，这个组件却不可以。 可前往 [RichText 自定义材质](../user-guide/text-render/text-richtext.md) 文档了解更多详情。 + +--- +## 复用 TiledMap 的 Culling 数据 + +一个 TiledMap 可能会有很多 TiledLayer，如果开启了 Culling，那这些 Layer 都需要单独计算 Culling 数据，增强包新增了在满足一定条件的情况下可以复用 Culling 数据的特性，以减少 CPU 的性能消耗。 + +可前往 [复用 Culling 数据](../user-guide/tiledmap/tiledmap-culling.md) 文档了解更多详情。 diff --git a/docs/docs/theory-guide/tiledmap-theory.md b/docs/docs/theory-guide/tiledmap-theory.md new file mode 100644 index 00000000..29ec69bb --- /dev/null +++ b/docs/docs/theory-guide/tiledmap-theory.md @@ -0,0 +1,12 @@ +--- +sidebar_position: 5 +description: "详细了解增强 TiledMap 的实现方式。" +--- + +# 增强 TiledMap + +:::caution TODO + +施工中... + +::: diff --git a/docs/docs/update-log.md b/docs/docs/update-log.md index 7203c088..34dc7088 100644 --- a/docs/docs/update-log.md +++ b/docs/docs/update-log.md @@ -4,6 +4,15 @@ sidebar_position: 7 # 更新日志 +--- +## Enhance Kit v1.2.0 + +适配 Cocos Creator v2.4.9 版本，[点此下载压缩包](https://github.com/smallmain/cocos-enhance-kit/releases/tag/v1.2.0) + +- **[新特性] cc.TiledLayer 支持复用 Culling 数据** +- [修复] 修复 MotionStreak 初始化报错的问题 +- [修复] 修复勾选延迟加载资源时资源不会加载的问题 + --- ## Enhance Kit v1.1.0 diff --git a/docs/docs/user-guide/tiledmap/_category_.json b/docs/docs/user-guide/tiledmap/_category_.json new file mode 100644 index 00000000..59e24f39 --- /dev/null +++ b/docs/docs/user-guide/tiledmap/_category_.json @@ -0,0 +1,9 @@ +{ + "label": "TiledMap", + "position": 5, + "collapsed": true, + "link": { + "type": "doc", + "id": "tiledmap-intro" + } +} diff --git a/docs/docs/user-guide/tiledmap/assets/tiledmap-inspector.png b/docs/docs/user-guide/tiledmap/assets/tiledmap-inspector.png new file mode 100644 index 0000000000000000000000000000000000000000..8a521293de7f21e196d7f8bbd3112e8d33c63385 GIT binary patch literal 24629 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 literal 0 HcmV?d00001 diff --git a/docs/docs/user-guide/tiledmap/assets/tiledmap-nodetree.png b/docs/docs/user-guide/tiledmap/assets/tiledmap-nodetree.png new file mode 100644 index 0000000000000000000000000000000000000000..d2fb68eb8ac4aff601daa54bb5e2ac0979f1a975 GIT binary patch literal 8728 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 literal 0 HcmV?d00001 diff --git a/docs/docs/user-guide/tiledmap/tiledmap-culling.md b/docs/docs/user-guide/tiledmap/tiledmap-culling.md new file mode 100644 index 00000000..89ba397d --- /dev/null +++ b/docs/docs/user-guide/tiledmap/tiledmap-culling.md @@ -0,0 +1,37 @@ +--- +sidebar_position: 2 +description: "像其它渲染组件一样在 Spine 组件上使用动态合图。" +--- + +# 复用 Culling 数据 + +一个 TiledMap 可能会有很多 TiledLayer，如果开启了 Culling，那这些 Layer 都需要单独计算 Culling 数据，增强包新增了在满足一定条件的情况下可以复用 Culling 数据的特性，以减少 CPU 的性能消耗。 + +## 大致原理 + +通过为 TiledLayer 指定另一个 TiledLayer，来复用指定的 TiledLayer 的 Culling 数据。 + +## 前提条件 + +- 两者的世界矩阵（也是大小、位置、缩放等属性）一致 +- 两者所用的 Camera 一致 +- 两者的 TiledLayer 类型、属性一致 +- 确保被复用的 Layer 会更早进行渲染（否则 Culling 数据同步可能会延迟一帧） + +:::tip 注意 + +复用可以是不同 TiledMap 的 TiledLayer，但一定要满足上面几个条件，否则 Culling 结果可能不正确。 + +::: + +## 使用方式 + +假设项目中有 TiledMap 由 5 个 TiledLayer 组合成一张地图。 + +![](./assets/tiledmap-nodetree.png) + +这种情况如果需要复用 Culling 数据只需要多选后四个节点，然后将第一个节点拖入这四个节点的 `Culling Layer` 属性中即可。 + +![](./assets/tiledmap-inspector.png) + +这样就使后四个 Layer 复用第一个 Layer 的 Culling 数据了。 diff --git a/docs/docs/user-guide/tiledmap/tiledmap-intro.mdx b/docs/docs/user-guide/tiledmap/tiledmap-intro.mdx new file mode 100644 index 00000000..65511fce --- /dev/null +++ b/docs/docs/user-guide/tiledmap/tiledmap-intro.mdx @@ -0,0 +1,12 @@ +import DocCardList from '@theme/DocCardList'; +import {useCurrentSidebarCategory} from '@docusaurus/theme-common'; + +# TiledMap + +增强包对 TiledMap 进行了优化： + +- 复用 TiledLayer 的 Culling 数据 + +你可以阅读下面的文档了解详情： + + diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js index 0b557422..fa162d02 100644 --- a/docs/docusaurus.config.js +++ b/docs/docusaurus.config.js @@ -37,6 +37,9 @@ const config = { sidebarPath: require.resolve('./sidebars.js'), includeCurrentVersion: true, versions: { + "1.2.0": { + label: "v1.2.0", + }, "1.1.0": { label: "v1.1.0", }, diff --git a/extension/v1.2.0/enhance-kit-support/inspectors/comps/label.js b/extension/v1.2.0/enhance-kit-support/inspectors/comps/label.js new file mode 100644 index 00000000..15e476dc --- /dev/null +++ b/extension/v1.2.0/enhance-kit-support/inspectors/comps/label.js @@ -0,0 +1,129 @@ +"use strict"; +Vue.component("cc-label", { + dependencies: ["packages://inspector/share/blend.js"], + template: ` + + + + + + + :multi-values="multi" + + + + + + + + + + + + + + + + + + + + + + + `, + props: { + target: { + twoWay: !0, + type: Object + }, + multi: { + type: Boolean + } + }, + methods: { + T: Editor.T, + _isBMFont() { + return this.target._bmFontOriginalSize.value > 0 + }, + _isSystemFont() { + return this.target.useSystemFont.value + }, + _hiddenWrapText() { + let t = this.target.overflow.value; + return 0 === t || 3 === t + }, + _hiddenActualFontSize() { + return 2 !== this.target.overflow.value + }, + _isCharCacheMode() { + return 2 === this.target.cacheMode.value + }, + } +}); diff --git a/extension/v1.2.0/enhance-kit-support/inspectors/comps/richtext.js b/extension/v1.2.0/enhance-kit-support/inspectors/comps/richtext.js new file mode 100644 index 00000000..568e2679 --- /dev/null +++ b/extension/v1.2.0/enhance-kit-support/inspectors/comps/richtext.js @@ -0,0 +1,73 @@ +"use strict"; +Vue.component("cc-richtext", { + template: ` + + + + :multi-values="multi" + + + + + + + + + + + + + + + `, + props: { + target: { + twoWay: !0, + type: Object + }, + multi: { + type: Boolean + } + }, + methods: { + T: Editor.T, + _isSystemFont() { + return this.target.useSystemFont.value + }, + _isCharCacheMode() { + return 2 === this.target.cacheMode.value + }, + } +}); diff --git a/extension/v1.2.0/enhance-kit-support/inspectors/comps/sprite.js b/extension/v1.2.0/enhance-kit-support/inspectors/comps/sprite.js new file mode 100644 index 00000000..30b36cf1 --- /dev/null +++ b/extension/v1.2.0/enhance-kit-support/inspectors/comps/sprite.js @@ -0,0 +1,155 @@ +"use strict"; +Vue.component("cc-sprite", { + dependencies: ["packages://inspector/share/blend.js"], + template: ` + + + + {{T('COMPONENT.sprite.select_button')}} + + + + + + + {{T('COMPONENT.sprite.edit_button')}} + + + + + +
+ + + + +
+ + + + + + + + + + `, + props: { + target: { + twoWay: !0, + type: Object + }, + multi: { + twoWay: !0, + type: Boolean + } + }, + data: ()=>({ + atlasUuid: "", + atlasUuids: "", + atlasMulti: !1, + spriteUuid: "", + spriteUuids: "", + spriteMulti: !1 + }), + created() { + this.target && (this._updateAtlas(), + this._updateSprite()) + }, + watch: { + target() { + this._updateAtlas(), + this._updateSprite() + } + }, + methods: { + T: Editor.T, + selectAtlas() { + Editor.Ipc.sendToPanel("assets", "change-filter", "t:sprite-atlas") + }, + editSprite() { + Editor.Panel.open("sprite-editor", { + uuid: this.target.spriteFrame.value.uuid + }) + }, + allowTrim() { + return this.target.type.value === cc.Sprite.Type.SIMPLE + }, + isFilledType() { + return this.target.type.value === cc.Sprite.Type.FILLED + }, + isRadialFilled() { + return this.target.fillType.value === cc.Sprite.FillType.RADIAL + }, + _updateAtlas() { + if (!this.target) + return this.atlasUuid = "", + this.atlasUuids = "", + this.atlasMulti = !1, + void 0; + this.atlasUuid = this.target._atlas.value.uuid, + this.atlasUuids = this.target._atlas.values.map(t=>t.uuid); + var t = this.atlasUuids[0]; + this.atlasMulti = !this.atlasUuids.every((i,e)=>0 === e || i === t) + }, + _updateSprite() { + if (!this.target) + return this.spriteUuid = "", + this.spriteUuids = "", + this.spriteMulti = !1, + void 0; + this.spriteUuid = this.target.spriteFrame.value.uuid, + this.spriteUuids = this.target.spriteFrame.values.map(t=>t.uuid); + var t = this.spriteUuids[0]; + this.spriteMulti = !this.spriteUuids.every((i,e)=>0 === e || i === t) + } + } +}); diff --git a/extension/v1.2.0/enhance-kit-support/inspectors/comps/tiled-layer.js b/extension/v1.2.0/enhance-kit-support/inspectors/comps/tiled-layer.js new file mode 100644 index 00000000..99993394 --- /dev/null +++ b/extension/v1.2.0/enhance-kit-support/inspectors/comps/tiled-layer.js @@ -0,0 +1,15 @@ +"use strict"; +Vue.component("cc-tiled-layer", { + dependencies: ["packages://inspector/share/blend.js"], + template: '\n \n\n ', + props: { + target: { + twoWay: !0, + type: Object + }, + multi: { + twoWay: !0, + type: Boolean + } + } +}); diff --git a/extension/v1.2.0/enhance-kit-support/main.js b/extension/v1.2.0/enhance-kit-support/main.js new file mode 100644 index 00000000..8b46fbba --- /dev/null +++ b/extension/v1.2.0/enhance-kit-support/main.js @@ -0,0 +1,3 @@ +'use strict'; + +module.exports = {}; diff --git a/extension/v1.2.0/enhance-kit-support/package.json b/extension/v1.2.0/enhance-kit-support/package.json new file mode 100644 index 00000000..9795ef8f --- /dev/null +++ b/extension/v1.2.0/enhance-kit-support/package.json @@ -0,0 +1,16 @@ +{ + "name": "enhance-kit", + "version": "1.2.0", + "description": "This extension provides support for cocos enhance kit.", + "author": "SmallMain", + "main": "main.js", + "runtime-resource": { + "path": "resources", + "name": "resources" + }, + "reload": { + "ignore": [ + "resources/**/*" + ] + } +} diff --git a/extension/v1.2.0/enhance-kit-support/resources/sp.meta b/extension/v1.2.0/enhance-kit-support/resources/sp.meta new file mode 100644 index 00000000..cdcd6b2b --- /dev/null +++ b/extension/v1.2.0/enhance-kit-support/resources/sp.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.1.2", + "uuid": "74663d94-6782-4dee-9db9-26127ee8b265", + "isBundle": true, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/extension/v1.2.0/enhance-kit-support/resources/sp/effects.meta b/extension/v1.2.0/enhance-kit-support/resources/sp/effects.meta new file mode 100644 index 00000000..81bd1d8b --- /dev/null +++ b/extension/v1.2.0/enhance-kit-support/resources/sp/effects.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.1.2", + "uuid": "8ee63b7e-0ac8-4cb5-95f0-85278bfd748a", + "isBundle": false, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/extension/v1.2.0/enhance-kit-support/resources/sp/effects/multi-2d-universal.effect b/extension/v1.2.0/enhance-kit-support/resources/sp/effects/multi-2d-universal.effect new file mode 100644 index 00000000..8354ecb8 --- /dev/null +++ b/extension/v1.2.0/enhance-kit-support/resources/sp/effects/multi-2d-universal.effect @@ -0,0 +1,152 @@ +// Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + +CCEffect %{ + techniques: + - passes: + - vert: vs + frag: fs + blendState: + targets: + - blend: true + rasterizerState: + cullMode: none + properties: + texture: { value: white } + texture2: { value: white } + texture3: { value: white } + texture4: { value: white } + texture5: { value: white } + texture6: { value: white } + texture7: { value: white } + texture8: { value: white } + alphaThreshold: { value: 0.5 } +}% + + +CCProgram vs %{ + precision highp float; + + #include + #include + + in vec3 a_position; + in vec4 a_color; + out vec4 v_color; + + #if USE_TINT + in vec4 a_color0; + out vec4 v_color0; + #endif + + #if USE_TEXTURE + in vec2 a_uv0; + out vec2 v_uv0; + + #if USE_MULTI_TEXTURE + in float a_texId; + out float v_texId; + #endif + + #endif + + void main () { + vec4 pos = vec4(a_position, 1); + + #if CC_USE_MODEL + pos = cc_matViewProj * cc_matWorld * pos; + #else + pos = cc_matViewProj * pos; + #endif + + #if USE_TEXTURE + v_uv0 = a_uv0; + + #if USE_MULTI_TEXTURE + v_texId = a_texId; + #endif + + #endif + + v_color = a_color; + #if USE_TINT + v_color0 = a_color0; + #endif + + gl_Position = pos; + } +}% + + +CCProgram fs %{ + precision highp float; + + #include + #include + + in vec4 v_color; + + #if USE_TINT + in vec4 v_color0; + #endif + + #if USE_TEXTURE + in vec2 v_uv0; + uniform sampler2D texture; + + #if USE_MULTI_TEXTURE + in float v_texId; + uniform sampler2D texture2; + uniform sampler2D texture3; + uniform sampler2D texture4; + uniform sampler2D texture5; + uniform sampler2D texture6; + uniform sampler2D texture7; + uniform sampler2D texture8; + #endif + + #endif + + void main () { + vec4 o = vec4(1, 1, 1, 1); + + #if USE_TEXTURE + #if USE_MULTI_TEXTURE + if(v_texId < 1.0){ + CCTexture(texture, v_uv0, o); + } else if(v_texId < 2.0){ + CCTexture(texture2, v_uv0, o); + } else if(v_texId < 3.0){ + CCTexture(texture3, v_uv0, o); + } else if(v_texId < 4.0){ + CCTexture(texture4, v_uv0, o); + } else if(v_texId < 5.0){ + CCTexture(texture5, v_uv0, o); + } else if(v_texId < 6.0){ + CCTexture(texture6, v_uv0, o); + } else if(v_texId < 7.0){ + CCTexture(texture7, v_uv0, o); + } else { + CCTexture(texture8, v_uv0, o); + } + #else + CCTexture(texture, v_uv0, o); + #endif + #endif + + #if USE_TINT + vec4 finalColor; + finalColor.a = v_color.a * o.a; + finalColor.rgb = ((o.a - 1.0) * v_color0.a + 1.0 - o.rgb) * v_color0.rgb + o.rgb * v_color.rgb; + + ALPHA_TEST(finalColor); + + gl_FragColor = finalColor; + #else + o *= v_color; + + ALPHA_TEST(o); + + gl_FragColor = o; + #endif + } +}% diff --git a/extension/v1.2.0/enhance-kit-support/resources/sp/effects/multi-2d-universal.effect.meta b/extension/v1.2.0/enhance-kit-support/resources/sp/effects/multi-2d-universal.effect.meta new file mode 100644 index 00000000..300f4f02 --- /dev/null +++ b/extension/v1.2.0/enhance-kit-support/resources/sp/effects/multi-2d-universal.effect.meta @@ -0,0 +1,17 @@ +{ + "ver": "1.0.25", + "uuid": "5dcffc18-b913-460e-a0d9-5d74f4cda12b", + "compiledShaders": [ + { + "glsl1": { + "vert": "\nprecision highp float;\nuniform mat4 cc_matViewProj;\nuniform mat4 cc_matWorld;\nattribute vec3 a_position;\nattribute vec4 a_color;\nvarying vec4 v_color;\n#if USE_TEXTURE\nattribute vec2 a_uv0;\nvarying vec2 v_uv0;\nattribute float a_texId;\nvarying float v_texId;\n#endif\nvoid main () {\n vec4 pos = vec4(a_position, 1);\n #if CC_USE_MODEL\n pos = cc_matViewProj * cc_matWorld * pos;\n #else\n pos = cc_matViewProj * pos;\n #endif\n #if USE_TEXTURE\n v_uv0 = a_uv0;\n v_texId = a_texId;\n #endif\n v_color = a_color;\n gl_Position = pos;\n}", + "frag": "\nprecision highp float;\n#if USE_ALPHA_TEST\n uniform float alphaThreshold;\n#endif\nvoid ALPHA_TEST (in vec4 color) {\n #if USE_ALPHA_TEST\n if (color.a < alphaThreshold) discard;\n #endif\n}\nvoid ALPHA_TEST (in float alpha) {\n #if USE_ALPHA_TEST\n if (alpha < alphaThreshold) discard;\n #endif\n}\nvarying vec4 v_color;\n#if USE_TEXTURE\nvarying vec2 v_uv0;\nvarying float v_texId;\nuniform sampler2D texture;\nuniform sampler2D texture2;\nuniform sampler2D texture3;\nuniform sampler2D texture4;\nuniform sampler2D texture5;\nuniform sampler2D texture6;\nuniform sampler2D texture7;\nuniform sampler2D texture8;\n#endif\nvoid main () {\n vec4 o = vec4(1, 1, 1, 1);\n #if USE_TEXTURE\n if(v_texId < 1.0){\n vec4 texture_tmp = texture2D(texture, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture\n texture_tmp.a *= texture2D(texture, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture_tmp.rgb * texture_tmp.rgb);\n o.a *= texture_tmp.a;\n #else\n o *= texture_tmp;\n #endif\n } else if(v_texId < 2.0){\n vec4 texture2_tmp = texture2D(texture2, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture2\n texture2_tmp.a *= texture2D(texture2, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture2_tmp.rgb * texture2_tmp.rgb);\n o.a *= texture2_tmp.a;\n #else\n o *= texture2_tmp;\n #endif\n } else if(v_texId < 3.0){\n vec4 texture3_tmp = texture2D(texture3, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture3\n texture3_tmp.a *= texture2D(texture3, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture3_tmp.rgb * texture3_tmp.rgb);\n o.a *= texture3_tmp.a;\n #else\n o *= texture3_tmp;\n #endif\n } else if(v_texId < 4.0){\n vec4 texture4_tmp = texture2D(texture4, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture4\n texture4_tmp.a *= texture2D(texture4, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture4_tmp.rgb * texture4_tmp.rgb);\n o.a *= texture4_tmp.a;\n #else\n o *= texture4_tmp;\n #endif\n } else if(v_texId < 5.0){\n vec4 texture5_tmp = texture2D(texture5, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture5\n texture5_tmp.a *= texture2D(texture5, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture5_tmp.rgb * texture5_tmp.rgb);\n o.a *= texture5_tmp.a;\n #else\n o *= texture5_tmp;\n #endif\n } else if(v_texId < 6.0){\n vec4 texture6_tmp = texture2D(texture6, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture6\n texture6_tmp.a *= texture2D(texture6, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture6_tmp.rgb * texture6_tmp.rgb);\n o.a *= texture6_tmp.a;\n #else\n o *= texture6_tmp;\n #endif\n } else if(v_texId < 7.0){\n vec4 texture7_tmp = texture2D(texture7, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture7\n texture7_tmp.a *= texture2D(texture7, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture7_tmp.rgb * texture7_tmp.rgb);\n o.a *= texture7_tmp.a;\n #else\n o *= texture7_tmp;\n #endif\n } else {\n vec4 texture8_tmp = texture2D(texture8, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture8\n texture8_tmp.a *= texture2D(texture8, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture8_tmp.rgb * texture8_tmp.rgb);\n o.a *= texture8_tmp.a;\n #else\n o *= texture8_tmp;\n #endif\n }\n #endif\n o *= v_color;\n ALPHA_TEST(o);\n gl_FragColor = o;\n}" + }, + "glsl3": { + "vert": "\nprecision highp float;\nuniform CCGlobal {\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 vec4 cc_time;\n mediump vec4 cc_screenSize;\n mediump vec4 cc_screenScale;\n};\nuniform CCLocal {\n mat4 cc_matWorld;\n mat4 cc_matWorldIT;\n};\nin vec3 a_position;\nin vec4 a_color;\nout vec4 v_color;\n#if USE_TEXTURE\nin vec2 a_uv0;\nout vec2 v_uv0;\nin float a_texId;\nout float v_texId;\n#endif\nvoid main () {\n vec4 pos = vec4(a_position, 1);\n #if CC_USE_MODEL\n pos = cc_matViewProj * cc_matWorld * pos;\n #else\n pos = cc_matViewProj * pos;\n #endif\n #if USE_TEXTURE\n v_uv0 = a_uv0;\n v_texId = a_texId;\n #endif\n v_color = a_color;\n gl_Position = pos;\n}", + "frag": "\nprecision highp float;\n#if USE_ALPHA_TEST\n uniform ALPHA_TEST {\n float alphaThreshold;\n };\n#endif\nvoid ALPHA_TEST (in vec4 color) {\n #if USE_ALPHA_TEST\n if (color.a < alphaThreshold) discard;\n #endif\n}\nvoid ALPHA_TEST (in float alpha) {\n #if USE_ALPHA_TEST\n if (alpha < alphaThreshold) discard;\n #endif\n}\nin vec4 v_color;\n#if USE_TEXTURE\nin vec2 v_uv0;\nin float v_texId;\nuniform sampler2D texture;\nuniform sampler2D texture2;\nuniform sampler2D texture3;\nuniform sampler2D texture4;\nuniform sampler2D texture5;\nuniform sampler2D texture6;\nuniform sampler2D texture7;\nuniform sampler2D texture8;\n#endif\nvoid main () {\n vec4 o = vec4(1, 1, 1, 1);\n #if USE_TEXTURE\n if(v_texId < 1.0){\n vec4 texture_tmp = texture(texture, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture\n texture_tmp.a *= texture(texture, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture_tmp.rgb * texture_tmp.rgb);\n o.a *= texture_tmp.a;\n #else\n o *= texture_tmp;\n #endif\n } else if(v_texId < 2.0){\n vec4 texture2_tmp = texture(texture2, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture2\n texture2_tmp.a *= texture(texture2, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture2_tmp.rgb * texture2_tmp.rgb);\n o.a *= texture2_tmp.a;\n #else\n o *= texture2_tmp;\n #endif\n } else if(v_texId < 3.0){\n vec4 texture3_tmp = texture(texture3, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture3\n texture3_tmp.a *= texture(texture3, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture3_tmp.rgb * texture3_tmp.rgb);\n o.a *= texture3_tmp.a;\n #else\n o *= texture3_tmp;\n #endif\n } else if(v_texId < 4.0){\n vec4 texture4_tmp = texture(texture4, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture4\n texture4_tmp.a *= texture(texture4, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture4_tmp.rgb * texture4_tmp.rgb);\n o.a *= texture4_tmp.a;\n #else\n o *= texture4_tmp;\n #endif\n } else if(v_texId < 5.0){\n vec4 texture5_tmp = texture(texture5, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture5\n texture5_tmp.a *= texture(texture5, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture5_tmp.rgb * texture5_tmp.rgb);\n o.a *= texture5_tmp.a;\n #else\n o *= texture5_tmp;\n #endif\n } else if(v_texId < 6.0){\n vec4 texture6_tmp = texture(texture6, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture6\n texture6_tmp.a *= texture(texture6, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture6_tmp.rgb * texture6_tmp.rgb);\n o.a *= texture6_tmp.a;\n #else\n o *= texture6_tmp;\n #endif\n } else if(v_texId < 7.0){\n vec4 texture7_tmp = texture(texture7, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture7\n texture7_tmp.a *= texture(texture7, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture7_tmp.rgb * texture7_tmp.rgb);\n o.a *= texture7_tmp.a;\n #else\n o *= texture7_tmp;\n #endif\n } else {\n vec4 texture8_tmp = texture(texture8, v_uv0);\n #if CC_USE_ALPHA_ATLAS_texture8\n texture8_tmp.a *= texture(texture8, v_uv0 + vec2(0, 0.5)).r;\n #endif\n #if INPUT_IS_GAMMA\n o.rgb *= (texture8_tmp.rgb * texture8_tmp.rgb);\n o.a *= texture8_tmp.a;\n #else\n o *= texture8_tmp;\n #endif\n }\n #endif\n o *= v_color;\n ALPHA_TEST(o);\n gl_FragColor = o;\n}" + } + } + ], + "subMetas": {} +} \ No newline at end of file