[v3.8.6] Inline enums for CCObjectFlags. #18190
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dumganhar
force-pushed
the
386-ccobjectflags-enum
branch
from
15e14fc to
bddf279
Compare
dumganhar
commented
Jan 14, 2025
| @@ -111,7 +109,7 @@ export default class Burst { | |||
| preFrameTime = (preFrameTime > 0.0) ? preFrameTime : 0.0; | |||
| const curFrameTime = repeat(psys.time - psys.startDelay.evaluate(0, 1), psys.duration); | |||
| if (this._curTime >= preFrameTime && this._curTime < curFrameTime) { | |||
| (psys as any).emit(this.count.evaluate(this._curTime / psys.duration, 1), dt - (curFrameTime - this._curTime)); | |||
| psys.emit(this.count.evaluate(this._curTime / psys.duration, 1), dt - (curFrameTime - this._curTime)); | |||
There was a problem hiding this comment.
Don't convert to any since we're using Typescript, mark emit as public and engineInternal.
👍 Package size ⤵ -852 bytes, old: 5242908, new: 5242056Interface Check Report! WARNING this pull request has changed these public interfaces:
@@ -21467,8 +21467,34 @@
}
export let __props__: string[];
export let __values__: string[];
}
+ export enum CCObjectFlags {
+ Destroyed = 1,
+ RealDestroyed = 2,
+ ToDestroy = 4,
+ DontSave = 8,
+ EditorOnly = 16,
+ Dirty = 32,
+ DontDestroy = 64,
+ Destroying = 128,
+ Deactivating = 256,
+ LockedInEditor = 512,
+ HideInHierarchy = 1024,
+ IsOnEnableCalled = 2048,
+ IsEditorOnEnableCalled = 4096,
+ IsPreloadStarted = 8192,
+ IsOnLoadCalled = 16384,
+ IsOnLoadStarted = 32768,
+ IsStartCalled = 65536,
+ IsRotationLocked = 131072,
+ IsScaleLocked = 262144,
+ IsAnchorLocked = 524288,
+ IsSizeLocked = 1048576,
+ IsPositionLocked = 2097152,
+ PersistentMask = "Bad expression <-4192741>",
+ AllHideMasks = 1560
+ }
/**
* @en
* Indicates that the editor should treat this property or array element as an Integer value.
* @zh
@@ -46953,9 +46979,9 @@
* @zh 获取最大的触发粒子数量。
* @param psys @en Particle system to burst. @zh 要触发的粒子系统。
* @returns @en burst max particle count. @zh 一次最多触发的粒子个数。
*/
- getMaxCount(psys: any): number;
+ getMaxCount(psys: ParticleSystem): number;
}
export function loadWasmModuleBox2D(): Promise<void>;
export const Physics2DUtils: {
PolygonSeparator: typeof __private._cocos_physics_2d_framework_utils_polygon_separator;
|
dumganhar
commented
Jan 14, 2025
| let dirtyBits = 0; | ||
|
|
||
| while (i) { | ||
| child = dirtyNodes[--i]; | ||
| childMat = child._mat; | ||
| childPos = child._pos; |
There was a problem hiding this comment.
Avoid to invoke child._mat & child._pos many times here.
minggo
approved these changes
Jan 14, 2025
It seems beak compatibility. |
…86-ccobjectflags-enum # Conflicts: # cocos/serialization/instantiate.ts
|
@minggo Reverted hideFlags setter/getter and optimize the CCObject.Flags definition. |
|
@cocos-robot run test cases |
minggo
approved these changes
Jan 15, 2025
|
@dumganhar, Please check the result of
Task Details
|
|
@dumganhar, Please check the result of
Task Details
|
|
PR test failed because editor doesn't update ccbuild. I will update the editor version as soon as possible. |
|
@cocos-robot run test cases |
|
@dumganhar, Please check the result of
Task Details |
|
@dumganhar, Please check the result of
Task Details |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re: #
Changelog
Continuous Integration
This pull request:
Compatibility Check
This pull request: