Skip to content

Commit

Permalink
Merge pull request #1 from shrinktofit/v3.6.2-glTF
Browse files Browse the repository at this point in the history
Export animation internals
  • Loading branch information
Canvasfull committed Dec 5, 2022
2 parents 71e26cf + 7fd17f9 commit d8ea921
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 6 deletions.
3 changes: 3 additions & 0 deletions cc.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@
"MARIONETTE": true
}
},
"_experimental-animation-internals": {
"modules": ["_experimental-animation-internals"]
},
"custom-pipeline": { "modules": ["custom-pipeline"] }
},
"moduleOverrides": [
Expand Down
5 changes: 5 additions & 0 deletions cocos/core/animation/_experimental-animation-internals.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// These bindings are exported for internal usages only.

export { exoticAnimationTag } from './animation-clip';
export { ExoticAnimation } from './exotic-animation/exotic-animation';
export { RealArrayTrack } from './tracks/array-track';
7 changes: 1 addition & 6 deletions cocos/core/animation/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ legacyCC.easing = easing;
export * from '../curves/bezier';
export { easing };
export * from './animation-curve';
export { AnimationClip, exoticAnimationTag } from './animation-clip';
export { AnimationClip } from './animation-clip';
export * from './animation-manager';
export {
AnimationState,
Expand All @@ -43,8 +43,3 @@ export {
export * from './transform-utils';
export { animation };
export type { ILerpable } from './types';

// For runtime create animation clip.
export * from './exotic-animation/exotic-animation';
export * from './tracks/track';
export * from './tracks/array-track';
11 changes: 11 additions & 0 deletions editor/engine-features/render-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,13 @@
"wechatPlugin": false,
"category": "animation"
},
"_experimental-animation-internals": {
"default": [],
"label": "i18n:ENGINE.features._experimental_animation_internals.label",
"description": "i18n:ENGINE.features._experimental_animation_internals.description",
"wechatPlugin": false,
"category": "_experimental_internals"
},
"custom-pipeline": {
"default": [],
"label": "i18n:ENGINE.features.custom_pipeline.label",
Expand All @@ -248,6 +255,10 @@
"animation": {
"label": "i18n:ENGINE.features.categories.animation.label",
"description": "i18n:ENGINE.features.categories.animation.description"
},
"_experimental_internals": {
"label": "i18n:ENGINE.features.categories._experimental_internals.label",
"description": "i18n:ENGINE.features.categories._experimental_internals.description"
}
}
}
12 changes: 12 additions & 0 deletions editor/i18n/en/localization.js
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,14 @@ module.exports = {
label: 'Animation',
description: 'Animation System.',
},
_experimental_internals: {
label: '(Experimental)Internal interfaces',
description:
'(Experimental)Export internal interfaces. ' +
'Features under this category might be used by certain external libraries that are tightly related to engine. ' +
'These features are highly coupled with engine editions, undocumented, and ' +
'no compatibilities are guaranteed.',
},
},
core: {
label: "Core",
Expand Down Expand Up @@ -935,6 +943,10 @@ module.exports = {
label: "Custom Render Pipeline (Experimental)",
description: "Enable custom render pipeline",
},
_experimental_animation_internals: {
label: "(Experimental)Animation Internals",
description: "(Experimental)Export animation internal interfaces.",
},
},
renderable_2d: {
srcBlendFactor: 'Specifies the source blend mode, <br>it will clone a new material object.',
Expand Down
10 changes: 10 additions & 0 deletions editor/i18n/zh/localization.js
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,12 @@ module.exports = {
label: '动画',
description: '动画系统。',
},
_experimental_internals: {
label: '(实验性)内部接口',
description:
'(实验性)导出内部接口。此分类下的功能可能会被某些与引擎紧密相关的外部库使用。' +
'这些功能和引擎版本高度耦合,无明确文档并不保证任何兼容性。',
},
},
core: {
label: "核心功能",
Expand Down Expand Up @@ -916,6 +922,10 @@ module.exports = {
label: "自定义渲染管线(实验)",
description: "启用自定义渲染管线。",
},
_experimental_animation_internals: {
label: "(实验性)内部动画接口",
description: "(实验性)导出内部动画接口。",
},
},
renderable_2d: {
srcBlendFactor: '指定源的混合模式,这会克隆一个新的材质对象,注意这带来的性能和内存损耗',
Expand Down
7 changes: 7 additions & 0 deletions exports/_experimental-animation-internals.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import legacyCC from '../predefine';

import * as internals from '../cocos/core/animation/_experimental-animation-internals';

Object.assign(legacyCC.internal, {
animation: internals,
});

0 comments on commit d8ea921

Please sign in to comment.