Restructure Module (cocos#7968)

* module restructure

* refine

* restructure module

* merge

* revert

* fix ci

* update import path of unit-test

* split 2d and ui

* add more module

* change audio adapter

* rename primitive

* config wechat plugin

* merge

* add category config

* merge

* merge

cc.config.json

@@ -3,7 +3,9 @@
         "base": { "modules": [ "base" ] },
         "gfx-webgl": { "modules": [ "gfx-webgl" ] },
         "gfx-webgl2": { "modules": [ "gfx-webgl2" ] },
-        "ui": { "modules": [ "ui" ] },
+        "3d": { "modules": [ "3d" ]},
+        "2d": { "modules": [ "2d" ]},
+        "ui": { "modules": [ "ui", "2d" ] },
         "particle": { "modules": [ "particle" ] },
         "particle-2d": { "modules": [ "particle-2d" ] },
         "physics-cannon": { "modules": [ "physics-cannon", "physics-framework" ] },
@@ -12,6 +14,8 @@
         "physics-2d-box2d": { "modules": [ "physics-2d-box2d", "physics-2d-framework" ] },
         "physics-2d-builtin": { "modules": [ "physics-2d-builtin", "physics-2d-framework" ] },
         "intersection-2d": { "modules": [ "intersection-2d" ] },
+        "primitive": { "modules": [ "primitive" ] },
+        "profiler": { "modules": [ "profiler" ] },
         "audio": { "modules": [ "audio" ] },
         "video": { "modules": [ "video" ] },
         "terrain": { "modules": [ "terrain" ] },

cocos/ui/assembler/graphics/webgl/graphics-assembler.ts → cocos/2d/assembler/graphics/webgl/graphics-assembler.ts

@@ -29,9 +29,9 @@
  */
 
 import { Color, Vec3 } from '../../../../core/math';
-import { IAssembler } from '../../../../core/renderer/ui/base';
-import { MeshRenderData } from '../../../../core/renderer/ui/render-data';
-import { UI } from '../../../../core/renderer/ui/ui';
+import { IAssembler } from '../../../renderer/base';
+import { MeshRenderData } from '../../../renderer/render-data';
+import { UI } from '../../../renderer/ui';
 import { Graphics } from '../../../components';
 import { LineCap, LineJoin, PointFlags } from '../types';
 import { earcut as Earcut } from './earcut';

cocos/ui/assembler/graphics/webgl/impl.ts → cocos/2d/assembler/graphics/webgl/impl.ts

@@ -25,7 +25,7 @@
 
 
 import { Color, Vec2 } from '../../../../core/math';
-import { MeshRenderData } from '../../../../core/renderer/ui/render-data';
+import { MeshRenderData } from '../../../renderer/render-data';
 import { arc, ellipse, roundRect, tesselateBezier } from '../helper';
 import { LineCap, LineJoin, PointFlags} from '../types';
 

cocos/ui/assembler/graphics/webgl/index.ts → cocos/2d/assembler/graphics/webgl/index.ts

@@ -23,8 +23,8 @@
  THE SOFTWARE.
 */
 
-import { UIRenderable } from '../../../../core/components/ui-base/ui-renderable';
-import { IAssemblerManager } from '../../../../core/renderer/ui/base';
+import { UIRenderable } from '../../../framework/ui-renderable';
+import { IAssemblerManager } from '../../../renderer/base';
 import { Graphics } from '../../../components';
 import { graphicsAssembler as graphics } from './graphics-assembler';
 export { earcut } from './earcut';

cocos/ui/assembler/index.ts → cocos/2d/assembler/index.ts

@@ -29,8 +29,8 @@
  */
 
 import './utils';
+
 export * from './graphics';
 export * from './label';
 export * from './mask';
 export * from './sprite';
-export * from '../../core/renderer/ui/base';

cocos/ui/assembler/label/bmfont.ts → cocos/2d/assembler/label/bmfont.ts

@@ -28,12 +28,12 @@
  * @module ui-assembler
  */
 
-import { SpriteFrame } from '../../../core/assets/sprite-frame';
+import { SpriteFrame } from '../../assets/sprite-frame';
 import * as js from '../../../core/utils/js';
 import { Rect } from '../../../core/math';
-import { UI } from '../../../core/renderer/ui/ui';
+import { UI } from '../../renderer/ui';
 import { Label } from '../../components/label';
-import { IAssembler } from '../../../core/renderer/ui/base';
+import { IAssembler } from '../../renderer/base';
 import { fillMeshVertices3D } from '../utils';
 import { bmfontUtils } from './bmfontUtils';
 

cocos/ui/assembler/label/bmfontUtils.ts → cocos/2d/assembler/label/bmfontUtils.ts

@@ -28,13 +28,12 @@
  * @hidden
  */
 
-import { BitmapFont, IConfig, FontLetterDefinition } from '../../../core/assets/bitmap-font';
-import { SpriteFrame } from '../../../core/assets/sprite-frame';
-import { isUnicodeCJK, isUnicodeSpace } from '../../../core/utils/text-utils';
+import { BitmapFont, IConfig, FontLetterDefinition } from '../../assets/bitmap-font';
+import { SpriteFrame } from '../../assets/sprite-frame';
+import { isUnicodeCJK, isUnicodeSpace } from '../../utils/text-utils';
 import { Rect, Size, Vec2 } from '../../../core/math';
-import { HorizontalTextAlignment, VerticalTextAlignment } from '../../components/label';
-import { Label, Overflow } from '../../components/label';
-import { UITransform } from '../../../core/components/ui-base/ui-transform';
+import { HorizontalTextAlignment, VerticalTextAlignment, Label, Overflow } from '../../components/label';
+import { UITransform } from '../../framework/ui-transform';
 import { shareLabelInfo } from './font-utils';
 
 class LetterInfo {

cocos/ui/assembler/label/font-utils.ts → cocos/2d/assembler/label/font-utils.ts

@@ -28,12 +28,12 @@
  * @hidden
  */
 
-import { FontAtlas } from '../../../core/assets/bitmap-font';
+import { FontAtlas } from '../../assets/bitmap-font';
 import { Color } from '../../../core/math';
 import { ImageAsset, Texture2D } from '../../../core/assets';
 import { PixelFormat } from '../../../core/assets/asset-enum';
 import { BufferTextureCopy } from '../../../core/gfx';
-import { safeMeasureText, BASELINE_RATIO, MIDDLE_RATIO, getBaselineOffset } from '../../../core/utils';
+import { safeMeasureText, BASELINE_RATIO, MIDDLE_RATIO, getBaselineOffset } from '../../utils/text-utils';
 import { director, Director } from '../../../core/director';
 
 export interface ISharedLabelData {

cocos/ui/assembler/label/index.ts → cocos/2d/assembler/label/index.ts

@@ -28,9 +28,9 @@
  * @module ui-assembler
  */
 
-import { BitmapFont } from '../../../core/assets';
+import { BitmapFont } from '../../assets';
 import { Label } from '../../components';
-import { IAssemblerManager } from '../../../core/renderer/ui/base';
+import { IAssemblerManager } from '../../renderer/base';
 import { bmfont } from './bmfont';
 import { CanvasPool } from './font-utils';
 import { letter } from './letter';

cocos/ui/assembler/label/letter.ts → cocos/2d/assembler/label/letter.ts

@@ -29,7 +29,7 @@
  */
 
 import { addon } from '../../../core/utils/js';
-import { UI } from '../../../core/renderer/ui/ui';
+import { UI } from '../../renderer/ui';
 import { Label } from '../../components/label';
 import { fillMeshVertices3D } from '../utils';
 import { bmfont } from './bmfont';

cocos/ui/assembler/label/ttf.ts → cocos/2d/assembler/label/ttf.ts

@@ -30,11 +30,11 @@
 
 import * as js from '../../../core/utils/js';
 import { Color, Vec3 } from '../../../core/math';
-import { UI } from '../../../core/renderer/ui/ui';
+import { UI } from '../../renderer/ui';
 import { Label } from '../../components/label';
-import { IAssembler } from '../../../core/renderer/ui/base';
+import { IAssembler } from '../../renderer/base';
 import { ttfUtils } from './ttfUtils';
-import { IRenderData } from '../../../core/renderer/ui/render-data';
+import { IRenderData } from '../../renderer/render-data';
 
 const WHITE = Color.WHITE.clone();
 

cocos/ui/assembler/label/ttfUtils.ts → cocos/2d/assembler/label/ttfUtils.ts

@@ -28,15 +28,16 @@
  * @hidden
  */
 
-import { SpriteFrame, Texture2D } from '../../../core/assets';
-import { fragmentText, safeMeasureText, getBaselineOffset, BASELINE_RATIO } from '../../../core/utils';
+import { SpriteFrame } from '../../assets';
+import { Texture2D } from '../../../core/assets';
+import { fragmentText, safeMeasureText, getBaselineOffset, BASELINE_RATIO } from '../../utils/text-utils';
 import { Color, Size, Vec2, Rect } from '../../../core/math';
 import { HorizontalTextAlignment, Label, LabelOutline, VerticalTextAlignment, LabelShadow } from '../../components';
 import { ISharedLabelData, LetterRenderTexture } from './font-utils';
 import { logID } from '../../../core/platform/debug';
-import { UITransform } from '../../../core/components/ui-base/ui-transform';
+import { UITransform } from '../../framework/ui-transform';
 import { legacyCC } from '../../../core/global-exports';
-import { assetManager } from '../../../core';
+import { assetManager } from '../../../core/asset-manager';
 
 const Overflow = Label.Overflow;
 const MAX_SIZE = 2048;

cocos/ui/assembler/mask/mask-assembler.ts → cocos/2d/assembler/mask/mask-assembler.ts

@@ -28,11 +28,11 @@
  * @module ui-assembler
  */
 
-import { IRenderData, RenderData } from '../../../core/renderer/ui/render-data';
-import { UI } from '../../../core/renderer/ui/ui';
+import { IRenderData, RenderData } from '../../renderer/render-data';
+import { UI } from '../../renderer/ui';
 import { Mask, MaskType } from '../../components/mask';
-import { IAssembler, IAssemblerManager } from '../../../core/renderer/ui/base';
-import { StencilManager } from '../../../core/renderer/ui/stencil-manager';
+import { IAssembler, IAssemblerManager } from '../../renderer/base';
+import { StencilManager } from '../../renderer/stencil-manager';
 import { simple } from '../sprite';
 
 const _stencilManager = StencilManager.sharedManager!;

cocos/ui/assembler/sprite/bar-filled.ts → cocos/2d/assembler/sprite/bar-filled.ts

@@ -29,10 +29,10 @@
  */
 
 import { Mat4, Vec3 } from '../../../core/math';
-import { IRenderData, RenderData } from '../../../core/renderer/ui/render-data';
-import { UI } from '../../../core/renderer/ui/ui';
+import { IRenderData, RenderData } from '../../renderer/render-data';
+import { UI } from '../../renderer/ui';
 import { Sprite } from '../../components';
-import { IAssembler } from '../../../core/renderer/ui/base';
+import { IAssembler } from '../../renderer/base';
 import { fillVerticesWithoutCalc3D } from '../utils';
 import { errorID } from '../../../core/platform/debug';
 

cocos/ui/assembler/sprite/index.ts → cocos/2d/assembler/sprite/index.ts

@@ -28,8 +28,8 @@
  * @hidden
  */
 
-import { UIRenderable } from '../../../core/components/ui-base/ui-renderable';
-import { IAssemblerManager } from '../../../core/renderer/ui/base';
+import { UIRenderable } from '../../framework/ui-renderable';
+import { IAssemblerManager } from '../../renderer/base';
 import { Sprite } from '../../components';
 import { barFilled } from './bar-filled';
 import { radialFilled } from './radial-filled';

cocos/ui/assembler/sprite/radial-filled.ts → cocos/2d/assembler/sprite/radial-filled.ts

@@ -28,12 +28,12 @@
  * @module ui-assembler
  */
 
-import { SpriteFrame } from '../../../core/assets';
+import { SpriteFrame } from '../../assets';
 import { Vec2 } from '../../../core/math';
-import { IRenderData, RenderData } from '../../../core/renderer/ui/render-data';
-import { UI } from '../../../core/renderer/ui/ui';
+import { IRenderData, RenderData } from '../../renderer/render-data';
+import { UI } from '../../renderer/ui';
 import { Sprite } from '../../components';
-import { IAssembler } from '../../../core/renderer/ui/base';
+import { IAssembler } from '../../renderer/base';
 import { fillVertices3D } from '../utils';
 
 const PI_2 = Math.PI * 2;

cocos/ui/assembler/sprite/simple.ts → cocos/2d/assembler/sprite/simple.ts

@@ -29,9 +29,9 @@
  */
 
 import { Vec3 } from '../../../core/math';
-import { IAssembler } from '../../../core/renderer/ui/base';
-import { IRenderData, RenderData } from '../../../core/renderer/ui/render-data';
-import { UI } from '../../../core/renderer/ui/ui';
+import { IAssembler } from '../../renderer/base';
+import { IRenderData, RenderData } from '../../renderer/render-data';
+import { UI } from '../../renderer/ui';
 import { Sprite } from '../../components';
 
 const vec3_temps: Vec3[] = [];

cocos/ui/assembler/sprite/sliced.ts → cocos/2d/assembler/sprite/sliced.ts

@@ -28,12 +28,12 @@
  * @module ui-assembler
  */
 
-import { IUV, SpriteFrame } from '../../../core/assets';
+import { IUV, SpriteFrame } from '../../assets';
 import { Color, Mat4, Vec3 } from '../../../core/math';
-import { IRenderData, RenderData } from '../../../core/renderer/ui/render-data';
-import { UI } from '../../../core/renderer/ui/ui';
+import { IRenderData, RenderData } from '../../renderer/render-data';
+import { UI } from '../../renderer/ui';
 import { Sprite } from '../../components';
-import { IAssembler } from '../../../core/renderer/ui/base';
+import { IAssembler } from '../../renderer/base';
 
 const vec3_temp = new Vec3();
 const matrix = new Mat4();

cocos/ui/assembler/sprite/tiled.ts → cocos/2d/assembler/sprite/tiled.ts

@@ -29,11 +29,11 @@
  */
 
 import { Mat4, Vec3, Color } from '../../../core/math';
-import { RenderData, IRenderData } from '../../../core/renderer/ui/render-data';
-import { UI } from '../../../core/renderer/ui/ui';
+import { RenderData, IRenderData } from '../../renderer/render-data';
+import { UI } from '../../renderer/ui';
 import { Sprite } from '../../components/sprite';
-import { UIRenderable } from '../../../core/components/ui-base/ui-renderable';
-import { IAssembler } from '../../../core/renderer/ui/base';
+import { UIRenderable } from '../../framework/ui-renderable';
+import { IAssembler } from '../../renderer/base';
 
 const vec3_temps: Vec3[] = [];
 for (let i = 0; i < 4; i++) {

cocos/ui/assembler/utils.ts → cocos/2d/assembler/utils.ts

@@ -29,9 +29,9 @@
  */
 
 import { Color, Mat4, Vec3 } from '../../core/math';
-import { RenderData } from '../../core/renderer/ui/render-data';
-import { UI } from '../../core/renderer/ui/ui';
-import { Node } from '../../core';
+import { RenderData } from '../renderer/render-data';
+import { UI } from '../renderer/ui';
+import { Node } from '../../core/';
 
 const vec3_temp = new Vec3();
 const _worldMatrix = new Mat4();

cocos/core/assets/bitmap-font.ts → cocos/2d/assets/bitmap-font.ts

@@ -32,9 +32,9 @@
 import { ccclass, type, serializable, editable } from 'cc.decorator';
 import { Font } from './font';
 import { SpriteFrame } from './sprite-frame';
-import { legacyCC } from '../global-exports';
-import { js } from '../utils';
-import { warn } from '../platform/debug';
+import { legacyCC } from '../../core/global-exports';
+import { js } from '../../core/utils';
+import { warn } from '../../core/platform/debug';
 
 export interface IConfig {
     [key: string]: any;

cocos/core/assets/font.ts → cocos/2d/assets/font.ts

@@ -29,9 +29,9 @@
  * @module asset
  */
 
-import {ccclass} from 'cc.decorator';
-import { Asset } from './asset';
-import { legacyCC } from '../global-exports';
+import { ccclass } from 'cc.decorator';
+import { Asset } from '../../core/assets';
+import { legacyCC } from '../../core/global-exports';
 
 /**
  * @en Class for Font handling.

cocos/2d/assets/index.ts

@@ -0,0 +1,6 @@
+export * from './sprite-frame';
+export { SpriteAtlas } from './sprite-atlas';
+export { TTFFont } from './ttf-font';
+export { LabelAtlas } from './label-atlas';
+export { BitmapFont } from './bitmap-font';
+export { Font } from './font';

cocos/core/assets/label-atlas.ts → cocos/2d/assets/label-atlas.ts

@@ -31,7 +31,7 @@
 
 import { ccclass } from 'cc.decorator';
 import { BitmapFont } from './bitmap-font';
-import { legacyCC } from '../global-exports';
+import { legacyCC } from '../../core/global-exports';
 /**
  * @en Class for LabelAtlas handling.
  * @zh 艺术数字字体资源类。

cocos/core/assets/sprite-atlas.ts → cocos/2d/assets/sprite-atlas.ts

@@ -31,10 +31,10 @@
 
 import { EDITOR, TEST } from "internal:constants";
 import { ccclass, serializable, editable } from 'cc.decorator';
-import * as js from '../utils/js';
-import { Asset } from './asset';
+import * as js from '../../core/utils/js';
+import { Asset } from '../../core/assets';
 import { SpriteFrame } from './sprite-frame';
-import { legacyCC } from '../global-exports';
+import { legacyCC } from '../../core/global-exports';
 
 interface ISpriteAtlasSerializeData{
     name: string;

cocos/core/assets/sprite-frame.ts → cocos/2d/assets/sprite-frame.ts

@@ -32,15 +32,15 @@
 
 import { ccclass } from 'cc.decorator';
 import { EDITOR, TEST, BUILD } from 'internal:constants';
-import { Rect, Size, Vec2 } from '../math';
-import { murmurhash2_32_gc } from '../utils/murmurhash2_gc';
-import { Asset } from './asset';
-import { RenderTexture } from './render-texture';
-import { TextureBase } from './texture-base';
-import { legacyCC } from '../global-exports';
-import { ImageAsset, ImageSource } from './image-asset';
-import { Texture2D } from './texture-2d';
-import { errorID } from '../platform/debug';
+import { Rect, Size, Vec2 } from '../../core/math';
+import { murmurhash2_32_gc } from '../../core/utils/murmurhash2_gc';
+import { Asset } from '../../core/assets/asset';
+import { RenderTexture } from '../../core/assets/render-texture';
+import { TextureBase } from '../../core/assets/texture-base';
+import { legacyCC } from '../../core/global-exports';
+import { ImageAsset, ImageSource } from '../../core/assets/image-asset';
+import { Texture2D } from '../../core/assets/texture-2d';
+import { errorID } from '../../core/platform/debug';
 
 const INSET_LEFT = 0;
 const INSET_TOP = 1;

cocos/core/assets/ttf-font.ts → cocos/2d/assets/ttf-font.ts

@@ -29,10 +29,10 @@
  * @module asset
  */
 
-import {ccclass, string, override, serializable} from 'cc.decorator';
-import { extname } from '../utils/path';
+import { ccclass, string, override, serializable } from 'cc.decorator';
+import { extname } from '../../core/utils/path';
 import { Font } from './font';
-import { legacyCC } from '../global-exports';
+import { legacyCC } from '../../core/global-exports';
 
 /**
  * @en Class for TTFFont asset.