From 325a942214fa9a52439aa57840b0d6a39a70a364 Mon Sep 17 00:00:00 2001 From: Santy-Wang Date: Mon, 16 Aug 2021 23:56:28 +0800 Subject: [PATCH 1/9] fix parsing asset's dependencies failed (#9193) * fix parsing asset's dependencies failed * refine --- cocos/core/asset-manager/depend-util.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cocos/core/asset-manager/depend-util.ts b/cocos/core/asset-manager/depend-util.ts index 7017e49d79..f152c25609 100644 --- a/cocos/core/asset-manager/depend-util.ts +++ b/cocos/core/asset-manager/depend-util.ts @@ -35,6 +35,7 @@ import { decodeUuid } from './helper'; import { files, parsed } from './shared'; import { dependMap, nativeDependMap } from './depend-maps'; import { assertIsNonNullable } from '../data/utils/asserts'; +import { CCON } from '../data/ccon'; export interface IDependencies { nativeDep?: Record; @@ -146,7 +147,7 @@ export class DependUtil { */ public parse (uuid: string, json: any): IDependencies { let out: IDependencies | null = null; - if (Array.isArray(json) || json.__type__) { + if (Array.isArray(json) || json.__type__ || json instanceof CCON) { if (this._depends.has(uuid)) { return this._depends.get(uuid)!; } From eaf15b9d556c08756ebb4030ebf575020c3b1eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=A3=AE=E6=96=8C?= Date: Tue, 17 Aug 2021 17:50:13 +0800 Subject: [PATCH 2/9] fix javascript initial data changed without modified (#9196) --- editor/inspector/assets/javascript.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/editor/inspector/assets/javascript.js b/editor/inspector/assets/javascript.js index bbc481de16..d94d7c5d0f 100644 --- a/editor/inspector/assets/javascript.js +++ b/editor/inspector/assets/javascript.js @@ -164,6 +164,10 @@ const Elements = { length = 10; } + if (!Array.isArray(this.meta.userData.dependencies)) { + this.meta.userData.dependencies = []; + } + while (this.meta.userData.dependencies.length < length) { this.meta.userData.dependencies.push(''); } @@ -172,6 +176,10 @@ const Elements = { this.meta.userData.dependencies.pop(); } + if (!this.meta.userData.dependencies.length) { + this.meta.userData.dependencies = undefined; + } + this.dispatch('change'); Elements.dependencies.update.call(this); @@ -188,14 +196,14 @@ const Elements = { return; } + this.$.dependenciesContent.innerText = ''; + if (!Array.isArray(this.meta.userData.dependencies)) { - this.meta.userData.dependencies = []; + return; } const length = this.meta.userData.dependencies.length; - this.$.dependenciesInput.value = length; - this.$.dependenciesContent.innerText = ''; for (let i = 0; i < length; i++) { const child = document.createElement('ui-asset'); From c34205c9b3cd96579aa6c7bb2e3d54c2527aa73c Mon Sep 17 00:00:00 2001 From: ChiaNing Date: Tue, 17 Aug 2021 18:38:19 +0800 Subject: [PATCH 3/9] fix batch passes bug when not reset (#9197) --- cocos/core/pipeline/forward/ui-phase.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cocos/core/pipeline/forward/ui-phase.ts b/cocos/core/pipeline/forward/ui-phase.ts index 4aa22ceb90..156aad77bb 100644 --- a/cocos/core/pipeline/forward/ui-phase.ts +++ b/cocos/core/pipeline/forward/ui-phase.ts @@ -53,7 +53,8 @@ export class UIPhase { } if (!visible) continue; - const count = batch.passes.length; + // shaders.length always equals actual used passes.length + const count = batch.shaders.length; for (let j = 0; j < count; j++) { const pass = batch.passes[j]; if (pass.phase !== this._phaseID) continue; From 1b75b06b31ea26b4729f871659fedf89e9a049a9 Mon Sep 17 00:00:00 2001 From: Santy-Wang Date: Tue, 17 Aug 2021 19:10:04 +0800 Subject: [PATCH 4/9] fix loadRes failed (#9200) --- cocos/core/asset-manager/url-transformer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/core/asset-manager/url-transformer.ts b/cocos/core/asset-manager/url-transformer.ts index ec4e3fb61d..9972e7af94 100644 --- a/cocos/core/asset-manager/url-transformer.ts +++ b/cocos/core/asset-manager/url-transformer.ts @@ -113,7 +113,7 @@ export function parse (task: Task) { out.uuid = info.uuid; out.info = info; } - out.ext = item.ext || '.json'; + out.ext = item.ext || info?.extension || '.json'; break; case RequestType.SCENE: if (!item.bundle) { From e3d5ccb110784f1fa6f6bcef05707fec6c85793e Mon Sep 17 00:00:00 2001 From: Santy-Wang Date: Thu, 19 Aug 2021 14:31:49 +0800 Subject: [PATCH 5/9] 3.3 fix loading (#9210) * fix loading dir failed * refine --- cocos/core/asset-manager/helper.ts | 2 +- cocos/core/asset-manager/url-transformer.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/core/asset-manager/helper.ts b/cocos/core/asset-manager/helper.ts index ff109f3587..7c81067665 100644 --- a/cocos/core/asset-manager/helper.ts +++ b/cocos/core/asset-manager/helper.ts @@ -106,7 +106,7 @@ export function getUrlWithUuid (uuid: string, options?: IOptions | null): string * */ export function isScene (asset) { - return asset && (asset instanceof legacyCC.SceneAsset || asset instanceof legacyCC.Scene); + return !!asset && (asset instanceof legacyCC.SceneAsset || asset instanceof legacyCC.Scene); } /** diff --git a/cocos/core/asset-manager/url-transformer.ts b/cocos/core/asset-manager/url-transformer.ts index 9972e7af94..4a8d5a63ff 100644 --- a/cocos/core/asset-manager/url-transformer.ts +++ b/cocos/core/asset-manager/url-transformer.ts @@ -87,7 +87,7 @@ export function parse (task: Task) { if (bundles.has(item.bundle)) { bundles.get(item.bundle)!.config.getDirWithPath(item.dir, item.type, infos); for (const assetInfo of infos) { - input.push({ uuid: assetInfo.uuid, __isNative__: false, ext: '.json', bundle: item.bundle }); + input.push({ uuid: assetInfo.uuid, __isNative__: false, ext: assetInfo.extension || '.json', bundle: item.bundle }); } infos.length = 0; } From d120ba3ace4d547f872b236092624e03964b4dff Mon Sep 17 00:00:00 2001 From: zhakesi Date: Thu, 19 Aug 2021 15:17:33 +0800 Subject: [PATCH 6/9] fix:root node scene has no rts info. (#9167) * fix:root node scene has no rts info. * add lpos lrot lscale attributes for scene --- cocos/core/scene-graph/scene.ts | 6 ++++++ tests/core/node.test.ts | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 tests/core/node.test.ts diff --git a/cocos/core/scene-graph/scene.ts b/cocos/core/scene-graph/scene.ts index 123ebecade..07fff51bf7 100644 --- a/cocos/core/scene-graph/scene.ts +++ b/cocos/core/scene-graph/scene.ts @@ -100,6 +100,12 @@ export class Scene extends BaseNode { protected declare _nativeObj: NativeScene | null; + protected _lpos = Vec3.ZERO; + + protected _lrot = Quat.IDENTITY; + + protected _lscale = Vec3.ONE; + protected _updateScene () { this._scene = this; } diff --git a/tests/core/node.test.ts b/tests/core/node.test.ts new file mode 100644 index 0000000000..67b5c2811d --- /dev/null +++ b/tests/core/node.test.ts @@ -0,0 +1,17 @@ +import { Node, Scene} from "../../cocos/core/scene-graph" +import {Vec3} from "../../cocos/core/math" + +describe(`Node`, () => { + test('@inverseTransformPoint', () => { + let scene = new Scene('temp'); + let parentNode = new Node(); + let subNode = new Node(); + parentNode.setPosition(20, -30, 100); + subNode.setPosition(55, 35, 22); + parentNode.parent = scene; + subNode.parent = parentNode; + let p = new Vec3(100, 200, 0); + subNode.inverseTransformPoint(p, p); + expect(p).toStrictEqual(new Vec3(25, 195, -122)); + }); +}); From d1a462d9c4a1992e4d6030f1bef9fbc82820756d Mon Sep 17 00:00:00 2001 From: Santy-Wang Date: Thu, 19 Aug 2021 16:14:22 +0800 Subject: [PATCH 7/9] fix engine version (#9214) --- cocos/core/global-exports.ts | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/core/global-exports.ts b/cocos/core/global-exports.ts index 3a599b918f..30a560cc17 100644 --- a/cocos/core/global-exports.ts +++ b/cocos/core/global-exports.ts @@ -173,7 +173,7 @@ if (DEV) { legacyCC._Test = {}; } -const engineVersion = '3.4.0'; +const engineVersion = '3.3.1'; /** * The current version of Cocos2d being used.
diff --git a/package.json b/package.json index 98a8ebe3ae..2307d728db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cocos-creator", - "version": "3.4.0", + "version": "3.3.1", "description": "Cocos Creator is a cross-platform 2D & 3D game engine written in TypeScript, licensed under MIT.", "homepage": "http://www.cocos.com", "license": "MIT", From a5cb20a9957a5e856f08dcae60d3944bb22928b9 Mon Sep 17 00:00:00 2001 From: ChiaNing Date: Fri, 20 Aug 2021 11:07:44 +0800 Subject: [PATCH 8/9] Remove pass cache check (#9216) * hack DS bind bug * remove pass cache check --- cocos/2d/renderer/draw-batch.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cocos/2d/renderer/draw-batch.ts b/cocos/2d/renderer/draw-batch.ts index cc5095d722..13532b2e40 100644 --- a/cocos/2d/renderer/draw-batch.ts +++ b/cocos/2d/renderer/draw-batch.ts @@ -150,9 +150,7 @@ export class DrawBatch2D { mtlPass.update(); - if (mtlPass.hash === passInUse.hash) { - continue; - } + // Hack: Cause pass.hash can not check all pass value if (!dss) { dss = mtlPass.depthStencilState; dssHash = 0; } if (!bs) { bs = mtlPass.blendState; bsHash = 0; } From f09a8e444973dc63059622d31dc97dfb28e542ca Mon Sep 17 00:00:00 2001 From: Yun Hsiao Wu Date: Fri, 20 Aug 2021 11:26:47 +0800 Subject: [PATCH 9/9] fix webgl uniform array upload (#9202) --- cocos/core/gfx/webgl/webgl-commands.ts | 84 +++++++++-------------- cocos/core/gfx/webgl/webgl-gpu-objects.ts | 1 - editor/assets/default_ui/atom.plist.meta | 18 ++--- 3 files changed, 37 insertions(+), 66 deletions(-) diff --git a/cocos/core/gfx/webgl/webgl-commands.ts b/cocos/core/gfx/webgl/webgl-commands.ts index abc7542204..4f312d6968 100644 --- a/cocos/core/gfx/webgl/webgl-commands.ts +++ b/cocos/core/gfx/webgl/webgl-commands.ts @@ -1282,12 +1282,8 @@ export function WebGLCmdFuncCreateShader (device: WebGLDevice, gpuShader: IWebGL for (let u = 0; u < block.members.length; ++u) { const uniform = block.members[u]; const glType = GFXTypeToWebGLType(uniform.type, gl); - const Ctor = GFXTypeToTypedArrayCtor(uniform.type); const stride = WebGLGetTypeSize(glType, gl); const size = stride * uniform.count; - const begin = glBlock.size / 4; - const count = size / 4; - const array = new Ctor(count); glBlock.glUniforms[u] = { binding: -1, @@ -1296,42 +1292,13 @@ export function WebGLCmdFuncCreateShader (device: WebGLDevice, gpuShader: IWebGL stride, count: uniform.count, size, - offset: glBlock.size, + offset: 0, glType, glLoc: -1, - array, - begin, + array: null!, }; - - glBlock.size += size; } - - /* - glBlock.buffer = new ArrayBuffer(glBlock.size); - - for (let k = 0; k < glBlock.glUniforms.length; k++) { - const glUniform = glBlock.glUniforms[k]; - switch (glUniform.glType) { - case gl.BOOL: - case gl.BOOL_VEC2: - case gl.BOOL_VEC3: - case gl.BOOL_VEC4: - case gl.INT: - case gl.INT_VEC2: - case gl.INT_VEC3: - case gl.INT_VEC4: - case gl.SAMPLER_2D: - case gl.SAMPLER_CUBE: { - glUniform.vi32 = new Int32Array(glBlock.buffer); - break; - } - default: { - glUniform.vf32 = new Float32Array(glBlock.buffer); - } - } - } - */ } } @@ -1376,8 +1343,6 @@ export function WebGLCmdFuncCreateShader (device: WebGLDevice, gpuShader: IWebGL varName = uniformInfo.name; } - // let stride = WebGLGetTypeSize(info.type); - // build uniform block mapping for (let j = 0; j < gpuShader.glBlocks.length; j++) { const glBlock = gpuShader.glBlocks[j]; @@ -1385,19 +1350,32 @@ export function WebGLCmdFuncCreateShader (device: WebGLDevice, gpuShader: IWebGL for (let k = 0; k < glBlock.glUniforms.length; k++) { const glUniform = glBlock.glUniforms[k]; if (glUniform.name === varName) { - // let varSize = stride * info.size; - glUniform.glLoc = glLoc; - glBlock.glActiveUniforms.push(glUniform); + glUniform.count = uniformInfo.size; + glUniform.size = glUniform.stride * glUniform.count; + glUniform.array = new (GFXTypeToTypedArrayCtor(glUniform.type))(glUniform.size / 4); + glBlock.glActiveUniforms.push(glUniform); break; } } - } // for + } } } } - } // for + } + + // calculate offset & size + // WARNING: we can't handle inactive uniform arrays with wrong input sizes + // and there is no way to detect that for now + for (let j = 0; j < gpuShader.glBlocks.length; j++) { + const glBlock = gpuShader.glBlocks[j]; + for (let k = 0; k < glBlock.glUniforms.length; k++) { + const glUniform = glBlock.glUniforms[k]; + glUniform.offset = glBlock.size / 4; + glBlock.size += glUniform.size; + } + } // texture unit index mapping optimization const glActiveSamplers: IWebGLGPUUniformSamplerTexture[] = []; @@ -2025,7 +2003,7 @@ export function WebGLCmdFuncBindStates ( case gl.BOOL: case gl.INT: { for (let u = 0; u < glUniform.array.length; ++u) { - const idx = glUniform.begin + offset + u; + const idx = glUniform.offset + offset + u; if (vf32[idx] !== glUniform.array[u]) { for (let n = u, m = idx; n < glUniform.array.length; ++n, ++m) { glUniform.array[n] = vf32[m]; @@ -2039,7 +2017,7 @@ export function WebGLCmdFuncBindStates ( case gl.BOOL_VEC2: case gl.INT_VEC2: { for (let u = 0; u < glUniform.array.length; ++u) { - const idx = glUniform.begin + offset + u; + const idx = glUniform.offset + offset + u; if (vf32[idx] !== glUniform.array[u]) { for (let n = u, m = idx; n < glUniform.array.length; ++n, ++m) { glUniform.array[n] = vf32[m]; @@ -2053,7 +2031,7 @@ export function WebGLCmdFuncBindStates ( case gl.BOOL_VEC3: case gl.INT_VEC3: { for (let u = 0; u < glUniform.array.length; ++u) { - const idx = glUniform.begin + offset + u; + const idx = glUniform.offset + offset + u; if (vf32[idx] !== glUniform.array[u]) { for (let n = u, m = idx; n < glUniform.array.length; ++n, ++m) { glUniform.array[n] = vf32[m]; @@ -2067,7 +2045,7 @@ export function WebGLCmdFuncBindStates ( case gl.BOOL_VEC4: case gl.INT_VEC4: { for (let u = 0; u < glUniform.array.length; ++u) { - const idx = glUniform.begin + offset + u; + const idx = glUniform.offset + offset + u; if (vf32[idx] !== glUniform.array[u]) { for (let n = u, m = idx; n < glUniform.array.length; ++n, ++m) { glUniform.array[n] = vf32[m]; @@ -2080,7 +2058,7 @@ export function WebGLCmdFuncBindStates ( } case gl.FLOAT: { for (let u = 0; u < glUniform.array.length; ++u) { - const idx = glUniform.begin + offset + u; + const idx = glUniform.offset + offset + u; if (vf32[idx] !== glUniform.array[u]) { for (let n = u, m = idx; n < glUniform.array.length; ++n, ++m) { glUniform.array[n] = vf32[m]; @@ -2093,7 +2071,7 @@ export function WebGLCmdFuncBindStates ( } case gl.FLOAT_VEC2: { for (let u = 0; u < glUniform.array.length; ++u) { - const idx = glUniform.begin + offset + u; + const idx = glUniform.offset + offset + u; if (vf32[idx] !== glUniform.array[u]) { for (let n = u, m = idx; n < glUniform.array.length; ++n, ++m) { glUniform.array[n] = vf32[m]; @@ -2106,7 +2084,7 @@ export function WebGLCmdFuncBindStates ( } case gl.FLOAT_VEC3: { for (let u = 0; u < glUniform.array.length; ++u) { - const idx = glUniform.begin + offset + u; + const idx = glUniform.offset + offset + u; if (vf32[idx] !== glUniform.array[u]) { for (let n = u, m = idx; n < glUniform.array.length; ++n, ++m) { glUniform.array[n] = vf32[m]; @@ -2119,7 +2097,7 @@ export function WebGLCmdFuncBindStates ( } case gl.FLOAT_VEC4: { for (let u = 0; u < glUniform.array.length; ++u) { - const idx = glUniform.begin + offset + u; + const idx = glUniform.offset + offset + u; if (vf32[idx] !== glUniform.array[u]) { for (let n = u, m = idx; n < glUniform.array.length; ++n, ++m) { glUniform.array[n] = vf32[m]; @@ -2132,7 +2110,7 @@ export function WebGLCmdFuncBindStates ( } case gl.FLOAT_MAT2: { for (let u = 0; u < glUniform.array.length; ++u) { - const idx = glUniform.begin + offset + u; + const idx = glUniform.offset + offset + u; if (vf32[idx] !== glUniform.array[u]) { for (let n = u, m = idx; n < glUniform.array.length; ++n, ++m) { glUniform.array[n] = vf32[m]; @@ -2145,7 +2123,7 @@ export function WebGLCmdFuncBindStates ( } case gl.FLOAT_MAT3: { for (let u = 0; u < glUniform.array.length; ++u) { - const idx = glUniform.begin + offset + u; + const idx = glUniform.offset + offset + u; if (vf32[idx] !== glUniform.array[u]) { for (let n = u, m = idx; n < glUniform.array.length; ++n, ++m) { glUniform.array[n] = vf32[m]; @@ -2158,7 +2136,7 @@ export function WebGLCmdFuncBindStates ( } case gl.FLOAT_MAT4: { for (let u = 0; u < glUniform.array.length; ++u) { - const idx = glUniform.begin + offset + u; + const idx = glUniform.offset + offset + u; if (vf32[idx] !== glUniform.array[u]) { for (let n = u, m = idx; n < glUniform.array.length; ++n, ++m) { glUniform.array[n] = vf32[m]; diff --git a/cocos/core/gfx/webgl/webgl-gpu-objects.ts b/cocos/core/gfx/webgl/webgl-gpu-objects.ts index 4799b0db09..4947e730d4 100644 --- a/cocos/core/gfx/webgl/webgl-gpu-objects.ts +++ b/cocos/core/gfx/webgl/webgl-gpu-objects.ts @@ -131,7 +131,6 @@ export interface IWebGLGPUUniform { glType: GLenum; glLoc: WebGLUniformLocation; array: Int32Array | Float32Array; - begin: number; } export interface IWebGLGPUUniformBlock { diff --git a/editor/assets/default_ui/atom.plist.meta b/editor/assets/default_ui/atom.plist.meta index 28244b8ef6..a680e02621 100644 --- a/editor/assets/default_ui/atom.plist.meta +++ b/editor/assets/default_ui/atom.plist.meta @@ -50,16 +50,12 @@ "endSizeVar": 0, "positionType": 0, "sourcePos": { - "_array": { - "0": 0, - "1": 0 - } + "x": 0, + "y": 0 }, "posVar": { - "_array": { - "0": 7, - "1": 7 - } + "x": 7, + "y": 7 }, "angle": 360, "angleVar": 360, @@ -69,10 +65,8 @@ "endSpinVar": -142.11000061035156, "emitterMode": 0, "gravity": { - "_array": { - "0": 0.25, - "1": 0.8600000143051147 - } + "x": 0.25, + "y": 0.8600000143051147 }, "speed": 0, "speedVar": 190.7899932861328,