From ad4bff3988387eba854eafdb84ccde636a92bb30 Mon Sep 17 00:00:00 2001 From: Santy-Wang Date: Thu, 24 Dec 2020 19:07:26 +0800 Subject: [PATCH] Restructure Module (#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 | 6 +- cocos/{ui => 2d}/assembler/graphics/helper.ts | 0 cocos/{ui => 2d}/assembler/graphics/index.ts | 0 cocos/{ui => 2d}/assembler/graphics/types.ts | 0 .../assembler/graphics/webgl/earcut.ts | 0 .../graphics/webgl/graphics-assembler.ts | 6 +- .../assembler/graphics/webgl/impl.ts | 2 +- .../assembler/graphics/webgl/index.ts | 4 +- cocos/{ui => 2d}/assembler/index.ts | 2 +- cocos/{ui => 2d}/assembler/label/bmfont.ts | 6 +- .../{ui => 2d}/assembler/label/bmfontUtils.ts | 11 +- .../{ui => 2d}/assembler/label/font-utils.ts | 4 +- cocos/{ui => 2d}/assembler/label/index.ts | 4 +- .../{ui => 2d}/assembler/label/letter-font.ts | 0 cocos/{ui => 2d}/assembler/label/letter.ts | 2 +- cocos/{ui => 2d}/assembler/label/ttf.ts | 6 +- cocos/{ui => 2d}/assembler/label/ttfUtils.ts | 9 +- cocos/{ui => 2d}/assembler/mask/index.ts | 0 .../assembler/mask/mask-assembler.ts | 8 +- .../{ui => 2d}/assembler/sprite/bar-filled.ts | 6 +- cocos/{ui => 2d}/assembler/sprite/index.ts | 4 +- cocos/{ui => 2d}/assembler/sprite/mesh.js | 0 .../assembler/sprite/radial-filled.ts | 8 +- cocos/{ui => 2d}/assembler/sprite/simple.ts | 6 +- cocos/{ui => 2d}/assembler/sprite/sliced.ts | 8 +- cocos/{ui => 2d}/assembler/sprite/tiled.ts | 8 +- cocos/{ui => 2d}/assembler/utils.ts | 6 +- cocos/{core => 2d}/assets/bitmap-font.ts | 6 +- cocos/{core => 2d}/assets/font.ts | 6 +- cocos/2d/assets/index.ts | 6 + cocos/{core => 2d}/assets/label-atlas.ts | 2 +- cocos/{core => 2d}/assets/sprite-atlas.ts | 6 +- cocos/{core => 2d}/assets/sprite-frame.ts | 18 +- cocos/{core => 2d}/assets/ttf-font.ts | 6 +- cocos/2d/components/deprecated.ts | 104 +++++ cocos/{ui => 2d}/components/graphics.ts | 12 +- cocos/2d/components/index.ts | 41 ++ cocos/{ui => 2d}/components/label-outline.ts | 0 cocos/{ui => 2d}/components/label-shadow.ts | 3 +- cocos/{ui => 2d}/components/label.ts | 9 +- cocos/{ui => 2d}/components/mask.ts | 11 +- cocos/{ui => 2d}/components/rich-text.ts | 9 +- cocos/{ui => 2d}/components/sprite.ts | 8 +- .../{ui => 2d}/components/ui-mesh-renderer.ts | 6 +- cocos/{ui => 2d}/components/ui-opacity.ts | 0 .../{ui => 2d}/components/ui-static-batch.ts | 10 +- .../ui-base => 2d/framework}/canvas.ts | 30 +- .../ui-base => 2d/framework}/deprecated.ts | 88 ++-- .../ui-base => 2d/framework}/index.ts | 0 .../ui-base => 2d/framework}/ui-component.ts | 6 +- .../ui-base => 2d/framework}/ui-renderable.ts | 32 +- .../ui-base => 2d/framework}/ui-transform.ts | 16 +- cocos/2d/index.ts | 98 ++++ .../{core/renderer/ui => 2d/renderer}/base.ts | 2 +- .../ui => 2d/renderer}/mesh-buffer.ts | 6 +- .../ui => 2d/renderer}/render-data.ts | 6 +- .../ui => 2d/renderer}/stencil-manager.ts | 8 +- .../ui => 2d/renderer}/ui-draw-batch.ts | 16 +- .../ui => 2d/renderer}/ui-material.ts | 6 +- .../ui => 2d/renderer}/ui-vertex-format.ts | 6 +- cocos/{core/renderer/ui => 2d/renderer}/ui.ts | 39 +- .../asset-manager => 2d/utils}/font-loader.ts | 36 +- cocos/{core => 2d}/utils/html-text-parser.ts | 2 +- cocos/2d/utils/index.ts | 32 ++ cocos/{core => 2d}/utils/text-utils.ts | 0 .../index.ts => 3d/assets/deprecated.ts} | 26 +- cocos/3d/assets/index.ts | 32 ++ cocos/{core => 3d}/assets/mesh.ts | 390 +--------------- cocos/{core => 3d}/assets/morph-rendering.ts | 24 +- cocos/{core => 3d}/assets/morph.ts | 4 +- cocos/{core => 3d}/assets/skeleton.ts | 6 +- cocos/3d/framework/deprecated.ts | 52 +++ cocos/3d/framework/index.ts | 34 ++ .../{core => }/3d/framework/mesh-renderer.ts | 34 +- cocos/{core => }/3d/index.ts | 13 +- .../index.ts => 3d/lights/deprecated.ts} | 64 +-- .../lights}/directional-light-component.ts | 2 +- cocos/3d/lights/index.ts | 37 ++ .../lights}/light-component.ts | 12 +- .../lights}/sphere-light-component.ts | 2 +- .../lights}/spot-light-component.ts | 4 +- cocos/{core/utils => 3d/misc}/batch-utils.ts | 178 ++++---- cocos/{core => }/3d/misc/buffer-blob.ts | 0 cocos/{core => }/3d/misc/buffer.ts | 4 +- cocos/{core => }/3d/misc/create-mesh.ts | 8 +- .../3d/misc/utils.ts => 3d/misc/index.ts} | 3 +- cocos/{core => }/3d/misc/ppm.ts | 1 - cocos/{core => }/3d/misc/read-mesh.ts | 5 +- .../models/baked-skinning-model.ts | 32 +- .../renderer => 3d}/models/morph-model.ts | 10 +- .../renderer => 3d}/models/skinning-model.ts | 92 +--- .../skeletal-animation}/data-pool-manager.ts | 9 +- cocos/3d/skeletal-animation/deprecated.ts | 39 ++ .../skeletal-animation/index.ts} | 7 +- .../skeletal-animation-blending.ts | 10 +- .../skeletal-animation-data-hub.ts | 10 +- .../skeletal-animation-state.ts | 14 +- .../skeletal-animation-utils.ts | 26 +- .../skeletal-animation}/skeletal-animation.ts | 20 +- cocos/3d/skinned-mesh-renderer/deprecated.ts | 55 +++ .../skinned-mesh-renderer}/index.ts | 29 +- .../skinned-mesh-batch-renderer.ts | 22 +- .../skinned-mesh-renderer.ts | 25 +- cocos/audio/audio-downloader.ts | 32 +- cocos/core/3d/framework/deprecated.ts | 137 ------ cocos/core/animation/animation-clip.ts | 12 +- cocos/core/animation/animation-manager.ts | 6 +- cocos/core/animation/animation-state.ts | 3 +- cocos/core/animation/deprecated.ts | 8 - cocos/core/animation/index.ts | 3 - .../animation/skeletal-animation-utils.ts | 98 ++++ .../value-proxy-factories/morph-weights.ts | 2 +- .../value-proxy-factories/uniform.ts | 30 +- cocos/core/asset-manager/downloader.ts | 31 +- cocos/core/asset-manager/factory.ts | 49 +- cocos/core/assets/deprecation.ts | 67 ++- cocos/core/assets/index.ts | 9 +- cocos/core/assets/material.ts | 9 +- cocos/core/assets/rendering-sub-mesh.ts | 417 ++++++++++++++++++ .../init.ts => builtin/builtin-res-mgr.ts} | 28 +- cocos/core/{3d => }/builtin/effects.ts | 0 cocos/core/{3d => }/builtin/index.ts | 3 +- .../builtin/shader-source-assembly.ts | 0 .../{3d => }/builtin/shader-sources/glsl1.ts | 0 .../{3d => }/builtin/shader-sources/glsl3.ts | 0 .../{3d => }/builtin/shader-sources/glsl4.ts | 0 .../camera-component.ts | 34 +- cocos/core/components/deprecated.ts | 60 +++ cocos/core/components/index.ts | 4 + .../renderable-component.ts | 12 +- cocos/core/game.ts | 6 +- cocos/core/geometry/intersect.ts | 3 +- cocos/core/index.ts | 5 +- .../core/pipeline/forward/forward-pipeline.ts | 2 +- cocos/core/pipeline/forward/scene-culling.ts | 2 - .../pipeline/render-additive-light-queue.ts | 2 +- cocos/core/renderer/core/material-instance.ts | 2 +- cocos/core/renderer/core/pass.ts | 2 +- cocos/core/renderer/index.ts | 15 +- cocos/core/renderer/scene/model.ts | 6 +- cocos/core/renderer/scene/render-scene.ts | 4 +- cocos/core/renderer/scene/skybox.ts | 12 +- cocos/core/renderer/scene/submodel.ts | 2 +- cocos/core/renderer/utils.ts | 2 +- cocos/core/root.ts | 12 +- cocos/core/scene-graph/node-ui-properties.ts | 10 +- .../core/utils/coordinates-converts-utils.ts | 2 +- cocos/core/utils/index.ts | 3 - cocos/dragon-bones/ArmatureDisplay.ts | 10 +- cocos/dragon-bones/CCTextureData.ts | 3 +- cocos/dragon-bones/assembler/index.ts | 2 +- cocos/dragon-bones/assembler/simple.ts | 4 +- .../particle-2d/motion-streak-2d-assembler.ts | 6 +- cocos/particle-2d/motion-streak-2d.ts | 6 +- cocos/particle-2d/particle-asset.ts | 2 +- cocos/particle-2d/particle-simulator-2d.ts | 2 +- .../particle-system-2d-assembler.ts | 6 +- cocos/particle-2d/particle-system-2d.ts | 6 +- cocos/particle/billboard.ts | 9 +- cocos/particle/line.ts | 5 +- cocos/particle/models/line-model.ts | 2 +- cocos/particle/models/particle-batch-model.ts | 23 +- cocos/particle/particle-system.ts | 8 +- .../renderer/particle-system-renderer-cpu.ts | 2 +- .../renderer/particle-system-renderer-data.ts | 3 +- .../renderer/particle-system-renderer-gpu.ts | 2 +- cocos/particle/renderer/trail.ts | 2 +- cocos/physics-2d/box2d/physics-world.ts | 11 +- .../box2d/platform/physics-debug-draw.ts | 2 +- cocos/physics-2d/builtin/builtin-world.ts | 4 +- cocos/physics/ammo/ammo-util.ts | 2 +- .../physics/ammo/shapes/ammo-trimesh-shape.ts | 3 +- .../cannon/shapes/cannon-trimesh-shape.ts | 3 +- .../components/colliders/mesh-collider.ts | 2 +- .../physics/physx/shapes/physx-cone-shape.ts | 2 +- .../physx/shapes/physx-cylinder-shape.ts | 2 +- .../physx/shapes/physx-trimesh-shape.ts | 3 +- cocos/physics/spec/i-physics-shape.ts | 2 +- cocos/{core => }/primitive/box.ts | 2 +- cocos/{core => }/primitive/capsule.ts | 2 +- cocos/{core => }/primitive/circle.ts | 2 +- cocos/{core => }/primitive/cone.ts | 0 cocos/{core => }/primitive/cylinder.ts | 2 +- cocos/{core => }/primitive/define.ts | 4 +- cocos/{core => }/primitive/index.ts | 0 cocos/{core => }/primitive/plane.ts | 2 +- cocos/{core => }/primitive/primitive.ts | 10 +- cocos/{core => }/primitive/quad.ts | 0 cocos/{core => }/primitive/sphere.ts | 2 +- cocos/{core => }/primitive/torus.ts | 2 +- cocos/{core => }/primitive/transform.ts | 2 +- cocos/{core => }/primitive/utils.ts | 2 +- cocos/{core/utils => }/profiler/counter.ts | 0 .../{core/utils => }/profiler/perf-counter.ts | 0 cocos/{core/utils => }/profiler/profiler.ts | 24 +- cocos/spine/assembler/index.ts | 2 +- cocos/spine/assembler/simple.ts | 6 +- cocos/spine/skeleton.ts | 18 +- cocos/terrain/terrain.ts | 6 +- cocos/tiledmap/assembler/index.ts | 2 +- cocos/tiledmap/assembler/simple.ts | 6 +- cocos/tiledmap/tiled-layer.ts | 9 +- cocos/tiledmap/tiled-map-asset.ts | 6 +- cocos/tiledmap/tiled-map.ts | 7 +- cocos/tiledmap/tiled-object-group.ts | 9 +- cocos/tiledmap/tiled-types.ts | 6 +- cocos/tiledmap/tiled-utils.ts | 3 +- cocos/tiledmap/tmx-xml-parser.ts | 5 +- cocos/tween/actions/action-instant.ts | 43 +- cocos/tween/tween-action.ts | 3 +- cocos/ui/{components => }/SubContextView.ts | 18 +- .../ui/{components => }/block-input-events.ts | 6 +- cocos/ui/{components => }/button.ts | 22 +- cocos/ui/deprecated.ts | 80 +--- .../editbox/edit-box-impl-base.ts | 0 .../{components => }/editbox/edit-box-impl.ts | 24 +- cocos/ui/{components => }/editbox/edit-box.ts | 24 +- .../{components => }/editbox/tabIndexUtil.ts | 0 cocos/ui/{components => }/editbox/types.ts | 2 +- cocos/ui/index.ts | 82 +--- cocos/ui/{components => }/layout.ts | 16 +- .../{components => }/page-view-indicator.ts | 16 +- cocos/ui/{components => }/page-view.ts | 19 +- cocos/ui/{components => }/progress-bar.ts | 16 +- cocos/ui/{components => }/safe-area.ts | 9 +- cocos/ui/{components => }/scroll-bar.ts | 16 +- cocos/ui/{components => }/scroll-view.ts | 18 +- cocos/ui/{components => }/slider.ts | 16 +- cocos/ui/{components => }/toggle-container.ts | 6 +- cocos/ui/{components => }/toggle.ts | 13 +- .../{components => }/ui-coodinate-tracker.ts | 10 +- cocos/ui/{components => }/view-group.ts | 4 +- cocos/ui/{components => }/widget-manager.ts | 20 +- cocos/ui/{components => }/widget.ts | 24 +- cocos/video/video-downloader.ts | 32 ++ cocos/video/video-player-impl.ts | 2 +- cocos/video/video-player.ts | 2 +- cocos/web-view/web-view-impl.ts | 2 +- cocos/web-view/web-view.ts | 4 +- editor/engine-features/render-config.json | 88 +++- editor/engine-features/schema.json | 27 ++ editor/engine-features/types.ts | 6 +- exports/2d.ts | 1 + exports/3d.ts | 1 + exports/base.ts | 10 +- exports/primitive.ts | 8 + exports/profiler.ts | 1 + exports/ui.ts | 4 +- package-lock.json | 2 +- .../minigame/common/engine/AudioPlayer.js | 316 ++++++------- .../alipay/wrapper/engine/AudioPlayer.js | 4 +- platforms/native/engine/jsb-audio.js | 228 +++++----- .../runtime/common/engine/AudioPlayer.js | 232 +++++----- .../huawei-quick-game/engine/AudioPlayer.js | 262 +++++------ .../oppo-mini-game/engine/AudioPlayer.js | 262 +++++------ .../vivo-mini-game/engine/AudioPlayer.js | 262 +++++------ scripts/module-division/division-config.json | 26 +- tests/animation/animation-clip.test.ts | 3 +- tests/animation/animation-events.test.ts | 3 +- 259 files changed, 3215 insertions(+), 2649 deletions(-) rename cocos/{ui => 2d}/assembler/graphics/helper.ts (100%) rename cocos/{ui => 2d}/assembler/graphics/index.ts (100%) rename cocos/{ui => 2d}/assembler/graphics/types.ts (100%) rename cocos/{ui => 2d}/assembler/graphics/webgl/earcut.ts (100%) rename cocos/{ui => 2d}/assembler/graphics/webgl/graphics-assembler.ts (99%) rename cocos/{ui => 2d}/assembler/graphics/webgl/impl.ts (98%) rename cocos/{ui => 2d}/assembler/graphics/webgl/index.ts (91%) rename cocos/{ui => 2d}/assembler/index.ts (96%) rename cocos/{ui => 2d}/assembler/label/bmfont.ts (95%) rename cocos/{ui => 2d}/assembler/label/bmfontUtils.ts (98%) rename cocos/{ui => 2d}/assembler/label/font-utils.ts (99%) rename cocos/{ui => 2d}/assembler/label/index.ts (94%) rename cocos/{ui => 2d}/assembler/label/letter-font.ts (100%) rename cocos/{ui => 2d}/assembler/label/letter.ts (97%) rename cocos/{ui => 2d}/assembler/label/ttf.ts (96%) rename cocos/{ui => 2d}/assembler/label/ttfUtils.ts (98%) rename cocos/{ui => 2d}/assembler/mask/index.ts (100%) rename cocos/{ui => 2d}/assembler/mask/mask-assembler.ts (91%) rename cocos/{ui => 2d}/assembler/sprite/bar-filled.ts (97%) rename cocos/{ui => 2d}/assembler/sprite/index.ts (94%) rename cocos/{ui => 2d}/assembler/sprite/mesh.js (100%) rename cocos/{ui => 2d}/assembler/sprite/radial-filled.ts (98%) rename cocos/{ui => 2d}/assembler/sprite/simple.ts (97%) rename cocos/{ui => 2d}/assembler/sprite/sliced.ts (96%) rename cocos/{ui => 2d}/assembler/sprite/tiled.ts (98%) rename cocos/{ui => 2d}/assembler/utils.ts (97%) rename cocos/{core => 2d}/assets/bitmap-font.ts (97%) rename cocos/{core => 2d}/assets/font.ts (91%) create mode 100644 cocos/2d/assets/index.ts rename cocos/{core => 2d}/assets/label-atlas.ts (96%) rename cocos/{core => 2d}/assets/sprite-atlas.ts (97%) rename cocos/{core => 2d}/assets/sprite-frame.ts (98%) rename cocos/{core => 2d}/assets/ttf-font.ts (91%) create mode 100644 cocos/2d/components/deprecated.ts rename cocos/{ui => 2d}/components/graphics.ts (98%) create mode 100644 cocos/2d/components/index.ts rename cocos/{ui => 2d}/components/label-outline.ts (100%) rename cocos/{ui => 2d}/components/label-shadow.ts (98%) rename cocos/{ui => 2d}/components/label.ts (98%) rename cocos/{ui => 2d}/components/mask.ts (97%) rename cocos/{ui => 2d}/components/rich-text.ts (98%) rename cocos/{ui => 2d}/components/sprite.ts (98%) rename cocos/{ui => 2d}/components/ui-mesh-renderer.ts (95%) rename cocos/{ui => 2d}/components/ui-opacity.ts (100%) rename cocos/{ui => 2d}/components/ui-static-batch.ts (95%) rename cocos/{core/components/ui-base => 2d/framework}/canvas.ts (94%) rename cocos/{core/components/ui-base => 2d/framework}/deprecated.ts (92%) rename cocos/{core/components/ui-base => 2d/framework}/index.ts (100%) rename cocos/{core/components/ui-base => 2d/framework}/ui-component.ts (96%) rename cocos/{core/components/ui-base => 2d/framework}/ui-renderable.ts (94%) rename cocos/{core/components/ui-base => 2d/framework}/ui-transform.ts (97%) create mode 100644 cocos/2d/index.ts rename cocos/{core/renderer/ui => 2d/renderer}/base.ts (95%) rename cocos/{core/renderer/ui => 2d/renderer}/mesh-buffer.ts (97%) rename cocos/{core/renderer/ui => 2d/renderer}/render-data.ts (98%) rename cocos/{core/renderer/ui => 2d/renderer}/stencil-manager.ts (96%) rename cocos/{core/renderer/ui => 2d/renderer}/ui-draw-batch.ts (90%) rename cocos/{core/renderer/ui => 2d/renderer}/ui-material.ts (94%) rename cocos/{core/renderer/ui => 2d/renderer}/ui-vertex-format.ts (93%) rename cocos/{core/renderer/ui => 2d/renderer}/ui.ts (96%) rename cocos/{core/asset-manager => 2d/utils}/font-loader.ts (88%) rename cocos/{core => 2d}/utils/html-text-parser.ts (99%) create mode 100644 cocos/2d/utils/index.ts rename cocos/{core => 2d}/utils/text-utils.ts (100%) rename cocos/{core/renderer/models/index.ts => 3d/assets/deprecated.ts} (74%) create mode 100644 cocos/3d/assets/index.ts rename cocos/{core => 3d}/assets/mesh.ts (75%) rename cocos/{core => 3d}/assets/morph-rendering.ts (97%) rename cocos/{core => 3d}/assets/morph.ts (96%) rename cocos/{core => 3d}/assets/skeleton.ts (96%) create mode 100644 cocos/3d/framework/deprecated.ts create mode 100644 cocos/3d/framework/index.ts rename cocos/{core => }/3d/framework/mesh-renderer.ts (94%) rename cocos/{core => }/3d/index.ts (84%) rename cocos/{ui/components/index.ts => 3d/lights/deprecated.ts} (50%) rename cocos/{core/3d/framework => 3d/lights}/directional-light-component.ts (98%) create mode 100644 cocos/3d/lights/index.ts rename cocos/{core/3d/framework => 3d/lights}/light-component.ts (96%) rename cocos/{core/3d/framework => 3d/lights}/sphere-light-component.ts (98%) rename cocos/{core/3d/framework => 3d/lights}/spot-light-component.ts (97%) rename cocos/{core/utils => 3d/misc}/batch-utils.ts (95%) rename cocos/{core => }/3d/misc/buffer-blob.ts (100%) rename cocos/{core => }/3d/misc/buffer.ts (98%) rename cocos/{core => }/3d/misc/create-mesh.ts (98%) rename cocos/{core/3d/misc/utils.ts => 3d/misc/index.ts} (96%) rename cocos/{core => }/3d/misc/ppm.ts (99%) rename cocos/{core => }/3d/misc/read-mesh.ts (95%) rename cocos/{core/renderer => 3d}/models/baked-skinning-model.ts (90%) rename cocos/{core/renderer => 3d}/models/morph-model.ts (90%) rename cocos/{core/renderer => 3d}/models/skinning-model.ts (75%) rename cocos/{core/renderer => 3d/skeletal-animation}/data-pool-manager.ts (86%) create mode 100644 cocos/3d/skeletal-animation/deprecated.ts rename cocos/{core/renderer/models/model-uniforms.ts => 3d/skeletal-animation/index.ts} (87%) rename cocos/{core/animation => 3d/skeletal-animation}/skeletal-animation-blending.ts (96%) rename cocos/{core/animation => 3d/skeletal-animation}/skeletal-animation-data-hub.ts (95%) rename cocos/{core/animation => 3d/skeletal-animation}/skeletal-animation-state.ts (93%) rename cocos/{core/renderer/models => 3d/skeletal-animation}/skeletal-animation-utils.ts (96%) rename cocos/{core/animation => 3d/skeletal-animation}/skeletal-animation.ts (93%) create mode 100644 cocos/3d/skinned-mesh-renderer/deprecated.ts rename cocos/{core/3d/framework => 3d/skinned-mesh-renderer}/index.ts (64%) rename cocos/{core/3d/framework => 3d/skinned-mesh-renderer}/skinned-mesh-batch-renderer.ts (97%) rename cocos/{core/3d/framework => 3d/skinned-mesh-renderer}/skinned-mesh-renderer.ts (85%) delete mode 100644 cocos/core/3d/framework/deprecated.ts create mode 100644 cocos/core/animation/skeletal-animation-utils.ts create mode 100644 cocos/core/assets/rendering-sub-mesh.ts rename cocos/core/{3d/builtin/init.ts => builtin/builtin-res-mgr.ts} (94%) rename cocos/core/{3d => }/builtin/effects.ts (100%) rename cocos/core/{3d => }/builtin/index.ts (97%) rename cocos/core/{3d => }/builtin/shader-source-assembly.ts (100%) rename cocos/core/{3d => }/builtin/shader-sources/glsl1.ts (100%) rename cocos/core/{3d => }/builtin/shader-sources/glsl3.ts (100%) rename cocos/core/{3d => }/builtin/shader-sources/glsl4.ts (100%) rename cocos/core/{3d/framework => components}/camera-component.ts (95%) create mode 100644 cocos/core/components/deprecated.ts rename cocos/core/{3d/framework => components}/renderable-component.ts (95%) rename cocos/{core => }/primitive/box.ts (99%) rename cocos/{core => }/primitive/capsule.ts (99%) rename cocos/{core => }/primitive/circle.ts (98%) rename cocos/{core => }/primitive/cone.ts (100%) rename cocos/{core => }/primitive/cylinder.ts (99%) rename cocos/{core => }/primitive/define.ts (97%) rename cocos/{core => }/primitive/index.ts (100%) rename cocos/{core => }/primitive/plane.ts (99%) rename cocos/{core => }/primitive/primitive.ts (92%) rename cocos/{core => }/primitive/quad.ts (100%) rename cocos/{core => }/primitive/sphere.ts (98%) rename cocos/{core => }/primitive/torus.ts (98%) rename cocos/{core => }/primitive/transform.ts (98%) rename cocos/{core => }/primitive/utils.ts (98%) rename cocos/{core/utils => }/profiler/counter.ts (100%) rename cocos/{core/utils => }/profiler/perf-counter.ts (100%) rename cocos/{core/utils => }/profiler/profiler.ts (96%) rename cocos/ui/{components => }/SubContextView.ts (94%) rename cocos/ui/{components => }/block-input-events.ts (94%) rename cocos/ui/{components => }/button.ts (98%) rename cocos/ui/{components => }/editbox/edit-box-impl-base.ts (100%) rename cocos/ui/{components => }/editbox/edit-box-impl.ts (97%) rename cocos/ui/{components => }/editbox/edit-box.ts (97%) rename cocos/ui/{components => }/editbox/tabIndexUtil.ts (100%) rename cocos/ui/{components => }/editbox/types.ts (98%) rename cocos/ui/{components => }/layout.ts (98%) rename cocos/ui/{components => }/page-view-indicator.ts (94%) rename cocos/ui/{components => }/page-view.ts (97%) rename cocos/ui/{components => }/progress-bar.ts (96%) rename cocos/ui/{components => }/safe-area.ts (95%) rename cocos/ui/{components => }/scroll-bar.ts (97%) rename cocos/ui/{components => }/scroll-view.ts (99%) rename cocos/ui/{components => }/slider.ts (95%) rename cocos/ui/{components => }/toggle-container.ts (97%) rename cocos/ui/{components => }/toggle.ts (93%) rename cocos/ui/{components => }/ui-coodinate-tracker.ts (95%) rename cocos/ui/{components => }/view-group.ts (95%) rename cocos/ui/{components => }/widget-manager.ts (96%) rename cocos/ui/{components => }/widget.ts (97%) create mode 100644 exports/2d.ts create mode 100644 exports/3d.ts create mode 100644 exports/primitive.ts create mode 100644 exports/profiler.ts diff --git a/cc.config.json b/cc.config.json index 53318deb33..61213ab6e1 100644 --- a/cc.config.json +++ b/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" ] }, diff --git a/cocos/ui/assembler/graphics/helper.ts b/cocos/2d/assembler/graphics/helper.ts similarity index 100% rename from cocos/ui/assembler/graphics/helper.ts rename to cocos/2d/assembler/graphics/helper.ts diff --git a/cocos/ui/assembler/graphics/index.ts b/cocos/2d/assembler/graphics/index.ts similarity index 100% rename from cocos/ui/assembler/graphics/index.ts rename to cocos/2d/assembler/graphics/index.ts diff --git a/cocos/ui/assembler/graphics/types.ts b/cocos/2d/assembler/graphics/types.ts similarity index 100% rename from cocos/ui/assembler/graphics/types.ts rename to cocos/2d/assembler/graphics/types.ts diff --git a/cocos/ui/assembler/graphics/webgl/earcut.ts b/cocos/2d/assembler/graphics/webgl/earcut.ts similarity index 100% rename from cocos/ui/assembler/graphics/webgl/earcut.ts rename to cocos/2d/assembler/graphics/webgl/earcut.ts diff --git a/cocos/ui/assembler/graphics/webgl/graphics-assembler.ts b/cocos/2d/assembler/graphics/webgl/graphics-assembler.ts similarity index 99% rename from cocos/ui/assembler/graphics/webgl/graphics-assembler.ts rename to cocos/2d/assembler/graphics/webgl/graphics-assembler.ts index 4705c27399..d7e8f2d007 100644 --- a/cocos/ui/assembler/graphics/webgl/graphics-assembler.ts +++ b/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'; diff --git a/cocos/ui/assembler/graphics/webgl/impl.ts b/cocos/2d/assembler/graphics/webgl/impl.ts similarity index 98% rename from cocos/ui/assembler/graphics/webgl/impl.ts rename to cocos/2d/assembler/graphics/webgl/impl.ts index 5529e90ddc..3a4d56070f 100644 --- a/cocos/ui/assembler/graphics/webgl/impl.ts +++ b/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'; diff --git a/cocos/ui/assembler/graphics/webgl/index.ts b/cocos/2d/assembler/graphics/webgl/index.ts similarity index 91% rename from cocos/ui/assembler/graphics/webgl/index.ts rename to cocos/2d/assembler/graphics/webgl/index.ts index 36e3064c6d..e00f0d367b 100644 --- a/cocos/ui/assembler/graphics/webgl/index.ts +++ b/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'; diff --git a/cocos/ui/assembler/index.ts b/cocos/2d/assembler/index.ts similarity index 96% rename from cocos/ui/assembler/index.ts rename to cocos/2d/assembler/index.ts index 1b669bd0dd..b422354fb5 100644 --- a/cocos/ui/assembler/index.ts +++ b/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'; diff --git a/cocos/ui/assembler/label/bmfont.ts b/cocos/2d/assembler/label/bmfont.ts similarity index 95% rename from cocos/ui/assembler/label/bmfont.ts rename to cocos/2d/assembler/label/bmfont.ts index 6a73947ea8..17ff60a9d6 100644 --- a/cocos/ui/assembler/label/bmfont.ts +++ b/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'; diff --git a/cocos/ui/assembler/label/bmfontUtils.ts b/cocos/2d/assembler/label/bmfontUtils.ts similarity index 98% rename from cocos/ui/assembler/label/bmfontUtils.ts rename to cocos/2d/assembler/label/bmfontUtils.ts index 18ea746c28..a953150be0 100644 --- a/cocos/ui/assembler/label/bmfontUtils.ts +++ b/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 { diff --git a/cocos/ui/assembler/label/font-utils.ts b/cocos/2d/assembler/label/font-utils.ts similarity index 99% rename from cocos/ui/assembler/label/font-utils.ts rename to cocos/2d/assembler/label/font-utils.ts index afd858ed4f..c615185dad 100644 --- a/cocos/ui/assembler/label/font-utils.ts +++ b/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 { diff --git a/cocos/ui/assembler/label/index.ts b/cocos/2d/assembler/label/index.ts similarity index 94% rename from cocos/ui/assembler/label/index.ts rename to cocos/2d/assembler/label/index.ts index d606282285..6257aa88c9 100644 --- a/cocos/ui/assembler/label/index.ts +++ b/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'; diff --git a/cocos/ui/assembler/label/letter-font.ts b/cocos/2d/assembler/label/letter-font.ts similarity index 100% rename from cocos/ui/assembler/label/letter-font.ts rename to cocos/2d/assembler/label/letter-font.ts diff --git a/cocos/ui/assembler/label/letter.ts b/cocos/2d/assembler/label/letter.ts similarity index 97% rename from cocos/ui/assembler/label/letter.ts rename to cocos/2d/assembler/label/letter.ts index d0bd289e54..0dae24df0d 100644 --- a/cocos/ui/assembler/label/letter.ts +++ b/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'; diff --git a/cocos/ui/assembler/label/ttf.ts b/cocos/2d/assembler/label/ttf.ts similarity index 96% rename from cocos/ui/assembler/label/ttf.ts rename to cocos/2d/assembler/label/ttf.ts index 2b23896e2b..1b56a38901 100644 --- a/cocos/ui/assembler/label/ttf.ts +++ b/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(); diff --git a/cocos/ui/assembler/label/ttfUtils.ts b/cocos/2d/assembler/label/ttfUtils.ts similarity index 98% rename from cocos/ui/assembler/label/ttfUtils.ts rename to cocos/2d/assembler/label/ttfUtils.ts index 0babb86d13..22e358b398 100644 --- a/cocos/ui/assembler/label/ttfUtils.ts +++ b/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; diff --git a/cocos/ui/assembler/mask/index.ts b/cocos/2d/assembler/mask/index.ts similarity index 100% rename from cocos/ui/assembler/mask/index.ts rename to cocos/2d/assembler/mask/index.ts diff --git a/cocos/ui/assembler/mask/mask-assembler.ts b/cocos/2d/assembler/mask/mask-assembler.ts similarity index 91% rename from cocos/ui/assembler/mask/mask-assembler.ts rename to cocos/2d/assembler/mask/mask-assembler.ts index bd7578fb14..379fcfd41b 100644 --- a/cocos/ui/assembler/mask/mask-assembler.ts +++ b/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!; diff --git a/cocos/ui/assembler/sprite/bar-filled.ts b/cocos/2d/assembler/sprite/bar-filled.ts similarity index 97% rename from cocos/ui/assembler/sprite/bar-filled.ts rename to cocos/2d/assembler/sprite/bar-filled.ts index 9656cb5766..418a7b624d 100644 --- a/cocos/ui/assembler/sprite/bar-filled.ts +++ b/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'; diff --git a/cocos/ui/assembler/sprite/index.ts b/cocos/2d/assembler/sprite/index.ts similarity index 94% rename from cocos/ui/assembler/sprite/index.ts rename to cocos/2d/assembler/sprite/index.ts index 5a67c9bd8d..4b8fa380de 100644 --- a/cocos/ui/assembler/sprite/index.ts +++ b/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'; diff --git a/cocos/ui/assembler/sprite/mesh.js b/cocos/2d/assembler/sprite/mesh.js similarity index 100% rename from cocos/ui/assembler/sprite/mesh.js rename to cocos/2d/assembler/sprite/mesh.js diff --git a/cocos/ui/assembler/sprite/radial-filled.ts b/cocos/2d/assembler/sprite/radial-filled.ts similarity index 98% rename from cocos/ui/assembler/sprite/radial-filled.ts rename to cocos/2d/assembler/sprite/radial-filled.ts index cd3cfa3cf5..adf606616d 100644 --- a/cocos/ui/assembler/sprite/radial-filled.ts +++ b/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; diff --git a/cocos/ui/assembler/sprite/simple.ts b/cocos/2d/assembler/sprite/simple.ts similarity index 97% rename from cocos/ui/assembler/sprite/simple.ts rename to cocos/2d/assembler/sprite/simple.ts index bc6be2a57c..5163aaa2c0 100644 --- a/cocos/ui/assembler/sprite/simple.ts +++ b/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[] = []; diff --git a/cocos/ui/assembler/sprite/sliced.ts b/cocos/2d/assembler/sprite/sliced.ts similarity index 96% rename from cocos/ui/assembler/sprite/sliced.ts rename to cocos/2d/assembler/sprite/sliced.ts index 2e2802e5e3..fbfbfbf90f 100644 --- a/cocos/ui/assembler/sprite/sliced.ts +++ b/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(); diff --git a/cocos/ui/assembler/sprite/tiled.ts b/cocos/2d/assembler/sprite/tiled.ts similarity index 98% rename from cocos/ui/assembler/sprite/tiled.ts rename to cocos/2d/assembler/sprite/tiled.ts index b4ef3476cd..8e6d33ed4d 100644 --- a/cocos/ui/assembler/sprite/tiled.ts +++ b/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++) { diff --git a/cocos/ui/assembler/utils.ts b/cocos/2d/assembler/utils.ts similarity index 97% rename from cocos/ui/assembler/utils.ts rename to cocos/2d/assembler/utils.ts index 36f902606a..e87231a5e5 100644 --- a/cocos/ui/assembler/utils.ts +++ b/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(); diff --git a/cocos/core/assets/bitmap-font.ts b/cocos/2d/assets/bitmap-font.ts similarity index 97% rename from cocos/core/assets/bitmap-font.ts rename to cocos/2d/assets/bitmap-font.ts index 9412cc6465..a5bb01462e 100644 --- a/cocos/core/assets/bitmap-font.ts +++ b/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; diff --git a/cocos/core/assets/font.ts b/cocos/2d/assets/font.ts similarity index 91% rename from cocos/core/assets/font.ts rename to cocos/2d/assets/font.ts index 6692872e71..b57a343e2a 100644 --- a/cocos/core/assets/font.ts +++ b/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. diff --git a/cocos/2d/assets/index.ts b/cocos/2d/assets/index.ts new file mode 100644 index 0000000000..9aaccd1e18 --- /dev/null +++ b/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'; diff --git a/cocos/core/assets/label-atlas.ts b/cocos/2d/assets/label-atlas.ts similarity index 96% rename from cocos/core/assets/label-atlas.ts rename to cocos/2d/assets/label-atlas.ts index 92502d7a11..dc9cde306a 100644 --- a/cocos/core/assets/label-atlas.ts +++ b/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 艺术数字字体资源类。 diff --git a/cocos/core/assets/sprite-atlas.ts b/cocos/2d/assets/sprite-atlas.ts similarity index 97% rename from cocos/core/assets/sprite-atlas.ts rename to cocos/2d/assets/sprite-atlas.ts index 17f847d8ce..c4be9999d8 100644 --- a/cocos/core/assets/sprite-atlas.ts +++ b/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; diff --git a/cocos/core/assets/sprite-frame.ts b/cocos/2d/assets/sprite-frame.ts similarity index 98% rename from cocos/core/assets/sprite-frame.ts rename to cocos/2d/assets/sprite-frame.ts index c2b183c71b..92c1d70765 100644 --- a/cocos/core/assets/sprite-frame.ts +++ b/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; diff --git a/cocos/core/assets/ttf-font.ts b/cocos/2d/assets/ttf-font.ts similarity index 91% rename from cocos/core/assets/ttf-font.ts rename to cocos/2d/assets/ttf-font.ts index 0154dc49b7..ff9519b1b7 100644 --- a/cocos/core/assets/ttf-font.ts +++ b/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. diff --git a/cocos/2d/components/deprecated.ts b/cocos/2d/components/deprecated.ts new file mode 100644 index 0000000000..46ebaef46c --- /dev/null +++ b/cocos/2d/components/deprecated.ts @@ -0,0 +1,104 @@ +/* + Copyright (c) 2020 Xiamen Yaji Software Co., Ltd. + + https://www.cocos.com/ + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + */ + +/** + * @packageDocumentation + * @module ui + */ +import { Mask } from './mask'; +import { Label } from './label'; +import { LabelOutline } from './label-outline'; +import { RichText } from './rich-text'; +import { Sprite } from './sprite'; +import { UIMeshRenderer } from './ui-mesh-renderer'; +import { Graphics } from './graphics'; +import { UIStaticBatch } from './ui-static-batch'; +import { UIOpacity } from './ui-opacity'; +import { js } from '../../core/utils/js'; +import { legacyCC } from '../../core/global-exports'; + + +/** + * Alias of [[Mask]] + * @deprecated Since v1.2 + */ +export { Mask as MaskComponent }; +legacyCC.MaskComponent = Mask; +js.setClassAlias(Mask, 'cc.MaskComponent'); +/** + * Alias of [[Label]] + * @deprecated Since v1.2 + */ +export { Label as LabelComponent }; +legacyCC.LabelComponent = Label; +js.setClassAlias(Label, 'cc.LabelComponent'); +/** + * Alias of [[LabelOutline]] + * @deprecated Since v1.2 + */ +export { LabelOutline as LabelOutlineComponent }; +legacyCC.LabelOutlineComponent = LabelOutline; +js.setClassAlias(LabelOutline, 'cc.LabelOutlineComponent'); + +/** + * Alias of [[RichText]] + * @deprecated Since v1.2 + */ +export { RichText as RichTextComponent }; +legacyCC.RichTextComponent = RichText; +js.setClassAlias(RichText, 'cc.RichTextComponent'); +/** + * Alias of [[Sprite]] + * @deprecated Since v1.2 + */ +export { Sprite as SpriteComponent }; +legacyCC.SpriteComponent = Sprite; +js.setClassAlias(Sprite, 'cc.SpriteComponent'); +/** + * Alias of [[UIMeshRenderer]] + * @deprecated Since v1.2 + */ +export { UIMeshRenderer as UIModelComponent }; +legacyCC.UIModelComponent = UIMeshRenderer; +js.setClassAlias(UIMeshRenderer, 'cc.UIModelComponent'); +/** + * Alias of [[Graphics]] + * @deprecated Since v1.2 + */ +export { Graphics as GraphicsComponent }; +legacyCC.GraphicsComponent = Graphics; +js.setClassAlias(Graphics, 'cc.GraphicsComponent'); +/** + * Alias of [[UIStaticBatch]] + * @deprecated Since v1.2 + */ +export { UIStaticBatch as UIStaticBatchComponent }; +js.setClassAlias(UIStaticBatch, 'cc.UIStaticBatchComponent'); +/** + * Alias of [[UIOpacity]] + * @deprecated Since v1.2 + */ +export { UIOpacity as UIOpacityComponent }; +js.setClassAlias(UIOpacity, 'cc.UIOpacityComponent'); diff --git a/cocos/ui/components/graphics.ts b/cocos/2d/components/graphics.ts similarity index 98% rename from cocos/ui/components/graphics.ts rename to cocos/2d/components/graphics.ts index 9b11a4c205..ca6b4bc662 100644 --- a/cocos/ui/components/graphics.ts +++ b/cocos/2d/components/graphics.ts @@ -30,18 +30,18 @@ */ import { ccclass, help, executionOrder, menu, tooltip, type, visible, override, editable, serializable } from 'cc.decorator'; -import { builtinResMgr } from '../../core/3d/builtin'; -import { InstanceMaterialType, UIRenderable } from '../../core/components/ui-base/ui-renderable'; +import { builtinResMgr } from '../../core/builtin'; +import { InstanceMaterialType, UIRenderable } from '../framework/ui-renderable'; import { director } from '../../core/director'; import { Color } from '../../core/math'; import { IMaterialInstanceInfo, scene } from '../../core/renderer'; -import { IAssembler } from '../../core/renderer/ui/base'; -import { UI } from '../../core/renderer/ui/ui'; +import { IAssembler } from '../renderer/base'; +import { UI } from '../renderer/ui'; import { LineCap, LineJoin } from '../assembler/graphics/types'; import { Impl } from '../assembler/graphics/webgl/impl'; -import { RenderingSubMesh } from '../../core'; +import { RenderingSubMesh } from '../../core/assets'; import { Format, PrimitiveMode, Attribute, Device, BufferUsageBit, BufferInfo, MemoryUsageBit } from '../../core/gfx'; -import { vfmtPosColor, getAttributeStride, getAttributeFormatBytes } from '../../core/renderer/ui/ui-vertex-format'; +import { vfmtPosColor, getAttributeStride, getAttributeFormatBytes } from '../renderer/ui-vertex-format'; import { legacyCC } from '../../core/global-exports'; const _matInsInfo: IMaterialInstanceInfo = { diff --git a/cocos/2d/components/index.ts b/cocos/2d/components/index.ts new file mode 100644 index 0000000000..1640df101c --- /dev/null +++ b/cocos/2d/components/index.ts @@ -0,0 +1,41 @@ +/* + Copyright (c) 2020 Xiamen Yaji Software Co., Ltd. + + https://www.cocos.com/ + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + */ + +/** + * @packageDocumentation + * @hidden + */ +export * from './label'; +export { Mask } from './mask'; +export { RichText } from './rich-text'; +export { Sprite } from './sprite'; +export { UIMeshRenderer } from './ui-mesh-renderer'; +export { LabelOutline } from './label-outline'; +export { Graphics } from './graphics'; +export { UIStaticBatch } from './ui-static-batch'; +export { LabelShadow } from './label-shadow'; +export { UIOpacity } from './ui-opacity'; + +export * from './deprecated'; diff --git a/cocos/ui/components/label-outline.ts b/cocos/2d/components/label-outline.ts similarity index 100% rename from cocos/ui/components/label-outline.ts rename to cocos/2d/components/label-outline.ts diff --git a/cocos/ui/components/label-shadow.ts b/cocos/2d/components/label-shadow.ts similarity index 98% rename from cocos/ui/components/label-shadow.ts rename to cocos/2d/components/label-shadow.ts index 914dbb076b..cd4b9b0aed 100644 --- a/cocos/ui/components/label-shadow.ts +++ b/cocos/2d/components/label-shadow.ts @@ -31,10 +31,9 @@ import { Component } from '../../core/components/component'; import { ccclass, help, executionOrder, menu, tooltip, requireComponent, executeInEditMode, serializable } from 'cc.decorator'; -import { Color } from '../../core/math'; +import { Color, Vec2 } from '../../core/math'; import { Label } from './label'; import { legacyCC } from '../../core/global-exports'; -import { Vec2 } from '../../core/math'; /** * @en Shadow effect for Label component, only for system fonts or TTF fonts diff --git a/cocos/ui/components/label.ts b/cocos/2d/components/label.ts similarity index 98% rename from cocos/ui/components/label.ts rename to cocos/2d/components/label.ts index ed21966eee..24410ece0c 100644 --- a/cocos/ui/components/label.ts +++ b/cocos/2d/components/label.ts @@ -29,13 +29,14 @@ * @module ui */ -import { BitmapFont, Font, ImageAsset, SpriteFrame, Texture2D, Material } from '../../core/assets'; +import { BitmapFont, Font, SpriteFrame } from '../assets'; +import { ImageAsset, Texture2D, Material } from '../../core/assets'; import { ccclass, help, executionOrder, menu, tooltip, displayOrder, visible, displayName, multiline, type, readOnly, override, serializable, editable } from 'cc.decorator'; import { ccenum } from '../../core/value-types/enum'; -import { UI } from '../../core/renderer/ui/ui'; -import { FontAtlas } from '../../core/assets/bitmap-font'; +import { UI } from '../renderer/ui'; +import { FontAtlas } from '../assets/bitmap-font'; import { CanvasPool, ISharedLabelData, LetterRenderTexture } from '../assembler/label/font-utils'; -import { UIRenderable } from '../../core/components/ui-base/ui-renderable'; +import { UIRenderable } from '../framework/ui-renderable'; import { warnID } from '../../core/platform/debug'; import { EDITOR } from 'internal:constants'; diff --git a/cocos/ui/components/mask.ts b/cocos/2d/components/mask.ts similarity index 97% rename from cocos/ui/components/mask.ts rename to cocos/2d/components/mask.ts index b1da74ab7c..bfb150e1bb 100644 --- a/cocos/ui/components/mask.ts +++ b/cocos/2d/components/mask.ts @@ -30,20 +30,21 @@ */ import { ccclass, help, executionOrder, menu, tooltip, displayOrder, type, visible, override, serializable, range, slide } from 'cc.decorator'; -import { InstanceMaterialType, UIRenderable } from '../../core/components/ui-base/ui-renderable'; +import { InstanceMaterialType, UIRenderable } from '../framework/ui-renderable'; import { clamp, Color, Mat4, Vec2, Vec3 } from '../../core/math'; import { warnID } from '../../core/platform'; -import { UI } from '../../core/renderer/ui/ui'; +import { UI } from '../renderer/ui'; import { ccenum } from '../../core/value-types/enum'; import { Graphics } from './graphics'; import { TransformBit } from '../../core/scene-graph/node-enum'; -import { Game, SpriteFrame, Material, builtinResMgr, director, RenderingSubMesh } from '../../core'; +import { SpriteFrame } from '../assets/sprite-frame'; +import { Game, Material, builtinResMgr, director, RenderingSubMesh } from '../../core/'; import { Device, BufferInfo, BufferUsageBit, MemoryUsageBit, PrimitiveMode } from '../../core/gfx'; import { legacyCC } from '../../core/global-exports'; import { MaterialInstance, scene } from '../../core/renderer'; import { Model } from '../../core/renderer/scene'; -import { vfmt, getAttributeStride } from '../../core/renderer/ui/ui-vertex-format'; -import { Stage } from '../../core/renderer/ui/stencil-manager'; +import { vfmt, getAttributeStride } from '../renderer/ui-vertex-format'; +import { Stage } from '../renderer/stencil-manager'; const _worldMatrix = new Mat4(); const _vec2_temp = new Vec2(); diff --git a/cocos/ui/components/rich-text.ts b/cocos/2d/components/rich-text.ts similarity index 98% rename from cocos/ui/components/rich-text.ts rename to cocos/2d/components/rich-text.ts index de787d853d..1969eb03dc 100644 --- a/cocos/ui/components/rich-text.ts +++ b/cocos/2d/components/rich-text.ts @@ -29,20 +29,21 @@ * @module ui */ -import { Font, SpriteAtlas, SpriteFrame, TTFFont } from '../../core/assets'; +import { Font, SpriteAtlas, TTFFont, SpriteFrame } from '../assets'; import { ccclass, executeInEditMode, executionOrder, help, menu, tooltip, multiline, type, serializable } from 'cc.decorator'; import { assert, EventTouch, warnID } from '../../core/platform'; -import { BASELINE_RATIO, fragmentText, HtmlTextParser, IHtmlTextParserResultObj, IHtmlTextParserStack, isUnicodeCJK, isUnicodeSpace } from '../../core/utils'; +import { BASELINE_RATIO, fragmentText, isUnicodeCJK, isUnicodeSpace } from '../utils/text-utils'; +import { HtmlTextParser, IHtmlTextParserResultObj, IHtmlTextParserStack } from '../utils/html-text-parser'; import Pool from '../../core/utils/pool'; import { Color, Vec2 } from '../../core/math'; import { Node, PrivateNode } from '../../core/scene-graph'; import { CacheMode, HorizontalTextAlignment, Label, VerticalTextAlignment } from './label'; import { LabelOutline } from './label-outline'; import { Sprite } from './sprite'; -import { UIComponent, UIRenderable, UITransform } from '../../core/components/ui-base'; +import { UIComponent, UIRenderable, UITransform } from '../framework'; import { DEV, EDITOR } from 'internal:constants'; import { legacyCC } from '../../core/global-exports'; -import { Component } from "../../core/components"; +import { Component } from '../../core/components'; import assetManager from '../../core/asset-manager/asset-manager'; const _htmlTextParser = new HtmlTextParser(); diff --git a/cocos/ui/components/sprite.ts b/cocos/2d/components/sprite.ts similarity index 98% rename from cocos/ui/components/sprite.ts rename to cocos/2d/components/sprite.ts index 7a46f3f86e..0c77593648 100644 --- a/cocos/ui/components/sprite.ts +++ b/cocos/2d/components/sprite.ts @@ -29,15 +29,15 @@ * @module ui */ -import { SpriteAtlas } from '../../core/assets/sprite-atlas'; -import { SpriteFrame } from '../../core/assets/sprite-frame'; +import { SpriteAtlas } from '../assets/sprite-atlas'; +import { SpriteFrame } from '../assets/sprite-frame'; import { ccclass, help, executionOrder, menu, tooltip, displayOrder, type, range, editable, serializable } from 'cc.decorator'; import { SystemEventType } from '../../core/platform/event-manager/event-enum'; import { Vec2 } from '../../core/math'; import { ccenum } from '../../core/value-types/enum'; import { clamp } from '../../core/math/utils'; -import { UI } from '../../core/renderer/ui/ui'; -import { UIRenderable, InstanceMaterialType } from '../../core/components/ui-base/ui-renderable'; +import { UI } from '../renderer/ui'; +import { UIRenderable, InstanceMaterialType } from '../framework/ui-renderable'; import { EDITOR } from 'internal:constants'; import { legacyCC } from '../../core/global-exports'; import { PixelFormat } from '../../core/assets/asset-enum'; diff --git a/cocos/ui/components/ui-mesh-renderer.ts b/cocos/2d/components/ui-mesh-renderer.ts similarity index 95% rename from cocos/ui/components/ui-mesh-renderer.ts rename to cocos/2d/components/ui-mesh-renderer.ts index cb0b61adb5..38b50f3ca6 100644 --- a/cocos/ui/components/ui-mesh-renderer.ts +++ b/cocos/2d/components/ui-mesh-renderer.ts @@ -29,12 +29,12 @@ * @module ui */ -import { RenderableComponent } from '../../core/3d/framework/renderable-component'; -import { UIComponent } from '../../core/components/ui-base/ui-component'; +import { RenderableComponent } from '../../core/components/renderable-component'; +import { UIComponent } from '../framework/ui-component'; import { ccclass, help, executionOrder, menu } from 'cc.decorator'; import { director } from '../../core/director'; import { RenderPriority } from '../../core/pipeline/define'; -import { UI } from '../../core/renderer/ui/ui'; +import { UI } from '../renderer/ui'; import { scene } from '../../core/renderer'; import { legacyCC } from '../../core/global-exports'; diff --git a/cocos/ui/components/ui-opacity.ts b/cocos/2d/components/ui-opacity.ts similarity index 100% rename from cocos/ui/components/ui-opacity.ts rename to cocos/2d/components/ui-opacity.ts diff --git a/cocos/ui/components/ui-static-batch.ts b/cocos/2d/components/ui-static-batch.ts similarity index 95% rename from cocos/ui/components/ui-static-batch.ts rename to cocos/2d/components/ui-static-batch.ts index dd8fd02aa7..88768a90e1 100644 --- a/cocos/ui/components/ui-static-batch.ts +++ b/cocos/2d/components/ui-static-batch.ts @@ -29,12 +29,12 @@ */ import { ccclass, help, menu, executionOrder, visible, override } from 'cc.decorator'; -import { UIRenderable } from '../../core/components/ui-base/ui-renderable'; -import { UI } from '../../core/renderer/ui/ui'; -import { MeshBuffer } from '../../core/renderer/ui/mesh-buffer'; -import { UIDrawBatch } from '../../core/renderer/ui/ui-draw-batch'; +import { UIRenderable } from '../framework/ui-renderable'; +import { UI } from '../renderer/ui'; +import { MeshBuffer } from '../renderer/mesh-buffer'; +import { UIDrawBatch } from '../renderer/ui-draw-batch'; import { director, Color, warnID } from '../../core'; -import { vfmtPosUvColor } from '../../core/renderer/ui/ui-vertex-format'; +import { vfmtPosUvColor } from '../renderer/ui-vertex-format'; import { BlendFactor } from '../../core/gfx'; /** diff --git a/cocos/core/components/ui-base/canvas.ts b/cocos/2d/framework/canvas.ts similarity index 94% rename from cocos/core/components/ui-base/canvas.ts rename to cocos/2d/framework/canvas.ts index f4f0e70ee8..61f1b9e26d 100644 --- a/cocos/core/components/ui-base/canvas.ts +++ b/cocos/2d/framework/canvas.ts @@ -32,21 +32,21 @@ import { ccclass, help, disallowMultiple, executeInEditMode, executionOrder, menu, requireComponent, tooltip, type, serializable } from 'cc.decorator'; import { EDITOR } from 'internal:constants'; -import { Camera } from '../../3d/framework/camera-component'; -import { Widget } from '../../../ui/components/widget'; -import { RenderTexture } from '../../assets/render-texture'; -import { game } from '../../game'; -import { ClearFlag } from '../../gfx/define'; -import { Color, Vec3, Rect, Size } from '../../math'; -import { view } from '../../platform/view'; -import visibleRect from '../../platform/visible-rect'; -import { Node } from '../../scene-graph/node'; -import { Enum } from '../../value-types'; -import { Component } from '../component'; +import { Camera } from '../../core/components/camera-component'; +import { Widget } from '../../ui/widget'; +import { RenderTexture } from '../../core/assets/render-texture'; +import { game } from '../../core/game'; +import { ClearFlag } from '../../core/gfx/define'; +import { Color, Vec3, Rect, Size } from '../../core/math'; +import { view } from '../../core/platform/view'; +import visibleRect from '../../core/platform/visible-rect'; +import { Node } from '../../core/scene-graph/node'; +import { Enum } from '../../core/value-types'; +import { Component } from '../../core/components/component'; import { UITransform } from './ui-transform'; -import { legacyCC } from '../../global-exports'; -import { RenderWindow } from '../../renderer/core/render-window'; -import { SystemEventType } from '../../platform/event-manager'; +import { legacyCC } from '../../core/global-exports'; +import { RenderWindow } from '../../core/renderer/core/render-window'; +import { SystemEventType } from '../../core/platform/event-manager'; const _worldPos = new Vec3(); @@ -291,7 +291,7 @@ export class Canvas extends Component { public __preload () { // Stretch to matched size during the scene initialization - const widget = this.getComponent(Widget); + const widget = this.getComponent('cc.Widget') as unknown as Widget; if (widget) { widget.updateAlignment(); } else if (EDITOR) { diff --git a/cocos/core/components/ui-base/deprecated.ts b/cocos/2d/framework/deprecated.ts similarity index 92% rename from cocos/core/components/ui-base/deprecated.ts rename to cocos/2d/framework/deprecated.ts index fd6c2ffaf6..eda4150495 100644 --- a/cocos/core/components/ui-base/deprecated.ts +++ b/cocos/2d/framework/deprecated.ts @@ -23,47 +23,47 @@ THE SOFTWARE. */ -/** - * @packageDocumentation - * @module ui - */ - -import { removeProperty } from '../../utils'; -import { UIComponent } from './ui-component'; -import { UITransform } from './ui-transform'; -import { UIRenderable } from './ui-renderable'; -import { Canvas } from './canvas'; -import { js } from '../../utils/js'; -import { legacyCC } from '../../global-exports'; - -removeProperty(UIComponent.prototype, 'UIComponent',[ - { - name: '_visibility', - }, - { - name: 'setVisibility', - }, -]); - -/** - * Alias of [[UITransform]] - * @deprecated Since v1.2 - */ -export { UITransform as UITransformComponent }; -legacyCC.UITransformComponent = UITransform; -js.setClassAlias(UITransform, 'cc.UITransformComponent'); - -/** - * Alias of [[UIRenderable]] - * @deprecated Since v1.2 - */ -export { UIRenderable as RenderComponent }; -js.setClassAlias(UIRenderable, 'cc.RenderComponent'); - -/** - * Alias of [[Canvas]] - * @deprecated Since v1.2 - */ -export { Canvas as CanvasComponent }; -legacyCC.CanvasComponent = Canvas; -js.setClassAlias(Canvas, 'cc.CanvasComponent'); +/** + * @packageDocumentation + * @module ui + */ + +import { removeProperty } from '../../core/utils'; +import { UIComponent } from './ui-component'; +import { UITransform } from './ui-transform'; +import { UIRenderable } from './ui-renderable'; +import { Canvas } from './canvas'; +import { js } from '../../core/utils/js'; +import { legacyCC } from '../../core/global-exports'; + +removeProperty(UIComponent.prototype, 'UIComponent',[ + { + name: '_visibility', + }, + { + name: 'setVisibility', + }, +]); + +/** + * Alias of [[UITransform]] + * @deprecated Since v1.2 + */ +export { UITransform as UITransformComponent }; +legacyCC.UITransformComponent = UITransform; +js.setClassAlias(UITransform, 'cc.UITransformComponent'); + +/** + * Alias of [[UIRenderable]] + * @deprecated Since v1.2 + */ +export { UIRenderable as RenderComponent }; +js.setClassAlias(UIRenderable, 'cc.RenderComponent'); + +/** + * Alias of [[Canvas]] + * @deprecated Since v1.2 + */ +export { Canvas as CanvasComponent }; +legacyCC.CanvasComponent = Canvas; +js.setClassAlias(Canvas, 'cc.CanvasComponent'); diff --git a/cocos/core/components/ui-base/index.ts b/cocos/2d/framework/index.ts similarity index 100% rename from cocos/core/components/ui-base/index.ts rename to cocos/2d/framework/index.ts diff --git a/cocos/core/components/ui-base/ui-component.ts b/cocos/2d/framework/ui-component.ts similarity index 96% rename from cocos/core/components/ui-base/ui-component.ts rename to cocos/2d/framework/ui-component.ts index e8f40d137a..2773f9b28d 100644 --- a/cocos/core/components/ui-base/ui-component.ts +++ b/cocos/2d/framework/ui-component.ts @@ -29,10 +29,10 @@ */ import { ccclass, disallowMultiple, executeInEditMode, executionOrder, requireComponent } from 'cc.decorator'; -import { UI } from '../../renderer/ui/ui'; -import { Component } from '../component'; +import { UI } from '../renderer/ui'; +import { Component } from '../../core/components/component'; import { UITransform } from './ui-transform'; -import { Node } from '../../scene-graph'; +import { Node } from '../../core/scene-graph'; /** * @en Legacy UI base class for rendering component, please use [[UIRenderable]] instead. diff --git a/cocos/core/components/ui-base/ui-renderable.ts b/cocos/2d/framework/ui-renderable.ts similarity index 94% rename from cocos/core/components/ui-base/ui-renderable.ts rename to cocos/2d/framework/ui-renderable.ts index b6a1da71d5..e143ae6b3d 100644 --- a/cocos/core/components/ui-base/ui-renderable.ts +++ b/cocos/2d/framework/ui-renderable.ts @@ -29,24 +29,24 @@ */ import { ccclass, executeInEditMode, requireComponent, disallowMultiple, tooltip, type, displayOrder, serializable, override, visible, displayName } from 'cc.decorator'; -import { Color } from '../../math'; -import { SystemEventType } from '../../platform/event-manager/event-enum'; -import { ccenum } from '../../value-types/enum'; -import { builtinResMgr } from '../../3d/builtin/init'; -import { Material } from '../../assets'; -import { BlendFactor } from '../../gfx/define'; -import { IMaterialInstanceInfo } from '../../renderer/core/material-instance'; -import { IAssembler, IAssemblerManager } from '../../renderer/ui/base'; -import { RenderData } from '../../renderer/ui/render-data'; -import { UI } from '../../renderer/ui/ui'; -import { Node } from '../../scene-graph'; -import { TransformBit } from '../../scene-graph/node-enum'; +import { Color } from '../../core/math'; +import { SystemEventType } from '../../core/platform/event-manager/event-enum'; +import { ccenum } from '../../core/value-types/enum'; +import { builtinResMgr } from '../../core/builtin'; +import { Material } from '../../core/assets'; +import { BlendFactor } from '../../core/gfx/define'; +import { IMaterialInstanceInfo } from '../../core/renderer/core/material-instance'; +import { IAssembler, IAssemblerManager } from '../renderer/base'; +import { RenderData } from '../renderer/render-data'; +import { UI } from '../renderer/ui'; +import { Node } from '../../core/scene-graph'; +import { TransformBit } from '../../core/scene-graph/node-enum'; import { UITransform } from './ui-transform'; -import { RenderableComponent } from '../../3d/framework/renderable-component'; +import { RenderableComponent } from '../../core/components/renderable-component'; import { EDITOR } from 'internal:constants'; -import { Stage } from '../../renderer/ui/stencil-manager'; -import { warnID } from '../../platform/debug'; -import { murmurhash2_32_gc } from '../../utils'; +import { Stage } from '../renderer/stencil-manager'; +import { warnID } from '../../core/platform/debug'; +import { murmurhash2_32_gc } from '../../core/utils'; // hack ccenum(BlendFactor); diff --git a/cocos/core/components/ui-base/ui-transform.ts b/cocos/2d/framework/ui-transform.ts similarity index 97% rename from cocos/core/components/ui-base/ui-transform.ts rename to cocos/2d/framework/ui-transform.ts index 38425fd918..e1d85b8fe6 100644 --- a/cocos/core/components/ui-base/ui-transform.ts +++ b/cocos/2d/framework/ui-transform.ts @@ -30,15 +30,15 @@ import { ccclass, help, executeInEditMode, executionOrder, menu, tooltip, displayOrder, serializable, disallowMultiple } from 'cc.decorator'; import { EDITOR } from 'internal:constants'; -import { Component } from '../component'; -import { SystemEventType } from '../../platform/event-manager/event-enum'; -import { EventListener, IListenerMask } from '../../platform/event-manager/event-listener'; -import { Mat4, Rect, Size, Vec2, Vec3 } from '../../math'; -import { AABB } from '../../geometry'; +import { Component } from '../../core/components'; +import { SystemEventType } from '../../core/platform/event-manager/event-enum'; +import { EventListener, IListenerMask } from '../../core/platform/event-manager/event-listener'; +import { Mat4, Rect, Size, Vec2, Vec3 } from '../../core/math'; +import { AABB } from '../../core/geometry'; import { Canvas } from './canvas'; -import { Node } from '../../scene-graph'; -import { legacyCC } from '../../global-exports'; -import { warnID } from '../../platform/debug'; +import { Node } from '../../core/scene-graph'; +import { legacyCC } from '../../core/global-exports'; +import { warnID } from '../../core/platform/debug'; const _vec2a = new Vec2(); const _vec2b = new Vec2(); diff --git a/cocos/2d/index.ts b/cocos/2d/index.ts new file mode 100644 index 0000000000..b5fa09aa2d --- /dev/null +++ b/cocos/2d/index.ts @@ -0,0 +1,98 @@ +/* + Copyright (c) 2020 Xiamen Yaji Software Co., Ltd. + + https://www.cocos.com/ + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + */ + +/** + * @packageDocumentation + * @hidden + */ + +import { + barFilled, + bmfont, + CanvasPool, + graphics, + graphicsAssembler, + labelAssembler, + letter, + mask, + maskEnd, + radialFilled, + simple, + sliced, + spriteAssembler, + ttf, + earcut, +} from './assembler'; +import { MeshBuffer } from './renderer/mesh-buffer'; +import * as UIVertexFormat from './renderer/ui-vertex-format'; +import { StencilManager } from './renderer/stencil-manager'; +import { legacyCC } from '../core/global-exports'; + +import './renderer/ui'; + +export * from './assets'; +export * from './framework'; +export * from './components'; +export * from './renderer/base'; +export * from './utils'; + +export { + MeshBuffer, + UIVertexFormat, + StencilManager, + CanvasPool, + // barFilled, + // radialFilled, + // simple, + // sliced, + // ttf, + // bmfont, + // letter, + // mask, + // maskEnd, + spriteAssembler, + // graphics, + labelAssembler, + graphicsAssembler, + earcut, +}; + +legacyCC.UI = { + MeshBuffer, + UIVertexFormat, + // barFilled, + // radialFilled, + // simple, + // sliced, + // ttf, + // bmfont, + // letter, + // mask, + // maskEnd, + // graphics, + spriteAssembler, + graphicsAssembler, + labelAssembler, +}; diff --git a/cocos/core/renderer/ui/base.ts b/cocos/2d/renderer/base.ts similarity index 95% rename from cocos/core/renderer/ui/base.ts rename to cocos/2d/renderer/base.ts index 353340a606..dd6ceb9bd7 100644 --- a/cocos/core/renderer/ui/base.ts +++ b/cocos/2d/renderer/base.ts @@ -29,7 +29,7 @@ */ -import { UIRenderable } from '../../components/ui-base/ui-renderable'; +import { UIRenderable } from '../framework/ui-renderable'; export interface IAssembler { [key: string]: any; diff --git a/cocos/core/renderer/ui/mesh-buffer.ts b/cocos/2d/renderer/mesh-buffer.ts similarity index 97% rename from cocos/core/renderer/ui/mesh-buffer.ts rename to cocos/2d/renderer/mesh-buffer.ts index 2024e2001c..59f5e3e56a 100644 --- a/cocos/core/renderer/ui/mesh-buffer.ts +++ b/cocos/2d/renderer/mesh-buffer.ts @@ -27,10 +27,10 @@ * @packageDocumentation * @module ui */ -import { BufferUsageBit, MemoryUsageBit } from '../../gfx/define'; -import { InputAssemblerInfo, Attribute, Buffer, BufferInfo } from '../../gfx'; +import { BufferUsageBit, MemoryUsageBit } from '../../core/gfx/define'; +import { InputAssemblerInfo, Attribute, Buffer, BufferInfo } from '../../core/gfx'; import { UI } from './ui'; -import { InputAssemblerHandle, NULL_HANDLE, IAPool } from '../core/memory-pools'; +import { InputAssemblerHandle, NULL_HANDLE, IAPool } from '../../core/renderer/core/memory-pools'; import { getAttributeFormatBytes } from './ui-vertex-format'; export class MeshBuffer { diff --git a/cocos/core/renderer/ui/render-data.ts b/cocos/2d/renderer/render-data.ts similarity index 98% rename from cocos/core/renderer/ui/render-data.ts rename to cocos/2d/renderer/render-data.ts index f41aa86db2..6bad62ace2 100644 --- a/cocos/core/renderer/ui/render-data.ts +++ b/cocos/2d/renderer/render-data.ts @@ -28,9 +28,9 @@ * @hidden */ -import { Material } from '../../assets/material'; -import { Color } from '../../math'; -import { Pool, RecyclePool } from '../../memop'; +import { Material } from '../../core/assets/material'; +import { Color } from '../../core/math'; +import { Pool, RecyclePool } from '../../core/memop'; export interface IRenderData { x: number; diff --git a/cocos/core/renderer/ui/stencil-manager.ts b/cocos/2d/renderer/stencil-manager.ts similarity index 96% rename from cocos/core/renderer/ui/stencil-manager.ts rename to cocos/2d/renderer/stencil-manager.ts index d90d328cb3..e90f20e977 100644 --- a/cocos/core/renderer/ui/stencil-manager.ts +++ b/cocos/2d/renderer/stencil-manager.ts @@ -27,10 +27,10 @@ * @hidden */ -import { UIRenderable } from '../../../../exports/ui'; -import { Material } from '../../assets/material'; -import { ComparisonFunc, StencilOp } from '../../gfx/define'; -import { Pass } from '../core/pass'; +import { UIRenderable } from '../framework'; +import { Material } from '../../core/assets/material'; +import { ComparisonFunc, StencilOp } from '../../core/gfx/define'; +import { Pass } from '../../core/renderer/core/pass'; // Stage types export enum Stage { diff --git a/cocos/core/renderer/ui/ui-draw-batch.ts b/cocos/2d/renderer/ui-draw-batch.ts similarity index 90% rename from cocos/core/renderer/ui/ui-draw-batch.ts rename to cocos/2d/renderer/ui-draw-batch.ts index 532973ca35..f84f88617a 100644 --- a/cocos/core/renderer/ui/ui-draw-batch.ts +++ b/cocos/2d/renderer/ui-draw-batch.ts @@ -28,15 +28,15 @@ * @hidden */ -import { MeshBuffer } from '../../../ui'; -import { Material } from '../../assets/material'; -import { Texture, Sampler } from '../../gfx'; -import { Node } from '../../scene-graph'; -import { Camera } from '../scene/camera'; -import { Model } from '../scene/model'; +import { MeshBuffer } from './mesh-buffer'; +import { Material } from '../../core/assets/material'; +import { Texture, Sampler } from '../../core/gfx'; +import { Node } from '../../core/scene-graph'; +import { Camera } from '../../core/renderer/scene/camera'; +import { Model } from '../../core/renderer/scene/model'; import { UI } from './ui'; -import { InputAssemblerHandle, DescriptorSetHandle, NULL_HANDLE, UIBatchHandle, UIBatchPool, UIBatchView, DSPool } from '../core/memory-pools'; -import { Layers } from '../../scene-graph/layers'; +import { InputAssemblerHandle, DescriptorSetHandle, NULL_HANDLE, UIBatchHandle, UIBatchPool, UIBatchView, DSPool } from '../../core/renderer/core/memory-pools'; +import { Layers } from '../../core/scene-graph/layers'; const UI_VIS_FLAG = Layers.Enum.NONE | Layers.Enum.UI_3D; diff --git a/cocos/core/renderer/ui/ui-material.ts b/cocos/2d/renderer/ui-material.ts similarity index 94% rename from cocos/core/renderer/ui/ui-material.ts rename to cocos/2d/renderer/ui-material.ts index 670b44f9fc..7054e074cf 100644 --- a/cocos/core/renderer/ui/ui-material.ts +++ b/cocos/2d/renderer/ui-material.ts @@ -27,9 +27,9 @@ * @hidden */ -import { Material } from '../../assets/material'; -import { Pass } from '../../renderer/core/pass'; -import { PassView, PassPool, DescriptorSetHandle, NULL_HANDLE } from '../core/memory-pools'; +import { Material } from '../../core/assets/material'; +import { Pass } from '../../core/renderer/core/pass'; +import { PassView, PassPool, DescriptorSetHandle, NULL_HANDLE } from '../../core/renderer/core/memory-pools'; export interface IUIMaterialInfo { material: Material; diff --git a/cocos/core/renderer/ui/ui-vertex-format.ts b/cocos/2d/renderer/ui-vertex-format.ts similarity index 93% rename from cocos/core/renderer/ui/ui-vertex-format.ts rename to cocos/2d/renderer/ui-vertex-format.ts index c654ce4d58..b47c4dd9ff 100644 --- a/cocos/core/renderer/ui/ui-vertex-format.ts +++ b/cocos/2d/renderer/ui-vertex-format.ts @@ -28,9 +28,9 @@ * @hidden */ -import { AttributeName, Format, FormatInfos } from '../../gfx/define'; -import { Attribute } from '../../gfx'; -import { legacyCC } from '../../global-exports'; +import { AttributeName, Format, FormatInfos } from '../../core/gfx/define'; +import { Attribute } from '../../core/gfx'; +import { legacyCC } from '../../core/global-exports'; export const vfmt = [ new Attribute(AttributeName.ATTR_POSITION, Format.RGB32F), diff --git a/cocos/core/renderer/ui/ui.ts b/cocos/2d/renderer/ui.ts similarity index 96% rename from cocos/core/renderer/ui/ui.ts rename to cocos/2d/renderer/ui.ts index dc79e5aad7..19b29287bc 100644 --- a/cocos/core/renderer/ui/ui.ts +++ b/cocos/2d/renderer/ui.ts @@ -27,29 +27,30 @@ * @hidden */ -import { UIStaticBatch } from '../../../ui'; -import { Material } from '../../assets/material'; -import { Canvas, UIComponent, UIRenderable } from '../../components/ui-base'; -import { Texture, Device, Attribute, Sampler, DescriptorSetInfo } from '../../gfx'; -import { Pool, RecyclePool } from '../../memop'; -import { CachedArray } from '../../memop/cached-array'; -import { Camera } from '../scene/camera'; -import { Model } from '../scene/model'; -import { RenderScene } from '../scene/render-scene'; -import { Root } from '../../root'; -import { Layers, Node } from '../../scene-graph'; +import { UIStaticBatch } from '../components'; +import { Material } from '../../core/assets/material'; +import { Canvas, UIComponent, UIRenderable } from '../framework'; +import { Texture, Device, Attribute, Sampler, DescriptorSetInfo } from '../../core/gfx'; +import { Pool, RecyclePool } from '../../core/memop'; +import { CachedArray } from '../../core/memop/cached-array'; +import { Camera } from '../../core/renderer/scene/camera'; +import { Model } from '../../core/renderer/scene/model'; +import { RenderScene } from '../../core/renderer/scene/render-scene'; +import { Root } from '../../core/root'; +import { Layers, Node } from '../../core/scene-graph'; import { MeshBuffer } from './mesh-buffer'; import { StencilManager } from './stencil-manager'; import { UIDrawBatch } from './ui-draw-batch'; import { UIMaterial } from './ui-material'; import * as UIVertexFormat from './ui-vertex-format'; -import { legacyCC } from '../../global-exports'; -import { DescriptorSetHandle, DSPool, SubModelPool, SubModelView } from '../core/memory-pools'; -import { ModelLocalBindings } from '../../pipeline/define'; -import { EffectAsset, RenderTexture, SpriteFrame } from '../../assets'; -import { programLib } from '../core/program-lib'; -import { TextureBase } from '../../assets/texture-base'; -import { sys } from '../../platform/sys'; +import { legacyCC } from '../../core/global-exports'; +import { DescriptorSetHandle, DSPool, SubModelPool, SubModelView } from '../../core/renderer/core/memory-pools'; +import { ModelLocalBindings } from '../../core/pipeline/define'; +import { EffectAsset, RenderTexture } from '../../core/assets'; +import { SpriteFrame } from '../assets'; +import { programLib } from '../../core/renderer/core/program-lib'; +import { TextureBase } from '../../core/assets/texture-base'; +import { sys } from '../../core/platform/sys'; const _dsInfo = new DescriptorSetInfo(null!); @@ -788,3 +789,5 @@ export class UI { this._descriptorSetCacheMap.clear(); } } + +legacyCC.internal.UI = UI; diff --git a/cocos/core/asset-manager/font-loader.ts b/cocos/2d/utils/font-loader.ts similarity index 88% rename from cocos/core/asset-manager/font-loader.ts rename to cocos/2d/utils/font-loader.ts index 5baa8cf8dd..79c6b96b0b 100644 --- a/cocos/core/asset-manager/font-loader.ts +++ b/cocos/2d/utils/font-loader.ts @@ -28,9 +28,12 @@ * @hidden */ -import { warnID } from '../platform/debug'; -import { safeMeasureText } from '../utils/text-utils'; -import { CompleteCallback, IDownloadParseOptions } from './shared'; +import { warnID } from '../../core/platform/debug'; +import { safeMeasureText } from './text-utils'; +import { CompleteCallback, IDownloadParseOptions } from '../../core/asset-manager/shared'; +import downloader from '../../core/asset-manager/downloader'; +import factory from '../../core/asset-manager/factory'; +import { TTFFont } from '../assets/ttf-font'; interface IFontLoadHandle { fontFamilyName: string; @@ -237,3 +240,30 @@ export function _getFontFamily (fontHandle: string): string { } return fontFamilyName; } + +function createFont (id: string, data: string, options: IDownloadParseOptions, onComplete: CompleteCallback) { + const out = new TTFFont(); + out._nativeUrl = id; + out._nativeAsset = data; + onComplete(null, out); +} + +downloader.register({ + // font + '.font': loadFont, + '.eot': loadFont, + '.ttf': loadFont, + '.woff': loadFont, + '.svg': loadFont, + '.ttc': loadFont, +}); + +factory.register({ + // font + '.font': createFont, + '.eot': createFont, + '.ttf': createFont, + '.woff': createFont, + '.svg': createFont, + '.ttc': createFont, +}); diff --git a/cocos/core/utils/html-text-parser.ts b/cocos/2d/utils/html-text-parser.ts similarity index 99% rename from cocos/core/utils/html-text-parser.ts rename to cocos/2d/utils/html-text-parser.ts index 3cf84aa86f..3931ce796a 100644 --- a/cocos/core/utils/html-text-parser.ts +++ b/cocos/2d/utils/html-text-parser.ts @@ -30,7 +30,7 @@ */ import { TEST } from 'internal:constants'; -import { legacyCC } from '../global-exports'; +import { legacyCC } from '../../core/global-exports'; /** * diff --git a/cocos/2d/utils/index.ts b/cocos/2d/utils/index.ts new file mode 100644 index 0000000000..7275368413 --- /dev/null +++ b/cocos/2d/utils/index.ts @@ -0,0 +1,32 @@ +/* + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + */ + +/** + * @packageDocumentation + * @hidden + */ +import './font-loader'; +export * from './html-text-parser'; +export * from './text-utils'; \ No newline at end of file diff --git a/cocos/core/utils/text-utils.ts b/cocos/2d/utils/text-utils.ts similarity index 100% rename from cocos/core/utils/text-utils.ts rename to cocos/2d/utils/text-utils.ts diff --git a/cocos/core/renderer/models/index.ts b/cocos/3d/assets/deprecated.ts similarity index 74% rename from cocos/core/renderer/models/index.ts rename to cocos/3d/assets/deprecated.ts index 49c9eab376..b3dabb3312 100644 --- a/cocos/core/renderer/models/index.ts +++ b/cocos/3d/assets/deprecated.ts @@ -23,8 +23,26 @@ THE SOFTWARE. */ +/** + * @packageDocumentation + * @hidden + */ -export * from './skeletal-animation-utils'; -export * from './skinning-model'; -export * from './baked-skinning-model'; -export * from './morph-model'; \ No newline at end of file +import { removeProperty, replaceProperty } from '../../core/utils'; +import { Mesh } from './mesh'; + +replaceProperty(Mesh.prototype, 'Mesh.prototype', [ + { + name: 'renderingMesh', + newName: 'renderingSubMeshes', + }, +]); + +removeProperty(Mesh.prototype, 'Mesh.prototype', [ + { + name: 'hasFlatBuffers', + }, + { + name: 'destroyFlatBuffers', + }, +]); \ No newline at end of file diff --git a/cocos/3d/assets/index.ts b/cocos/3d/assets/index.ts new file mode 100644 index 0000000000..cf39cb87bd --- /dev/null +++ b/cocos/3d/assets/index.ts @@ -0,0 +1,32 @@ +/* + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. + + https://www.cocos.com/ + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +*/ +/** + * @packageDocumentation + * @hidden + */ +export { Mesh } from './mesh'; +export { Skeleton } from './skeleton'; +import './deprecated'; \ No newline at end of file diff --git a/cocos/core/assets/mesh.ts b/cocos/3d/assets/mesh.ts similarity index 75% rename from cocos/core/assets/mesh.ts rename to cocos/3d/assets/mesh.ts index ea293ec391..f0c3100e8e 100644 --- a/cocos/core/assets/mesh.ts +++ b/cocos/3d/assets/mesh.ts @@ -29,18 +29,18 @@ */ import { ccclass, serializable } from 'cc.decorator'; -import { Asset } from './asset'; -import { BufferBlob } from '../3d/misc/buffer-blob'; +import { Asset } from '../../core/assets/asset'; +import { BufferBlob } from '../misc/buffer-blob'; import { Skeleton } from './skeleton'; -import { AABB } from '../geometry'; -import { legacyCC } from '../global-exports'; -import { mapBuffer } from '../3d/misc/buffer'; -import { murmurhash2_32_gc } from '../utils/murmurhash2_gc'; -import { sys } from '../platform/sys'; -import { warnID } from '../platform/debug'; +import { AABB } from '../../core/geometry'; +import { legacyCC } from '../../core/global-exports'; +import { murmurhash2_32_gc } from '../../core/utils/murmurhash2_gc'; +import { sys } from '../../core/platform/sys'; +import { warnID } from '../../core/platform/debug'; +import { RenderingSubMesh } from '../../core/assets'; import { Attribute, Device, InputAssemblerInfo, Buffer, BufferInfo, -} from '../gfx'; +} from '../../core/gfx'; import { AttributeName, BufferUsageBit, @@ -51,13 +51,9 @@ import { MemoryUsageBit, PrimitiveMode, getTypedArrayConstructor, -} from '../gfx/define'; +} from '../../core/gfx/define'; -import { - FlatBufferArrayPool, FlatBufferPool, FlatBufferView, NULL_HANDLE, RawBufferPool, - SubMeshHandle, SubMeshPool, SubMeshView, freeHandleArray, -} from '../renderer/core/memory-pools'; -import { Mat4, Quat, Vec3 } from '../math'; +import { Mat4, Quat, Vec3 } from '../../core/math'; import { Morph, MorphRendering, createMorphRendering } from './morph'; function getIndexStrideCtor (stride: number) { @@ -69,370 +65,6 @@ function getIndexStrideCtor (stride: number) { } } -/** - * @en Array views for index buffer - * @zh 允许存储索引的数组视图。 - */ -export type IBArray = Uint8Array | Uint16Array | Uint32Array; - -/** - * @en The interface of geometric information - * @zh 几何信息。 - */ -export interface IGeometricInfo { - /** - * @en Vertex positions - * @zh 顶点位置。 - */ - positions: Float32Array; - - /** - * @en Indices data - * @zh 索引数据。 - */ - indices?: IBArray; - - /** - * @en Whether the geometry is treated as double sided - * @zh 是否将图元按双面对待。 - */ - doubleSided?: boolean; - - /** - * @en The bounding box - * @zh 此几何体的轴对齐包围盒。 - */ - boundingBox: { max: Vec3; min: Vec3 }; -} - -/** - * @en Flat vertex buffer - * @zh 扁平化顶点缓冲区 - */ -export interface IFlatBuffer { - stride: number; - count: number; - buffer: Uint8Array; -} - -/** - * @en Sub mesh for rendering which contains all geometry data, it can be used to create [[InputAssembler]]. - * @zh 包含所有顶点数据的渲染子网格,可以用来创建 [[InputAssembler]]。 - */ -export class RenderingSubMesh { - public mesh?: Mesh; - - public subMeshIdx?: number; - - private _flatBuffers: IFlatBuffer[] = []; - - private _jointMappedBuffers?: Buffer[]; - - private _jointMappedBufferIndices?: number[]; - - private _vertexIdChannel?: { stream: number; index: number }; - - private _geometricInfo?: IGeometricInfo; - - private _vertexBuffers: Buffer[]; - - private _attributes: Attribute[]; - - private _indexBuffer: Buffer | null = null; - - private _indirectBuffer: Buffer | null = null; - - private _primitiveMode: PrimitiveMode; - - private _iaInfo: InputAssemblerInfo; - - private _handle: SubMeshHandle = NULL_HANDLE; - - constructor ( - vertexBuffers: Buffer[], attributes: Attribute[], primitiveMode: PrimitiveMode, - indexBuffer: Buffer | null = null, indirectBuffer: Buffer | null = null, - ) { - this._attributes = attributes; - this._vertexBuffers = vertexBuffers; - this._indexBuffer = indexBuffer; - this._indirectBuffer = indirectBuffer; - this._primitiveMode = primitiveMode; - this._iaInfo = new InputAssemblerInfo(attributes, vertexBuffers, indexBuffer, indirectBuffer); - this._handle = SubMeshPool.alloc(); - const fbArrayHandle = FlatBufferArrayPool.alloc(); - SubMeshPool.set(this._handle, SubMeshView.FLAT_BUFFER_ARRAY, fbArrayHandle); - } - - /** - * @en All vertex attributes used by the sub mesh - * @zh 所有顶点属性。 - */ - get attributes () { return this._attributes; } - - /** - * @en All vertex buffers used by the sub mesh - * @zh 使用的所有顶点缓冲区。 - */ - get vertexBuffers () { return this._vertexBuffers; } - - /** - * @en Index buffer used by the sub mesh - * @zh 使用的索引缓冲区,若未使用则无需指定。 - */ - get indexBuffer () { return this._indexBuffer; } - - /** - * @en Indirect buffer used by the sub mesh - * @zh 间接绘制缓冲区。 - */ - get indirectBuffer () { return this._indirectBuffer; } - - /** - * @en Primitive mode used by the sub mesh - * @zh 图元类型。 - */ - get primitiveMode () { return this._primitiveMode; } - - /** - * @en The geometric info of the sub mesh, used for raycast. - * @zh (用于射线检测的)几何信息。 - */ - get geometricInfo () { - if (this._geometricInfo) { - return this._geometricInfo; - } - if (this.mesh === undefined) { - return { positions: new Float32Array(), indices: new Uint8Array(), boundingBox: { min: Vec3.ZERO, max: Vec3.ZERO } }; - } - if (this.subMeshIdx === undefined) { - return { positions: new Float32Array(), indices: new Uint8Array(), boundingBox: { min: Vec3.ZERO, max: Vec3.ZERO } }; - } - const { mesh } = this; const index = this.subMeshIdx; - const positions = mesh.readAttribute(index, AttributeName.ATTR_POSITION) as unknown as Float32Array; - const indices = mesh.readIndices(index) as Uint16Array; - const max = new Vec3(); - const min = new Vec3(); - const pAttri = this.attributes.find((element) => element.name === AttributeName.ATTR_POSITION); - if (pAttri) { - const conut = FormatInfos[pAttri.format].count; - if (conut === 2) { - max.set(positions[0], positions[1], 0); - min.set(positions[0], positions[1], 0); - } else { - max.set(positions[0], positions[1], positions[2]); - min.set(positions[0], positions[1], positions[2]); - } - for (let i = 0; i < positions.length; i += conut) { - if (conut === 2) { - max.x = positions[i] > max.x ? positions[i] : max.x; - max.y = positions[i + 1] > max.y ? positions[i + 1] : max.y; - min.x = positions[i] < min.x ? positions[i] : min.x; - min.y = positions[i + 1] < min.y ? positions[i + 1] : min.y; - } else { - max.x = positions[i] > max.x ? positions[i] : max.x; - max.y = positions[i + 1] > max.y ? positions[i + 1] : max.y; - max.z = positions[i + 2] > max.z ? positions[i + 2] : max.z; - min.x = positions[i] < min.x ? positions[i] : min.x; - min.y = positions[i + 1] < min.y ? positions[i + 1] : min.y; - min.z = positions[i + 2] < min.z ? positions[i + 2] : min.z; - } - } - } - this._geometricInfo = { positions, indices, boundingBox: { max, min } }; - return this._geometricInfo; - } - - /** - * @en Flatted vertex buffers - * @zh 扁平化的顶点缓冲区。 - */ - get flatBuffers () { return this._flatBuffers; } - - public genFlatBuffers () { - if (this._flatBuffers.length || !this.mesh || this.subMeshIdx === undefined) { return; } - - const { mesh } = this; - let idxCount = 0; - const prim = mesh.struct.primitives[this.subMeshIdx]; - const fbArrayHandle = SubMeshPool.get(this._handle, SubMeshView.FLAT_BUFFER_ARRAY); - if (prim.indexView) { idxCount = prim.indexView.count; } - for (let i = 0; i < prim.vertexBundelIndices.length; i++) { - const bundleIdx = prim.vertexBundelIndices[i]; - const vertexBundle = mesh.struct.vertexBundles[bundleIdx]; - const vbCount = prim.indexView ? prim.indexView.count : vertexBundle.view.count; - const vbStride = vertexBundle.view.stride; - const vbSize = vbStride * vbCount; - const view = new Uint8Array(mesh.data.buffer, vertexBundle.view.offset, vertexBundle.view.length); - - const hBuffer = RawBufferPool.alloc(prim.indexView ? vbSize : vertexBundle.view.length); - const hFlatBuffer = FlatBufferPool.alloc(); - FlatBufferPool.set(hFlatBuffer, FlatBufferView.STRIDE, vbStride); - FlatBufferPool.set(hFlatBuffer, FlatBufferView.AMOUNT, vbCount); - FlatBufferPool.set(hFlatBuffer, FlatBufferView.BUFFER, hBuffer); - FlatBufferArrayPool.push(fbArrayHandle, hFlatBuffer); - - const buffer = RawBufferPool.getBuffer(hBuffer); - const sharedView = new Uint8Array(buffer); - - if (!prim.indexView) { - sharedView.set(mesh.data.subarray(vertexBundle.view.offset, vertexBundle.view.offset + vertexBundle.view.length)); - this._flatBuffers.push({ stride: vbStride, count: vbCount, buffer: sharedView }); - continue; - } - - const ibView = mesh.readIndices(this.subMeshIdx)!; - // transform to flat buffer - for (let n = 0; n < idxCount; ++n) { - const idx = ibView[n]; - const offset = n * vbStride; - const srcOffset = idx * vbStride; - for (let m = 0; m < vbStride; ++m) { - sharedView[offset + m] = view[srcOffset + m]; - } - } - this._flatBuffers.push({ stride: vbStride, count: vbCount, buffer: sharedView }); - } - } - - /** - * @en The vertex buffer for joint after mapping - * @zh 骨骼索引按映射表处理后的顶点缓冲。 - */ - get jointMappedBuffers () { - if (this._jointMappedBuffers) { return this._jointMappedBuffers; } - const buffers: Buffer[] = this._jointMappedBuffers = []; - const indices: number[] = this._jointMappedBufferIndices = []; - if (!this.mesh || this.subMeshIdx === undefined) { return this._jointMappedBuffers = this.vertexBuffers; } - const { struct } = this.mesh; - const prim = struct.primitives[this.subMeshIdx]; - if (!struct.jointMaps || prim.jointMapIndex === undefined || !struct.jointMaps[prim.jointMapIndex]) { - return this._jointMappedBuffers = this.vertexBuffers; - } - let jointFormat: Format; - let jointOffset: number; - const { device } = legacyCC.director.root; - for (let i = 0; i < prim.vertexBundelIndices.length; i++) { - const bundle = struct.vertexBundles[prim.vertexBundelIndices[i]]; - jointOffset = 0; - jointFormat = Format.UNKNOWN; - for (let j = 0; j < bundle.attributes.length; j++) { - const attr = bundle.attributes[j]; - if (attr.name === AttributeName.ATTR_JOINTS) { - jointFormat = attr.format; - break; - } - jointOffset += FormatInfos[attr.format].size; - } - if (jointFormat) { - const data = new Uint8Array(this.mesh.data.buffer, bundle.view.offset, bundle.view.length); - const dataView = new DataView(data.slice().buffer); - const idxMap = struct.jointMaps[prim.jointMapIndex]; - mapBuffer(dataView, (cur) => idxMap.indexOf(cur), jointFormat, jointOffset, - bundle.view.length, bundle.view.stride, dataView); - const buffer = device.createBuffer(new BufferInfo( - BufferUsageBit.VERTEX | BufferUsageBit.TRANSFER_DST, - MemoryUsageBit.DEVICE, - bundle.view.length, - bundle.view.stride, - )); - buffer.update(dataView.buffer); buffers.push(buffer); indices.push(i); - } else { - buffers.push(this.vertexBuffers[prim.vertexBundelIndices[i]]); - } - } - if (this._vertexIdChannel) { - buffers.push(this._allocVertexIdBuffer(device)); - } - return buffers; - } - - get iaInfo () { return this._iaInfo; } - - get handle () { - return this._handle; - } - - public destroy () { - for (let i = 0; i < this.vertexBuffers.length; i++) { - this.vertexBuffers[i].destroy(); - } - this.vertexBuffers.length = 0; - if (this._indexBuffer) { - this._indexBuffer.destroy(); - this._indexBuffer = null; - } - if (this._jointMappedBuffers && this._jointMappedBufferIndices) { - for (let i = 0; i < this._jointMappedBufferIndices.length; i++) { - this._jointMappedBuffers[this._jointMappedBufferIndices[i]].destroy(); - } - this._jointMappedBuffers = undefined; - this._jointMappedBufferIndices = undefined; - } - if (this._indirectBuffer) { - this._indirectBuffer.destroy(); - this._indirectBuffer = null; - } - if (this._handle) { - const fbArrayHandle = SubMeshPool.get(this._handle, SubMeshView.FLAT_BUFFER_ARRAY); - freeHandleArray(fbArrayHandle, FlatBufferArrayPool, FlatBufferPool); - - SubMeshPool.free(this._handle); - this._handle = NULL_HANDLE; - } - } - - /** - * @en Adds a vertex attribute input called 'a_vertexId' into this sub-mesh. - * This is useful if you want to simulate `gl_VertexId` in WebGL context prior to 2.0. - * Once you call this function, the vertex attribute is permanently added. - * Subsequent calls to this function take no effect. - * @param device Device used to create related rendering resources. - */ - public enableVertexIdChannel (device: Device) { - if (this._vertexIdChannel) { - return; - } - - const streamIndex = this.vertexBuffers.length; - const attributeIndex = this.attributes.length; - - const vertexIdBuffer = this._allocVertexIdBuffer(device); - this._vertexBuffers.push(vertexIdBuffer); - this._attributes.push(new Attribute('a_vertexId', Format.R32F, false, streamIndex)); - - this._iaInfo.attributes = this._attributes; - this._iaInfo.vertexBuffers = this._vertexBuffers; - - this._vertexIdChannel = { - stream: streamIndex, - index: attributeIndex, - }; - } - - private _allocVertexIdBuffer (device: Device) { - const vertexCount = (this.vertexBuffers.length === 0 || this.vertexBuffers[0].stride === 0) - ? 0 - // TODO: This depends on how stride of a vertex buffer is defined; Consider padding problem. - : this.vertexBuffers[0].size / this.vertexBuffers[0].stride; - const vertexIds = new Float32Array(vertexCount); - for (let iVertex = 0; iVertex < vertexCount; ++iVertex) { - // `+0.5` because on some platforms, the "fetched integer" may have small error. - // For example `26` may yield `25.99999`, which is convert to `25` instead of `26` using `int()`. - vertexIds[iVertex] = iVertex + 0.5; - } - - const vertexIdBuffer = device.createBuffer(new BufferInfo( - BufferUsageBit.VERTEX | BufferUsageBit.TRANSFER_DST, - MemoryUsageBit.DEVICE, - vertexIds.byteLength, - vertexIds.BYTES_PER_ELEMENT, - )); - vertexIdBuffer.update(vertexIds); - - return vertexIdBuffer; - } -} - export declare namespace Mesh { export interface IBufferView { offset: number; diff --git a/cocos/core/assets/morph-rendering.ts b/cocos/3d/assets/morph-rendering.ts similarity index 97% rename from cocos/core/assets/morph-rendering.ts rename to cocos/3d/assets/morph-rendering.ts index 87ff6d1458..ed50877333 100644 --- a/cocos/core/assets/morph-rendering.ts +++ b/cocos/3d/assets/morph-rendering.ts @@ -28,20 +28,20 @@ * @hidden */ -import { AttributeName, Buffer, BufferUsageBit, Device, Feature, MemoryUsageBit, DescriptorSet, BufferInfo } from '../gfx'; +import { AttributeName, Buffer, BufferUsageBit, Device, Feature, MemoryUsageBit, DescriptorSet, BufferInfo } from '../../core/gfx'; import { Mesh } from './mesh'; -import { Texture2D } from './texture-2d'; -import { ImageAsset } from './image-asset'; -import { samplerLib } from '../renderer/core/sampler-lib'; -import { UBOMorph, UNIFORM_NORMAL_MORPH_TEXTURE_BINDING, UNIFORM_POSITION_MORPH_TEXTURE_BINDING, UNIFORM_TANGENT_MORPH_TEXTURE_BINDING } from '../pipeline/define'; -import { warn, warnID } from '../platform/debug'; +import { Texture2D } from '../../core/assets/texture-2d'; +import { ImageAsset } from '../../core/assets/image-asset'; +import { samplerLib } from '../../core/renderer/core/sampler-lib'; +import { UBOMorph, UNIFORM_NORMAL_MORPH_TEXTURE_BINDING, UNIFORM_POSITION_MORPH_TEXTURE_BINDING, UNIFORM_TANGENT_MORPH_TEXTURE_BINDING } from '../../core/pipeline/define'; +import { warn, warnID } from '../../core/platform/debug'; import { Morph, MorphRendering, MorphRenderingInstance, SubMeshMorph } from './morph'; -import { assertIsNonNullable, assertIsTrue } from '../data/utils/asserts'; -import { log2, nextPow2 } from '../math/bits'; -import { IMacroPatch } from '../renderer'; -import { legacyCC } from '../global-exports'; -import { PixelFormat } from './asset-enum'; -import { DSPool } from '../renderer/core/memory-pools'; +import { assertIsNonNullable, assertIsTrue } from '../../core/data/utils/asserts'; +import { log2, nextPow2 } from '../../core/math/bits'; +import { IMacroPatch } from '../../core/renderer'; +import { legacyCC } from '../../core/global-exports'; +import { PixelFormat } from '../../core/assets/asset-enum'; +import { DSPool } from '../../core/renderer/core/memory-pools'; /** * True if force to use cpu computing based sub-mesh rendering. diff --git a/cocos/core/assets/morph.ts b/cocos/3d/assets/morph.ts similarity index 96% rename from cocos/core/assets/morph.ts rename to cocos/3d/assets/morph.ts index 218b842d10..aaedb86a13 100644 --- a/cocos/core/assets/morph.ts +++ b/cocos/3d/assets/morph.ts @@ -28,10 +28,10 @@ * @hidden */ -import { AttributeName, Device, DescriptorSet } from '../gfx'; +import { AttributeName, Device, DescriptorSet } from '../../core/gfx'; import { Mesh } from './mesh'; import { StdMorphRendering } from './morph-rendering'; -import { IMacroPatch } from '../renderer'; +import { IMacroPatch } from '../../core/renderer'; export interface Morph { /** diff --git a/cocos/core/assets/skeleton.ts b/cocos/3d/assets/skeleton.ts similarity index 96% rename from cocos/core/assets/skeleton.ts rename to cocos/3d/assets/skeleton.ts index e489f20e04..5b4c50bd93 100644 --- a/cocos/core/assets/skeleton.ts +++ b/cocos/3d/assets/skeleton.ts @@ -32,9 +32,9 @@ import { ccclass, type, serializable } from 'cc.decorator'; import { CCString } from '../../core/data/utils/attribute'; import { Mat4 } from '../../core/math'; import { murmurhash2_32_gc } from '../../core/utils/murmurhash2_gc'; -import { DataPoolManager } from '../renderer/data-pool-manager'; -import { Asset } from './asset'; -import { legacyCC } from '../global-exports'; +import { DataPoolManager } from '../skeletal-animation/data-pool-manager'; +import { Asset } from '../../core/assets/asset'; +import { legacyCC } from '../../core/global-exports'; /** * @en The skeleton asset. It stores the path related to [[SkinnedMeshRenderer.skinningRoot]] of all bones and its bind pose matrix. diff --git a/cocos/3d/framework/deprecated.ts b/cocos/3d/framework/deprecated.ts new file mode 100644 index 0000000000..359293a51a --- /dev/null +++ b/cocos/3d/framework/deprecated.ts @@ -0,0 +1,52 @@ +/* + Copyright (c) 2020 Xiamen Yaji Software Co., Ltd. + + https://www.cocos.com/ + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + */ + + +/** + * @packageDocumentation + * @module component + */ + +import { removeProperty, replaceProperty } from '../../core/utils'; +import { MeshRenderer } from './mesh-renderer'; +import { js } from '../../core/utils/js'; +import { legacyCC } from '../../core/global-exports'; + +removeProperty(MeshRenderer.prototype, 'MeshRenderer.prototype', [ + { + name: 'enableDynamicBatching', + }, + { + name: 'recieveShadows', + }, +]); + +/** + * Alias of [[MeshRenderer]] + * @deprecated Since v1.2 + */ +export { MeshRenderer as ModelComponent }; +legacyCC.ModelComponent = MeshRenderer; +js.setClassAlias(MeshRenderer, 'cc.ModelComponent'); diff --git a/cocos/3d/framework/index.ts b/cocos/3d/framework/index.ts new file mode 100644 index 0000000000..6e4d820b78 --- /dev/null +++ b/cocos/3d/framework/index.ts @@ -0,0 +1,34 @@ +/* + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +*/ + +/** + * @packageDocumentation + * @hidden + */ +export { MeshRenderer } from './mesh-renderer'; + +/** deprecated */ +export * from './deprecated'; diff --git a/cocos/core/3d/framework/mesh-renderer.ts b/cocos/3d/framework/mesh-renderer.ts similarity index 94% rename from cocos/core/3d/framework/mesh-renderer.ts rename to cocos/3d/framework/mesh-renderer.ts index b78e813616..0870f9d128 100644 --- a/cocos/core/3d/framework/mesh-renderer.ts +++ b/cocos/3d/framework/mesh-renderer.ts @@ -28,20 +28,21 @@ * @module model */ -import { Texture2D } from '../../assets'; -import { Material } from '../../assets/material'; -import { Mesh } from '../../assets/mesh'; import { ccclass, help, executeInEditMode, executionOrder, menu, tooltip, visible, type, formerlySerializedAs, serializable, editable, disallowAnimation } from 'cc.decorator'; -import { Vec4 } from '../../math'; -import { scene, models } from '../../renderer'; -import { Root } from '../../root'; -import { TransformBit } from '../../scene-graph/node-enum'; -import { Enum } from '../../value-types'; -import { builtinResMgr } from '../builtin'; -import { RenderableComponent } from './renderable-component'; -import { MorphRenderingInstance } from '../../assets/morph'; -import { legacyCC } from '../../global-exports'; -import { assertIsTrue } from '../../data/utils/asserts'; +import { Texture2D } from '../../core/assets'; +import { Material } from '../../core/assets/material'; +import { Mesh } from '../assets/mesh'; +import { Vec4 } from '../../core/math'; +import { scene } from '../../core/renderer'; +import { MorphModel } from '../models/morph-model'; +import { Root } from '../../core/root'; +import { TransformBit } from '../../core/scene-graph/node-enum'; +import { Enum } from '../../core/value-types'; +import { builtinResMgr } from '../../core/builtin'; +import { RenderableComponent } from '../../core/components/renderable-component'; +import { MorphRenderingInstance } from '../assets/morph'; +import { legacyCC } from '../../core/global-exports'; +import { assertIsTrue } from '../../core/data/utils/asserts'; /** * @en Shadow projection mode. @@ -159,7 +160,6 @@ class ModelLightmapSettings { @menu('Components/MeshRenderer') @executeInEditMode export class MeshRenderer extends RenderableComponent { - public static ShadowCastingMode = ModelShadowCastingMode; public static ShadowReceivingMode = ModelShadowReceivingMode; @@ -361,13 +361,13 @@ export class MeshRenderer extends RenderableComponent { // Please notice that we do not enforce that // derived classes should use a morph-able model type(i.e. model type derived from `MorphModel`). // So we should take care of the edge case. - const modelType = (preferMorphOverPlain && this._modelType === scene.Model) ? models.MorphModel : this._modelType; + const modelType = (preferMorphOverPlain && this._modelType === scene.Model) ? MorphModel : this._modelType; const model = this._model! = (legacyCC.director.root as Root).createModel(modelType); model.visFlags = this.visibility; model.node = model.transform = this.node; this._models.length = 0; this._models.push(this._model); - if (this._morphInstance && model instanceof models.MorphModel) { + if (this._morphInstance && model instanceof MorphModel) { model.setMorphRendering(this._morphInstance); } } @@ -522,7 +522,7 @@ export class MeshRenderer extends RenderableComponent { this._morphInstance.setWeights(iSubMesh, weights); } - if (this._model && this._model instanceof models.MorphModel) { + if (this._model && this._model instanceof MorphModel) { this._model.setMorphRendering(this._morphInstance); } } diff --git a/cocos/core/3d/index.ts b/cocos/3d/index.ts similarity index 84% rename from cocos/core/3d/index.ts rename to cocos/3d/index.ts index 9247e648c5..ec07c5e66d 100644 --- a/cocos/core/3d/index.ts +++ b/cocos/3d/index.ts @@ -28,11 +28,16 @@ * @hidden */ -export * from './builtin'; -export * from './framework'; -import * as utils from './misc/utils'; -import { legacyCC } from '../global-exports'; +import * as utils from './misc'; +import { legacyCC } from '../core/global-exports'; +export * from './misc/batch-utils'; +export * from './assets'; +export * from './framework'; + +export * from './lights'; +export * from './skinned-mesh-renderer'; +export * from './skeletal-animation'; export { utils, }; diff --git a/cocos/ui/components/index.ts b/cocos/3d/lights/deprecated.ts similarity index 50% rename from cocos/ui/components/index.ts rename to cocos/3d/lights/deprecated.ts index 52e0b9a4d7..f982adef14 100644 --- a/cocos/ui/components/index.ts +++ b/cocos/3d/lights/deprecated.ts @@ -25,35 +25,41 @@ /** * @packageDocumentation - * @hidden + * @module component */ -export { Button } from './button'; -export { EditBox } from './editbox/edit-box'; -export * from './label'; -export { Layout } from './layout'; -export { Mask } from './mask'; -export { ProgressBar } from './progress-bar'; -export { RichText } from './rich-text'; -export { ScrollBar } from './scroll-bar'; -export { ScrollView } from './scroll-view'; -export { Slider } from './slider'; -export { Sprite } from './sprite'; -export { Toggle } from './toggle'; -export { ToggleContainer } from './toggle-container'; -export { UIMeshRenderer } from './ui-mesh-renderer'; -export { ViewGroup } from './view-group'; -export { Widget } from './widget'; -export { LabelOutline } from './label-outline'; -export { Graphics } from './graphics'; -export { PageView } from './page-view'; -export { PageViewIndicator } from './page-view-indicator'; -export { UIStaticBatch } from './ui-static-batch'; -export { UIOpacity } from './ui-opacity'; -export { SafeArea } from './safe-area'; -export { UICoordinateTracker } from './ui-coodinate-tracker'; -export { BlockInputEvents } from './block-input-events'; -export { LabelShadow } from './label-shadow'; -export { SubContextView } from './SubContextView'; +import { Light } from './light-component'; +import { SpotLight } from './spot-light-component'; +import { SphereLight } from './sphere-light-component'; +import { DirectionalLight } from './directional-light-component'; +import { legacyCC } from '../../core/global-exports'; +import { js } from '../../core/utils/js'; -export { widgetManager } from './widget-manager'; +/** + * Alias of [[Light]] + * @deprecated Since v1.2 + */ +export { Light as LightComponent }; +legacyCC.LightComponent = Light; +js.setClassAlias(Light, 'cc.LightComponent'); +/** + * Alias of [[DirectionalLight]] + * @deprecated Since v1.2 + */ +export { DirectionalLight as DirectionalLightComponent }; +legacyCC.DirectionalLightComponent = DirectionalLight; +js.setClassAlias(DirectionalLight, 'cc.DirectionalLightComponent'); +/** + * Alias of [[SphereLight]] + * @deprecated Since v1.2 + */ +export { SphereLight as SphereLightComponent }; +legacyCC.SphereLightComponent = SphereLight; +js.setClassAlias(SphereLight, 'cc.SphereLightComponent'); +/** + * Alias of [[SpotLight]] + * @deprecated Since v1.2 + */ +export { SpotLight as SpotLightComponent }; +legacyCC.SpotLightComponent = SpotLight; +js.setClassAlias(SpotLight, 'cc.SpotLightComponent'); \ No newline at end of file diff --git a/cocos/core/3d/framework/directional-light-component.ts b/cocos/3d/lights/directional-light-component.ts similarity index 98% rename from cocos/core/3d/framework/directional-light-component.ts rename to cocos/3d/lights/directional-light-component.ts index be7310d3d7..d14aeefd3d 100644 --- a/cocos/core/3d/framework/directional-light-component.ts +++ b/cocos/3d/lights/directional-light-component.ts @@ -29,7 +29,7 @@ */ import { ccclass, help, executeInEditMode, menu, tooltip, unit, serializable } from 'cc.decorator'; -import { scene } from '../../renderer'; +import { scene } from '../../core/renderer'; import { Light } from './light-component'; @ccclass('cc.DirectionalLight') diff --git a/cocos/3d/lights/index.ts b/cocos/3d/lights/index.ts new file mode 100644 index 0000000000..e0edbc1089 --- /dev/null +++ b/cocos/3d/lights/index.ts @@ -0,0 +1,37 @@ +/* + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +*/ + +/** + * @packageDocumentation + * @hidden + */ +export { DirectionalLight } from './directional-light-component'; +export { Light } from './light-component'; +export { SphereLight } from './sphere-light-component'; +export { SpotLight } from './spot-light-component'; + +/** deprecated */ +export * from './deprecated'; \ No newline at end of file diff --git a/cocos/core/3d/framework/light-component.ts b/cocos/3d/lights/light-component.ts similarity index 96% rename from cocos/core/3d/framework/light-component.ts rename to cocos/3d/lights/light-component.ts index 2cd6ff0b6e..1467f6f954 100644 --- a/cocos/core/3d/framework/light-component.ts +++ b/cocos/3d/lights/light-component.ts @@ -28,14 +28,14 @@ * @module component/light */ -import { Component } from '../../components/component'; +import { Component } from '../../core/components/component'; import { ccclass, tooltip, range, slide, type, serializable, editable } from 'cc.decorator'; -import { Color, Vec3 } from '../../math'; -import { Enum } from '../../value-types'; +import { Color, Vec3 } from '../../core/math'; +import { Enum } from '../../core/value-types'; -import { scene } from '../../renderer'; -import { Root } from '../../root'; -import { legacyCC } from '../../global-exports'; +import { scene } from '../../core/renderer'; +import { Root } from '../../core/root'; +import { legacyCC } from '../../core/global-exports'; export const PhotometricTerm = Enum({ LUMINOUS_POWER: 0, diff --git a/cocos/core/3d/framework/sphere-light-component.ts b/cocos/3d/lights/sphere-light-component.ts similarity index 98% rename from cocos/core/3d/framework/sphere-light-component.ts rename to cocos/3d/lights/sphere-light-component.ts index 6a83c354d3..f7826c0d83 100644 --- a/cocos/core/3d/framework/sphere-light-component.ts +++ b/cocos/3d/lights/sphere-light-component.ts @@ -28,7 +28,7 @@ */ import { ccclass, help, executeInEditMode, menu, tooltip, type, unit, serializable } from 'cc.decorator'; -import { scene } from '../../renderer'; +import { scene } from '../../core/renderer'; import { Light, PhotometricTerm } from './light-component'; @ccclass('cc.SphereLight') diff --git a/cocos/core/3d/framework/spot-light-component.ts b/cocos/3d/lights/spot-light-component.ts similarity index 97% rename from cocos/core/3d/framework/spot-light-component.ts rename to cocos/3d/lights/spot-light-component.ts index 6abf03290b..5277c8f6ed 100644 --- a/cocos/core/3d/framework/spot-light-component.ts +++ b/cocos/3d/lights/spot-light-component.ts @@ -31,8 +31,8 @@ import { ccclass, help, executeInEditMode, menu, tooltip, type, slide, range, unit, serializable, } from 'cc.decorator'; -import { toRadian } from '../../math'; -import { scene } from '../../renderer'; +import { toRadian } from '../../core/math'; +import { scene } from '../../core/renderer'; import { Light, PhotometricTerm } from './light-component'; @ccclass('cc.SpotLight') diff --git a/cocos/core/utils/batch-utils.ts b/cocos/3d/misc/batch-utils.ts similarity index 95% rename from cocos/core/utils/batch-utils.ts rename to cocos/3d/misc/batch-utils.ts index 02458a62ce..d598e7fec0 100644 --- a/cocos/core/utils/batch-utils.ts +++ b/cocos/3d/misc/batch-utils.ts @@ -23,92 +23,92 @@ THE SOFTWARE. */ -/** - * @packageDocumentation - * @module core - */ - -import { MeshRenderer } from '../3d/framework/mesh-renderer'; -import { Mesh } from '../assets/mesh'; -import { Mat4 } from '../math/mat4'; -import { Node } from '../scene-graph/node'; - -function checkMaterialisSame (comp1: MeshRenderer, comp2: MeshRenderer): boolean { - const matNum = comp1.sharedMaterials.length; - if (matNum !== comp2.sharedMaterials.length) { - return false; - } - for (let i = 0; i < matNum; i++) { - if (comp1.getRenderMaterial(i) !== comp2.getRenderMaterial(i)) { - return false; - } - } - return true; -} - -/** - * @en Utility for 3d model static batching - * @zh 服务于 3D 模型静态合批的工具类 - */ -export class BatchingUtility { - /** - * Collect the Models under `staticModelRoot`, - * merge all the meshes statically into one (while disabling each component), - * and attach it to a new Model on `batchedRoot`. - * The world transform of each model is guaranteed to be preserved. - * - * For a more fine-grained control over the process, use `Mesh.merge` directly. - * @param staticModelRoot root of all the static models to be batched - * @param batchedRoot the target output node - */ - public static batchStaticModel (staticModelRoot: Node, batchedRoot: Node) { - const models = staticModelRoot.getComponentsInChildren(MeshRenderer); - if (models.length < 2) { - console.error('the number of static models to batch is less than 2,it needn\'t batch.'); - return false; - } - for (let i = 1; i < models.length; i++) { - if (!models[0].mesh!.validateMergingMesh(models[i].mesh!)) { - console.error('the meshes of ' + models[0].node.name + ' and ' + models[i].node.name + ' can\'t be merged'); - return false; - } - if (!checkMaterialisSame(models[0], models[i])) { - console.error('the materials of ' + models[0].node.name + ' and ' + models[i].node.name + ' can\'t be merged'); - return false; - } - } - const batchedMesh = new Mesh(); - const worldMat = new Mat4(); - const rootWorldMatInv = new Mat4(); - staticModelRoot.getWorldMatrix(rootWorldMatInv); - Mat4.invert(rootWorldMatInv, rootWorldMatInv); - for (let i = 0; i < models.length; i++) { - const comp = models[i]; - comp.node.getWorldMatrix(worldMat); - Mat4.multiply(worldMat, rootWorldMatInv, worldMat); - batchedMesh.merge(models[i].mesh!, worldMat); - comp.enabled = false; - } - const batchedModel = batchedRoot.addComponent(MeshRenderer); - batchedModel.mesh = batchedMesh; - batchedModel.sharedMaterials = models[0].sharedMaterials; - return true; - } - - /** - * Undoes everything `batchStaticModel` did. - * - * @param staticModelRoot root of all the static models to be batched - * @param batchedRoot the target output node - */ - public static unbatchStaticModel (staticModelRoot: Node, batchedRoot: Node) { - const models = staticModelRoot.getComponentsInChildren('cc.MeshRenderer'); - for (let i = 0; i < models.length; i++) { - const comp = models[i]; - comp.enabled = true; - } - const batchedModel = batchedRoot.getComponent('cc.MeshRenderer'); - if (batchedModel) { batchedModel.destroy(); } - return true; - } -} +/** + * @packageDocumentation + * @module core + */ + +import { MeshRenderer } from '../framework/mesh-renderer'; +import { Mesh } from '../assets/mesh'; +import { Mat4 } from '../../core/math/mat4'; +import { Node } from '../../core/scene-graph/node'; + +function checkMaterialisSame (comp1: MeshRenderer, comp2: MeshRenderer): boolean { + const matNum = comp1.sharedMaterials.length; + if (matNum !== comp2.sharedMaterials.length) { + return false; + } + for (let i = 0; i < matNum; i++) { + if (comp1.getRenderMaterial(i) !== comp2.getRenderMaterial(i)) { + return false; + } + } + return true; +} + +/** + * @en Utility for 3d model static batching + * @zh 服务于 3D 模型静态合批的工具类 + */ +export class BatchingUtility { + /** + * Collect the Models under `staticModelRoot`, + * merge all the meshes statically into one (while disabling each component), + * and attach it to a new Model on `batchedRoot`. + * The world transform of each model is guaranteed to be preserved. + * + * For a more fine-grained control over the process, use `Mesh.merge` directly. + * @param staticModelRoot root of all the static models to be batched + * @param batchedRoot the target output node + */ + public static batchStaticModel (staticModelRoot: Node, batchedRoot: Node) { + const models = staticModelRoot.getComponentsInChildren(MeshRenderer); + if (models.length < 2) { + console.error('the number of static models to batch is less than 2,it needn\'t batch.'); + return false; + } + for (let i = 1; i < models.length; i++) { + if (!models[0].mesh!.validateMergingMesh(models[i].mesh!)) { + console.error('the meshes of ' + models[0].node.name + ' and ' + models[i].node.name + ' can\'t be merged'); + return false; + } + if (!checkMaterialisSame(models[0], models[i])) { + console.error('the materials of ' + models[0].node.name + ' and ' + models[i].node.name + ' can\'t be merged'); + return false; + } + } + const batchedMesh = new Mesh(); + const worldMat = new Mat4(); + const rootWorldMatInv = new Mat4(); + staticModelRoot.getWorldMatrix(rootWorldMatInv); + Mat4.invert(rootWorldMatInv, rootWorldMatInv); + for (let i = 0; i < models.length; i++) { + const comp = models[i]; + comp.node.getWorldMatrix(worldMat); + Mat4.multiply(worldMat, rootWorldMatInv, worldMat); + batchedMesh.merge(models[i].mesh!, worldMat); + comp.enabled = false; + } + const batchedModel = batchedRoot.addComponent(MeshRenderer); + batchedModel.mesh = batchedMesh; + batchedModel.sharedMaterials = models[0].sharedMaterials; + return true; + } + + /** + * Undoes everything `batchStaticModel` did. + * + * @param staticModelRoot root of all the static models to be batched + * @param batchedRoot the target output node + */ + public static unbatchStaticModel (staticModelRoot: Node, batchedRoot: Node) { + const models = staticModelRoot.getComponentsInChildren('cc.MeshRenderer'); + for (let i = 0; i < models.length; i++) { + const comp = models[i]; + comp.enabled = true; + } + const batchedModel = batchedRoot.getComponent('cc.MeshRenderer'); + if (batchedModel) { batchedModel.destroy(); } + return true; + } +} diff --git a/cocos/core/3d/misc/buffer-blob.ts b/cocos/3d/misc/buffer-blob.ts similarity index 100% rename from cocos/core/3d/misc/buffer-blob.ts rename to cocos/3d/misc/buffer-blob.ts diff --git a/cocos/core/3d/misc/buffer.ts b/cocos/3d/misc/buffer.ts similarity index 98% rename from cocos/core/3d/misc/buffer.ts rename to cocos/3d/misc/buffer.ts index 00bae841b8..f443ccd492 100644 --- a/cocos/core/3d/misc/buffer.ts +++ b/cocos/3d/misc/buffer.ts @@ -23,8 +23,8 @@ THE SOFTWARE. */ -import { Format, FormatInfos, FormatType, FormatInfo } from '../../gfx/define'; -import { sys } from '../../platform/sys'; +import { Format, FormatInfos, FormatType, FormatInfo } from '../../core/gfx/define'; +import { sys } from '../../core/platform/sys'; const _typeMap = { [FormatType.UNORM]: 'Uint', diff --git a/cocos/core/3d/misc/create-mesh.ts b/cocos/3d/misc/create-mesh.ts similarity index 98% rename from cocos/core/3d/misc/create-mesh.ts rename to cocos/3d/misc/create-mesh.ts index 6fbdf68525..0bd8a84d40 100644 --- a/cocos/core/3d/misc/create-mesh.ts +++ b/cocos/3d/misc/create-mesh.ts @@ -23,10 +23,10 @@ THE SOFTWARE. */ -import { Mesh } from '../../assets/mesh'; -import { AttributeName, Format, FormatInfos, PrimitiveMode } from '../../gfx/define'; -import { Attribute } from '../../gfx'; -import { Vec3 } from '../../math'; +import { Mesh } from '../assets/mesh'; +import { AttributeName, Format, FormatInfos, PrimitiveMode } from '../../core/gfx/define'; +import { Attribute } from '../../core/gfx'; +import { Vec3 } from '../../core/math'; import { IGeometry } from '../../primitive/define'; import { writeBuffer } from './buffer'; import { BufferBlob } from './buffer-blob'; diff --git a/cocos/core/3d/misc/utils.ts b/cocos/3d/misc/index.ts similarity index 96% rename from cocos/core/3d/misc/utils.ts rename to cocos/3d/misc/index.ts index 7c9440978c..01683f4ccc 100644 --- a/cocos/core/3d/misc/utils.ts +++ b/cocos/3d/misc/index.ts @@ -23,8 +23,7 @@ THE SOFTWARE. */ - -export { find } from '../../scene-graph/find'; +export { find } from '../../core/scene-graph/find'; export { toPPM } from './ppm'; export { readMesh } from './read-mesh'; export { createMesh } from './create-mesh'; diff --git a/cocos/core/3d/misc/ppm.ts b/cocos/3d/misc/ppm.ts similarity index 99% rename from cocos/core/3d/misc/ppm.ts rename to cocos/3d/misc/ppm.ts index 3dc8b34114..22bb9a0202 100644 --- a/cocos/core/3d/misc/ppm.ts +++ b/cocos/3d/misc/ppm.ts @@ -23,7 +23,6 @@ THE SOFTWARE. */ - /** * save a color buffer to a PPM file */ diff --git a/cocos/core/3d/misc/read-mesh.ts b/cocos/3d/misc/read-mesh.ts similarity index 95% rename from cocos/core/3d/misc/read-mesh.ts rename to cocos/3d/misc/read-mesh.ts index 1a5046e726..9f1377661c 100644 --- a/cocos/core/3d/misc/read-mesh.ts +++ b/cocos/3d/misc/read-mesh.ts @@ -23,9 +23,8 @@ THE SOFTWARE. */ - -import { Mesh } from '../../assets/mesh'; -import { AttributeName, Format, FormatInfos } from '../../gfx/define'; +import { Mesh } from '../assets/mesh'; +import { AttributeName, Format, FormatInfos } from '../../core/gfx/define'; import { IGeometry } from '../../primitive/define'; import { readBuffer } from './buffer'; diff --git a/cocos/core/renderer/models/baked-skinning-model.ts b/cocos/3d/models/baked-skinning-model.ts similarity index 90% rename from cocos/core/renderer/models/baked-skinning-model.ts rename to cocos/3d/models/baked-skinning-model.ts index a3905ffc20..82d1296960 100644 --- a/cocos/core/renderer/models/baked-skinning-model.ts +++ b/cocos/3d/models/baked-skinning-model.ts @@ -28,23 +28,23 @@ * @hidden */ -import { AnimationClip } from '../../animation/animation-clip'; -import { Mesh } from '../../assets/mesh'; -import { Skeleton } from '../../assets/skeleton'; -import { AABB } from '../../geometry'; -import { BufferUsageBit, MemoryUsageBit } from '../../gfx/define'; -import { Vec3 } from '../../math'; -import { INST_JOINT_ANIM_INFO, UBOSkinningAnimation, UBOSkinningTexture, UNIFORM_JOINT_TEXTURE_BINDING } from '../../pipeline/define'; -import { Node } from '../../scene-graph'; -import { Pass } from '../core/pass'; -import { samplerLib } from '../core/sampler-lib'; -import { DataPoolManager } from '../data-pool-manager'; -import { ModelType } from '../scene/model'; -import { IAnimInfo, IJointTextureHandle, jointTextureSamplerHash } from './skeletal-animation-utils'; +import { AnimationClip } from '../../core/animation/animation-clip'; +import { Mesh } from '../assets/mesh'; +import { Skeleton } from '../assets/skeleton'; +import { AABB } from '../../core/geometry'; +import { BufferUsageBit, MemoryUsageBit } from '../../core/gfx/define'; +import { Vec3 } from '../../core/math'; +import { INST_JOINT_ANIM_INFO, UBOSkinningAnimation, UBOSkinningTexture, UNIFORM_JOINT_TEXTURE_BINDING } from '../../core/pipeline/define'; +import { Node } from '../../core/scene-graph'; +import { Pass } from '../../core/renderer/core/pass'; +import { samplerLib } from '../../core/renderer/core/sampler-lib'; +import { DataPoolManager } from '../skeletal-animation/data-pool-manager'; +import { ModelType } from '../../core/renderer/scene/model'; +import { IAnimInfo, IJointTextureHandle, jointTextureSamplerHash } from '../skeletal-animation/skeletal-animation-utils'; import { MorphModel } from './morph-model'; -import { legacyCC } from '../../global-exports'; -import { Attribute, DescriptorSet, Buffer, BufferInfo } from '../../gfx'; -import { AABBPool, AABBView } from '../core/memory-pools'; +import { legacyCC } from '../../core/global-exports'; +import { Attribute, DescriptorSet, Buffer, BufferInfo } from '../../core/gfx'; +import { AABBPool, AABBView } from '../../core/renderer/core/memory-pools'; interface IJointsInfo { buffer: Buffer | null; diff --git a/cocos/core/renderer/models/morph-model.ts b/cocos/3d/models/morph-model.ts similarity index 90% rename from cocos/core/renderer/models/morph-model.ts rename to cocos/3d/models/morph-model.ts index adacf57620..8d92bc7db8 100644 --- a/cocos/core/renderer/models/morph-model.ts +++ b/cocos/3d/models/morph-model.ts @@ -28,11 +28,11 @@ * @hidden */ -import { Model } from '../scene/model'; -import { MorphRenderingInstance } from '../../assets/morph'; -import { Material } from '../../assets/material'; -import { RenderingSubMesh } from '../../assets/mesh'; -import { DescriptorSet } from '../../gfx'; +import { Model } from '../../core/renderer/scene/model'; +import { MorphRenderingInstance } from '../assets/morph'; +import { Material } from '../../core/assets/material'; +import { RenderingSubMesh } from '../../core/assets/rendering-sub-mesh'; +import { DescriptorSet } from '../../core/gfx'; export class MorphModel extends Model { private _morphRenderingInstance: MorphRenderingInstance | null = null; diff --git a/cocos/core/renderer/models/skinning-model.ts b/cocos/3d/models/skinning-model.ts similarity index 75% rename from cocos/core/renderer/models/skinning-model.ts rename to cocos/3d/models/skinning-model.ts index c59b3f6d9a..2d7195de58 100644 --- a/cocos/core/renderer/models/skinning-model.ts +++ b/cocos/3d/models/skinning-model.ts @@ -28,90 +28,26 @@ * @hidden */ -import { Material } from '../../assets/material'; -import { Mesh, RenderingSubMesh } from '../../assets/mesh'; -import { Skeleton } from '../../assets/skeleton'; -import { AABB } from '../../geometry'; -import { BufferUsageBit, MemoryUsageBit } from '../../gfx/define'; -import { Mat4, Vec3 } from '../../math'; -import { UBOSkinning } from '../../pipeline/define'; -import { Node } from '../../scene-graph/node'; -import { ModelType } from '../scene/model'; -import { uploadJointData } from './skeletal-animation-utils'; +import { Material } from '../../core/assets/material'; +import { RenderingSubMesh } from '../../core/assets/rendering-sub-mesh'; +import { Mesh } from '../assets/mesh'; +import { Skeleton } from '../assets/skeleton'; +import { AABB } from '../../core/geometry'; +import { BufferUsageBit, MemoryUsageBit } from '../../core/gfx/define'; +import { Mat4, Vec3 } from '../../core/math'; +import { UBOSkinning } from '../../core/pipeline/define'; +import { Node } from '../../core/scene-graph/node'; +import { ModelType } from '../../core/renderer/scene/model'; +import { uploadJointData } from '../skeletal-animation/skeletal-animation-utils'; import { MorphModel } from './morph-model'; -import { DescriptorSet, Buffer, BufferInfo } from '../../gfx'; -import { AABBPool, AABBView } from '../core/memory-pools'; - -export interface IJointTransform { - node: Node; - local: Mat4; - world: Mat4; - stamp: number; - parent: IJointTransform | null; -} - -const stack: IJointTransform[] = []; -const pool: Map = new Map(); +import { DescriptorSet, Buffer, BufferInfo } from '../../core/gfx'; +import { AABBPool, AABBView } from '../../core/renderer/core/memory-pools'; +import { deleteTransform, getTransform, getWorldMatrix, IJointTransform } from '../../core/animation/skeletal-animation-utils'; const myPatches = [ { name: 'CC_USE_SKINNING', value: true }, ]; -export function getWorldMatrix (transform: IJointTransform | null, stamp: number) { - let i = 0; - let res = Mat4.IDENTITY; - while (transform) { - if (transform.stamp === stamp || transform.stamp + 1 === stamp && !transform.node.hasChangedFlags) { - res = transform.world; - transform.stamp = stamp; - break; - } - transform.stamp = stamp; - stack[i++] = transform; - transform = transform.parent; - } - while (i > 0) { - transform = stack[--i]; - const node = transform.node; - Mat4.fromRTS(transform.local, node.rotation, node.position, node.scale); - res = Mat4.multiply(transform.world, res, transform.local); - } - return res; -} - -export function getTransform (node: Node, root: Node) { - let joint: IJointTransform | null = null; - let i = 0; - while (node !== root) { - const id = node.uuid; - if (pool.has(id)) { - joint = pool.get(id)!; - break; - } else { // TODO: object reuse - joint = { node, local: new Mat4(), world: new Mat4(), stamp: -1, parent: null }; - pool.set(id, joint); - } - stack[i++] = joint; - node = node.parent!; - joint = null; - } - let child: IJointTransform; - while (i > 0) { - child = stack[--i]; - child.parent = joint; - joint = child; - } - return joint; -} - -export function deleteTransform (node: Node) { - let transform = pool.get(node.uuid) || null; - while (transform) { - pool.delete(transform.node.uuid); - transform = transform.parent; - } -} - function getRelevantBuffers (outIndices: number[], outBuffers: number[], jointMaps: number[][], targetJoint: number) { for (let i = 0; i < jointMaps.length; i++) { const idxMap = jointMaps[i]; diff --git a/cocos/core/renderer/data-pool-manager.ts b/cocos/3d/skeletal-animation/data-pool-manager.ts similarity index 86% rename from cocos/core/renderer/data-pool-manager.ts rename to cocos/3d/skeletal-animation/data-pool-manager.ts index 0a694680a2..fad34a4a09 100644 --- a/cocos/core/renderer/data-pool-manager.ts +++ b/cocos/3d/skeletal-animation/data-pool-manager.ts @@ -28,10 +28,11 @@ * @hidden */ -import { AnimationClip } from '../animation/animation-clip'; +import { AnimationClip } from '../../core/animation/animation-clip'; import { Skeleton } from '../assets'; -import { Device } from '../gfx'; -import { JointAnimationInfo, JointTexturePool } from './models/skeletal-animation-utils'; +import { Device } from '../../core/gfx'; +import { JointAnimationInfo, JointTexturePool } from './skeletal-animation-utils'; +import { legacyCC } from '../../core/global-exports'; export class DataPoolManager { public jointTexturePool: JointTexturePool; @@ -55,3 +56,5 @@ export class DataPoolManager { this.jointAnimationInfo.clear(); } } + +legacyCC.internal.DataPoolManager = DataPoolManager; diff --git a/cocos/3d/skeletal-animation/deprecated.ts b/cocos/3d/skeletal-animation/deprecated.ts new file mode 100644 index 0000000000..6ec68fc8e6 --- /dev/null +++ b/cocos/3d/skeletal-animation/deprecated.ts @@ -0,0 +1,39 @@ +/* + Copyright (c) 2020 Xiamen Yaji Software Co., Ltd. + + https://www.cocos.com/ + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + */ + +/** + * @packageDocumentation + * @module animation + */ +import { js } from '../../core/utils/js'; +import { legacyCC } from '../../core/global-exports'; +import { SkeletalAnimation } from './skeletal-animation'; +/** + * Alias of [[SkeletalAnimation]] + * @deprecated Since v1.2 + */ +export { SkeletalAnimation as SkeletalAnimationComponent }; +legacyCC.SkeletalAnimationComponent = SkeletalAnimation; +js.setClassAlias(SkeletalAnimation, 'cc.SkeletalAnimationComponent'); \ No newline at end of file diff --git a/cocos/core/renderer/models/model-uniforms.ts b/cocos/3d/skeletal-animation/index.ts similarity index 87% rename from cocos/core/renderer/models/model-uniforms.ts rename to cocos/3d/skeletal-animation/index.ts index f6708fddfd..384021ba5d 100644 --- a/cocos/core/renderer/models/model-uniforms.ts +++ b/cocos/3d/skeletal-animation/index.ts @@ -27,6 +27,9 @@ * @packageDocumentation * @hidden */ +import './data-pool-manager'; -import { Type } from '../../gfx/define'; -import { UniformBlock, UniformSampler } from '../../gfx/shader'; +export * from './skeletal-animation-data-hub'; +export * from './skeletal-animation-state'; +export * from './skeletal-animation'; +export * from './deprecated'; diff --git a/cocos/core/animation/skeletal-animation-blending.ts b/cocos/3d/skeletal-animation/skeletal-animation-blending.ts similarity index 96% rename from cocos/core/animation/skeletal-animation-blending.ts rename to cocos/3d/skeletal-animation/skeletal-animation-blending.ts index 5d72ade50e..cae7fe0b8f 100644 --- a/cocos/core/animation/skeletal-animation-blending.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation-blending.ts @@ -28,11 +28,11 @@ * @hidden */ -import { Vec3, Quat } from '../math'; -import { Node } from '../scene-graph'; -import { IValueProxyFactory } from './value-proxy'; -import { assertIsNonNullable } from '../data/utils/asserts'; -import { AnimationState } from './animation-state'; +import { Vec3, Quat } from '../../core/math'; +import { Node } from '../../core/scene-graph'; +import { IValueProxyFactory } from '../../core/animation/value-proxy'; +import { assertIsNonNullable } from '../../core/data/utils/asserts'; +import { AnimationState } from '../../core/animation/animation-state'; export class BlendStateBuffer { private _nodeBlendStates: Map = new Map(); diff --git a/cocos/core/animation/skeletal-animation-data-hub.ts b/cocos/3d/skeletal-animation/skeletal-animation-data-hub.ts similarity index 95% rename from cocos/core/animation/skeletal-animation-data-hub.ts rename to cocos/3d/skeletal-animation/skeletal-animation-data-hub.ts index aa86fccc52..a2dd5c178a 100644 --- a/cocos/core/animation/skeletal-animation-data-hub.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation-data-hub.ts @@ -30,11 +30,11 @@ import { clamp01, Mat4, Quat, Vec3, -} from '../math'; -import { DataPoolManager } from '../renderer/data-pool-manager'; -import { AnimationClip, IObjectCurveData } from './animation-clip'; -import { HierarchyPath, isCustomPath, isPropertyPath } from './target-path'; -import { legacyCC } from '../global-exports'; +} from '../../core/math'; +import { DataPoolManager } from './data-pool-manager'; +import { AnimationClip, IObjectCurveData } from '../../core/animation/animation-clip'; +import { HierarchyPath, isCustomPath, isPropertyPath } from '../../core/animation/target-path'; +import { legacyCC } from '../../core/global-exports'; type CurveData = Vec3[] | Quat[] | Mat4[]; type ConvertedProps = Record; diff --git a/cocos/core/animation/skeletal-animation-state.ts b/cocos/3d/skeletal-animation/skeletal-animation-state.ts similarity index 93% rename from cocos/core/animation/skeletal-animation-state.ts rename to cocos/3d/skeletal-animation/skeletal-animation-state.ts index 943ae9c3f5..58d786e955 100644 --- a/cocos/core/animation/skeletal-animation-state.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation-state.ts @@ -28,15 +28,15 @@ * @module animation */ -import { SkinnedMeshRenderer } from '../3d/framework/skinned-mesh-renderer'; -import { Mat4, Quat, Vec3 } from '../math'; -import { IAnimInfo, JointAnimationInfo } from '../renderer/models/skeletal-animation-utils'; -import { Node } from '../scene-graph/node'; -import { AnimationClip, IRuntimeCurve } from './animation-clip'; -import { AnimationState } from './animation-state'; +import { SkinnedMeshRenderer } from '../skinned-mesh-renderer'; +import { Mat4, Quat, Vec3 } from '../../core/math'; +import { IAnimInfo, JointAnimationInfo } from './skeletal-animation-utils'; +import { Node } from '../../core/scene-graph/node'; +import { AnimationClip, IRuntimeCurve } from '../../core/animation/animation-clip'; +import { AnimationState } from '../../core/animation/animation-state'; import { SkeletalAnimation, Socket } from './skeletal-animation'; import { SkelAnimDataHub } from './skeletal-animation-data-hub'; -import { legacyCC } from '../global-exports'; +import { legacyCC } from '../../core/global-exports'; const m4_1 = new Mat4(); const m4_2 = new Mat4(); diff --git a/cocos/core/renderer/models/skeletal-animation-utils.ts b/cocos/3d/skeletal-animation/skeletal-animation-utils.ts similarity index 96% rename from cocos/core/renderer/models/skeletal-animation-utils.ts rename to cocos/3d/skeletal-animation/skeletal-animation-utils.ts index bfd92709b7..2bba8542a6 100644 --- a/cocos/core/renderer/models/skeletal-animation-utils.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation-utils.ts @@ -29,21 +29,21 @@ */ import { EDITOR } from 'internal:constants'; -import { AnimationClip } from '../../animation/animation-clip'; -import { SkelAnimDataHub } from '../../animation/skeletal-animation-data-hub'; -import { getWorldTransformUntilRoot } from '../../animation/transform-utils'; -import { Mesh } from '../../assets/mesh'; -import { Skeleton } from '../../assets/skeleton'; -import { AABB } from '../../geometry'; +import { AnimationClip } from '../../core/animation/animation-clip'; +import { SkelAnimDataHub } from './skeletal-animation-data-hub'; +import { getWorldTransformUntilRoot } from '../../core/animation/transform-utils'; +import { Mesh } from '../assets/mesh'; +import { Skeleton } from '../assets/skeleton'; +import { AABB } from '../../core/geometry'; import { Address, BufferUsageBit, Filter, Format, FormatInfos, MemoryUsageBit, Feature, -} from '../../gfx/define'; -import { Device, Buffer, BufferInfo } from '../../gfx'; -import { Mat4, Quat, Vec3 } from '../../math'; -import { UBOSkinningAnimation } from '../../pipeline/define'; -import { Node } from '../../scene-graph'; -import { genSamplerHash } from '../core/sampler-lib'; -import { ITextureBufferHandle, TextureBufferPool } from '../core/texture-buffer-pool'; +} from '../../core/gfx/define'; +import { Device, Buffer, BufferInfo } from '../../core/gfx'; +import { Mat4, Quat, Vec3 } from '../../core/math'; +import { UBOSkinningAnimation } from '../../core/pipeline/define'; +import { Node } from '../../core/scene-graph'; +import { genSamplerHash } from '../../core/renderer/core/sampler-lib'; +import { ITextureBufferHandle, TextureBufferPool } from '../../core/renderer/core/texture-buffer-pool'; // change here and cc-skinning.chunk to use other skinning algorithms export const uploadJointData = uploadJointDataLBS; diff --git a/cocos/core/animation/skeletal-animation.ts b/cocos/3d/skeletal-animation/skeletal-animation.ts similarity index 93% rename from cocos/core/animation/skeletal-animation.ts rename to cocos/3d/skeletal-animation/skeletal-animation.ts index 168f33adb0..0a3497cbc2 100644 --- a/cocos/core/animation/skeletal-animation.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation.ts @@ -31,18 +31,18 @@ import { ccclass, executeInEditMode, executionOrder, help, menu, tooltip, type, serializable, editable, } from 'cc.decorator'; -import { SkinnedMeshRenderer } from '../3d/framework/skinned-mesh-renderer'; -import { Mat4 } from '../math'; -import { DataPoolManager } from '../renderer/data-pool-manager'; -import { Node } from '../scene-graph/node'; -import { AnimationClip } from './animation-clip'; -import { Animation } from './animation-component'; +import { SkinnedMeshRenderer } from '../skinned-mesh-renderer'; +import { Mat4 } from '../../core/math'; +import { DataPoolManager } from './data-pool-manager'; +import { Node } from '../../core/scene-graph/node'; +import { AnimationClip } from '../../core/animation/animation-clip'; +import { Animation } from '../../core/animation/animation-component'; import { SkelAnimDataHub } from './skeletal-animation-data-hub'; import { SkeletalAnimationState } from './skeletal-animation-state'; -import { getWorldTransformUntilRoot } from './transform-utils'; -import { legacyCC } from '../global-exports'; -import { AnimationManager } from './animation-manager'; -import { js } from '../utils/js'; +import { getWorldTransformUntilRoot } from '../../core/animation/transform-utils'; +import { legacyCC } from '../../core/global-exports'; +import { AnimationManager } from '../../core/animation/animation-manager'; +import { js } from '../../core/utils/js'; @ccclass('cc.SkeletalAnimation.Socket') export class Socket { diff --git a/cocos/3d/skinned-mesh-renderer/deprecated.ts b/cocos/3d/skinned-mesh-renderer/deprecated.ts new file mode 100644 index 0000000000..6f251d7816 --- /dev/null +++ b/cocos/3d/skinned-mesh-renderer/deprecated.ts @@ -0,0 +1,55 @@ +/* + Copyright (c) 2020 Xiamen Yaji Software Co., Ltd. + + https://www.cocos.com/ + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + */ + +/** + * @packageDocumentation + * @module component + */ + +import { SkinnedMeshRenderer } from './skinned-mesh-renderer'; +import { SkinnedMeshBatchRenderer, SkinnedMeshUnit } from './skinned-mesh-batch-renderer'; +import { js } from '../../core/utils/js'; +import { legacyCC } from '../../core/global-exports'; +/** + * Alias of [[SkinnedMeshRenderer]] + * @deprecated Since v1.2 + */ +export { SkinnedMeshRenderer as SkinningModelComponent }; +legacyCC.SkinningModelComponent = SkinnedMeshRenderer; +js.setClassAlias(SkinnedMeshRenderer, 'cc.SkinningModelComponent'); +/** + * Alias of [[SkinnedMeshUnit]] + * @deprecated Since v1.2 + */ +export { SkinnedMeshUnit as SkinningModelUnit }; +legacyCC.SkinningModelUnit = SkinnedMeshUnit; +js.setClassAlias(SkinnedMeshUnit, 'cc.SkinningModelUnit'); +/** + * Alias of [[SkinnedMeshBatchRenderer]] + * @deprecated Since v1.2 + */ +export { SkinnedMeshBatchRenderer as BatchedSkinningModelComponent }; +legacyCC.BatchedSkinningModelComponent = SkinnedMeshBatchRenderer; +js.setClassAlias(SkinnedMeshBatchRenderer, 'cc.BatchedSkinningModelComponent'); diff --git a/cocos/core/3d/framework/index.ts b/cocos/3d/skinned-mesh-renderer/index.ts similarity index 64% rename from cocos/core/3d/framework/index.ts rename to cocos/3d/skinned-mesh-renderer/index.ts index 63f1d7af21..6497b416de 100644 --- a/cocos/core/3d/framework/index.ts +++ b/cocos/3d/skinned-mesh-renderer/index.ts @@ -28,31 +28,8 @@ * @packageDocumentation * @hidden */ -import { legacyCC } from '../../global-exports'; -import { SkinnedMeshBatchRenderer, SkinnedMeshUnit } from './skinned-mesh-batch-renderer'; -import { Camera } from './camera-component'; -import { DirectionalLight } from './directional-light-component'; -import { Light } from './light-component'; -import { MeshRenderer } from './mesh-renderer'; -import { RenderableComponent } from './renderable-component'; -import { SkinnedMeshRenderer } from './skinned-mesh-renderer'; -import { SphereLight } from './sphere-light-component'; -import { SpotLight } from './spot-light-component'; +import '../skeletal-animation/data-pool-manager'; -export { - Camera, - Light, - MeshRenderer, - SkinnedMeshRenderer, - SkinnedMeshBatchRenderer, - SkinnedMeshUnit, - - RenderableComponent, - - DirectionalLight, - SphereLight, - SpotLight, -}; - -/** deprecated */ +export { SkinnedMeshRenderer } from './skinned-mesh-renderer'; +export { SkinnedMeshBatchRenderer, SkinnedMeshUnit } from './skinned-mesh-batch-renderer'; export * from './deprecated'; diff --git a/cocos/core/3d/framework/skinned-mesh-batch-renderer.ts b/cocos/3d/skinned-mesh-renderer/skinned-mesh-batch-renderer.ts similarity index 97% rename from cocos/core/3d/framework/skinned-mesh-batch-renderer.ts rename to cocos/3d/skinned-mesh-renderer/skinned-mesh-batch-renderer.ts index 7680f7da26..622766ad37 100644 --- a/cocos/core/3d/framework/skinned-mesh-batch-renderer.ts +++ b/cocos/3d/skinned-mesh-renderer/skinned-mesh-batch-renderer.ts @@ -31,21 +31,21 @@ import { EDITOR } from 'internal:constants'; import { ccclass, help, executeInEditMode, executionOrder, menu, tooltip, type, visible, override, serializable, editable, } from 'cc.decorator'; -import { getWorldTransformUntilRoot } from '../../animation/transform-utils'; -import { Filter, PixelFormat } from '../../assets/asset-enum'; -import { Material } from '../../assets/material'; -import { Mesh } from '../../assets/mesh'; -import { Skeleton } from '../../assets/skeleton'; -import { Texture2D } from '../../assets/texture-2d'; -import { CCString } from '../../data/utils/attribute'; +import { getWorldTransformUntilRoot } from '../../core/animation/transform-utils'; +import { Filter, PixelFormat } from '../../core/assets/asset-enum'; +import { Material } from '../../core/assets/material'; +import { Mesh } from '../assets/mesh'; +import { Skeleton } from '../assets/skeleton'; +import { Texture2D } from '../../core/assets/texture-2d'; +import { CCString } from '../../core/data/utils/attribute'; import { AttributeName, FormatInfos, Format, Type, -} from '../../gfx/define'; -import { Device, Attribute, BufferTextureCopy } from '../../gfx'; -import { Mat4, Vec2, Vec3 } from '../../math'; +} from '../../core/gfx/define'; +import { Device, Attribute, BufferTextureCopy } from '../../core/gfx'; +import { Mat4, Vec2, Vec3 } from '../../core/math'; import { mapBuffer, readBuffer, writeBuffer } from '../misc/buffer'; import { SkinnedMeshRenderer } from './skinned-mesh-renderer'; -import { legacyCC } from '../../global-exports'; +import { legacyCC } from '../../core/global-exports'; const repeat = (n: number) => n - Math.floor(n); const batch_id: Attribute = new Attribute(AttributeName.ATTR_BATCH_ID, Format.R32F); diff --git a/cocos/core/3d/framework/skinned-mesh-renderer.ts b/cocos/3d/skinned-mesh-renderer/skinned-mesh-renderer.ts similarity index 85% rename from cocos/core/3d/framework/skinned-mesh-renderer.ts rename to cocos/3d/skinned-mesh-renderer/skinned-mesh-renderer.ts index ce9e403112..697a6b50a7 100644 --- a/cocos/core/3d/framework/skinned-mesh-renderer.ts +++ b/cocos/3d/skinned-mesh-renderer/skinned-mesh-renderer.ts @@ -31,14 +31,15 @@ import { ccclass, executeInEditMode, executionOrder, help, menu, tooltip, type, } from 'cc.decorator'; -import { AnimationClip } from '../../animation/animation-clip'; -import { Material } from '../../assets'; -import { Skeleton } from '../../assets/skeleton'; -import { models } from '../../renderer'; -import { Node } from '../../scene-graph/node'; -import { MeshRenderer } from './mesh-renderer'; -import { SkeletalAnimation } from '../../animation/skeletal-animation'; -import { legacyCC } from '../../global-exports'; +import { AnimationClip } from '../../core/animation/animation-clip'; +import { Material } from '../../core/assets'; +import { Skeleton } from '../assets/skeleton'; +import { Node } from '../../core/scene-graph/node'; +import { MeshRenderer } from '../framework/mesh-renderer'; +import { SkeletalAnimation } from '../skeletal-animation'; +import { legacyCC } from '../../core/global-exports'; +import { SkinningModel } from '../models/skinning-model'; +import { BakedSkinningModel } from '../models/baked-skinning-model'; /** * @en The skinned mesh renderer component. @@ -91,12 +92,12 @@ export class SkinnedMeshRenderer extends MeshRenderer { } get model () { - return this._model as models.SkinningModel | models.BakedSkinningModel | null; + return this._model as SkinningModel | BakedSkinningModel | null; } constructor () { super(); - this._modelType = models.BakedSkinningModel; + this._modelType = BakedSkinningModel; } public __preload () { @@ -111,7 +112,7 @@ export class SkinnedMeshRenderer extends MeshRenderer { } public setUseBakedAnimation (val = true) { - const modelType = val ? models.BakedSkinningModel : models.SkinningModel; + const modelType = val ? BakedSkinningModel : SkinningModel; if (this._modelType === modelType) { return; } this._modelType = modelType; if (this._model) { @@ -128,7 +129,7 @@ export class SkinnedMeshRenderer extends MeshRenderer { public setMaterial (material: Material | null, index: number) { super.setMaterial(material, index); - if (this._modelType === models.SkinningModel) { + if (this._modelType === SkinningModel) { this.getMaterialInstance(index); } } diff --git a/cocos/audio/audio-downloader.ts b/cocos/audio/audio-downloader.ts index 377d1a667e..7cbfaca2f2 100644 --- a/cocos/audio/audio-downloader.ts +++ b/cocos/audio/audio-downloader.ts @@ -34,8 +34,9 @@ import { AudioClip, AudioType } from './assets/clip'; import { legacyCC } from '../core/global-exports'; import { CompleteCallback, IDownloadParseOptions } from '../core/asset-manager/shared'; import downloadFile from '../core/asset-manager/download-file'; -import { DownloadHandler } from '../core/asset-manager/downloader'; +import downloader, { DownloadHandler } from '../core/asset-manager/downloader'; import { createDomAudio } from './audio-utils'; +import factory from '../core/asset-manager/factory'; export function downloadDomAudio ( url: string, @@ -78,3 +79,32 @@ export function downloadAudio (url: string, options: IDownloadParseOptions, onCo } handler(url, options, onComplete); } + +function createAudioClip (id: string, + data: HTMLAudioElement | AudioBuffer, + options: IDownloadParseOptions, + onComplete: CompleteCallback) { + const out = new AudioClip(); + out._nativeUrl = id; + out._nativeAsset = data; + // @ts-expect-error assignment to private field + out._duration = data.duration; + onComplete(null, out); +} + +downloader.register({ + '.mp3': downloadAudio, + '.ogg': downloadAudio, + '.wav': downloadAudio, + '.m4a': downloadAudio, +}); + +downloader.downloadDomAudio = downloadDomAudio; + +factory.register({ + // Audio + '.mp3': createAudioClip, + '.ogg': createAudioClip, + '.wav': createAudioClip, + '.m4a': createAudioClip, +}); diff --git a/cocos/core/3d/framework/deprecated.ts b/cocos/core/3d/framework/deprecated.ts deleted file mode 100644 index d4f286798d..0000000000 --- a/cocos/core/3d/framework/deprecated.ts +++ /dev/null @@ -1,137 +0,0 @@ -/* - Copyright (c) 2020 Xiamen Yaji Software Co., Ltd. - - https://www.cocos.com/ - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license - to use Cocos Creator solely to develop games on your target platforms. You shall - not use Cocos Creator software for developing other software or tools that's - used for developing games. You are not granted to publish, distribute, - sublicense, and/or sell copies of Cocos Creator. - - The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - */ - - -/** - * @packageDocumentation - * @module component - */ - -import { removeProperty, replaceProperty } from '../../utils'; -import { MeshRenderer } from './mesh-renderer'; -import { Camera } from './camera-component'; -import { Light } from './light-component'; -import { SpotLight } from './spot-light-component'; -import { SphereLight } from './sphere-light-component'; -import { DirectionalLight } from './directional-light-component'; -import { SkinnedMeshRenderer } from './skinned-mesh-renderer'; -import { SkinnedMeshBatchRenderer, SkinnedMeshUnit } from './skinned-mesh-batch-renderer'; -import { js } from '../../utils/js'; -import { legacyCC } from '../../global-exports'; - -removeProperty(MeshRenderer.prototype, 'MeshRenderer.prototype', [ - { - name: 'enableDynamicBatching', - }, - { - name: 'recieveShadows', - }, -]); - -replaceProperty(Camera, 'Camera', [ - { - name: 'CameraClearFlag', - newName: 'ClearFlag' - } -]); - -replaceProperty(Camera.prototype, 'Camera.prototype', [ - { - name: 'color', - newName: 'clearColor', - }, - { - name: 'depth', - newName: 'clearDepth', - }, - { - name: 'stencil', - newName: 'clearStencil', - }, -]); - -/** - * Alias of [[Camera]] - * @deprecated Since v1.2 - */ -export { Camera as CameraComponent }; -legacyCC.CameraComponent = Camera; -js.setClassAlias(Camera, 'cc.CameraComponent'); -/** - * Alias of [[Light]] - * @deprecated Since v1.2 - */ -export { Light as LightComponent }; -legacyCC.LightComponent = Light; -js.setClassAlias(Light, 'cc.LightComponent'); -/** - * Alias of [[DirectionalLight]] - * @deprecated Since v1.2 - */ -export { DirectionalLight as DirectionalLightComponent }; -legacyCC.DirectionalLightComponent = DirectionalLight; -js.setClassAlias(DirectionalLight, 'cc.DirectionalLightComponent'); -/** - * Alias of [[SphereLight]] - * @deprecated Since v1.2 - */ -export { SphereLight as SphereLightComponent }; -legacyCC.SphereLightComponent = SphereLight; -js.setClassAlias(SphereLight, 'cc.SphereLightComponent'); -/** - * Alias of [[SpotLight]] - * @deprecated Since v1.2 - */ -export { SpotLight as SpotLightComponent }; -legacyCC.SpotLightComponent = SpotLight; -js.setClassAlias(SpotLight, 'cc.SpotLightComponent'); -/** - * Alias of [[MeshRenderer]] - * @deprecated Since v1.2 - */ -export { MeshRenderer as ModelComponent }; -legacyCC.ModelComponent = MeshRenderer; -js.setClassAlias(MeshRenderer, 'cc.ModelComponent'); -/** - * Alias of [[SkinnedMeshRenderer]] - * @deprecated Since v1.2 - */ -export { SkinnedMeshRenderer as SkinningModelComponent }; -legacyCC.SkinningModelComponent = SkinnedMeshRenderer; -js.setClassAlias(SkinnedMeshRenderer, 'cc.SkinningModelComponent'); -/** - * Alias of [[SkinnedMeshUnit]] - * @deprecated Since v1.2 - */ -export { SkinnedMeshUnit as SkinningModelUnit }; -legacyCC.SkinningModelUnit = SkinnedMeshUnit; -js.setClassAlias(SkinnedMeshUnit, 'cc.SkinningModelUnit'); -/** - * Alias of [[SkinnedMeshBatchRenderer]] - * @deprecated Since v1.2 - */ -export { SkinnedMeshBatchRenderer as BatchedSkinningModelComponent }; -legacyCC.BatchedSkinningModelComponent = SkinnedMeshBatchRenderer; -js.setClassAlias(SkinnedMeshBatchRenderer, 'cc.BatchedSkinningModelComponent'); diff --git a/cocos/core/animation/animation-clip.ts b/cocos/core/animation/animation-clip.ts index 8a9f7d6975..bae7a79661 100644 --- a/cocos/core/animation/animation-clip.ts +++ b/cocos/core/animation/animation-clip.ts @@ -30,16 +30,16 @@ */ import { EDITOR } from 'internal:constants'; -import { Asset } from '../assets/asset'; -import { SpriteFrame } from '../assets/sprite-frame'; import { ccclass, serializable } from 'cc.decorator'; +import { Asset } from '../assets/asset'; +import { SpriteFrame } from '../../2d/assets/sprite-frame'; import { CompactValueTypeArray } from '../data/utils/compact-value-type-array'; import { errorID } from '../platform/debug'; -import { DataPoolManager } from '../renderer/data-pool-manager'; +import { DataPoolManager } from '../../3d/skeletal-animation/data-pool-manager'; import binarySearchEpsilon from '../utils/binary-search'; import { murmurhash2_32_gc } from '../utils/murmurhash2_gc'; import { AnimCurve, IPropertyCurveData, RatioSampler } from './animation-curve'; -import { SkelAnimDataHub } from './skeletal-animation-data-hub'; +import { SkelAnimDataHub } from '../../3d/skeletal-animation/skeletal-animation-data-hub'; import { ComponentPath, HierarchyPath, TargetPath } from './target-path'; import { WrapMode as AnimationWrapMode } from './types'; import { IValueProxyFactory } from './value-proxy'; @@ -350,7 +350,9 @@ export class AnimationClip extends Asset { } public destroy () { - (legacyCC.director.root.dataPoolManager as DataPoolManager).releaseAnimationClip(this); + if (legacyCC.director.root.dataPoolManager) { + (legacyCC.director.root.dataPoolManager as DataPoolManager).releaseAnimationClip(this); + } SkelAnimDataHub.destroy(this); return super.destroy(); } diff --git a/cocos/core/animation/animation-manager.ts b/cocos/core/animation/animation-manager.ts index 13531e5ed2..3eb4cb4c9e 100644 --- a/cocos/core/animation/animation-manager.ts +++ b/cocos/core/animation/animation-manager.ts @@ -35,12 +35,12 @@ import { errorID } from '../platform/debug'; import { Node } from '../scene-graph'; import { Scheduler } from '../scheduler'; import { MutableForwardIterator, remove } from '../utils/array'; -import { BlendStateBuffer } from './skeletal-animation-blending'; +import { BlendStateBuffer } from '../../3d/skeletal-animation/skeletal-animation-blending'; import { AnimationState } from './animation-state'; import { CrossFade } from './cross-fade'; import { legacyCC } from '../global-exports'; -import { IJointTransform, deleteTransform, getTransform, getWorldMatrix } from '../renderer/models/skinning-model'; -import { Socket } from './skeletal-animation'; +import { IJointTransform, deleteTransform, getTransform, getWorldMatrix } from './skeletal-animation-utils'; +import { Socket } from '../../3d/skeletal-animation/skeletal-animation'; interface ISocketData { target: Node; diff --git a/cocos/core/animation/animation-state.ts b/cocos/core/animation/animation-state.ts index 42615db5d9..28b6c6d060 100644 --- a/cocos/core/animation/animation-state.ts +++ b/cocos/core/animation/animation-state.ts @@ -36,7 +36,7 @@ import { Playable } from './playable'; import { WrapMode, WrapModeMask, WrappedInfo } from './types'; import { EDITOR } from 'internal:constants'; import { HierarchyPath, evaluatePath, TargetPath } from './target-path'; -import { BlendStateBuffer, createBlendStateWriter, IBlendStateWriter, IBlendStateWriterHost } from './skeletal-animation-blending'; +import { BlendStateBuffer, createBlendStateWriter, IBlendStateWriter, IBlendStateWriterHost } from '../../3d/skeletal-animation/skeletal-animation-blending'; import { legacyCC } from '../global-exports'; import { ccenum } from '../value-types/enum'; import { IValueProxyFactory } from './value-proxy'; @@ -167,7 +167,6 @@ const InvalidIndex = -1; * */ export class AnimationState extends Playable { - /** * @en The clip that is being played by this animation state. * @zh 此动画状态正在播放的剪辑。 diff --git a/cocos/core/animation/deprecated.ts b/cocos/core/animation/deprecated.ts index 6bd31331fd..b694ede7e9 100644 --- a/cocos/core/animation/deprecated.ts +++ b/cocos/core/animation/deprecated.ts @@ -30,7 +30,6 @@ import { replaceProperty } from '../utils/x-deprecated'; import { Animation } from './animation-component'; -import { SkeletalAnimation } from './skeletal-animation'; import { AnimationClip } from './animation-clip'; import { js } from '../utils/js'; import { legacyCC } from '../global-exports'; @@ -62,10 +61,3 @@ replaceProperty(Animation.prototype, 'Animation', [ export { Animation as AnimationComponent }; legacyCC.AnimationComponent = Animation; js.setClassAlias(Animation, 'cc.AnimationComponent'); -/** - * Alias of [[SkeletalAnimation]] - * @deprecated Since v1.2 - */ -export { SkeletalAnimation as SkeletalAnimationComponent }; -legacyCC.SkeletalAnimationComponent = SkeletalAnimation; -js.setClassAlias(SkeletalAnimation, 'cc.SkeletalAnimationComponent'); diff --git a/cocos/core/animation/index.ts b/cocos/core/animation/index.ts index 74aa6edeba..8549766fd4 100644 --- a/cocos/core/animation/index.ts +++ b/cocos/core/animation/index.ts @@ -47,9 +47,6 @@ export { AnimationState, } from './animation-state'; export * from './animation-component'; -export * from './skeletal-animation-data-hub'; -export * from './skeletal-animation-state'; -export * from './skeletal-animation'; export * from './transform-utils'; export { animation }; diff --git a/cocos/core/animation/skeletal-animation-utils.ts b/cocos/core/animation/skeletal-animation-utils.ts new file mode 100644 index 0000000000..26210cadde --- /dev/null +++ b/cocos/core/animation/skeletal-animation-utils.ts @@ -0,0 +1,98 @@ +/* + Copyright (c) 2020 Xiamen Yaji Software Co., Ltd. + + https://www.cocos.com/ + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + */ + +/** + * @packageDocumentation + * @hidden + */ + +import { Mat4 } from '../math'; +import { Node } from '../scene-graph/node'; + +const stack: IJointTransform[] = []; +const pool: Map = new Map(); + +export interface IJointTransform { + node: Node; + local: Mat4; + world: Mat4; + stamp: number; + parent: IJointTransform | null; +} + +export function getWorldMatrix (transform: IJointTransform | null, stamp: number) { + let i = 0; + let res = Mat4.IDENTITY; + while (transform) { + if (transform.stamp === stamp || transform.stamp + 1 === stamp && !transform.node.hasChangedFlags) { + res = transform.world; + transform.stamp = stamp; + break; + } + transform.stamp = stamp; + stack[i++] = transform; + transform = transform.parent; + } + while (i > 0) { + transform = stack[--i]; + const node = transform.node; + Mat4.fromRTS(transform.local, node.rotation, node.position, node.scale); + res = Mat4.multiply(transform.world, res, transform.local); + } + return res; +} + +export function getTransform (node: Node, root: Node) { + let joint: IJointTransform | null = null; + let i = 0; + while (node !== root) { + const id = node.uuid; + if (pool.has(id)) { + joint = pool.get(id)!; + break; + } else { // TODO: object reuse + joint = { node, local: new Mat4(), world: new Mat4(), stamp: -1, parent: null }; + pool.set(id, joint); + } + stack[i++] = joint; + node = node.parent!; + joint = null; + } + let child: IJointTransform; + while (i > 0) { + child = stack[--i]; + child.parent = joint; + joint = child; + } + return joint; +} + +export function deleteTransform (node: Node) { + let transform = pool.get(node.uuid) || null; + while (transform) { + pool.delete(transform.node.uuid); + transform = transform.parent; + } +} diff --git a/cocos/core/animation/value-proxy-factories/morph-weights.ts b/cocos/core/animation/value-proxy-factories/morph-weights.ts index 53fea5780f..e6dfd7aee7 100644 --- a/cocos/core/animation/value-proxy-factories/morph-weights.ts +++ b/cocos/core/animation/value-proxy-factories/morph-weights.ts @@ -29,7 +29,7 @@ */ import { ccclass, serializable } from 'cc.decorator'; -import { MeshRenderer } from '../../3d/framework/mesh-renderer'; +import { MeshRenderer } from '../../../3d/framework/mesh-renderer'; import { IValueProxyFactory } from '../value-proxy'; /** diff --git a/cocos/core/animation/value-proxy-factories/uniform.ts b/cocos/core/animation/value-proxy-factories/uniform.ts index fa809bcaf3..7337e4130f 100644 --- a/cocos/core/animation/value-proxy-factories/uniform.ts +++ b/cocos/core/animation/value-proxy-factories/uniform.ts @@ -28,11 +28,11 @@ * @hidden */ -import { builtinResMgr } from '../../3d/builtin/init'; -import { Material } from '../../assets/material'; -import { SpriteFrame } from '../../assets/sprite-frame'; -import { TextureBase } from '../../assets/texture-base'; import { ccclass, float, serializable } from 'cc.decorator'; +import { builtinResMgr } from '../../builtin/builtin-res-mgr'; +import { Material } from '../../assets/material'; +import { SpriteFrame } from '../../../2d/assets/sprite-frame'; +import { TextureBase } from '../../assets/texture-base'; import { Type } from '../../gfx/define'; import { Pass } from '../../renderer/core/pass'; import { getDefaultFromType, PropertyType } from '../../renderer/core/pass-utils'; @@ -54,14 +54,14 @@ export class UniformProxyFactory implements IValueProxyFactory { * @zh Pass 索引。 */ @serializable - public passIndex: number = 0; + public passIndex = 0; /** * @en Uniform name. * @zh Uniform 名称。 */ @serializable - public uniformName: string = ''; + public uniformName = ''; /** * @en @@ -99,17 +99,16 @@ export class UniformProxyFactory implements IValueProxyFactory { pass.setUniformArray(realHandle, value); }, }; - } else { - return { - set: (value: any) => { - pass.setUniform(realHandle, value); - }, - }; } - } else if (propertyType === PropertyType.SAMPLER) { + return { + set: (value: any) => { + pass.setUniform(realHandle, value); + }, + }; + } if (propertyType === PropertyType.SAMPLER) { const binding = Pass.getBindingFromHandle(handle); const prop = pass.properties[this.uniformName]; - const texName = prop && prop.value ? prop.value + '-texture' : getDefaultFromType(prop.type) as string; + const texName = prop && prop.value ? `${prop.value}-texture` : getDefaultFromType(prop.type) as string; let dftTex = builtinResMgr.get(texName); if (!dftTex) { warn(`Illegal texture default value: ${texName}.`); @@ -126,9 +125,8 @@ export class UniformProxyFactory implements IValueProxyFactory { } }, }; - } else { - throw new Error(`Animations are not available for uniforms with property type ${propertyType}.`); } + throw new Error(`Animations are not available for uniforms with property type ${propertyType}.`); } } diff --git a/cocos/core/asset-manager/downloader.ts b/cocos/core/asset-manager/downloader.ts index 032787f57a..46217f9665 100644 --- a/cocos/core/asset-manager/downloader.ts +++ b/cocos/core/asset-manager/downloader.ts @@ -31,14 +31,10 @@ import { js } from '../utils'; import { callInNextTick } from '../utils/misc'; import { basename } from '../utils/path'; import Cache from './cache'; -import { downloadDomAudio, downloadAudio } from '../../audio/audio-downloader'; -import { downloadVideo } from '../../video/video-downloader'; import downloadDomImage from './download-dom-image'; import downloadFile from './download-file'; import downloadScript from './download-script'; -import { loadFont } from './font-loader'; -import { CompleteCallback, CompleteCallbackNoData, IBundleOptions, IDownloadParseOptions } from './shared'; -import { files } from './shared'; +import { CompleteCallback, CompleteCallbackNoData, IBundleOptions, IDownloadParseOptions, files } from './shared'; import { retry, RetryFunction, urlAppendTimestamp } from './utilities'; import { legacyCC } from '../global-exports'; import { EDITOR } from 'internal:constants'; @@ -219,7 +215,7 @@ export class Downloader { public downloadDomImage = downloadDomImage; - public downloadDomAudio = downloadDomAudio; + public downloadDomAudio: DownloadHandler | null = null; public downloadFile = downloadFile; @@ -241,12 +237,6 @@ export class Downloader { '.pkm': downloadArrayBuffer, '.astc': downloadArrayBuffer, - // Audio - '.mp3' : downloadAudio, - '.ogg' : downloadAudio, - '.wav' : downloadAudio, - '.m4a' : downloadAudio, - // Txt '.txt' : downloadText, '.xml' : downloadText, @@ -263,23 +253,6 @@ export class Downloader { '.fnt' : downloadText, - // font - '.font' : loadFont, - '.eot' : loadFont, - '.ttf' : loadFont, - '.woff' : loadFont, - '.svg' : loadFont, - '.ttc' : loadFont, - - // Video - '.mp4': downloadVideo, - '.avi': downloadVideo, - '.mov': downloadVideo, - '.mpg': downloadVideo, - '.mpeg': downloadVideo, - '.rm': downloadVideo, - '.rmvb': downloadVideo, - // Binary '.binary' : downloadArrayBuffer, '.bin': downloadArrayBuffer, diff --git a/cocos/core/asset-manager/factory.ts b/cocos/core/asset-manager/factory.ts index 5617ef7018..3cc0038e5c 100644 --- a/cocos/core/asset-manager/factory.ts +++ b/cocos/core/asset-manager/factory.ts @@ -28,10 +28,9 @@ * @hidden */ -import { AudioClip } from '../../audio/assets/clip'; import { VideoClip } from '../../video/assets/video-clip'; import { - ImageAsset, JsonAsset, TextAsset, TTFFont, Asset, + ImageAsset, JsonAsset, TextAsset, Asset, } from '../assets'; import { BufferAsset } from '../assets/buffer-asset'; import { js } from '../utils/js'; @@ -60,15 +59,6 @@ function createImageAsset (id: string, data: HTMLImageElement, options: IDownloa onComplete(err, out); } -function createAudioClip (id: string, data: HTMLAudioElement | AudioBuffer, options: IDownloadParseOptions, onComplete: CompleteCallback) { - const out = new AudioClip(); - out._nativeUrl = id; - out._nativeAsset = data; - // @ts-expect-error assignment to private field - out._duration = data.duration; - onComplete(null, out); -} - function createJsonAsset (id: string, data: Record, options: IDownloadParseOptions, onComplete: CompleteCallback) { const out = new JsonAsset(); out.json = data; @@ -81,13 +71,6 @@ function createTextAsset (id: string, data: string, options: IDownloadParseOptio onComplete(null, out); } -function createFont (id: string, data: string, options: IDownloadParseOptions, onComplete: CompleteCallback) { - const out = new TTFFont(); - out._nativeUrl = id; - out._nativeAsset = data; - onComplete(null, out); -} - function createBufferAsset (id: string, data: ArrayBufferView, options: IDownloadParseOptions, onComplete: CompleteCallback) { const out = new BufferAsset(); out._nativeUrl = id; @@ -112,13 +95,6 @@ function createBundle (id: string, data: IConfigOption, options: IDownloadParseO onComplete(null, bundle); } -function createVideoClip (id: string, data: HTMLVideoElement, options: IDownloadParseOptions, onComplete: CompleteCallback) { - const out = new VideoClip(); - out._nativeUrl = id; - out._nativeAsset = data; - onComplete(null, out); -} - export class Factory { private _creating = new Cache(); @@ -136,21 +112,6 @@ export class Factory { '.pvr': createImageAsset, '.pkm': createImageAsset, - // Audio - '.mp3': createAudioClip, - '.ogg': createAudioClip, - '.wav': createAudioClip, - '.m4a': createAudioClip, - - // Video - '.mp4': createVideoClip, - '.avi': createVideoClip, - '.mov': createVideoClip, - '.mpg': createVideoClip, - '.mpeg': createVideoClip, - '.rm': createVideoClip, - '.rmvb': createVideoClip, - // Txt '.txt': createTextAsset, '.xml': createTextAsset, @@ -165,14 +126,6 @@ export class Factory { '.json': createJsonAsset, '.ExportJson': createJsonAsset, - // font - '.font': createFont, - '.eot': createFont, - '.ttf': createFont, - '.woff': createFont, - '.svg': createFont, - '.ttc': createFont, - // Binary '.binary': createBufferAsset, '.bin': createBufferAsset, diff --git a/cocos/core/assets/deprecation.ts b/cocos/core/assets/deprecation.ts index 5f77090723..ed33d5c544 100644 --- a/cocos/core/assets/deprecation.ts +++ b/cocos/core/assets/deprecation.ts @@ -1,54 +1,37 @@ -/* - Copyright (c) 2020 Xiamen Yaji Software Co., Ltd. - - https://www.cocos.com/ - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license - to use Cocos Creator solely to develop games on your target platforms. You shall - not use Cocos Creator software for developing other software or tools that's - used for developing games. You are not granted to publish, distribute, - sublicense, and/or sell copies of Cocos Creator. - - The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - */ - +/* + Copyright (c) 2020 Xiamen Yaji Software Co., Ltd. + + https://www.cocos.com/ + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + */ + /** * @packageDocumentation * @hidden */ import { removeProperty, replaceProperty } from '../utils'; -import { Mesh } from './mesh'; import { TextureBase } from './texture-base'; import { RenderTexture } from './render-texture'; -replaceProperty(Mesh.prototype, 'Mesh.prototype', [ - { - name: 'renderingMesh', - newName: 'renderingSubMeshes', - }, -]); - -removeProperty(Mesh.prototype, 'Mesh.prototype', [ - { - name: 'hasFlatBuffers', - }, - { - name: 'destroyFlatBuffers', - }, -]); - removeProperty(TextureBase.prototype, 'TextureBase.prototype', [ { name: 'hasPremultipliedAlpha', diff --git a/cocos/core/assets/index.ts b/cocos/core/assets/index.ts index 617e57cd3b..94b376fc3c 100644 --- a/cocos/core/assets/index.ts +++ b/cocos/core/assets/index.ts @@ -33,21 +33,14 @@ export { Asset } from './asset'; export { BufferAsset } from './buffer-asset'; export { default as Prefab } from './prefab'; export * from './scripts'; +export { RenderingSubMesh } from './rendering-sub-mesh'; export { default as SceneAsset } from './scene-asset'; -export * from './sprite-frame'; -export { SpriteAtlas } from './sprite-atlas'; export { default as TextAsset } from './text-asset'; export { default as JsonAsset } from './json-asset'; export { ImageAsset } from './image-asset'; export { Texture2D } from './texture-2d'; export { TextureCube } from './texture-cube'; -export { TTFFont } from './ttf-font'; -export { LabelAtlas } from './label-atlas'; -export { BitmapFont } from './bitmap-font'; -export { Font } from './font'; export { EffectAsset } from './effect-asset'; export { Material } from './material'; -export { Mesh, RenderingSubMesh } from './mesh'; -export { Skeleton } from './skeleton'; export { RenderTexture } from './render-texture'; import './deprecation'; diff --git a/cocos/core/assets/material.ts b/cocos/core/assets/material.ts index e4ca7e4f4d..15b0734586 100644 --- a/cocos/core/assets/material.ts +++ b/cocos/core/assets/material.ts @@ -32,11 +32,10 @@ import { ccclass, serializable, type } from 'cc.decorator'; import { Asset } from './asset'; import { EffectAsset } from './effect-asset'; import { RenderTexture } from './render-texture'; -import { RenderableComponent } from '../3d/framework/renderable-component'; -import { SpriteFrame } from './sprite-frame'; +import { RenderableComponent } from '../components/renderable-component'; import { Texture } from '../gfx'; import { TextureBase } from './texture-base'; -import { builtinResMgr } from '../3d/builtin/init'; +import { builtinResMgr } from '../builtin/builtin-res-mgr'; import { legacyCC } from '../global-exports'; import { IPassInfoFull, Pass, PassOverrides } from '../renderer/core/pass'; import { MacroRecord, MaterialProperty, PropertyType } from '../renderer/core/pass-utils'; @@ -83,7 +82,7 @@ interface IMaterialInfo { states?: PassOverrides | PassOverrides[]; } -type MaterialPropertyFull = MaterialProperty | TextureBase | SpriteFrame | RenderTexture | Texture | null; +type MaterialPropertyFull = MaterialProperty | TextureBase | RenderTexture | Texture | null; /** * @en The material asset, specifies in details how a model is drawn on screen. @@ -452,7 +451,7 @@ export class Material extends Asset { const binding = Pass.getBindingFromHandle(handle); if (val instanceof Texture) { pass.bindTexture(binding, val, index); - } else if (val instanceof TextureBase || val instanceof SpriteFrame || val instanceof RenderTexture) { + } else if (val instanceof TextureBase || val instanceof RenderTexture) { const texture: Texture | null = val.getGFXTexture(); if (!texture || !texture.width || !texture.height) { // console.warn(`material '${this._uuid}' received incomplete texture asset '${val._uuid}'`); diff --git a/cocos/core/assets/rendering-sub-mesh.ts b/cocos/core/assets/rendering-sub-mesh.ts new file mode 100644 index 0000000000..abf3fca103 --- /dev/null +++ b/cocos/core/assets/rendering-sub-mesh.ts @@ -0,0 +1,417 @@ +/* + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +*/ + +/** + * @packageDocumentation + * @module asset + */ + +import { legacyCC } from '../global-exports'; +import { mapBuffer } from '../../3d/misc/buffer'; +import { + Attribute, Device, InputAssemblerInfo, Buffer, BufferInfo, +} from '../gfx'; +import { + AttributeName, + BufferUsageBit, + Feature, + Format, + FormatInfos, + FormatType, + MemoryUsageBit, + PrimitiveMode, + getTypedArrayConstructor, +} from '../gfx/define'; + +import { + FlatBufferArrayPool, FlatBufferPool, FlatBufferView, NULL_HANDLE, RawBufferPool, + SubMeshHandle, SubMeshPool, SubMeshView, freeHandleArray, +} from '../renderer/core/memory-pools'; +import { Vec3 } from '../math'; +import { Mesh } from '../../3d/assets/mesh'; + +/** + * @en Array views for index buffer + * @zh 允许存储索引的数组视图。 + */ +export type IBArray = Uint8Array | Uint16Array | Uint32Array; + +/** + * @en The interface of geometric information + * @zh 几何信息。 + */ +export interface IGeometricInfo { + /** + * @en Vertex positions + * @zh 顶点位置。 + */ + positions: Float32Array; + + /** + * @en Indices data + * @zh 索引数据。 + */ + indices?: IBArray; + + /** + * @en Whether the geometry is treated as double sided + * @zh 是否将图元按双面对待。 + */ + doubleSided?: boolean; + + /** + * @en The bounding box + * @zh 此几何体的轴对齐包围盒。 + */ + boundingBox: { max: Vec3; min: Vec3 }; +} + +/** + * @en Flat vertex buffer + * @zh 扁平化顶点缓冲区 + */ +export interface IFlatBuffer { + stride: number; + count: number; + buffer: Uint8Array; +} + +/** + * @en Sub mesh for rendering which contains all geometry data, it can be used to create [[InputAssembler]]. + * @zh 包含所有顶点数据的渲染子网格,可以用来创建 [[InputAssembler]]。 + */ +export class RenderingSubMesh { + public mesh?: Mesh; + + public subMeshIdx?: number; + + private _flatBuffers: IFlatBuffer[] = []; + + private _jointMappedBuffers?: Buffer[]; + + private _jointMappedBufferIndices?: number[]; + + private _vertexIdChannel?: { stream: number; index: number }; + + private _geometricInfo?: IGeometricInfo; + + private _vertexBuffers: Buffer[]; + + private _attributes: Attribute[]; + + private _indexBuffer: Buffer | null = null; + + private _indirectBuffer: Buffer | null = null; + + private _primitiveMode: PrimitiveMode; + + private _iaInfo: InputAssemblerInfo; + + private _handle: SubMeshHandle = NULL_HANDLE; + + constructor ( + vertexBuffers: Buffer[], attributes: Attribute[], primitiveMode: PrimitiveMode, + indexBuffer: Buffer | null = null, indirectBuffer: Buffer | null = null, + ) { + this._attributes = attributes; + this._vertexBuffers = vertexBuffers; + this._indexBuffer = indexBuffer; + this._indirectBuffer = indirectBuffer; + this._primitiveMode = primitiveMode; + this._iaInfo = new InputAssemblerInfo(attributes, vertexBuffers, indexBuffer, indirectBuffer); + this._handle = SubMeshPool.alloc(); + const fbArrayHandle = FlatBufferArrayPool.alloc(); + SubMeshPool.set(this._handle, SubMeshView.FLAT_BUFFER_ARRAY, fbArrayHandle); + } + + /** + * @en All vertex attributes used by the sub mesh + * @zh 所有顶点属性。 + */ + get attributes () { return this._attributes; } + + /** + * @en All vertex buffers used by the sub mesh + * @zh 使用的所有顶点缓冲区。 + */ + get vertexBuffers () { return this._vertexBuffers; } + + /** + * @en Index buffer used by the sub mesh + * @zh 使用的索引缓冲区,若未使用则无需指定。 + */ + get indexBuffer () { return this._indexBuffer; } + + /** + * @en Indirect buffer used by the sub mesh + * @zh 间接绘制缓冲区。 + */ + get indirectBuffer () { return this._indirectBuffer; } + + /** + * @en Primitive mode used by the sub mesh + * @zh 图元类型。 + */ + get primitiveMode () { return this._primitiveMode; } + + /** + * @en The geometric info of the sub mesh, used for raycast. + * @zh (用于射线检测的)几何信息。 + */ + get geometricInfo () { + if (this._geometricInfo) { + return this._geometricInfo; + } + if (this.mesh === undefined) { + return { positions: new Float32Array(), indices: new Uint8Array(), boundingBox: { min: Vec3.ZERO, max: Vec3.ZERO } }; + } + if (this.subMeshIdx === undefined) { + return { positions: new Float32Array(), indices: new Uint8Array(), boundingBox: { min: Vec3.ZERO, max: Vec3.ZERO } }; + } + const { mesh } = this; const index = this.subMeshIdx; + const positions = mesh.readAttribute(index, AttributeName.ATTR_POSITION) as unknown as Float32Array; + const indices = mesh.readIndices(index) as Uint16Array; + const max = new Vec3(); + const min = new Vec3(); + const pAttri = this.attributes.find((element) => element.name === AttributeName.ATTR_POSITION); + if (pAttri) { + const conut = FormatInfos[pAttri.format].count; + if (conut === 2) { + max.set(positions[0], positions[1], 0); + min.set(positions[0], positions[1], 0); + } else { + max.set(positions[0], positions[1], positions[2]); + min.set(positions[0], positions[1], positions[2]); + } + for (let i = 0; i < positions.length; i += conut) { + if (conut === 2) { + max.x = positions[i] > max.x ? positions[i] : max.x; + max.y = positions[i + 1] > max.y ? positions[i + 1] : max.y; + min.x = positions[i] < min.x ? positions[i] : min.x; + min.y = positions[i + 1] < min.y ? positions[i + 1] : min.y; + } else { + max.x = positions[i] > max.x ? positions[i] : max.x; + max.y = positions[i + 1] > max.y ? positions[i + 1] : max.y; + max.z = positions[i + 2] > max.z ? positions[i + 2] : max.z; + min.x = positions[i] < min.x ? positions[i] : min.x; + min.y = positions[i + 1] < min.y ? positions[i + 1] : min.y; + min.z = positions[i + 2] < min.z ? positions[i + 2] : min.z; + } + } + } + this._geometricInfo = { positions, indices, boundingBox: { max, min } }; + return this._geometricInfo; + } + + /** + * @en Flatted vertex buffers + * @zh 扁平化的顶点缓冲区。 + */ + get flatBuffers () { return this._flatBuffers; } + + public genFlatBuffers () { + if (this._flatBuffers.length || !this.mesh || this.subMeshIdx === undefined) { return; } + + const { mesh } = this; + let idxCount = 0; + const prim = mesh.struct.primitives[this.subMeshIdx]; + const fbArrayHandle = SubMeshPool.get(this._handle, SubMeshView.FLAT_BUFFER_ARRAY); + if (prim.indexView) { idxCount = prim.indexView.count; } + for (let i = 0; i < prim.vertexBundelIndices.length; i++) { + const bundleIdx = prim.vertexBundelIndices[i]; + const vertexBundle = mesh.struct.vertexBundles[bundleIdx]; + const vbCount = prim.indexView ? prim.indexView.count : vertexBundle.view.count; + const vbStride = vertexBundle.view.stride; + const vbSize = vbStride * vbCount; + const view = new Uint8Array(mesh.data.buffer, vertexBundle.view.offset, vertexBundle.view.length); + + const hBuffer = RawBufferPool.alloc(prim.indexView ? vbSize : vertexBundle.view.length); + const hFlatBuffer = FlatBufferPool.alloc(); + FlatBufferPool.set(hFlatBuffer, FlatBufferView.STRIDE, vbStride); + FlatBufferPool.set(hFlatBuffer, FlatBufferView.AMOUNT, vbCount); + FlatBufferPool.set(hFlatBuffer, FlatBufferView.BUFFER, hBuffer); + FlatBufferArrayPool.push(fbArrayHandle, hFlatBuffer); + + const buffer = RawBufferPool.getBuffer(hBuffer); + const sharedView = new Uint8Array(buffer); + + if (!prim.indexView) { + sharedView.set(mesh.data.subarray(vertexBundle.view.offset, vertexBundle.view.offset + vertexBundle.view.length)); + this._flatBuffers.push({ stride: vbStride, count: vbCount, buffer: sharedView }); + continue; + } + + const ibView = mesh.readIndices(this.subMeshIdx)!; + // transform to flat buffer + for (let n = 0; n < idxCount; ++n) { + const idx = ibView[n]; + const offset = n * vbStride; + const srcOffset = idx * vbStride; + for (let m = 0; m < vbStride; ++m) { + sharedView[offset + m] = view[srcOffset + m]; + } + } + this._flatBuffers.push({ stride: vbStride, count: vbCount, buffer: sharedView }); + } + } + + /** + * @en The vertex buffer for joint after mapping + * @zh 骨骼索引按映射表处理后的顶点缓冲。 + */ + get jointMappedBuffers () { + if (this._jointMappedBuffers) { return this._jointMappedBuffers; } + const buffers: Buffer[] = this._jointMappedBuffers = []; + const indices: number[] = this._jointMappedBufferIndices = []; + if (!this.mesh || this.subMeshIdx === undefined) { return this._jointMappedBuffers = this.vertexBuffers; } + const { struct } = this.mesh; + const prim = struct.primitives[this.subMeshIdx]; + if (!struct.jointMaps || prim.jointMapIndex === undefined || !struct.jointMaps[prim.jointMapIndex]) { + return this._jointMappedBuffers = this.vertexBuffers; + } + let jointFormat: Format; + let jointOffset: number; + const { device } = legacyCC.director.root; + for (let i = 0; i < prim.vertexBundelIndices.length; i++) { + const bundle = struct.vertexBundles[prim.vertexBundelIndices[i]]; + jointOffset = 0; + jointFormat = Format.UNKNOWN; + for (let j = 0; j < bundle.attributes.length; j++) { + const attr = bundle.attributes[j]; + if (attr.name === AttributeName.ATTR_JOINTS) { + jointFormat = attr.format; + break; + } + jointOffset += FormatInfos[attr.format].size; + } + if (jointFormat) { + const data = new Uint8Array(this.mesh.data.buffer, bundle.view.offset, bundle.view.length); + const dataView = new DataView(data.slice().buffer); + const idxMap = struct.jointMaps[prim.jointMapIndex]; + mapBuffer(dataView, (cur) => idxMap.indexOf(cur), jointFormat, jointOffset, + bundle.view.length, bundle.view.stride, dataView); + const buffer = device.createBuffer(new BufferInfo( + BufferUsageBit.VERTEX | BufferUsageBit.TRANSFER_DST, + MemoryUsageBit.DEVICE, + bundle.view.length, + bundle.view.stride, + )); + buffer.update(dataView.buffer); buffers.push(buffer); indices.push(i); + } else { + buffers.push(this.vertexBuffers[prim.vertexBundelIndices[i]]); + } + } + if (this._vertexIdChannel) { + buffers.push(this._allocVertexIdBuffer(device)); + } + return buffers; + } + + get iaInfo () { return this._iaInfo; } + + get handle () { + return this._handle; + } + + public destroy () { + for (let i = 0; i < this.vertexBuffers.length; i++) { + this.vertexBuffers[i].destroy(); + } + this.vertexBuffers.length = 0; + if (this._indexBuffer) { + this._indexBuffer.destroy(); + this._indexBuffer = null; + } + if (this._jointMappedBuffers && this._jointMappedBufferIndices) { + for (let i = 0; i < this._jointMappedBufferIndices.length; i++) { + this._jointMappedBuffers[this._jointMappedBufferIndices[i]].destroy(); + } + this._jointMappedBuffers = undefined; + this._jointMappedBufferIndices = undefined; + } + if (this._indirectBuffer) { + this._indirectBuffer.destroy(); + this._indirectBuffer = null; + } + if (this._handle) { + const fbArrayHandle = SubMeshPool.get(this._handle, SubMeshView.FLAT_BUFFER_ARRAY); + freeHandleArray(fbArrayHandle, FlatBufferArrayPool, FlatBufferPool); + + SubMeshPool.free(this._handle); + this._handle = NULL_HANDLE; + } + } + + /** + * @en Adds a vertex attribute input called 'a_vertexId' into this sub-mesh. + * This is useful if you want to simulate `gl_VertexId` in WebGL context prior to 2.0. + * Once you call this function, the vertex attribute is permanently added. + * Subsequent calls to this function take no effect. + * @param device Device used to create related rendering resources. + */ + public enableVertexIdChannel (device: Device) { + if (this._vertexIdChannel) { + return; + } + + const streamIndex = this.vertexBuffers.length; + const attributeIndex = this.attributes.length; + + const vertexIdBuffer = this._allocVertexIdBuffer(device); + this._vertexBuffers.push(vertexIdBuffer); + this._attributes.push(new Attribute('a_vertexId', Format.R32F, false, streamIndex)); + + this._iaInfo.attributes = this._attributes; + this._iaInfo.vertexBuffers = this._vertexBuffers; + + this._vertexIdChannel = { + stream: streamIndex, + index: attributeIndex, + }; + } + + private _allocVertexIdBuffer (device: Device) { + const vertexCount = (this.vertexBuffers.length === 0 || this.vertexBuffers[0].stride === 0) + ? 0 + // TODO: This depends on how stride of a vertex buffer is defined; Consider padding problem. + : this.vertexBuffers[0].size / this.vertexBuffers[0].stride; + const vertexIds = new Float32Array(vertexCount); + for (let iVertex = 0; iVertex < vertexCount; ++iVertex) { + // `+0.5` because on some platforms, the "fetched integer" may have small error. + // For example `26` may yield `25.99999`, which is convert to `25` instead of `26` using `int()`. + vertexIds[iVertex] = iVertex + 0.5; + } + + const vertexIdBuffer = device.createBuffer(new BufferInfo( + BufferUsageBit.VERTEX | BufferUsageBit.TRANSFER_DST, + MemoryUsageBit.DEVICE, + vertexIds.byteLength, + vertexIds.BYTES_PER_ELEMENT, + )); + vertexIdBuffer.update(vertexIds); + + return vertexIdBuffer; + } +} diff --git a/cocos/core/3d/builtin/init.ts b/cocos/core/builtin/builtin-res-mgr.ts similarity index 94% rename from cocos/core/3d/builtin/init.ts rename to cocos/core/builtin/builtin-res-mgr.ts index e586061197..f2e944d582 100644 --- a/cocos/core/3d/builtin/init.ts +++ b/cocos/core/builtin/builtin-res-mgr.ts @@ -23,15 +23,15 @@ THE SOFTWARE. */ -import { Asset } from '../../assets/asset'; -import { ImageAsset } from '../../assets/image-asset'; -import { SpriteFrame } from '../../assets/sprite-frame'; -import { Texture2D } from '../../assets/texture-2d'; -import { TextureCube } from '../../assets/texture-cube'; -import { Device } from '../../gfx'; +import { Asset } from '../assets/asset'; +import { ImageAsset } from '../assets/image-asset'; +import { SpriteFrame } from '../../2d/assets/sprite-frame'; +import { Texture2D } from '../assets/texture-2d'; +import { TextureCube } from '../assets/texture-cube'; +import { Device } from '../gfx'; import effects from './effects'; -import { legacyCC } from '../../global-exports'; -import { getDeviceShaderVersion } from '../../renderer/core/program-lib'; +import { legacyCC } from '../global-exports'; +import { getDeviceShaderVersion } from '../renderer/core/program-lib'; import shaderSourceAssembly from './shader-source-assembly'; class BuiltinResMgr { @@ -151,11 +151,13 @@ class BuiltinResMgr { }; resources[defaultCubeTexture._uuid] = defaultCubeTexture; - const spriteFrame = new SpriteFrame(); - const texture = imgAsset._texture; - spriteFrame.texture = texture; - spriteFrame._uuid = 'default-spriteframe'; - resources[spriteFrame._uuid] = spriteFrame; + if (legacyCC.SpriteFrame) { + const spriteFrame = new legacyCC.SpriteFrame() as SpriteFrame; + const texture = imgAsset._texture; + spriteFrame.texture = texture; + spriteFrame._uuid = 'default-spriteframe'; + resources[spriteFrame._uuid] = spriteFrame; + } const shaderVersionKey = getDeviceShaderVersion(device); if (!shaderVersionKey) { diff --git a/cocos/core/3d/builtin/effects.ts b/cocos/core/builtin/effects.ts similarity index 100% rename from cocos/core/3d/builtin/effects.ts rename to cocos/core/builtin/effects.ts diff --git a/cocos/core/3d/builtin/index.ts b/cocos/core/builtin/index.ts similarity index 97% rename from cocos/core/3d/builtin/index.ts rename to cocos/core/builtin/index.ts index 234b1c0f7c..7e2ce87ada 100644 --- a/cocos/core/3d/builtin/index.ts +++ b/cocos/core/builtin/index.ts @@ -23,6 +23,5 @@ THE SOFTWARE. */ - -export * from './init'; +export * from './builtin-res-mgr'; export { default as effects } from './effects'; diff --git a/cocos/core/3d/builtin/shader-source-assembly.ts b/cocos/core/builtin/shader-source-assembly.ts similarity index 100% rename from cocos/core/3d/builtin/shader-source-assembly.ts rename to cocos/core/builtin/shader-source-assembly.ts diff --git a/cocos/core/3d/builtin/shader-sources/glsl1.ts b/cocos/core/builtin/shader-sources/glsl1.ts similarity index 100% rename from cocos/core/3d/builtin/shader-sources/glsl1.ts rename to cocos/core/builtin/shader-sources/glsl1.ts diff --git a/cocos/core/3d/builtin/shader-sources/glsl3.ts b/cocos/core/builtin/shader-sources/glsl3.ts similarity index 100% rename from cocos/core/3d/builtin/shader-sources/glsl3.ts rename to cocos/core/builtin/shader-sources/glsl3.ts diff --git a/cocos/core/3d/builtin/shader-sources/glsl4.ts b/cocos/core/builtin/shader-sources/glsl4.ts similarity index 100% rename from cocos/core/3d/builtin/shader-sources/glsl4.ts rename to cocos/core/builtin/shader-sources/glsl4.ts diff --git a/cocos/core/3d/framework/camera-component.ts b/cocos/core/components/camera-component.ts similarity index 95% rename from cocos/core/3d/framework/camera-component.ts rename to cocos/core/components/camera-component.ts index 2f4b579cb8..49b90dfebc 100644 --- a/cocos/core/3d/framework/camera-component.ts +++ b/cocos/core/components/camera-component.ts @@ -30,23 +30,23 @@ import { EDITOR } from 'internal:constants'; import { ccclass, help, executeInEditMode, menu, tooltip, displayOrder, type, serializable } from 'cc.decorator'; -import { RenderTexture } from '../../assets/render-texture'; -import { UITransform } from '../../components/ui-base'; -import { Component } from '../../components/component'; -import { Ray } from '../../geometry'; -import { ClearFlag as GFXClearFlag } from '../../gfx/define'; -import { Color, Rect, toRadian, Vec3 } from '../../math'; -import { CAMERA_DEFAULT_MASK } from '../../pipeline/define'; -import { view } from '../../platform/view'; -import { scene } from '../../renderer'; -import { SKYBOX_FLAG, CameraProjection, CameraFOVAxis, CameraAperture, CameraISO, CameraShutter } from '../../renderer/scene/camera'; -import { Root } from '../../root'; -import { Node } from '../../scene-graph/node'; -import { Layers } from '../../scene-graph/layers'; -import { Enum } from '../../value-types'; -import { TransformBit } from '../../scene-graph/node-enum'; -import { legacyCC } from '../../global-exports'; -import { RenderWindow } from '../../renderer/core/render-window'; +import { RenderTexture } from '../assets/render-texture'; +import { UITransform } from '../../2d/framework'; +import { Component } from './component'; +import { Ray } from '../geometry'; +import { ClearFlag as GFXClearFlag } from '../gfx/define'; +import { Color, Rect, toRadian, Vec3 } from '../math'; +import { CAMERA_DEFAULT_MASK } from '../pipeline/define'; +import { view } from '../platform/view'; +import { scene } from '../renderer'; +import { SKYBOX_FLAG, CameraProjection, CameraFOVAxis, CameraAperture, CameraISO, CameraShutter } from '../renderer/scene/camera'; +import { Root } from '../root'; +import { Node } from '../scene-graph/node'; +import { Layers } from '../scene-graph/layers'; +import { Enum } from '../value-types'; +import { TransformBit } from '../scene-graph/node-enum'; +import { legacyCC } from '../global-exports'; +import { RenderWindow } from '../renderer/core/render-window'; const _temp_vec3_1 = new Vec3(); diff --git a/cocos/core/components/deprecated.ts b/cocos/core/components/deprecated.ts new file mode 100644 index 0000000000..4ff93a7a82 --- /dev/null +++ b/cocos/core/components/deprecated.ts @@ -0,0 +1,60 @@ +/* + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +*/ + +import { Camera } from './camera-component'; +import { replaceProperty } from "../utils"; +import { legacyCC } from '../global-exports'; +import { js } from '../utils/js'; + +replaceProperty(Camera, 'Camera', [ + { + name: 'CameraClearFlag', + newName: 'ClearFlag', + }, +]); + +replaceProperty(Camera.prototype, 'Camera.prototype', [ + { + name: 'color', + newName: 'clearColor', + }, + { + name: 'depth', + newName: 'clearDepth', + }, + { + name: 'stencil', + newName: 'clearStencil', + }, +]); + +/** + * Alias of [[Camera]] + * @deprecated Since v1.2 + */ +export { Camera as CameraComponent }; +legacyCC.CameraComponent = Camera; +js.setClassAlias(Camera, 'cc.CameraComponent'); \ No newline at end of file diff --git a/cocos/core/components/index.ts b/cocos/core/components/index.ts index 505195cd31..1692a9c6d8 100644 --- a/cocos/core/components/index.ts +++ b/cocos/core/components/index.ts @@ -32,3 +32,7 @@ export { default as System } from './system'; export { default as MissingScript } from './missing-script'; export { EventHandler } from './component-event-handler'; export { Component } from './component'; +export { Camera } from './camera-component'; +export { RenderableComponent } from './renderable-component'; +/** deprecated */ +export * from './deprecated'; diff --git a/cocos/core/3d/framework/renderable-component.ts b/cocos/core/components/renderable-component.ts similarity index 95% rename from cocos/core/3d/framework/renderable-component.ts rename to cocos/core/components/renderable-component.ts index b669fa6afc..5b486f75bc 100644 --- a/cocos/core/3d/framework/renderable-component.ts +++ b/cocos/core/components/renderable-component.ts @@ -32,12 +32,12 @@ import { EDITOR } from 'internal:constants'; import { ccclass, type, displayOrder, displayName, serializable, } from 'cc.decorator'; -import { Material } from '../../assets/material'; -import { Component } from '../../components/component'; -import { IMaterialInstanceInfo, MaterialInstance } from '../../renderer/core/material-instance'; -import { scene } from '../../renderer'; -import { Layers } from '../../scene-graph/layers'; -import { legacyCC } from '../../global-exports'; +import { Material } from '../assets/material'; +import { Component } from './component'; +import { IMaterialInstanceInfo, MaterialInstance } from '../renderer/core/material-instance'; +import { scene } from '../renderer'; +import { Layers } from '../scene-graph/layers'; +import { legacyCC } from '../global-exports'; const _matInsInfo: IMaterialInstanceInfo = { parent: null!, diff --git a/cocos/core/game.ts b/cocos/core/game.ts index bd5ac14c50..b5303195d7 100644 --- a/cocos/core/game.ts +++ b/cocos/core/game.ts @@ -36,7 +36,7 @@ import inputManager from './platform/event-manager/input-manager'; import { Device, DeviceInfo } from './gfx'; import { sys } from './platform/sys'; import { macro } from './platform/macro'; -import { ICustomJointTextureLayout } from './renderer/models'; +import { ICustomJointTextureLayout } from '../3d/skeletal-animation/skeletal-animation-utils'; import { legacyCC, VERSION } from './global-exports'; import { IPhysicsConfig } from '../physics/framework/physics-config'; import { bindingMappingInfo } from './pipeline/define'; @@ -517,7 +517,9 @@ export class Game extends EventTarget { this._initEvents(); } - legacyCC.director.root.dataPoolManager.jointTexturePool.registerCustomTextureLayouts(config.customJointTextureLayouts); + if (legacyCC.director.root.dataPoolManager) { + legacyCC.director.root.dataPoolManager.jointTexturePool.registerCustomTextureLayouts(config.customJointTextureLayouts); + } return this._engineInited; }); } diff --git a/cocos/core/geometry/intersect.ts b/cocos/core/geometry/intersect.ts index 38ac6dfa37..a760abbfb9 100644 --- a/cocos/core/geometry/intersect.ts +++ b/cocos/core/geometry/intersect.ts @@ -41,7 +41,8 @@ import { Ray } from './ray'; import { Sphere } from './sphere'; import { Triangle } from './triangle'; import { PrimitiveMode } from '../gfx'; -import { IBArray, RenderingSubMesh, Mesh } from '../assets/mesh'; +import { Mesh } from '../../3d/assets/mesh'; +import { IBArray, RenderingSubMesh } from '../assets/rendering-sub-mesh'; import { IRaySubMeshOptions, ERaycastMode, IRaySubMeshResult, IRayMeshOptions, IRayModelOptions } from './spec'; import { IVec3Like } from '../math/type-define'; import { scene } from '../renderer'; diff --git a/cocos/core/index.ts b/cocos/core/index.ts index e1b00b7330..45d454e8f5 100644 --- a/cocos/core/index.ts +++ b/cocos/core/index.ts @@ -56,11 +56,8 @@ export * from './pipeline'; export * from './asset-manager'; export * from './scene-graph'; export * from './components'; -export * from './3d'; +export * from './builtin'; export * from './animation'; -import './primitive'; - -export * from './utils/profiler/profiler'; import './splash-screen'; import './deprecated'; diff --git a/cocos/core/pipeline/forward/forward-pipeline.ts b/cocos/core/pipeline/forward/forward-pipeline.ts index ea616a8d74..18cc802904 100644 --- a/cocos/core/pipeline/forward/forward-pipeline.ts +++ b/cocos/core/pipeline/forward/forward-pipeline.ts @@ -47,7 +47,7 @@ import { Shadows, ShadowType } from '../../renderer/scene/shadows'; import { getShadowWorldMatrix, updatePlanarPROJ } from './scene-culling'; import { Light } from '../../renderer/scene/light'; import { genSamplerHash, samplerLib } from '../../renderer/core/sampler-lib'; -import { builtinResMgr } from '../../3d/builtin/init'; +import { builtinResMgr } from '../../builtin'; import { Texture2D } from '../../assets/texture-2d'; import { Camera } from '../../renderer/scene'; diff --git a/cocos/core/pipeline/forward/scene-culling.ts b/cocos/core/pipeline/forward/scene-culling.ts index 4e3f472f15..1c434c7234 100644 --- a/cocos/core/pipeline/forward/scene-culling.ts +++ b/cocos/core/pipeline/forward/scene-culling.ts @@ -38,8 +38,6 @@ import { Pool } from '../../memop'; import { IRenderObject, UBOShadow } from '../define'; import { ShadowType, Shadows } from '../../renderer/scene/shadows'; import { SphereLight, DirectionalLight, Light } from '../../renderer/scene'; -import { UIDrawBatch } from '../../renderer/ui/ui-draw-batch'; -import { legacyCC } from '../../global-exports'; const _tempVec3 = new Vec3(); const _dir_negate = new Vec3(); diff --git a/cocos/core/pipeline/render-additive-light-queue.ts b/cocos/core/pipeline/render-additive-light-queue.ts index 807c41a6e2..c150120d4e 100644 --- a/cocos/core/pipeline/render-additive-light-queue.ts +++ b/cocos/core/pipeline/render-additive-light-queue.ts @@ -50,7 +50,7 @@ import { Light, LightType } from '../renderer/scene/light'; import { IRenderObject, SetIndex, UBOForwardLight, UBOGlobal, UBOShadow, UBOCamera, UNIFORM_SHADOWMAP_BINDING, UNIFORM_SPOT_LIGHTING_MAP_TEXTURE_BINDING } from './define'; import { legacyCC } from '../global-exports'; import { genSamplerHash, samplerLib } from '../renderer/core/sampler-lib'; -import { builtinResMgr } from '../3d/builtin/init'; +import { builtinResMgr } from '../builtin/builtin-res-mgr'; import { Texture2D } from '../assets/texture-2d'; import { updatePlanarPROJ } from './forward/scene-culling'; import { Camera } from '../renderer/scene'; diff --git a/cocos/core/renderer/core/material-instance.ts b/cocos/core/renderer/core/material-instance.ts index 270791a509..7ecb2d8cc4 100644 --- a/cocos/core/renderer/core/material-instance.ts +++ b/cocos/core/renderer/core/material-instance.ts @@ -28,7 +28,7 @@ * @module material */ -import { RenderableComponent } from '../../3d/framework/renderable-component'; +import { RenderableComponent } from '../../components/renderable-component'; import { Material } from '../../assets/material'; import { PassInstance } from './pass-instance'; import { MacroRecord } from './pass-utils'; diff --git a/cocos/core/renderer/core/pass.ts b/cocos/core/renderer/core/pass.ts index 0b475c1a85..ff87e4c9c2 100644 --- a/cocos/core/renderer/core/pass.ts +++ b/cocos/core/renderer/core/pass.ts @@ -32,7 +32,7 @@ import { EDITOR } from 'internal:constants'; import { Color } from '../../gfx/define-class'; import { Root } from '../../root'; import { TextureBase } from '../../assets/texture-base'; -import { builtinResMgr } from '../../3d/builtin/init'; +import { builtinResMgr } from '../../builtin/builtin-res-mgr'; import { getPhaseID } from '../../pipeline/pass-phase'; import { murmurhash2_32_gc } from '../../utils/murmurhash2_gc'; import { samplerLib } from './sampler-lib'; diff --git a/cocos/core/renderer/index.ts b/cocos/core/renderer/index.ts index 89108614b3..e7dedb19d5 100644 --- a/cocos/core/renderer/index.ts +++ b/cocos/core/renderer/index.ts @@ -23,9 +23,14 @@ THE SOFTWARE. */ -export { createIA } from './utils'; import config from './config'; +import * as scene from './scene'; + +import './scene/deprecated'; + +export { createIA } from './utils'; + const addStage = config.addStage; export { addStage }; @@ -38,10 +43,4 @@ export * from './core/texture-buffer-pool'; export * from './core/material-instance'; export * from './core/pass-instance'; export * from './core/memory-pools'; - -import * as models from './models'; -import * as scene from './scene'; -export { scene, models }; - -import './scene/deprecated'; -import './ui/render-data'; +export { scene }; diff --git a/cocos/core/renderer/scene/model.ts b/cocos/core/renderer/scene/model.ts index f71ef39aa6..8ade4c15e2 100644 --- a/cocos/core/renderer/scene/model.ts +++ b/cocos/core/renderer/scene/model.ts @@ -24,9 +24,9 @@ */ // Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. -import { builtinResMgr } from '../../3d/builtin/init'; +import { builtinResMgr } from '../../builtin/builtin-res-mgr'; import { Material } from '../../assets/material'; -import { RenderingSubMesh } from '../../assets/mesh'; +import { RenderingSubMesh } from '../../assets/rendering-sub-mesh'; import { AABB } from '../../geometry'; import { Pool } from '../../memop'; import { Node } from '../../scene-graph'; @@ -36,7 +36,7 @@ import { Texture2D } from '../../assets/texture-2d'; import { SubModel } from './submodel'; import { Pass, IMacroPatch, BatchingSchemes } from '../core/pass'; import { legacyCC } from '../../global-exports'; -import { InstancedBuffer } from '../../pipeline'; +import { InstancedBuffer } from '../../pipeline/instanced-buffer'; import { Mat4, Vec3, Vec4 } from '../../math'; import { genSamplerHash, samplerLib } from '../core/sampler-lib'; diff --git a/cocos/core/renderer/scene/render-scene.ts b/cocos/core/renderer/scene/render-scene.ts index 9efe5300e4..8b36869df2 100644 --- a/cocos/core/renderer/scene/render-scene.ts +++ b/cocos/core/renderer/scene/render-scene.ts @@ -24,7 +24,7 @@ */ import { PREVIEW } from 'internal:constants'; -import { IBArray } from '../../assets/mesh'; +import { IBArray } from '../../assets/rendering-sub-mesh'; import { AABB, intersect, Ray, Triangle } from '../../geometry'; import { PrimitiveMode } from '../../gfx/define'; import { Mat4, Vec3 } from '../../math'; @@ -40,7 +40,7 @@ import { SpotLight } from './spot-light'; import { TransformBit } from '../../scene-graph/node-enum'; import { legacyCC } from '../../global-exports'; import { ScenePool, SceneView, ModelArrayPool, ModelArrayHandle, SceneHandle, NULL_HANDLE, UIBatchArrayHandle, UIBatchArrayPool, LightArrayHandle, LightArrayPool } from '../core/memory-pools'; -import { UIDrawBatch } from '../ui/ui-draw-batch'; +import { UIDrawBatch } from '../../../2d/renderer/ui-draw-batch'; export interface IRenderSceneInfo { name: string; diff --git a/cocos/core/renderer/scene/skybox.ts b/cocos/core/renderer/scene/skybox.ts index aed31b5156..d5ac7a0d1e 100644 --- a/cocos/core/renderer/scene/skybox.ts +++ b/cocos/core/renderer/scene/skybox.ts @@ -23,13 +23,11 @@ THE SOFTWARE. */ -import { builtinResMgr } from '../../3d/builtin'; -import { createMesh } from '../../3d/misc/utils'; +import { builtinResMgr } from '../../builtin'; import { Material } from '../../assets/material'; -import { Mesh } from '../../assets/mesh'; +import { Mesh } from '../../../3d/assets/mesh'; import { TextureCube } from '../../assets/texture-cube'; import { UNIFORM_ENVIRONMENT_BINDING } from '../../pipeline/define'; -import { box } from '../../primitive'; import { MaterialInstance } from '../core/material-instance'; import { samplerLib } from '../core/sampler-lib'; import { Model } from './model'; @@ -156,8 +154,10 @@ export class Skybox { skybox_material.recompileShaders({ USE_RGBE_CUBEMAP: this.isRGBE }); } - if (!skybox_mesh) { skybox_mesh = createMesh(box({ width: 2, height: 2, length: 2 })); } - this._model.initSubModel(0, skybox_mesh.renderingSubMeshes[0], skybox_material); + if (this.enabled) { + if (!skybox_mesh) { skybox_mesh = legacyCC.utils.createMesh(legacyCC.primitives.box({ width: 2, height: 2, length: 2 })) as Mesh; } + this._model.initSubModel(0, skybox_mesh.renderingSubMeshes[0], skybox_material); + } this._updateGlobalBinding(); this._updatePipeline(); } diff --git a/cocos/core/renderer/scene/submodel.ts b/cocos/core/renderer/scene/submodel.ts index 94e031951d..cc7f9c17c2 100644 --- a/cocos/core/renderer/scene/submodel.ts +++ b/cocos/core/renderer/scene/submodel.ts @@ -23,7 +23,7 @@ THE SOFTWARE. */ -import { RenderingSubMesh } from '../../assets/mesh'; +import { RenderingSubMesh } from '../../assets/rendering-sub-mesh'; import { RenderPriority } from '../../pipeline/define'; import { BatchingSchemes, IMacroPatch, Pass } from '../core/pass'; import { DSPool, IAPool, SubModelPool, SubModelView, SubModelHandle, NULL_HANDLE } from '../core/memory-pools'; diff --git a/cocos/core/renderer/utils.ts b/cocos/core/renderer/utils.ts index e151af510f..0f0ca7fd8d 100644 --- a/cocos/core/renderer/utils.ts +++ b/cocos/core/renderer/utils.ts @@ -30,7 +30,7 @@ import { Attribute, Buffer, BufferInfo, Device, InputAssemblerInfo } from '../gfx'; import { AttributeName, BufferUsageBit, Format, MemoryUsageBit } from '../gfx/define'; -import { IGeometry } from '../primitive/define'; +import { IGeometry } from '../../primitive/define'; export function createIA (device: Device, data: IGeometry) { if (!data.positions) { diff --git a/cocos/core/root.ts b/cocos/core/root.ts index dded934208..4b6379c391 100644 --- a/cocos/core/root.ts +++ b/cocos/core/root.ts @@ -28,16 +28,16 @@ * @module core */ -import { builtinResMgr } from './3d/builtin'; +import { builtinResMgr } from './builtin'; import { Pool } from './memop'; import { RenderPipeline, ForwardPipeline } from './pipeline'; import { Camera, Light, Model } from './renderer/scene'; -import { DataPoolManager } from './renderer/data-pool-manager'; +import { DataPoolManager } from '../3d/skeletal-animation/data-pool-manager'; import { LightType } from './renderer/scene/light'; import { IRenderSceneInfo, RenderScene } from './renderer/scene/render-scene'; import { SphereLight } from './renderer/scene/sphere-light'; import { SpotLight } from './renderer/scene/spot-light'; -import { UI } from './renderer/ui/ui'; +import { UI } from '../2d/renderer/ui'; import { legacyCC } from './global-exports'; import { RenderWindow, IRenderWindowInfo } from './renderer/core/render-window'; import { ColorAttachment, DepthStencilAttachment, RenderPassInfo, StoreOp, Device } from './gfx'; @@ -221,7 +221,7 @@ export class Root { */ constructor (device: Device) { this._device = device; - this._dataPoolMgr = new DataPoolManager(device); + this._dataPoolMgr = legacyCC.internal.DataPoolManager && new legacyCC.internal.DataPoolManager(device) as DataPoolManager; RenderScene.registerCreateFunc(this); RenderWindow.registerCreateFunc(this); @@ -318,8 +318,8 @@ export class Root { } this.onGlobalPipelineStateChanged(); - if (!this._ui) { - this._ui = new UI(this); + if (!this._ui && legacyCC.internal.UI) { + this._ui = new legacyCC.internal.UI(this) as UI; if (!this._ui.initialize()) { this.destroy(); return false; diff --git a/cocos/core/scene-graph/node-ui-properties.ts b/cocos/core/scene-graph/node-ui-properties.ts index f7b758d747..6544b21b66 100644 --- a/cocos/core/scene-graph/node-ui-properties.ts +++ b/cocos/core/scene-graph/node-ui-properties.ts @@ -28,9 +28,9 @@ * @module scene-graph */ -import { UIComponent } from '../components/ui-base/ui-component'; -import { UITransform } from '../components/ui-base/ui-transform'; -import { UIRenderable } from '../components/ui-base/ui-renderable'; +import { UIComponent } from '../../2d/framework/ui-component'; +import { UIRenderable } from '../../2d/framework/ui-renderable'; +import { UITransform } from '../../2d/framework/ui-transform'; import { warnID } from '../platform/debug'; /** @@ -44,12 +44,12 @@ export class NodeUIProperties { */ get uiTransformComp () { if (!this._uiTransformComp) { - this._uiTransformComp = this._node.getComponent(UITransform); + this._uiTransformComp = this._node.getComponent('cc.UITransform') as UITransform; } return this._uiTransformComp; } - set uiTransformComp (value) { + set uiTransformComp (value: UITransform | null) { this._uiTransformComp = value; } diff --git a/cocos/core/utils/coordinates-converts-utils.ts b/cocos/core/utils/coordinates-converts-utils.ts index 4944a7d11f..517faa659a 100644 --- a/cocos/core/utils/coordinates-converts-utils.ts +++ b/cocos/core/utils/coordinates-converts-utils.ts @@ -28,7 +28,7 @@ * @module core */ -import { Camera } from '../3d/framework/camera-component'; +import { Camera } from '../components/camera-component'; import { Vec3 } from '../math'; import { Node } from '../scene-graph'; import { replaceProperty } from './x-deprecated'; diff --git a/cocos/core/utils/index.ts b/cocos/core/utils/index.ts index d5123096d9..17bcfdb25e 100644 --- a/cocos/core/utils/index.ts +++ b/cocos/core/utils/index.ts @@ -37,10 +37,7 @@ import * as misc from './misc'; import * as path from './path'; export * from './x-deprecated'; -export * from './text-utils'; -export * from './html-text-parser'; export * from './prefab-helper'; -export * from './batch-utils'; export * from './murmurhash2_gc'; export { diff --git a/cocos/dragon-bones/ArmatureDisplay.ts b/cocos/dragon-bones/ArmatureDisplay.ts index 119e52c827..2f7e8f9d56 100644 --- a/cocos/dragon-bones/ArmatureDisplay.ts +++ b/cocos/dragon-bones/ArmatureDisplay.ts @@ -1,6 +1,6 @@ import { EDITOR } from 'internal:constants'; import { ccclass, executeInEditMode, help, menu } from '../core/data/class-decorator'; -import { UIRenderable } from '../core/components/ui-base/ui-renderable'; +import { UIRenderable } from '../2d/framework/ui-renderable'; import { Node, EventTarget, CCClass, Color, Enum, PrivateNode, ccenum, errorID, Texture2D, js, CCObject } from '../core'; import { displayName, editable, serializable, tooltip, type, visible } from '../core/data/decorators'; import { AnimationCache, ArmatureCache, ArmatureFrame } from './ArmatureCache'; @@ -9,10 +9,10 @@ import { CCFactory } from './CCFactory'; import { Armature, Bone, EventObject } from './lib/dragonBones.js'; import { DragonBonesAsset } from './DragonBonesAsset'; import { DragonBonesAtlasAsset } from './DragonBonesAtlasAsset'; -import { Graphics } from '../ui/components'; +import { Graphics } from '../2d/components'; import { CCArmatureDisplay } from './CCArmatureDisplay'; -import { MeshRenderData } from '../core/renderer/ui/render-data'; -import { UI } from '../core/renderer/ui/ui'; +import { MeshRenderData } from '../2d/renderer/render-data'; +import { UI } from '../2d/renderer/ui'; import { MaterialInstance } from '../core/renderer/core/material-instance'; import { BlendFactor } from '../core/gfx'; @@ -290,7 +290,7 @@ export class ArmatureDisplay extends UIRenderable { if (this._defaultCacheMode !== AnimationCacheMode.REALTIME) { if (this._armature && !ArmatureCache.canCache(this._armature)) { this._defaultCacheMode = AnimationCacheMode.REALTIME; - console.warn("Animation cache mode doesn't support skeletal nesting"); + console.warn('Animation cache mode doesn\'t support skeletal nesting'); return; } } diff --git a/cocos/dragon-bones/CCTextureData.ts b/cocos/dragon-bones/CCTextureData.ts index 51aa29db18..1be184bc1d 100644 --- a/cocos/dragon-bones/CCTextureData.ts +++ b/cocos/dragon-bones/CCTextureData.ts @@ -1,4 +1,5 @@ -import { RenderTexture, Size, SpriteFrame, Vec2 } from '../core'; +import { RenderTexture, Size, Vec2 } from '../core'; +import { SpriteFrame } from '../2d'; import { TextureBase } from '../core/assets/texture-base'; import { ccclass } from '../core/data/decorators'; import { Rect } from '../core/math/rect'; diff --git a/cocos/dragon-bones/assembler/index.ts b/cocos/dragon-bones/assembler/index.ts index 031f71c96c..ccaf25e175 100644 --- a/cocos/dragon-bones/assembler/index.ts +++ b/cocos/dragon-bones/assembler/index.ts @@ -1,4 +1,4 @@ -import { IAssemblerManager } from '../../core/renderer/ui/base'; +import { IAssemblerManager } from '../../2d/renderer/base'; import { ArmatureDisplay } from '../ArmatureDisplay'; import { simple } from './simple'; diff --git a/cocos/dragon-bones/assembler/simple.ts b/cocos/dragon-bones/assembler/simple.ts index 845e2803d1..d1ad6f77b3 100644 --- a/cocos/dragon-bones/assembler/simple.ts +++ b/cocos/dragon-bones/assembler/simple.ts @@ -2,8 +2,8 @@ import { Color, Component, macro, Mat4, RenderTexture, Node, Texture2D, Vec3 } f import { TextureBase } from '../../core/assets/texture-base'; import { BlendFactor } from '../../core/gfx'; import { MaterialInstance } from '../../core/renderer/core/material-instance'; -import { IAssembler } from '../../core/renderer/ui/base'; -import { UI } from '../../core/renderer/ui/ui'; +import { IAssembler } from '../../2d/renderer/base'; +import { UI } from '../../2d/renderer/ui'; import { ArmatureFrame, ArmatureFrameColor } from '../ArmatureCache'; import { ArmatureDisplay, ArmatureDisplayMeshData } from '../ArmatureDisplay'; import { CCSlot } from '../CCSlot'; diff --git a/cocos/particle-2d/motion-streak-2d-assembler.ts b/cocos/particle-2d/motion-streak-2d-assembler.ts index 98d0cb3237..09bf89e2cb 100644 --- a/cocos/particle-2d/motion-streak-2d-assembler.ts +++ b/cocos/particle-2d/motion-streak-2d-assembler.ts @@ -24,11 +24,11 @@ THE SOFTWARE. */ -import { IAssembler, IAssemblerManager } from '../core/renderer/ui/base'; +import { IAssembler, IAssemblerManager } from '../2d/renderer/base'; import { MotionStreak } from './motion-streak-2d'; import { Vec2, Color } from '../core/math'; -import { RenderData } from '../core/renderer/ui/render-data'; -import { UI } from '../core/renderer/ui/ui'; +import { RenderData } from '../2d/renderer/render-data'; +import { UI } from '../2d/renderer/ui'; class Point { public point = new Vec2(); diff --git a/cocos/particle-2d/motion-streak-2d.ts b/cocos/particle-2d/motion-streak-2d.ts index 0992e6a60b..22b2de7b82 100644 --- a/cocos/particle-2d/motion-streak-2d.ts +++ b/cocos/particle-2d/motion-streak-2d.ts @@ -25,10 +25,10 @@ */ import { ccclass, executeInEditMode, serializable, playOnFocus, menu, help, editable, type } from 'cc.decorator'; -import { UIRenderable } from '../core/components/ui-base'; -import { Texture2D } from '../core/assets/texture-2d'; -import { UI } from '../core/renderer/ui/ui'; import { EDITOR } from 'internal:constants'; +import { UIRenderable } from '../2d/framework'; +import { Texture2D } from '../core/assets/texture-2d'; +import { UI } from '../2d/renderer/ui'; /** * @en diff --git a/cocos/particle-2d/particle-asset.ts b/cocos/particle-2d/particle-asset.ts index 66fc4728dd..a51de79de9 100644 --- a/cocos/particle-2d/particle-asset.ts +++ b/cocos/particle-2d/particle-asset.ts @@ -32,7 +32,7 @@ import { ccclass, serializable, editable } from '../core/data/decorators'; import { Asset } from '../core/assets/asset'; -import { SpriteFrame } from '../core/assets/sprite-frame'; +import { SpriteFrame } from '../2d/assets/sprite-frame'; import { legacyCC } from '../core/global-exports'; /** diff --git a/cocos/particle-2d/particle-simulator-2d.ts b/cocos/particle-2d/particle-simulator-2d.ts index de70327298..7ce1fbebf2 100644 --- a/cocos/particle-2d/particle-simulator-2d.ts +++ b/cocos/particle-2d/particle-simulator-2d.ts @@ -26,7 +26,7 @@ import { Vec2, Vec3, Color } from '../core/math'; import Pool from '../core/utils/pool'; import { clampf, degreesToRadians, radiansToDegrees } from '../core/utils/misc'; import { director } from '../core/director'; -import { vfmtPosUvColor, getAttributeFormatBytes } from '../core/renderer/ui/ui-vertex-format'; +import { vfmtPosUvColor, getAttributeFormatBytes } from '../2d/renderer/ui-vertex-format'; import { PositionType, EmitterMode, START_SIZE_EQUAL_TO_END_SIZE, START_RADIUS_EQUAL_TO_END_RADIUS } from './define'; const ZERO_VEC2 = new Vec2(0, 0); diff --git a/cocos/particle-2d/particle-system-2d-assembler.ts b/cocos/particle-2d/particle-system-2d-assembler.ts index e808a70b06..c76c9e64c8 100644 --- a/cocos/particle-2d/particle-system-2d-assembler.ts +++ b/cocos/particle-2d/particle-system-2d-assembler.ts @@ -24,10 +24,10 @@ THE SOFTWARE. */ -import { IAssembler, IAssemblerManager } from '../core/renderer/ui/base'; +import { IAssembler, IAssemblerManager } from '../2d/renderer/base'; import { ParticleSystem2D } from './particle-system-2d'; -import { MeshRenderData } from '../core/renderer/ui/render-data'; -import { UI } from '../core/renderer/ui/ui'; +import { MeshRenderData } from '../2d/renderer/render-data'; +import { UI } from '../2d/renderer/ui'; import { PositionType } from './define'; import { legacyCC } from '../core/global-exports'; diff --git a/cocos/particle-2d/particle-system-2d.ts b/cocos/particle-2d/particle-system-2d.ts index 38f8b15f58..c48b3c3c4c 100644 --- a/cocos/particle-2d/particle-system-2d.ts +++ b/cocos/particle-2d/particle-system-2d.ts @@ -30,11 +30,11 @@ import { ccclass, editable, type, menu, executeInEditMode, serializable, playOnFocus, tooltip } from 'cc.decorator'; import { EDITOR } from 'internal:constants'; -import { UIRenderable } from '../core/components/ui-base/ui-renderable'; +import { UIRenderable } from '../2d/framework/ui-renderable'; import { Color, Vec2 } from '../core/math'; import { warnID, errorID, error } from '../core/platform/debug'; import { Simulator } from './particle-simulator-2d'; -import { SpriteFrame } from '../core/assets/sprite-frame'; +import { SpriteFrame } from '../2d/assets/sprite-frame'; import { ImageAsset } from '../core/assets/image-asset'; import { ParticleAsset } from './particle-asset'; import { BlendFactor } from '../core/gfx'; @@ -42,7 +42,7 @@ import { path } from '../core/utils'; import { PNGReader } from './png-reader'; import { TiffReader } from './tiff-reader'; import codec from '../../external/compression/ZipUtils'; -import { UI } from '../core/renderer/ui/ui'; +import { UI } from '../2d/renderer/ui'; import { assetManager } from '../core/asset-manager'; import { PositionType, EmitterMode, DURATION_INFINITY, START_RADIUS_EQUAL_TO_END_RADIUS, START_SIZE_EQUAL_TO_END_SIZE } from './define'; diff --git a/cocos/particle/billboard.ts b/cocos/particle/billboard.ts index 97342aa8fe..0079b3dff0 100644 --- a/cocos/particle/billboard.ts +++ b/cocos/particle/billboard.ts @@ -29,11 +29,12 @@ * @module particle */ -import { builtinResMgr } from '../core/3d/builtin'; -import { createMesh } from '../core/3d/misc/utils'; -import { Material, Mesh, Texture2D } from '../core/assets'; -import { Component } from '../core/components/component'; import { ccclass, help, executeInEditMode, menu, tooltip, type, serializable } from 'cc.decorator'; +import { builtinResMgr } from '../core/builtin'; +import { createMesh } from '../3d/misc'; +import { Mesh } from '../3d/assets'; +import { Material, Texture2D } from '../core/assets'; +import { Component } from '../core/components/component'; import { Attribute, AttributeName, Format, PrimitiveMode } from '../core/gfx'; import { Color, toDegree, toRadian, Vec4 } from '../core/math'; import { scene } from '../core/renderer'; diff --git a/cocos/particle/line.ts b/cocos/particle/line.ts index 35202fac40..9dde654e36 100644 --- a/cocos/particle/line.ts +++ b/cocos/particle/line.ts @@ -29,13 +29,12 @@ * @module particle */ - +import { ccclass, help, executeInEditMode, menu, tooltip, displayOrder, type, serializable } from 'cc.decorator'; import { Material, Texture2D } from '../core/assets'; import { Component } from '../core/components'; -import { ccclass, help, executeInEditMode, menu, tooltip, displayOrder, type, serializable } from 'cc.decorator'; import { Vec3, Vec2, Vec4 } from '../core/math'; import { LineModel } from './models/line-model'; -import { builtinResMgr } from '../core/3d/builtin'; +import { builtinResMgr } from '../core/builtin'; import CurveRange from './animator/curve-range'; import GradientRange from './animator/gradient-range'; import { legacyCC } from '../core/global-exports'; diff --git a/cocos/particle/models/line-model.ts b/cocos/particle/models/line-model.ts index cf6cd8e3bc..38067c6eac 100644 --- a/cocos/particle/models/line-model.ts +++ b/cocos/particle/models/line-model.ts @@ -28,7 +28,7 @@ * @hidden */ -import { RenderingSubMesh } from '../../core/assets/mesh'; +import { RenderingSubMesh } from '../../core/assets/rendering-sub-mesh'; import { DRAW_INFO_SIZE, Buffer, IndirectBuffer, Attribute, BufferInfo, DrawInfo } from '../../core/gfx'; import { AttributeName, BufferUsageBit, Format, FormatInfos, MemoryUsageBit, PrimitiveMode } from '../../core/gfx/define'; import { Vec3 } from '../../core/math'; diff --git a/cocos/particle/models/particle-batch-model.ts b/cocos/particle/models/particle-batch-model.ts index b3e26a366b..2b67a0fe60 100644 --- a/cocos/particle/models/particle-batch-model.ts +++ b/cocos/particle/models/particle-batch-model.ts @@ -28,14 +28,14 @@ * @hidden */ -import { RenderingSubMesh, Mesh } from '../../core/assets/mesh'; +import { Mesh } from '../../3d/assets/mesh'; import { AttributeName, BufferUsageBit, FormatInfos, MemoryUsageBit, PrimitiveMode } from '../../core/gfx/define'; import { Attribute, DRAW_INFO_SIZE, Buffer, IndirectBuffer, BufferInfo, DrawInfo } from '../../core/gfx'; import { Color } from '../../core/math/color'; import { scene } from '../../core/renderer'; import { Particle } from '../particle'; -import { Material } from '../../core/assets'; +import { Material, RenderingSubMesh } from '../../core/assets'; const _uvs = [ 0, 0, // bottom-left @@ -45,7 +45,6 @@ const _uvs = [ ]; export default class ParticleBatchModel extends scene.Model { - private _capacity: number; private _vertAttrs: Attribute[] | null; private _vertSize: number; @@ -57,10 +56,10 @@ export default class ParticleBatchModel extends scene.Model { private _iaInfoBuffer: Buffer | null; private _subMeshData: RenderingSubMesh | null; private _mesh: Mesh | null; - private _vertCount: number = 0; - private _indexCount: number = 0; - private _startTimeOffset: number = 0; - private _lifeTimeOffset: number = 0; + private _vertCount = 0; + private _indexCount = 0; + private _startTimeOffset = 0; + private _lifeTimeOffset = 0; private _material: Material | null = null; constructor () { @@ -288,7 +287,7 @@ export default class ParticleBatchModel extends scene.Model { lifeTime = this._vdataF32![pBaseIndex + this._lifeTimeOffset]; interval = time - startTime; if (lifeTime - interval < dt) { - lastBaseIndex = -- num * pSize; + lastBaseIndex = --num * pSize; this._vdataF32!.copyWithin(pBaseIndex, lastBaseIndex, lastBaseIndex + pSize); i--; } @@ -301,11 +300,11 @@ export default class ParticleBatchModel extends scene.Model { if (!this._vertAttrs) { return; } - let vIdx = this._vertAttrs!.findIndex((val) => val.name === 'a_position_starttime'); - let vOffset = (this._vertAttrs![vIdx] as any).offset; + let vIdx = this._vertAttrs.findIndex((val) => val.name === 'a_position_starttime'); + let vOffset = (this._vertAttrs[vIdx] as any).offset; this._startTimeOffset = vOffset / 4 + 3; - vIdx = this._vertAttrs!.findIndex((val) => val.name === 'a_dir_life'); - vOffset = (this._vertAttrs![vIdx] as any).offset; + vIdx = this._vertAttrs.findIndex((val) => val.name === 'a_dir_life'); + vOffset = (this._vertAttrs[vIdx] as any).offset; this._lifeTimeOffset = vOffset / 4 + 3; } diff --git a/cocos/particle/particle-system.ts b/cocos/particle/particle-system.ts index 9bbf277440..35faae38e8 100644 --- a/cocos/particle/particle-system.ts +++ b/cocos/particle/particle-system.ts @@ -30,11 +30,10 @@ * @module particle */ - - -import { RenderableComponent } from '../core/3d/framework/renderable-component'; -import { Material } from '../core/assets/material'; import { ccclass, help, executeInEditMode, executionOrder, menu, tooltip, displayOrder, type, range, displayName, visible, formerlySerializedAs, override, radian, serializable } from 'cc.decorator'; +import { EDITOR } from 'internal:constants'; +import { RenderableComponent } from '../core/components/renderable-component'; +import { Material } from '../core/assets/material'; import { Mat4, pseudoRandom, Quat, randomRangeInt, Vec2, Vec3 } from '../core/math'; import { INT_MAX } from '../core/math/bits'; import { scene } from '../core/renderer'; @@ -55,7 +54,6 @@ import ParticleSystemRenderer from './renderer/particle-system-renderer-data'; import TrailModule from './renderer/trail'; import { IParticleSystemRenderer } from './renderer/particle-system-renderer-base'; import { PARTICLE_MODULE_PROPERTY } from './particle'; -import { EDITOR } from 'internal:constants'; import { legacyCC } from '../core/global-exports'; const _world_mat = new Mat4(); diff --git a/cocos/particle/renderer/particle-system-renderer-cpu.ts b/cocos/particle/renderer/particle-system-renderer-cpu.ts index 4660c089c1..0abf6b3ce3 100644 --- a/cocos/particle/renderer/particle-system-renderer-cpu.ts +++ b/cocos/particle/renderer/particle-system-renderer-cpu.ts @@ -23,7 +23,7 @@ THE SOFTWARE. */ -import { builtinResMgr } from '../../core/3d/builtin'; +import { builtinResMgr } from '../../core/builtin'; import { Material } from '../../core/assets'; import { AttributeName, Format, Attribute } from '../../core/gfx'; import { Mat4, Vec2, Vec3, Vec4, pseudoRandom } from '../../core/math'; diff --git a/cocos/particle/renderer/particle-system-renderer-data.ts b/cocos/particle/renderer/particle-system-renderer-data.ts index 03159cd924..ff34b7534a 100644 --- a/cocos/particle/renderer/particle-system-renderer-data.ts +++ b/cocos/particle/renderer/particle-system-renderer-data.ts @@ -23,7 +23,8 @@ THE SOFTWARE. */ -import { Material, Mesh, Texture2D } from '../../core/assets'; +import { Mesh } from '../../3d'; +import { Material, Texture2D } from '../../core/assets'; import { ccclass, tooltip, displayOrder, type, serializable } from 'cc.decorator'; import { RenderMode} from '../enum'; import ParticleSystemRendererCPU from './particle-system-renderer-cpu'; diff --git a/cocos/particle/renderer/particle-system-renderer-gpu.ts b/cocos/particle/renderer/particle-system-renderer-gpu.ts index 46749c6470..89b668cc5a 100644 --- a/cocos/particle/renderer/particle-system-renderer-gpu.ts +++ b/cocos/particle/renderer/particle-system-renderer-gpu.ts @@ -23,7 +23,7 @@ THE SOFTWARE. */ -import { builtinResMgr } from '../../core/3d/builtin'; +import { builtinResMgr } from '../../core/builtin'; import { Material } from '../../core/assets'; import { Texture2D } from '../../core'; import { Component } from '../../core/components'; diff --git a/cocos/particle/renderer/trail.ts b/cocos/particle/renderer/trail.ts index 7fc238dc23..3a4baa6308 100644 --- a/cocos/particle/renderer/trail.ts +++ b/cocos/particle/renderer/trail.ts @@ -30,7 +30,7 @@ */ import { Material } from '../../core/assets/material'; -import { RenderingSubMesh } from '../../core/assets/mesh'; +import { RenderingSubMesh } from '../../core/assets/rendering-sub-mesh'; import { ccclass, tooltip, displayOrder, type, serializable } from 'cc.decorator'; import { director } from '../../core/director'; import { AttributeName, BufferUsageBit, Format, FormatInfos, MemoryUsageBit, PrimitiveMode } from '../../core/gfx/define'; diff --git a/cocos/physics-2d/box2d/physics-world.ts b/cocos/physics-2d/box2d/physics-world.ts index ff69808984..3b7e9e95b3 100644 --- a/cocos/physics-2d/box2d/physics-world.ts +++ b/cocos/physics-2d/box2d/physics-world.ts @@ -1,22 +1,21 @@ import b2 from '@cocos/box2d'; import { EDITOR } from 'internal:constants'; -import { IPhysicsWorld } from '../spec/i-physics-world' +import { IPhysicsWorld } from '../spec/i-physics-world'; import { IVec2Like, Vec3, Quat, toRadian, Vec2, toDegree, Rect, Node, game, CCObject, find, director } from '../../core'; -import { PHYSICS_2D_PTM_RATIO, ERaycast2DType } from '../framework/physics-types'; -import { ERigidBody2DType } from '../framework/physics-types'; +import { PHYSICS_2D_PTM_RATIO, ERaycast2DType, ERigidBody2DType } from '../framework/physics-types'; import { array } from '../../core/utils/js'; -import { Canvas, Graphics } from '../../../exports/ui'; +import { Canvas } from '../../2d/framework'; +import { Graphics } from '../../2d/components'; import { b2RigidBody2D } from './rigid-body'; import { PhysicsContactListener } from './platform/physics-contact-listener'; import { PhysicsAABBQueryCallback } from './platform/physics-aabb-query-callback'; import { PhysicsRayCastCallback } from './platform/physics-ray-cast-callback'; -import { PhysicsContact } from './physics-contact'; +import { PhysicsContact, b2ContactExtends } from './physics-contact'; import { Contact2DType, Collider2D, RaycastResult2D } from '../framework'; import { b2Shape2D } from './shapes/shape-2d'; import { PhysicsDebugDraw } from './platform/physics-debug-draw'; -import { b2ContactExtends } from './physics-contact'; let tempVec3 = new Vec3; let tempVec2_1 = new Vec2(); diff --git a/cocos/physics-2d/box2d/platform/physics-debug-draw.ts b/cocos/physics-2d/box2d/platform/physics-debug-draw.ts index bce1977821..5e90c3a1bd 100644 --- a/cocos/physics-2d/box2d/platform/physics-debug-draw.ts +++ b/cocos/physics-2d/box2d/platform/physics-debug-draw.ts @@ -26,7 +26,7 @@ import b2 from '@cocos/box2d'; import { Color } from '../../../core'; import { PHYSICS_2D_PTM_RATIO } from '../../framework'; -import { Graphics } from '../../../ui'; +import { Graphics } from '../../../2d'; let _tmp_vec2 = new b2.Vec2(); let _tmp_color = new Color(); diff --git a/cocos/physics-2d/builtin/builtin-world.ts b/cocos/physics-2d/builtin/builtin-world.ts index 48e4c07a21..c106f7c493 100644 --- a/cocos/physics-2d/builtin/builtin-world.ts +++ b/cocos/physics-2d/builtin/builtin-world.ts @@ -1,8 +1,8 @@ import { IPhysicsWorld } from '../spec/i-physics-world' import { EDITOR } from 'internal:constants'; -import { Graphics } from '../../ui'; +import { Graphics } from '../../2d'; import { Node, CCObject, find, director, Vec3, Color, IVec2Like, Vec2, Rect } from '../../core'; -import { Canvas } from '../../../exports/ui'; +import { Canvas } from '../../2d/framework'; import { BuiltinShape2D } from './shapes/shape-2d'; import { BuiltinBoxShape } from './shapes/box-shape-2d'; import { BuiltinCircleShape } from './shapes/circle-shape-2d'; diff --git a/cocos/physics/ammo/ammo-util.ts b/cocos/physics/ammo/ammo-util.ts index 7c1f8eadee..017dba866f 100644 --- a/cocos/physics/ammo/ammo-util.ts +++ b/cocos/physics/ammo/ammo-util.ts @@ -31,7 +31,7 @@ /* eslint-disable new-cap */ import Ammo from './ammo-instantiated'; import { IVec3Like, IQuatLike } from '../../core/math/type-define'; -import { Mesh } from '../../core/assets'; +import { Mesh } from '../../3d'; import { PrimitiveMode } from '../../core/gfx'; export function cocos2AmmoVec3 (out: Ammo.btVector3, v: IVec3Like): Ammo.btVector3 { diff --git a/cocos/physics/ammo/shapes/ammo-trimesh-shape.ts b/cocos/physics/ammo/shapes/ammo-trimesh-shape.ts index 76ec636e0c..eaa68922c8 100644 --- a/cocos/physics/ammo/shapes/ammo-trimesh-shape.ts +++ b/cocos/physics/ammo/shapes/ammo-trimesh-shape.ts @@ -31,7 +31,8 @@ /* eslint-disable new-cap */ import Ammo from '../ammo-instantiated'; import { AmmoShape } from './ammo-shape'; -import { Mesh, warnID } from '../../../core'; +import { warnID } from '../../../core'; +import { Mesh } from '../../../3d/assets'; import { MeshCollider } from '../../../../exports/physics-framework'; import { cocos2AmmoVec3, cocos2AmmoTriMesh } from '../ammo-util'; import { AmmoBroadphaseNativeTypes } from '../ammo-enum'; diff --git a/cocos/physics/cannon/shapes/cannon-trimesh-shape.ts b/cocos/physics/cannon/shapes/cannon-trimesh-shape.ts index 7bcf46211a..73353415d2 100644 --- a/cocos/physics/cannon/shapes/cannon-trimesh-shape.ts +++ b/cocos/physics/cannon/shapes/cannon-trimesh-shape.ts @@ -31,7 +31,8 @@ import CANNON from '@cocos/cannon'; import { CannonShape } from './cannon-shape'; import { MeshCollider } from '../../framework'; -import { Mesh, Vec3 } from '../../../core'; +import { Vec3 } from '../../../core'; +import { Mesh } from '../../../3d/assets'; import { ITrimeshShape } from '../../spec/i-physics-shape'; import { commitShapeUpdates } from '../cannon-util'; diff --git a/cocos/physics/framework/components/colliders/mesh-collider.ts b/cocos/physics/framework/components/colliders/mesh-collider.ts index b4553c0b8c..d4b55f333e 100644 --- a/cocos/physics/framework/components/colliders/mesh-collider.ts +++ b/cocos/physics/framework/components/colliders/mesh-collider.ts @@ -39,7 +39,7 @@ import { } from 'cc.decorator'; import { EDITOR, TEST } from 'internal:constants'; import { Collider } from './collider'; -import { Mesh } from '../../../../core'; +import { Mesh } from '../../../../3d/assets'; import { ITrimeshShape } from '../../../spec/i-physics-shape'; import { EColliderType } from '../../physics-enum'; diff --git a/cocos/physics/physx/shapes/physx-cone-shape.ts b/cocos/physics/physx/shapes/physx-cone-shape.ts index a92119b389..559b84bb31 100644 --- a/cocos/physics/physx/shapes/physx-cone-shape.ts +++ b/cocos/physics/physx/shapes/physx-cone-shape.ts @@ -29,7 +29,7 @@ */ import { Quat, Vec3 } from '../../../core'; -import cylinder from '../../../core/primitive/cylinder'; +import cylinder from '../../../primitive/cylinder'; import { ConeCollider, EAxisDirection } from '../../framework'; import { IConeShape } from '../../spec/i-physics-shape'; import { createConvexMesh, createMeshGeometryFlags, PX, _trans } from '../export-physx'; diff --git a/cocos/physics/physx/shapes/physx-cylinder-shape.ts b/cocos/physics/physx/shapes/physx-cylinder-shape.ts index d00bec04f6..ea06010c16 100644 --- a/cocos/physics/physx/shapes/physx-cylinder-shape.ts +++ b/cocos/physics/physx/shapes/physx-cylinder-shape.ts @@ -29,7 +29,7 @@ */ import { Quat, Vec3 } from '../../../core'; -import cylinder from '../../../core/primitive/cylinder'; +import cylinder from '../../../primitive/cylinder'; import { CylinderCollider, EAxisDirection } from '../../framework'; import { ICylinderShape } from '../../spec/i-physics-shape'; import { createConvexMesh, createMeshGeometryFlags, PX, _trans } from '../export-physx'; diff --git a/cocos/physics/physx/shapes/physx-trimesh-shape.ts b/cocos/physics/physx/shapes/physx-trimesh-shape.ts index 8d27a6d8e6..a22330abb2 100644 --- a/cocos/physics/physx/shapes/physx-trimesh-shape.ts +++ b/cocos/physics/physx/shapes/physx-trimesh-shape.ts @@ -28,7 +28,8 @@ * @hidden */ -import { GFXAttributeName, Mesh, Quat, Vec3 } from '../../../core'; +import { GFXAttributeName, Quat, Vec3 } from '../../../core'; +import { Mesh } from '../../../3d/assets'; import { MeshCollider } from '../../framework'; import { ITrimeshShape } from '../../spec/i-physics-shape'; import { createConvexMesh, createMeshGeometryFlags, createTriangleMesh, PX, _trans } from '../export-physx'; diff --git a/cocos/physics/spec/i-physics-shape.ts b/cocos/physics/spec/i-physics-shape.ts index 382de354d6..de10c57e28 100644 --- a/cocos/physics/spec/i-physics-shape.ts +++ b/cocos/physics/spec/i-physics-shape.ts @@ -32,7 +32,7 @@ import { ILifecycle } from './i-lifecycle'; import { IGroupMask } from './i-group-mask'; import { IVec3Like } from '../../core/math/type-define'; import { Collider, RigidBody, PhysicMaterial, SimplexCollider } from '../../../exports/physics-framework'; -import { Mesh } from '../../core'; +import { Mesh } from '../../3d/assets'; import { ITerrainAsset } from './i-external'; import { AABB, Sphere } from '../../core/geometry'; diff --git a/cocos/core/primitive/box.ts b/cocos/primitive/box.ts similarity index 99% rename from cocos/core/primitive/box.ts rename to cocos/primitive/box.ts index c59dc65853..da9897db10 100644 --- a/cocos/core/primitive/box.ts +++ b/cocos/primitive/box.ts @@ -28,7 +28,7 @@ * @module 3d/primitive */ -import { Vec3 } from '../math'; +import { Vec3 } from '../core/math'; import { IGeometry, IGeometryOptions } from './define'; /** diff --git a/cocos/core/primitive/capsule.ts b/cocos/primitive/capsule.ts similarity index 99% rename from cocos/core/primitive/capsule.ts rename to cocos/primitive/capsule.ts index b219274501..215276a5ed 100644 --- a/cocos/core/primitive/capsule.ts +++ b/cocos/primitive/capsule.ts @@ -28,7 +28,7 @@ * @module 3d/primitive */ -import { Vec3 } from '../math'; +import { Vec3 } from '../core/math'; /** * @en diff --git a/cocos/core/primitive/circle.ts b/cocos/primitive/circle.ts similarity index 98% rename from cocos/core/primitive/circle.ts rename to cocos/primitive/circle.ts index 25640403f5..ae83831bba 100644 --- a/cocos/core/primitive/circle.ts +++ b/cocos/primitive/circle.ts @@ -28,7 +28,7 @@ * @module 3d/primitive */ -import { PrimitiveMode } from '../gfx/define'; +import { PrimitiveMode } from '../core/gfx/define'; import { applyDefaultGeometryOptions, IGeometry, IGeometryOptions } from './define'; /** diff --git a/cocos/core/primitive/cone.ts b/cocos/primitive/cone.ts similarity index 100% rename from cocos/core/primitive/cone.ts rename to cocos/primitive/cone.ts diff --git a/cocos/core/primitive/cylinder.ts b/cocos/primitive/cylinder.ts similarity index 99% rename from cocos/core/primitive/cylinder.ts rename to cocos/primitive/cylinder.ts index 8b6285335b..e29a96fcbe 100644 --- a/cocos/core/primitive/cylinder.ts +++ b/cocos/primitive/cylinder.ts @@ -28,7 +28,7 @@ * @module 3d/primitive */ -import { Vec3 } from '../math'; +import { Vec3 } from '../core/math'; import { IGeometry, IGeometryOptions } from './define'; /** diff --git a/cocos/core/primitive/define.ts b/cocos/primitive/define.ts similarity index 97% rename from cocos/core/primitive/define.ts rename to cocos/primitive/define.ts index b002a12a60..5d31147735 100644 --- a/cocos/core/primitive/define.ts +++ b/cocos/primitive/define.ts @@ -28,8 +28,8 @@ * @module 3d/primitive */ -import { PrimitiveMode } from '../gfx/define'; -import { Attribute } from '../gfx'; +import { PrimitiveMode } from '../core/gfx/define'; +import { Attribute } from '../core/gfx'; /** * @en diff --git a/cocos/core/primitive/index.ts b/cocos/primitive/index.ts similarity index 100% rename from cocos/core/primitive/index.ts rename to cocos/primitive/index.ts diff --git a/cocos/core/primitive/plane.ts b/cocos/primitive/plane.ts similarity index 99% rename from cocos/core/primitive/plane.ts rename to cocos/primitive/plane.ts index ac08a6a68a..9ba2558ae5 100644 --- a/cocos/core/primitive/plane.ts +++ b/cocos/primitive/plane.ts @@ -28,7 +28,7 @@ * @module 3d/primitive */ -import { Vec3 } from '../math'; +import { Vec3 } from '../core/math'; import { applyDefaultGeometryOptions, IGeometry, IGeometryOptions } from './define'; /** diff --git a/cocos/core/primitive/primitive.ts b/cocos/primitive/primitive.ts similarity index 92% rename from cocos/core/primitive/primitive.ts rename to cocos/primitive/primitive.ts index eb132d7807..88ba267d76 100644 --- a/cocos/core/primitive/primitive.ts +++ b/cocos/primitive/primitive.ts @@ -28,12 +28,12 @@ * @module 3d/primitive */ -import { createMesh } from '../3d/misc/utils'; -import { Mesh } from '../assets/mesh'; import { ccclass, type, serializable, editable } from 'cc.decorator'; -import * as primitives from '../primitive'; -import { ccenum } from '../value-types/enum'; -import { legacyCC } from '../global-exports'; +import { createMesh } from '../3d/misc'; +import { Mesh } from '../3d/assets/mesh'; +import * as primitives from '.'; +import { ccenum } from '../core/value-types/enum'; +import { legacyCC } from '../core/global-exports'; enum PrimitiveType { BOX = 0, diff --git a/cocos/core/primitive/quad.ts b/cocos/primitive/quad.ts similarity index 100% rename from cocos/core/primitive/quad.ts rename to cocos/primitive/quad.ts diff --git a/cocos/core/primitive/sphere.ts b/cocos/primitive/sphere.ts similarity index 98% rename from cocos/core/primitive/sphere.ts rename to cocos/primitive/sphere.ts index 0ce8d11056..184212c63d 100644 --- a/cocos/core/primitive/sphere.ts +++ b/cocos/primitive/sphere.ts @@ -28,7 +28,7 @@ * @module 3d/primitive */ -import { Vec3 } from '../math'; +import { Vec3 } from '../core/math'; import { IGeometry, IGeometryOptions } from './define'; /** diff --git a/cocos/core/primitive/torus.ts b/cocos/primitive/torus.ts similarity index 98% rename from cocos/core/primitive/torus.ts rename to cocos/primitive/torus.ts index 3b51960179..7f619e662a 100644 --- a/cocos/core/primitive/torus.ts +++ b/cocos/primitive/torus.ts @@ -28,7 +28,7 @@ * @module 3d/primitive */ -import { Vec3 } from '../math'; +import { Vec3 } from '../core/math'; import { IGeometryOptions } from './define'; /** diff --git a/cocos/core/primitive/transform.ts b/cocos/primitive/transform.ts similarity index 98% rename from cocos/core/primitive/transform.ts rename to cocos/primitive/transform.ts index 1b2659f1f3..8cadb0aca5 100644 --- a/cocos/core/primitive/transform.ts +++ b/cocos/primitive/transform.ts @@ -28,7 +28,7 @@ * @module 3d/primitive */ -import { PrimitiveMode } from '../gfx/define'; +import { PrimitiveMode } from '../core/gfx/define'; import { IGeometry } from './define'; /** diff --git a/cocos/core/primitive/utils.ts b/cocos/primitive/utils.ts similarity index 98% rename from cocos/core/primitive/utils.ts rename to cocos/primitive/utils.ts index 7e8c12ee38..2bd75da313 100644 --- a/cocos/core/primitive/utils.ts +++ b/cocos/primitive/utils.ts @@ -28,7 +28,7 @@ * @module 3d/primitive */ -import { PrimitiveMode } from '../gfx/define'; +import { PrimitiveMode } from '../core/gfx/define'; import { IGeometry } from './define'; /** diff --git a/cocos/core/utils/profiler/counter.ts b/cocos/profiler/counter.ts similarity index 100% rename from cocos/core/utils/profiler/counter.ts rename to cocos/profiler/counter.ts diff --git a/cocos/core/utils/profiler/perf-counter.ts b/cocos/profiler/perf-counter.ts similarity index 100% rename from cocos/core/utils/profiler/perf-counter.ts rename to cocos/profiler/perf-counter.ts diff --git a/cocos/core/utils/profiler/profiler.ts b/cocos/profiler/profiler.ts similarity index 96% rename from cocos/core/utils/profiler/profiler.ts rename to cocos/profiler/profiler.ts index 39a9d9fe09..3156bd1097 100644 --- a/cocos/core/utils/profiler/profiler.ts +++ b/cocos/profiler/profiler.ts @@ -25,20 +25,20 @@ */ import { TEST, EDITOR } from 'internal:constants'; -import { MeshRenderer } from '../../3d/framework/mesh-renderer'; -import { Camera } from '../../3d/framework/camera-component'; -import { createMesh } from '../../3d/misc/utils'; -import { Material } from '../../assets/material'; -import { ClearFlag, Format, TextureType, TextureUsageBit } from '../../gfx/define'; -import { Texture, TextureInfo, Device, BufferTextureCopy } from '../../gfx'; -import { toRadian, Vec4 } from '../../math'; -import { Layers } from '../../scene-graph'; -import { Node } from '../../scene-graph/node'; +import { MeshRenderer } from '../3d/framework/mesh-renderer'; +import { Camera } from '../core/components/camera-component'; +import { createMesh } from '../3d/misc'; +import { Material } from '../core/assets/material'; +import { ClearFlag, Format, TextureType, TextureUsageBit } from '../core/gfx/define'; +import { Texture, TextureInfo, Device, BufferTextureCopy } from '../core/gfx'; +import { toRadian, Vec4 } from '../core/math'; +import { Layers } from '../core/scene-graph'; +import { Node } from '../core/scene-graph/node'; import { ICounterOption } from './counter'; import { PerfCounter } from './perf-counter'; -import { legacyCC } from '../../global-exports'; -import { Pass } from '../../renderer'; -import { preTransforms } from '../../math/mat4'; +import { legacyCC } from '../core/global-exports'; +import { Pass } from '../core/renderer'; +import { preTransforms } from '../core/math/mat4'; const _characters = '0123456789. '; diff --git a/cocos/spine/assembler/index.ts b/cocos/spine/assembler/index.ts index f0890e2ae5..f4e6c4dcc8 100644 --- a/cocos/spine/assembler/index.ts +++ b/cocos/spine/assembler/index.ts @@ -1,4 +1,4 @@ -import { IAssemblerManager } from '../../core/renderer/ui/base'; +import { IAssemblerManager } from '../../2d/renderer/base'; import { Skeleton } from '../skeleton'; import { simple } from './simple'; diff --git a/cocos/spine/assembler/simple.ts b/cocos/spine/assembler/simple.ts index 1cd8a66acc..ee9d2ad598 100644 --- a/cocos/spine/assembler/simple.ts +++ b/cocos/spine/assembler/simple.ts @@ -1,10 +1,10 @@ import spine from '../lib/spine-core.js'; -import { IAssembler } from '../../core/renderer/ui/base'; -import { UI } from '../../core/renderer/ui/ui'; +import { IAssembler } from '../../2d/renderer/base'; +import { UI } from '../../2d/renderer/ui'; import { FrameColor } from '../skeleton-cache'; import { MaterialInstance } from '../../core/renderer'; import { SkeletonTexture } from '../skeleton-texture'; -import { vfmtPosUvColor, vfmtPosUvTwoColor } from '../../core/renderer/ui/ui-vertex-format'; +import { vfmtPosUvColor, vfmtPosUvTwoColor } from '../../2d/renderer/ui-vertex-format'; import { Skeleton, SkeletonMeshData, SpineMaterialType } from '../skeleton'; import { Color, Mat4, Material, Node, Texture2D, Vec3 } from '../../core'; import { BlendFactor } from '../../core/gfx'; diff --git a/cocos/spine/skeleton.ts b/cocos/spine/skeleton.ts index 5863eefc5c..99818a5272 100644 --- a/cocos/spine/skeleton.ts +++ b/cocos/spine/skeleton.ts @@ -4,14 +4,14 @@ import spine from './lib/spine-core.js'; import SkeletonCache, { AnimationCache, AnimationFrame } from './skeleton-cache'; import { AttachUtil } from './attach-util'; import { ccclass, executeInEditMode, help, menu } from '../core/data/class-decorator'; -import { UIRenderable } from '../core/components/ui-base/ui-renderable'; -import { Node, CCClass, CCObject, Color, Enum, Material, PrivateNode, Texture2D, builtinResMgr, ccenum, errorID, logID, warn, Socket } from '../core'; +import { UIRenderable } from '../2d/framework/ui-renderable'; +import { Node, CCClass, CCObject, Color, Enum, Material, PrivateNode, Texture2D, builtinResMgr, ccenum, errorID, logID, warn } from '../core'; import { displayName, editable, override, serializable, tooltip, type, visible } from '../core/data/decorators'; import { SkeletonData } from './skeleton-data'; import { VertexEffectDelegate } from './vertex-effect-delegate'; -import { MeshRenderData } from '../core/renderer/ui/render-data'; -import { UI } from '../core/renderer/ui/ui'; -import { Graphics } from '../ui/components/graphics'; +import { MeshRenderData } from '../2d/renderer/render-data'; +import { UI } from '../2d/renderer/ui'; +import { Graphics } from '../2d/components/graphics'; import { MaterialInstance } from '../core/renderer'; import { js } from '../core/utils/js'; import { BlendFactor, BlendOp } from '../core/gfx'; @@ -653,7 +653,7 @@ export class Skeleton extends UIRenderable { */ public setAnimationStateData (stateData) { if (this.isAnimationCached()) { - warn("'setAnimationStateData' interface can not be invoked in cached mode."); + warn('\'setAnimationStateData\' interface can not be invoked in cached mode.'); } else { const state = new spine.AnimationState(stateData); if (this._listener) { @@ -1071,7 +1071,7 @@ export class Skeleton extends UIRenderable { */ public getCurrent (trackIndex: number) { if (this.isAnimationCached()) { - warn("'getCurrent' interface can not be invoked in cached mode."); + warn('\'getCurrent\' interface can not be invoked in cached mode.'); } else if (this._state) { return this._state.getCurrent(trackIndex); } @@ -1085,7 +1085,7 @@ export class Skeleton extends UIRenderable { */ public clearTracks () { if (this.isAnimationCached()) { - warn("'clearTracks' interface can not be invoked in cached mode."); + warn('\'clearTracks\' interface can not be invoked in cached mode.'); } else if (this._state) { this._state.clearTracks(); } @@ -1099,7 +1099,7 @@ export class Skeleton extends UIRenderable { */ public clearTrack (trackIndex: number) { if (this.isAnimationCached()) { - warn("'clearTrack' interface can not be invoked in cached mode."); + warn('\'clearTrack\' interface can not be invoked in cached mode.'); } else if (this._state) { this._state.clearTrack(trackIndex); if (EDITOR/* && !cc.engine.isPlaying */) { diff --git a/cocos/terrain/terrain.ts b/cocos/terrain/terrain.ts index 87b624fd60..7acaafeec8 100644 --- a/cocos/terrain/terrain.ts +++ b/cocos/terrain/terrain.ts @@ -28,12 +28,12 @@ * @module terrain */ import { ccclass, disallowMultiple, executeInEditMode, help, visible, type, serializable, editable, disallowAnimation } from 'cc.decorator'; -import { builtinResMgr } from '../core/3d/builtin'; -import { RenderableComponent } from '../core/3d/framework/renderable-component'; +import { builtinResMgr } from '../core/builtin'; +import { RenderableComponent } from '../core/components/renderable-component'; import { EffectAsset, Texture2D } from '../core/assets'; import { Filter, PixelFormat, WrapMode } from '../core/assets/asset-enum'; import { Material } from '../core/assets/material'; -import { RenderingSubMesh } from '../core/assets/mesh'; +import { RenderingSubMesh } from '../core/assets/rendering-sub-mesh'; import { Component } from '../core/components'; import { isValid } from '../core/data/object'; import { director } from '../core/director'; diff --git a/cocos/tiledmap/assembler/index.ts b/cocos/tiledmap/assembler/index.ts index a41f32e943..8f2614a4d6 100644 --- a/cocos/tiledmap/assembler/index.ts +++ b/cocos/tiledmap/assembler/index.ts @@ -28,7 +28,7 @@ * @hidden */ -import { IAssemblerManager } from '../../core/renderer/ui/base'; +import { IAssemblerManager } from '../../2d/renderer/base'; import { TiledLayer } from '../tiled-layer'; import { simple } from './simple'; diff --git a/cocos/tiledmap/assembler/simple.ts b/cocos/tiledmap/assembler/simple.ts index 66c3615c95..c798dc5a27 100644 --- a/cocos/tiledmap/assembler/simple.ts +++ b/cocos/tiledmap/assembler/simple.ts @@ -29,9 +29,9 @@ */ import { Mat4, Size, 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 '../../2d/renderer/base'; +import { MeshRenderData } from '../../2d/renderer/render-data'; +import { UI } from '../../2d/renderer/ui'; import { TiledLayer, TiledMeshData, TiledTile } from '..'; import { GID, MixedGID, RenderOrder, TiledGrid, TileFlag } from '../tiled-types'; import { Texture2D, Node } from '../../core'; diff --git a/cocos/tiledmap/tiled-layer.ts b/cocos/tiledmap/tiled-layer.ts index 25ea60a2c0..2819e32078 100644 --- a/cocos/tiledmap/tiled-layer.ts +++ b/cocos/tiledmap/tiled-layer.ts @@ -33,13 +33,14 @@ import { ccclass } from 'cc.decorator'; import { EDITOR } from 'internal:constants'; -import { UIRenderable } from '../core/components/ui-base/ui-renderable'; +import { UIRenderable } from '../2d/framework/ui-renderable'; +import { SpriteFrame } from '../2d/assets/sprite-frame'; import { Component } from '../core/components'; import { TMXMapInfo } from './tmx-xml-parser'; -import { Color, IVec2Like, Mat4, Size, SpriteFrame, SystemEventType, Texture2D, Vec2, Vec3, Node, warn, logID, CCBoolean } from '../core'; +import { Color, IVec2Like, Mat4, Size, SystemEventType, Texture2D, Vec2, Vec3, Node, warn, logID, CCBoolean } from '../core'; import { TiledTile } from './tiled-tile'; -import { MeshRenderData } from '../core/renderer/ui/render-data'; -import { UI } from '../core/renderer/ui/ui'; +import { MeshRenderData } from '../2d/renderer/render-data'; +import { UI } from '../2d/renderer/ui'; import { MixedGID, GID, Orientation, TiledTextureGrids, TMXTilesetInfo, RenderOrder, StaggerAxis, StaggerIndex, TileFlag, GIDFlags, TiledGrid, TiledAnimationType, PropertiesInfo, TMXLayerInfo, diff --git a/cocos/tiledmap/tiled-map-asset.ts b/cocos/tiledmap/tiled-map-asset.ts index b559c1a417..2fdbe467fa 100644 --- a/cocos/tiledmap/tiled-map-asset.ts +++ b/cocos/tiledmap/tiled-map-asset.ts @@ -24,10 +24,10 @@ THE SOFTWARE. */ - -import { Asset } from '../core/assets/asset'; import { ccclass, type, serializable } from 'cc.decorator'; -import { CCString, Size, SpriteFrame, TextAsset } from '../core'; +import { Asset } from '../core/assets/asset'; +import { CCString, Size, TextAsset } from '../core'; +import { SpriteFrame } from '../2d/assets'; /** * Class for tiled map asset handling. * @class TiledMapAsset diff --git a/cocos/tiledmap/tiled-map.ts b/cocos/tiledmap/tiled-map.ts index 1ec34cfa47..19a577dcd8 100644 --- a/cocos/tiledmap/tiled-map.ts +++ b/cocos/tiledmap/tiled-map.ts @@ -29,7 +29,7 @@ */ import { Component } from '../core/components'; -import { UITransform } from '../core/components/ui-base'; +import { UITransform } from '../2d/framework'; import { ccclass, displayOrder, executeInEditMode, help, menu, requireComponent, type, serializable } from 'cc.decorator'; import { GID, Orientation, PropertiesInfo, Property, RenderOrder, StaggerAxis, StaggerIndex, TiledAnimationType, TiledTextureGrids, TileFlag, TMXImageLayerInfo, TMXLayerInfo, TMXObjectGroupInfo, TMXObjectType, TMXTilesetInfo } from './tiled-types' @@ -37,10 +37,11 @@ import { TMXMapInfo } from './tmx-xml-parser'; import { TiledLayer } from './tiled-layer'; import { TiledObjectGroup } from './tiled-object-group'; import { TiledMapAsset } from './tiled-map-asset'; -import { Sprite } from '../ui/components/sprite'; +import { Sprite } from '../2d/components/sprite'; import { EDITOR } from 'internal:constants'; import { fillTextureGrids, loadAllTextures } from './tiled-utils'; -import { Size, SpriteFrame, SystemEventType, Vec2, Node, logID, Color, sys } from '../core'; +import { Size, SystemEventType, Vec2, Node, logID, Color, sys } from '../core'; +import { SpriteFrame } from '../2d/assets'; interface ImageExtendedNode extends Node { diff --git a/cocos/tiledmap/tiled-object-group.ts b/cocos/tiledmap/tiled-object-group.ts index df3f59c799..429d96ffa9 100644 --- a/cocos/tiledmap/tiled-object-group.ts +++ b/cocos/tiledmap/tiled-object-group.ts @@ -26,14 +26,15 @@ import { ccclass, help, type, requireComponent } from 'cc.decorator'; import { Component } from '../core/components'; -import { Sprite } from '../ui/components/sprite'; -import { Label } from '../ui/components/label'; +import { Sprite } from '../2d/components/sprite'; +import { Label } from '../2d/components/label'; import { BlendFactor } from '../core/gfx'; import { TMXMapInfo } from './tmx-xml-parser'; import { TiledTextureGrids, GID, TileFlag, Orientation, StaggerAxis, TMXObjectType, PropertiesInfo, TiledAnimationType, TMXObject, TMXObjectGroupInfo } from './tiled-types'; -import { UITransform } from '../core/components/ui-base/ui-transform'; -import { CCBoolean, Node, Vec2, SpriteFrame, Color, PrivateNode } from '../core'; +import { UITransform } from '../2d/framework/ui-transform'; +import { CCBoolean, Node, Vec2, Color, PrivateNode } from '../core'; +import { SpriteFrame } from '../2d/assets'; /** * @en Renders the TMX object group. diff --git a/cocos/tiledmap/tiled-types.ts b/cocos/tiledmap/tiled-types.ts index 9b9ad97b1a..a356a1f5ed 100644 --- a/cocos/tiledmap/tiled-types.ts +++ b/cocos/tiledmap/tiled-types.ts @@ -23,10 +23,10 @@ THE SOFTWARE. */ - -import { Color, Rect, Size, SpriteFrame, Texture2D, Vec2 } from '../core'; +import { Color, Rect, Size, Texture2D, Vec2 } from '../core'; +import { SpriteFrame } from '../2d/assets'; import { ccenum } from '../core/value-types/enum'; -import { HorizontalTextAlignment, VerticalTextAlignment } from '../ui/components/label'; +import { HorizontalTextAlignment, VerticalTextAlignment } from '../2d/components/label'; export type PropertiesInfo = { [key: string]: number | string }; diff --git a/cocos/tiledmap/tiled-utils.ts b/cocos/tiledmap/tiled-utils.ts index f93cc6158f..6324e12ebf 100644 --- a/cocos/tiledmap/tiled-utils.ts +++ b/cocos/tiledmap/tiled-utils.ts @@ -23,7 +23,8 @@ THE SOFTWARE. */ -import { Rect, SpriteFrame, Texture2D } from '../core'; +import { SpriteFrame } from '../2d/assets'; +import { Rect, Texture2D } from '../core'; import { GID, TiledGrid, TiledTextureGrids, TMXTilesetInfo } from './tiled-types'; export function fillTextureGrids (tileset: TMXTilesetInfo, texGrids: TiledTextureGrids, spFrame?: SpriteFrame) { diff --git a/cocos/tiledmap/tmx-xml-parser.ts b/cocos/tiledmap/tmx-xml-parser.ts index 586a3e936b..b8d2256c45 100644 --- a/cocos/tiledmap/tmx-xml-parser.ts +++ b/cocos/tiledmap/tmx-xml-parser.ts @@ -23,7 +23,7 @@ THE SOFTWARE. */ -import { Label, HorizontalTextAlignment, VerticalTextAlignment } from '../ui/components/label'; +import { Label, HorizontalTextAlignment, VerticalTextAlignment } from '../2d/components/label'; import codec from '../../external/compression/ZipUtils.js'; import zlib from '../../external/compression/zlib.min.js'; import { SAXParser } from '../core/asset-manager/plist-parser'; @@ -31,7 +31,8 @@ import { GID, MixedGID, Orientation, PropertiesInfo, RenderOrder, StaggerAxis, StaggerIndex, TiledAnimation, TiledAnimationType, TileFlag, TMXImageLayerInfo, TMXLayerInfo, TMXObject, TMXObjectGroupInfo, TMXObjectType, TMXTilesetInfo } from './tiled-types'; -import { Color, errorID, logID, Size, SpriteFrame, Vec2 } from '../core'; +import { Color, errorID, logID, Size, Vec2 } from '../core'; +import { SpriteFrame } from '../2d/assets'; function uint8ArrayToUint32Array (uint8Arr: Uint8Array): null | Uint32Array | number[] { if (uint8Arr.length % 4 !== 0) diff --git a/cocos/tween/actions/action-instant.ts b/cocos/tween/actions/action-instant.ts index 815e83d11c..b719ecefad 100644 --- a/cocos/tween/actions/action-instant.ts +++ b/cocos/tween/actions/action-instant.ts @@ -30,8 +30,8 @@ * @hidden */ -import { FiniteTimeAction, Action } from "./action"; -import { RenderableComponent } from "../../core"; +import { FiniteTimeAction, Action } from './action'; +import { RenderableComponent } from '../../core/components/renderable-component'; /** * @en Instant actions are immediate actions. They don't have a duration like the ActionInterval actions. @@ -40,7 +40,6 @@ import { RenderableComponent } from "../../core"; * @extends FiniteTimeAction */ export class ActionInstant extends FiniteTimeAction { - isDone () { return true; } @@ -50,7 +49,7 @@ export class ActionInstant extends FiniteTimeAction { } update (dt: number) { - //nothing + // nothing } /** @@ -76,9 +75,9 @@ export class ActionInstant extends FiniteTimeAction { */ export class Show extends ActionInstant { update (dt: any) { - var _renderComps = this.target!.getComponentsInChildren(RenderableComponent); - for (var i = 0; i < _renderComps.length; ++i) { - var render = _renderComps[i]; + const _renderComps = this.target!.getComponentsInChildren(RenderableComponent); + for (let i = 0; i < _renderComps.length; ++i) { + const render = _renderComps[i]; render.enabled = true; } } @@ -103,7 +102,7 @@ export class Show extends ActionInstant { */ export function show (): ActionInstant { return new Show(); -}; +} /* * Hide the node. @@ -111,11 +110,10 @@ export function show (): ActionInstant { * @extends ActionInstant */ export class Hide extends ActionInstant { - update (dt: any) { - var _renderComps = this.target!.getComponentsInChildren(RenderableComponent); - for (var i = 0; i < _renderComps.length; ++i) { - var render = _renderComps[i]; + const _renderComps = this.target!.getComponentsInChildren(RenderableComponent); + for (let i = 0; i < _renderComps.length; ++i) { + const render = _renderComps[i]; render.enabled = false; } } @@ -140,7 +138,7 @@ export class Hide extends ActionInstant { */ export function hide (): ActionInstant { return new Hide(); -}; +} /* * Toggles the visibility of a node. @@ -148,11 +146,10 @@ export function hide (): ActionInstant { * @extends ActionInstant */ export class ToggleVisibility extends ActionInstant { - update (dt: any) { - var _renderComps = this.target!.getComponentsInChildren(RenderableComponent); - for (var i = 0; i < _renderComps.length; ++i) { - var render = _renderComps[i]; + const _renderComps = this.target!.getComponentsInChildren(RenderableComponent); + for (let i = 0; i < _renderComps.length; ++i) { + const render = _renderComps[i]; render.enabled = !render.enabled; } } @@ -177,7 +174,7 @@ export class ToggleVisibility extends ActionInstant { */ export function toggleVisibility (): ActionInstant { return new ToggleVisibility(); -}; +} /* * Delete self in the next frame. @@ -231,7 +228,7 @@ export class RemoveSelf extends ActionInstant { */ export function removeSelf (isNeedCleanUp: boolean): ActionInstant { return new RemoveSelf(isNeedCleanUp); -}; +} /* * Calls a 'callback'. @@ -249,7 +246,6 @@ export function removeSelf (isNeedCleanUp: boolean): ActionInstant { * var finish = new CallFunc(this.removeFromParentAndCleanup, this, true); */ export class CallFunc extends ActionInstant { - private _selectorTarget = null; private _function: Function | null = null; private _data = null; @@ -313,14 +309,13 @@ export class CallFunc extends ActionInstant { */ setTargetCallback (sel: any) { if (sel !== this._selectorTarget) { - if (this._selectorTarget) - this._selectorTarget = null; + if (this._selectorTarget) { this._selectorTarget = null; } this._selectorTarget = sel; } } clone () { - var action = new CallFunc(); + const action = new CallFunc(); action.initWithFunction(this._function, this._selectorTarget, this._data); return action; } @@ -344,4 +339,4 @@ export class CallFunc extends ActionInstant { */ export function callFunc (selector: Function, selectorTarget?: any, data?: any): ActionInstant { return new CallFunc(selector, selectorTarget, data); -}; +} diff --git a/cocos/tween/tween-action.ts b/cocos/tween/tween-action.ts index 9939d25b3c..ca83e2ea6a 100644 --- a/cocos/tween/tween-action.ts +++ b/cocos/tween/tween-action.ts @@ -28,7 +28,8 @@ * @hidden */ -import { warnID, warn, easing } from '../core'; +import { easing } from '../core/animation'; +import { warnID, warn } from '../core'; import { ActionInterval } from './actions/action-interval'; import { ITweenOption } from './export-api'; import { legacyCC, VERSION } from '../core/global-exports'; diff --git a/cocos/ui/components/SubContextView.ts b/cocos/ui/SubContextView.ts similarity index 94% rename from cocos/ui/components/SubContextView.ts rename to cocos/ui/SubContextView.ts index bfb0457a97..c1224e9154 100644 --- a/cocos/ui/components/SubContextView.ts +++ b/cocos/ui/SubContextView.ts @@ -28,18 +28,18 @@ * @module component */ -import { Component } from '../../core/components/component'; +import { Component } from '../core/components/component'; import { ccclass, help, menu, executionOrder, requireComponent, tooltip, serializable } from 'cc.decorator'; -import { view } from '../../core/platform/view'; -import { Sprite } from './sprite'; -import { Node, PrivateNode } from '../../core/scene-graph'; -import { UITransform } from '../../core/components/ui-base/ui-transform'; +import { view } from '../core/platform/view'; +import { Sprite } from '../2d/components/sprite'; +import { Node, PrivateNode } from '../core/scene-graph'; +import { UITransform } from '../2d/framework/ui-transform'; -import { SpriteFrame } from '../../core/assets'; -import { ImageAsset } from '../../core/assets/image-asset'; -import { Rect, Size } from '../../core/math'; +import { SpriteFrame } from '../2d/assets'; +import { ImageAsset } from '../core/assets/image-asset'; +import { Rect, Size } from '../core/math'; -import { legacyCC } from '../../core/global-exports'; +import { legacyCC } from '../core/global-exports'; import { EDITOR } from 'internal:constants'; /** diff --git a/cocos/ui/components/block-input-events.ts b/cocos/ui/block-input-events.ts similarity index 94% rename from cocos/ui/components/block-input-events.ts rename to cocos/ui/block-input-events.ts index 5a5e106e2d..88b2e40cff 100644 --- a/cocos/ui/components/block-input-events.ts +++ b/cocos/ui/block-input-events.ts @@ -30,9 +30,9 @@ */ import { ccclass, help, menu } from 'cc.decorator'; -import { Component } from '../../core/components/component'; -import { Event } from '../../core/event'; -import { SystemEventType } from '../../core/platform/event-manager/event-enum'; +import { Component } from '../core/components/component'; +import { Event } from '../core/event'; +import { SystemEventType } from '../core/platform/event-manager/event-enum'; const BlockEvents = [SystemEventType.TOUCH_START, SystemEventType.TOUCH_END, SystemEventType.TOUCH_MOVE, SystemEventType.MOUSE_DOWN, SystemEventType.MOUSE_MOVE, SystemEventType.MOUSE_UP, diff --git a/cocos/ui/components/button.ts b/cocos/ui/button.ts similarity index 98% rename from cocos/ui/components/button.ts rename to cocos/ui/button.ts index a1ca764d56..552999b083 100644 --- a/cocos/ui/components/button.ts +++ b/cocos/ui/button.ts @@ -30,18 +30,18 @@ */ import { ccclass, help, executionOrder, menu, requireComponent, tooltip, displayOrder, type, rangeMin, rangeMax, serializable, executeInEditMode } from 'cc.decorator'; -import { SpriteFrame } from '../../core/assets'; -import { Component, EventHandler as ComponentEventHandler } from '../../core/components'; -import { UITransform, UIRenderable } from '../../core/components/ui-base'; -import { EventMouse, EventTouch, SystemEventType } from '../../core/platform'; -import { Color, Vec3 } from '../../core/math'; -import { ccenum } from '../../core/value-types/enum'; -import { lerp } from '../../core/math/utils'; -import { Node } from '../../core/scene-graph/node'; -import { Sprite } from './sprite'; +import { SpriteFrame } from '../2d/assets'; +import { Component, EventHandler as ComponentEventHandler } from '../core/components'; +import { UITransform, UIRenderable } from '../2d/framework'; +import { EventMouse, EventTouch, SystemEventType } from '../core/platform'; +import { Color, Vec3 } from '../core/math'; +import { ccenum } from '../core/value-types/enum'; +import { lerp } from '../core/math/utils'; +import { Node } from '../core/scene-graph/node'; +import { Sprite } from '../2d/components/sprite'; import { EDITOR } from 'internal:constants'; -import { legacyCC } from '../../core/global-exports'; -import { TransformBit } from '../../core/scene-graph/node-enum'; +import { legacyCC } from '../core/global-exports'; +import { TransformBit } from '../core/scene-graph/node-enum'; const _tempColor = new Color(); diff --git a/cocos/ui/deprecated.ts b/cocos/ui/deprecated.ts index f8a000e48d..bf207856e7 100644 --- a/cocos/ui/deprecated.ts +++ b/cocos/ui/deprecated.ts @@ -27,10 +27,23 @@ * @packageDocumentation * @module ui */ - +import { UICoordinateTracker } from './ui-coodinate-tracker'; +import { BlockInputEvents } from './block-input-events'; +import { Button } from './button'; +import { EditBox } from './editbox/edit-box'; +import { Layout } from './layout'; +import { ProgressBar } from './progress-bar'; +import { ScrollView } from './scroll-view'; +import { ScrollBar } from './scroll-bar'; +import { Slider } from './slider'; +import { Toggle } from './toggle'; +import { ToggleContainer } from './toggle-container'; +import { Widget } from './widget'; +import { PageView } from './page-view'; +import { PageViewIndicator } from './page-view-indicator'; +import { SafeArea } from './safe-area'; import { warnID } from '../core/platform/debug'; import { ccclass } from '../core/data/class-decorator'; -import { BlockInputEvents, Button, EditBox, Layout, Mask, Label, LabelOutline, ProgressBar, RichText, ScrollView, ScrollBar, Slider, Sprite, Toggle, ToggleContainer, UIMeshRenderer, Widget, Graphics, PageView, PageViewIndicator, UIStaticBatch, UIOpacity, SafeArea, UICoordinateTracker } from './components'; import { js } from '../core/utils/js'; import { legacyCC } from '../core/global-exports'; @@ -66,27 +79,6 @@ js.setClassAlias(EditBox, 'cc.EditBoxComponent'); export { Layout as LayoutComponent }; legacyCC.LayoutComponent = Layout; js.setClassAlias(Layout, 'cc.LayoutComponent'); -/** - * Alias of [[Mask]] - * @deprecated Since v1.2 - */ -export { Mask as MaskComponent }; -legacyCC.MaskComponent = Mask; -js.setClassAlias(Mask, 'cc.MaskComponent'); -/** - * Alias of [[Label]] - * @deprecated Since v1.2 - */ -export { Label as LabelComponent }; -legacyCC.LabelComponent = Label; -js.setClassAlias(Label, 'cc.LabelComponent'); -/** - * Alias of [[LabelOutline]] - * @deprecated Since v1.2 - */ -export { LabelOutline as LabelOutlineComponent }; -legacyCC.LabelOutlineComponent = LabelOutline; -js.setClassAlias(LabelOutline, 'cc.LabelOutlineComponent'); /** * Alias of [[ProgressBar]] * @deprecated Since v1.2 @@ -94,13 +86,6 @@ js.setClassAlias(LabelOutline, 'cc.LabelOutlineComponent'); export { ProgressBar as ProgressBarComponent }; legacyCC.ProgressBarComponent = ProgressBar; js.setClassAlias(ProgressBar, 'cc.ProgressBarComponent'); -/** - * Alias of [[RichText]] - * @deprecated Since v1.2 - */ -export { RichText as RichTextComponent }; -legacyCC.RichTextComponent = RichText; -js.setClassAlias(RichText, 'cc.RichTextComponent'); /** * Alias of [[ScrollView]] * @deprecated Since v1.2 @@ -122,13 +107,6 @@ js.setClassAlias(ScrollBar, 'cc.ScrollBarComponent'); export { Slider as SliderComponent }; legacyCC.SliderComponent = Slider; js.setClassAlias(Slider, 'cc.SliderComponent'); -/** - * Alias of [[Sprite]] - * @deprecated Since v1.2 - */ -export { Sprite as SpriteComponent }; -legacyCC.SpriteComponent = Sprite; -js.setClassAlias(Sprite, 'cc.SpriteComponent'); /** * Alias of [[Toggle]] * @deprecated Since v1.2 @@ -143,13 +121,6 @@ js.setClassAlias(Toggle, 'cc.ToggleComponent'); export { ToggleContainer as ToggleContainerComponent }; legacyCC.ToggleContainerComponent = ToggleContainer; js.setClassAlias(ToggleContainer, 'cc.ToggleContainerComponent'); -/** - * Alias of [[UIMeshRenderer]] - * @deprecated Since v1.2 - */ -export { UIMeshRenderer as UIModelComponent }; -legacyCC.UIModelComponent = UIMeshRenderer; -js.setClassAlias(UIMeshRenderer, 'cc.UIModelComponent'); /** * Alias of [[Widget]] * @deprecated Since v1.2 @@ -157,13 +128,6 @@ js.setClassAlias(UIMeshRenderer, 'cc.UIModelComponent'); export { Widget as WidgetComponent }; legacyCC.WidgetComponent = Widget; js.setClassAlias(Widget, 'cc.WidgetComponent'); -/** - * Alias of [[Graphics]] - * @deprecated Since v1.2 - */ -export { Graphics as GraphicsComponent }; -legacyCC.GraphicsComponent = Graphics; -js.setClassAlias(Graphics, 'cc.GraphicsComponent'); /** * Alias of [[PageView]] * @deprecated Since v1.2 @@ -178,18 +142,6 @@ js.setClassAlias(PageView, 'cc.PageViewComponent'); export { PageViewIndicator as PageViewIndicatorComponent }; legacyCC.PageViewIndicatorComponent = PageViewIndicator; js.setClassAlias(PageViewIndicator, 'cc.PageViewIndicatorComponent'); -/** - * Alias of [[UIStaticBatch]] - * @deprecated Since v1.2 - */ -export { UIStaticBatch as UIStaticBatchComponent }; -js.setClassAlias(UIStaticBatch, 'cc.UIStaticBatchComponent'); -/** - * Alias of [[UIOpacity]] - * @deprecated Since v1.2 - */ -export { UIOpacity as UIOpacityComponent }; -js.setClassAlias(UIOpacity, 'cc.UIOpacityComponent'); /** * Alias of [[SafeArea]] * @deprecated Since v1.2 @@ -209,4 +161,4 @@ js.setClassAlias(UICoordinateTracker, 'cc.UICoordinateTrackerComponent'); */ export { BlockInputEvents as BlockInputEventsComponent }; legacyCC.BlockInputEventsComponent = BlockInputEvents; -js.setClassAlias(BlockInputEvents, 'cc.BlockInputEventsComponent'); +js.setClassAlias(BlockInputEvents, 'cc.BlockInputEventsComponent'); \ No newline at end of file diff --git a/cocos/ui/components/editbox/edit-box-impl-base.ts b/cocos/ui/editbox/edit-box-impl-base.ts similarity index 100% rename from cocos/ui/components/editbox/edit-box-impl-base.ts rename to cocos/ui/editbox/edit-box-impl-base.ts diff --git a/cocos/ui/components/editbox/edit-box-impl.ts b/cocos/ui/editbox/edit-box-impl.ts similarity index 97% rename from cocos/ui/components/editbox/edit-box-impl.ts rename to cocos/ui/editbox/edit-box-impl.ts index 9185200fe7..1a812d52c9 100644 --- a/cocos/ui/components/editbox/edit-box-impl.ts +++ b/cocos/ui/editbox/edit-box-impl.ts @@ -31,22 +31,22 @@ * @hidden */ -import { BitmapFont } from '../../../core'; -import { director } from '../../../core/director'; -import { game } from '../../../core/game'; -import { Color, Mat4, Size, Vec3 } from '../../../core/math'; -import { screen, view } from '../../../core/platform'; -import { macro } from '../../../core/platform/macro'; -import { contains } from '../../../core/utils/misc'; -import { Label } from '../label'; +import { BitmapFont } from '../../2d/assets'; +import { director } from '../../core/director'; +import { game } from '../../core/game'; +import { Color, Mat4, Size, Vec3 } from '../../core/math'; +import { screen, view } from '../../core/platform'; +import { macro } from '../../core/platform/macro'; +import { contains } from '../../core/utils/misc'; +import { Label } from '../../2d/components/label'; import { EditBox } from './edit-box'; import { tabIndexUtil } from './tabIndexUtil'; import { InputFlag, InputMode, KeyboardReturnType } from './types'; -import { sys } from '../../../core/platform/sys'; -import visibleRect from '../../../core/platform/visible-rect'; -import { Node } from '../../../core'; +import { sys } from '../../core/platform/sys'; +import visibleRect from '../../core/platform/visible-rect'; +import { Node } from '../../core/scene-graph'; import { EditBoxImplBase } from './edit-box-impl-base'; -import { legacyCC } from '../../../core/global-exports'; +import { legacyCC } from '../../core/global-exports'; // https://segmentfault.com/q/1010000002914610 const SCROLLY = 40; diff --git a/cocos/ui/components/editbox/edit-box.ts b/cocos/ui/editbox/edit-box.ts similarity index 97% rename from cocos/ui/components/editbox/edit-box.ts rename to cocos/ui/editbox/edit-box.ts index f947a5b8ca..84cde389e1 100644 --- a/cocos/ui/components/editbox/edit-box.ts +++ b/cocos/ui/editbox/edit-box.ts @@ -29,23 +29,23 @@ * @module ui */ -import { UITransform } from '../../../core/components/ui-base'; -import { SpriteFrame } from '../../../core/assets/sprite-frame'; -import { Component } from '../../../core/components/component'; -import { EventHandler as ComponentEventHandler } from '../../../core/components/component-event-handler'; +import { UITransform } from '../../2d/framework'; +import { SpriteFrame } from '../../2d/assets/sprite-frame'; +import { Component } from '../../core/components/component'; +import { EventHandler as ComponentEventHandler } from '../../core/components/component-event-handler'; import { ccclass, help, executeInEditMode, executionOrder, menu, requireComponent, tooltip, displayOrder, type, serializable } from 'cc.decorator'; -import { Color, Size, Vec3 } from '../../../core/math'; -import { EventTouch } from '../../../core/platform'; -import { SystemEventType } from '../../../core/platform/event-manager/event-enum'; -import { Node } from '../../../core/scene-graph/node'; -import { Label, VerticalTextAlignment } from '../label'; -import { Sprite } from '../sprite'; +import { Color, Size, Vec3 } from '../../core/math'; +import { EventTouch } from '../../core/platform'; +import { SystemEventType } from '../../core/platform/event-manager/event-enum'; +import { Node } from '../../core/scene-graph/node'; +import { Label, VerticalTextAlignment } from '../../2d/components/label'; +import { Sprite } from '../../2d/components/sprite'; import { EditBoxImpl } from './edit-box-impl'; import { EditBoxImplBase } from './edit-box-impl-base'; import { InputFlag, InputMode, KeyboardReturnType } from './types'; -import { sys } from '../../../core/platform/sys'; +import { sys } from '../../core/platform/sys'; import { EDITOR, JSB, MINIGAME, RUNTIME_BASED } from 'internal:constants'; -import { legacyCC } from '../../../core/global-exports'; +import { legacyCC } from '../../core/global-exports'; const LEFT_PADDING = 2; diff --git a/cocos/ui/components/editbox/tabIndexUtil.ts b/cocos/ui/editbox/tabIndexUtil.ts similarity index 100% rename from cocos/ui/components/editbox/tabIndexUtil.ts rename to cocos/ui/editbox/tabIndexUtil.ts diff --git a/cocos/ui/components/editbox/types.ts b/cocos/ui/editbox/types.ts similarity index 98% rename from cocos/ui/components/editbox/types.ts rename to cocos/ui/editbox/types.ts index 309d113921..2b48f26b5d 100644 --- a/cocos/ui/components/editbox/types.ts +++ b/cocos/ui/editbox/types.ts @@ -28,7 +28,7 @@ * @hidden */ -import { Enum } from '../../../core/value-types'; +import { Enum } from '../../core/value-types'; /** * 键盘的返回键类型。 * @readonly diff --git a/cocos/ui/index.ts b/cocos/ui/index.ts index 8ecb0a09fd..463f815e23 100644 --- a/cocos/ui/index.ts +++ b/cocos/ui/index.ts @@ -27,68 +27,22 @@ * @packageDocumentation * @hidden */ - -import { - barFilled, - bmfont, - CanvasPool, - graphics, - graphicsAssembler, - labelAssembler, - letter, - mask, - maskEnd, - radialFilled, - simple, - sliced, - spriteAssembler, - ttf, - earcut, -} from './assembler'; -import { MeshBuffer } from '../core/renderer/ui/mesh-buffer'; -import * as UIVertexFormat from '../core/renderer/ui/ui-vertex-format'; -import { StencilManager } from '../core/renderer/ui/stencil-manager'; -import { legacyCC } from '../core/global-exports'; - -export * from './components'; - +export { Button } from './button'; +export { EditBox } from './editbox/edit-box'; +export { Layout } from './layout'; +export { ProgressBar } from './progress-bar'; +export { ScrollBar } from './scroll-bar'; +export { ScrollView } from './scroll-view'; +export { Slider } from './slider'; +export { Toggle } from './toggle'; +export { ToggleContainer } from './toggle-container'; +export { ViewGroup } from './view-group'; +export { Widget } from './widget'; +export { PageView } from './page-view'; +export { PageViewIndicator } from './page-view-indicator'; +export { SafeArea } from './safe-area'; +export { UICoordinateTracker } from './ui-coodinate-tracker'; +export { BlockInputEvents } from './block-input-events'; +export { SubContextView } from './SubContextView'; +export { widgetManager } from './widget-manager'; export * from './deprecated'; - -export { - MeshBuffer, - UIVertexFormat, - StencilManager, - CanvasPool, - // barFilled, - // radialFilled, - // simple, - // sliced, - // ttf, - // bmfont, - // letter, - // mask, - // maskEnd, - spriteAssembler, - // graphics, - labelAssembler, - graphicsAssembler, - earcut, -}; - -legacyCC.UI = { - MeshBuffer, - UIVertexFormat, - // barFilled, - // radialFilled, - // simple, - // sliced, - // ttf, - // bmfont, - // letter, - // mask, - // maskEnd, - // graphics, - spriteAssembler, - graphicsAssembler, - labelAssembler, -}; \ No newline at end of file diff --git a/cocos/ui/components/layout.ts b/cocos/ui/layout.ts similarity index 98% rename from cocos/ui/components/layout.ts rename to cocos/ui/layout.ts index 3e826196dc..31a3a8ff31 100644 --- a/cocos/ui/components/layout.ts +++ b/cocos/ui/layout.ts @@ -30,14 +30,14 @@ */ import { ccclass, help, executeInEditMode, executionOrder, menu, requireComponent, tooltip, type, serializable, visible, displayName } from 'cc.decorator'; -import { Component } from '../../core/components/component'; -import { Rect, Size, Vec2, Vec3 } from '../../core/math'; -import { ccenum } from '../../core/value-types/enum'; -import { UITransform } from '../../core/components/ui-base/ui-transform'; -import { SystemEventType } from '../../core/platform/event-manager/event-enum'; -import { director, Director } from '../../core/director'; -import { TransformBit } from '../../core/scene-graph/node-enum'; -import { Node, warn } from '../../core'; +import { Component } from '../core/components/component'; +import { Rect, Size, Vec2, Vec3 } from '../core/math'; +import { ccenum } from '../core/value-types/enum'; +import { UITransform } from '../2d/framework/ui-transform'; +import { SystemEventType } from '../core/platform/event-manager/event-enum'; +import { director, Director } from '../core/director'; +import { TransformBit } from '../core/scene-graph/node-enum'; +import { Node, warn } from '../core'; const NodeEvent = SystemEventType; /** diff --git a/cocos/ui/components/page-view-indicator.ts b/cocos/ui/page-view-indicator.ts similarity index 94% rename from cocos/ui/components/page-view-indicator.ts rename to cocos/ui/page-view-indicator.ts index 6791bd7f13..5e91bc448d 100644 --- a/cocos/ui/components/page-view-indicator.ts +++ b/cocos/ui/page-view-indicator.ts @@ -29,17 +29,17 @@ * @module ui */ -import { SpriteFrame } from '../../core/assets'; -import { Component } from '../../core/components'; +import { SpriteFrame } from '../2d/assets'; +import { Component } from '../core/components'; import { ccclass, help, executionOrder, menu, tooltip, type, serializable } from 'cc.decorator'; -import { Color, Size } from '../../core/math'; -import { ccenum } from '../../core/value-types/enum'; -import { Node } from '../../core/scene-graph'; +import { Color, Size } from '../core/math'; +import { ccenum } from '../core/value-types/enum'; +import { Node } from '../core/scene-graph'; import { Layout } from './layout'; import { PageView } from './page-view'; -import { Sprite } from './sprite'; -import { UIRenderable } from '../../core/components/ui-base/ui-renderable'; -import { legacyCC } from '../../core/global-exports'; +import { Sprite } from '../2d/components/sprite'; +import { UIRenderable } from '../2d/framework/ui-renderable'; +import { legacyCC } from '../core/global-exports'; const _color = new Color(); diff --git a/cocos/ui/components/page-view.ts b/cocos/ui/page-view.ts similarity index 97% rename from cocos/ui/components/page-view.ts rename to cocos/ui/page-view.ts index de68752869..1ce4fb5343 100644 --- a/cocos/ui/components/page-view.ts +++ b/cocos/ui/page-view.ts @@ -28,21 +28,20 @@ * @module ui */ -import { EventHandler as ComponentEventHandler } from '../../core/components'; +import { EventHandler as ComponentEventHandler } from '../core/components'; import { ccclass, help, executionOrder, menu, tooltip, type, slide, range, visible, override, serializable, editable } from 'cc.decorator'; -import { EventTouch, SystemEventType } from '../../core/platform'; -import { Vec2, Vec3 } from '../../core/math'; -import { ccenum } from '../../core/value-types/enum'; +import { EventTouch, SystemEventType } from '../core/platform'; +import { Vec2, Vec3 } from '../core/math'; +import { ccenum } from '../core/value-types/enum'; import { Layout } from './layout'; import { PageViewIndicator } from './page-view-indicator'; -import { ScrollView } from './scroll-view'; +import { ScrollView, EventType as ScrollEventType } from './scroll-view'; import { ScrollBar } from './scroll-bar'; -import { warnID, logID } from '../../core/platform/debug'; -import { extendsEnum } from '../../core/data/utils/extends-enum'; -import { EventType as ScrollEventType } from './scroll-view'; -import { Node } from '../../core'; +import { warnID, logID } from '../core/platform/debug'; +import { extendsEnum } from '../core/data/utils/extends-enum'; +import { Node } from '../core/scene-graph'; import { EDITOR } from 'internal:constants'; -import { legacyCC } from '../../core/global-exports'; +import { legacyCC } from '../core/global-exports'; const _temp_vec2 = new Vec2(); diff --git a/cocos/ui/components/progress-bar.ts b/cocos/ui/progress-bar.ts similarity index 96% rename from cocos/ui/components/progress-bar.ts rename to cocos/ui/progress-bar.ts index eb0b09f475..f85319e653 100644 --- a/cocos/ui/components/progress-bar.ts +++ b/cocos/ui/progress-bar.ts @@ -29,15 +29,15 @@ * @module ui */ -import { Component } from '../../core/components/component'; -import { UITransform } from '../../core/components/ui-base'; +import { Component } from '../core/components/component'; +import { UITransform } from '../2d/framework'; import { ccclass, help, executionOrder, menu, requireComponent, tooltip, type, range, slide, serializable } from 'cc.decorator'; -import { Size, Vec2, Vec3 } from '../../core/math'; -import { Enum } from '../../core/value-types'; -import { clamp01 } from '../../core/math/utils'; -import { Sprite } from './sprite'; -import { warn } from '../../core/platform/debug'; -import { legacyCC } from '../../core/global-exports'; +import { Size, Vec2, Vec3 } from '../core/math'; +import { Enum } from '../core/value-types'; +import { clamp01 } from '../core/math/utils'; +import { Sprite } from '../2d/components/sprite'; +import { warn } from '../core/platform/debug'; +import { legacyCC } from '../core/global-exports'; /** * @en diff --git a/cocos/ui/components/safe-area.ts b/cocos/ui/safe-area.ts similarity index 95% rename from cocos/ui/components/safe-area.ts rename to cocos/ui/safe-area.ts index 98bd1121cc..16cb470048 100644 --- a/cocos/ui/components/safe-area.ts +++ b/cocos/ui/safe-area.ts @@ -29,14 +29,13 @@ */ import { ccclass, help, executionOrder, menu, executeInEditMode, requireComponent } from 'cc.decorator'; -import { Component } from '../../core/components'; -import { UITransform } from '../../core/components/ui-base'; -import { view } from '../../core/platform'; +import { Component } from '../core/components'; +import { UITransform } from '../2d/framework'; +import { view, sys } from '../core/platform'; import { Widget } from './widget'; import { widgetManager } from './widget-manager'; -import { legacyCC } from "../../core/global-exports"; +import { legacyCC } from "../core/global-exports"; import { EDITOR } from 'internal:constants'; -import { sys } from "../../core/platform"; /** * @en diff --git a/cocos/ui/components/scroll-bar.ts b/cocos/ui/scroll-bar.ts similarity index 97% rename from cocos/ui/components/scroll-bar.ts rename to cocos/ui/scroll-bar.ts index 7fa0d3d699..d8e8d00be0 100644 --- a/cocos/ui/components/scroll-bar.ts +++ b/cocos/ui/scroll-bar.ts @@ -29,16 +29,16 @@ * @module ui */ -import { Component } from '../../core/components/component'; -import { UITransform } from '../../core/components/ui-base' +import { Component } from '../core/components/component'; +import { UITransform } from '../2d/framework'; import { ccclass, help, executionOrder, menu, requireComponent, tooltip, displayOrder, type, serializable } from 'cc.decorator'; -import { Color, Size, Vec2, Vec3 } from '../../core/math'; -import { ccenum } from '../../core/value-types/enum'; -import { clamp01 } from '../../core/math/utils'; +import { Color, Size, Vec2, Vec3 } from '../core/math'; +import { ccenum } from '../core/value-types/enum'; +import { clamp01 } from '../core/math/utils'; import { ScrollView } from './scroll-view'; -import { Sprite } from './sprite'; -import { Node } from '../../core'; -import { legacyCC } from '../../core/global-exports'; +import { Sprite } from '../2d/components/sprite'; +import { Node } from '../core/'; +import { legacyCC } from '../core/global-exports'; const GETTING_SHORTER_FACTOR = 20; const ZERO = new Vec3(); diff --git a/cocos/ui/components/scroll-view.ts b/cocos/ui/scroll-view.ts similarity index 99% rename from cocos/ui/components/scroll-view.ts rename to cocos/ui/scroll-view.ts index 0bd0939b5f..c3d343145f 100644 --- a/cocos/ui/components/scroll-view.ts +++ b/cocos/ui/scroll-view.ts @@ -29,20 +29,20 @@ * @module ui */ -import { EventHandler as ComponentEventHandler } from '../../core/components/component-event-handler'; -import { UITransform } from '../../core/components/ui-base'; +import { EventHandler as ComponentEventHandler } from '../core/components/component-event-handler'; +import { UITransform } from '../2d/framework'; import { ccclass, help, executionOrder, menu, requireComponent, tooltip, displayOrder, range, type, serializable } from 'cc.decorator'; -import { Event } from '../../core/event'; -import { EventMouse, EventTouch, Touch, logID } from '../../core/platform'; -import { Size, Vec2, Vec3 } from '../../core/math'; +import { Event } from '../core/event'; +import { EventMouse, EventTouch, Touch, logID } from '../core/platform'; +import { Size, Vec2, Vec3 } from '../core/math'; import { Layout } from './layout'; import { ScrollBar } from './scroll-bar'; import { ViewGroup } from './view-group'; -import { Node } from '../../core/scene-graph/node'; -import { director, Director } from '../../core/director'; -import { TransformBit } from '../../core/scene-graph/node-enum'; +import { Node } from '../core/scene-graph/node'; +import { director, Director } from '../core/director'; +import { TransformBit } from '../core/scene-graph/node-enum'; import { EDITOR } from 'internal:constants'; -import { legacyCC } from '../../core/global-exports'; +import { legacyCC } from '../core/global-exports'; const NUMBER_OF_GATHERED_TOUCHES_FOR_MOVE_SPEED = 5; const OUT_OF_BOUNDARY_BREAKING_FACTOR = 0.05; diff --git a/cocos/ui/components/slider.ts b/cocos/ui/slider.ts similarity index 95% rename from cocos/ui/components/slider.ts rename to cocos/ui/slider.ts index c19037cab5..83d55dbeca 100644 --- a/cocos/ui/components/slider.ts +++ b/cocos/ui/slider.ts @@ -29,16 +29,16 @@ * @module ui */ -import { Component, EventHandler } from '../../core/components'; -import { UITransform } from '../../core/components/ui-base'; +import { Component, EventHandler } from '../core/components'; +import { UITransform } from '../2d/framework'; import { ccclass, help, executionOrder, menu, requireComponent, tooltip, type, slide, range, serializable } from 'cc.decorator'; -import { EventTouch, SystemEventType, Touch } from '../../core/platform'; -import { Vec3 } from '../../core/math'; -import { ccenum } from '../../core/value-types/enum'; -import { clamp01 } from '../../core/math/utils'; -import { Sprite } from './sprite'; +import { EventTouch, SystemEventType, Touch } from '../core/platform'; +import { Vec3 } from '../core/math'; +import { ccenum } from '../core/value-types/enum'; +import { clamp01 } from '../core/math/utils'; +import { Sprite } from '../2d/components/sprite'; import { EDITOR } from 'internal:constants'; -import { legacyCC } from '../../core/global-exports'; +import { legacyCC } from '../core/global-exports'; const _tempPos = new Vec3(); /** diff --git a/cocos/ui/components/toggle-container.ts b/cocos/ui/toggle-container.ts similarity index 97% rename from cocos/ui/components/toggle-container.ts rename to cocos/ui/toggle-container.ts index fa63637b49..ae280bacde 100644 --- a/cocos/ui/components/toggle-container.ts +++ b/cocos/ui/toggle-container.ts @@ -29,11 +29,11 @@ * @module ui */ -import { Component, EventHandler as ComponentEventHandler } from '../../core/components'; +import { Component, EventHandler as ComponentEventHandler } from '../core/components'; import { ccclass, help, executeInEditMode, executionOrder, menu, tooltip, type, serializable } from 'cc.decorator'; import { Toggle } from './toggle'; -import { legacyCC } from '../../core/global-exports'; -import { SystemEventType } from "../../core/platform/event-manager"; +import { legacyCC } from '../core/global-exports'; +import { SystemEventType } from "../core/platform/event-manager"; /** * @en diff --git a/cocos/ui/components/toggle.ts b/cocos/ui/toggle.ts similarity index 93% rename from cocos/ui/components/toggle.ts rename to cocos/ui/toggle.ts index c64ebde47d..a1bc497ec1 100644 --- a/cocos/ui/components/toggle.ts +++ b/cocos/ui/toggle.ts @@ -29,16 +29,15 @@ * @module ui */ -import { EventHandler as ComponentEventHandler } from '../../core/components/component-event-handler'; -import { UITransform } from '../../core/components/ui-base'; +import { EventHandler as ComponentEventHandler } from '../core/components/component-event-handler'; +import { UITransform } from '../2d/framework'; import { ccclass, help, requireComponent, executionOrder, menu, tooltip, displayOrder, type, serializable } from 'cc.decorator'; -import { Button } from './button'; -import { Sprite } from './sprite'; +import { Sprite } from '../2d/components/sprite'; import { ToggleContainer } from './toggle-container'; -import { extendsEnum } from '../../core/data/utils/extends-enum'; -import { EventType as ButtonEventType } from './button'; +import { extendsEnum } from '../core/data/utils/extends-enum'; +import { EventType as ButtonEventType, Button } from './button'; import { EDITOR } from 'internal:constants'; -import { legacyCC } from '../../core/global-exports'; +import { legacyCC } from '../core/global-exports'; enum EventType { TOGGLE = 'toggle', diff --git a/cocos/ui/components/ui-coodinate-tracker.ts b/cocos/ui/ui-coodinate-tracker.ts similarity index 95% rename from cocos/ui/components/ui-coodinate-tracker.ts rename to cocos/ui/ui-coodinate-tracker.ts index 387f868337..3d17f5ffee 100644 --- a/cocos/ui/components/ui-coodinate-tracker.ts +++ b/cocos/ui/ui-coodinate-tracker.ts @@ -29,12 +29,12 @@ * @module component */ -import { Component } from '../../core/components/component'; -import { EventHandler } from '../../core/components/component-event-handler'; +import { Component } from '../core/components/component'; +import { EventHandler } from '../core/components/component-event-handler'; import { ccclass, help, menu, executionOrder, tooltip, type, serializable } from 'cc.decorator'; -import { Node } from '../../core/scene-graph/node'; -import { Camera } from '../../core/3d'; -import { Vec3 } from '../../core/math'; +import { Node } from '../core/scene-graph/node'; +import { Camera } from '../core/components'; +import { Vec3 } from '../core/math'; /** * @en The component that converts 3D node coordinates to UI node coordinates. diff --git a/cocos/ui/components/view-group.ts b/cocos/ui/view-group.ts similarity index 95% rename from cocos/ui/components/view-group.ts rename to cocos/ui/view-group.ts index 6eb502731a..862981e360 100644 --- a/cocos/ui/components/view-group.ts +++ b/cocos/ui/view-group.ts @@ -43,9 +43,9 @@ * 请参考 ScrollView 的实现来获取更多信息。 */ -import { Component } from '../../core/components'; +import { Component } from '../core/components'; import { ccclass, executionOrder } from 'cc.decorator'; -import { legacyCC } from '../../core/global-exports'; +import { legacyCC } from '../core/global-exports'; @ccclass('cc.ViewGroup') @executionOrder(110) diff --git a/cocos/ui/components/widget-manager.ts b/cocos/ui/widget-manager.ts similarity index 96% rename from cocos/ui/components/widget-manager.ts rename to cocos/ui/widget-manager.ts index 2f98f4d269..c3bccb0624 100644 --- a/cocos/ui/components/widget-manager.ts +++ b/cocos/ui/widget-manager.ts @@ -30,17 +30,17 @@ */ import { EDITOR, DEV } from 'internal:constants'; -import { Director, director } from '../../core/director'; -import { Vec2, Vec3 } from '../../core/math'; -import { View } from '../../core/platform/view'; -import visibleRect from '../../core/platform/visible-rect'; -import { Scene } from '../../core/scene-graph'; -import { Node } from '../../core/scene-graph/node'; -import { array } from '../../core/utils/js'; +import { Director, director } from '../core/director'; +import { Vec2, Vec3 } from '../core/math'; +import { View } from '../core/platform/view'; +import visibleRect from '../core/platform/visible-rect'; +import { Scene } from '../core/scene-graph'; +import { Node } from '../core/scene-graph/node'; +import { array } from '../core/utils/js'; import { AlignFlags, AlignMode, computeInverseTransForTarget, getReadonlyNodeSize, Widget } from './widget'; -import { UITransform } from '../../core/components/ui-base'; -import { legacyCC } from '../../core/global-exports'; -import { warnID } from '../../core/platform/debug'; +import { UITransform } from '../2d/framework'; +import { legacyCC } from '../core/global-exports'; +import { warnID } from '../core/platform/debug'; const _tempPos = new Vec3(); const _defaultAnchor = new Vec2(); diff --git a/cocos/ui/components/widget.ts b/cocos/ui/widget.ts similarity index 97% rename from cocos/ui/components/widget.ts rename to cocos/ui/widget.ts index dd05f2daa8..7462b71fcc 100644 --- a/cocos/ui/components/widget.ts +++ b/cocos/ui/widget.ts @@ -29,20 +29,20 @@ * @module ui */ -import { Component } from '../../core/components'; -import { UITransform } from '../../core/components/ui-base/ui-transform'; +import { Component } from '../core/components'; +import { UITransform } from '../2d/framework/ui-transform'; import { ccclass, help, executeInEditMode, executionOrder, menu, requireComponent, tooltip, type, editorOnly, editable, serializable, visible } from 'cc.decorator'; -import { Size, Vec3 } from '../../core/math'; -import { errorID, warnID } from '../../core/platform/debug'; -import { SystemEventType } from '../../core/platform/event-manager/event-enum'; -import { View } from '../../core/platform/view'; -import visibleRect from '../../core/platform/visible-rect'; -import { Scene } from '../../core/scene-graph'; -import { Node } from '../../core/scene-graph/node'; -import { ccenum } from '../../core/value-types/enum'; -import { TransformBit } from '../../core/scene-graph/node-enum'; +import { Size, Vec3 } from '../core/math'; +import { errorID, warnID } from '../core/platform/debug'; +import { SystemEventType } from '../core/platform/event-manager/event-enum'; +import { View } from '../core/platform/view'; +import visibleRect from '../core/platform/visible-rect'; +import { Scene } from '../core/scene-graph'; +import { Node } from '../core/scene-graph/node'; +import { ccenum } from '../core/value-types/enum'; +import { TransformBit } from '../core/scene-graph/node-enum'; import { EDITOR, DEV } from 'internal:constants'; -import { legacyCC } from '../../core/global-exports'; +import { legacyCC } from '../core/global-exports'; const _zeroVec3 = new Vec3(); diff --git a/cocos/video/video-downloader.ts b/cocos/video/video-downloader.ts index cd92dd3fbe..dd79788bae 100644 --- a/cocos/video/video-downloader.ts +++ b/cocos/video/video-downloader.ts @@ -27,9 +27,12 @@ * @category asset-manager */ +import downloader from '../core/asset-manager/downloader'; +import factory from '../core/asset-manager/factory'; import { CompleteCallback, IDownloadParseOptions } from '../core/asset-manager/shared'; import { getError, log } from '../core/platform/debug'; import { sys } from '../core/platform/sys'; +import { VideoClip } from './assets/video-clip'; // eslint-disable-next-line consistent-return export function downloadVideo (url: string, options: IDownloadParseOptions, onComplete: CompleteCallback) { @@ -61,3 +64,32 @@ export function downloadVideo (url: string, options: IDownloadParseOptions, onCo }; req.send(); } + +function createVideoClip (id: string, data: HTMLVideoElement, options: IDownloadParseOptions, onComplete: CompleteCallback) { + const out = new VideoClip(); + out._nativeUrl = id; + out._nativeAsset = data; + onComplete(null, out); +} + +downloader.register({ + // Video + '.mp4': downloadVideo, + '.avi': downloadVideo, + '.mov': downloadVideo, + '.mpg': downloadVideo, + '.mpeg': downloadVideo, + '.rm': downloadVideo, + '.rmvb': downloadVideo, +}); + +factory.register({ + // Video + '.mp4': createVideoClip, + '.avi': createVideoClip, + '.mov': createVideoClip, + '.mpg': createVideoClip, + '.mpeg': createVideoClip, + '.rm': createVideoClip, + '.rmvb': createVideoClip, +}); diff --git a/cocos/video/video-player-impl.ts b/cocos/video/video-player-impl.ts index 6526f83ec0..30ee4e16f5 100644 --- a/cocos/video/video-player-impl.ts +++ b/cocos/video/video-player-impl.ts @@ -24,7 +24,7 @@ */ import { legacyCC } from '../core/global-exports'; -import { UITransform } from '../core/components/ui-base'; +import { UITransform } from '../2d/framework'; import { VideoPlayer } from './video-player'; import { EventType } from './video-player-enums'; import { error } from '../core/platform'; diff --git a/cocos/video/video-player.ts b/cocos/video/video-player.ts index 0c7a36b7a1..f78cd05922 100644 --- a/cocos/video/video-player.ts +++ b/cocos/video/video-player.ts @@ -31,7 +31,7 @@ import { ccclass, displayOrder, executeInEditMode, help, menu, slide, range, req import { EDITOR } from 'internal:constants'; import { warn } from '../core/platform'; import { Component, EventHandler as ComponentEventHandler } from '../core/components'; -import { UITransform } from '../core/components/ui-base'; +import { UITransform } from '../2d/framework'; import { clamp } from '../core/math'; import { VideoClip } from './assets/video-clip'; import { VideoPlayerImplManager } from './video-player-impl-manager'; diff --git a/cocos/web-view/web-view-impl.ts b/cocos/web-view/web-view-impl.ts index 70ba361103..fec66cb7bd 100644 --- a/cocos/web-view/web-view-impl.ts +++ b/cocos/web-view/web-view-impl.ts @@ -31,7 +31,7 @@ import {legacyCC} from '../core/global-exports'; import {WebView} from './web-view'; import {EventType} from './web-view-enums'; -import {UITransform} from '../core/components/ui-base'; +import {UITransform} from '../2d/framework'; export abstract class WebViewImpl { protected _componentEventList: Map = new Map(); diff --git a/cocos/web-view/web-view.ts b/cocos/web-view/web-view.ts index 2b62f14dd1..c10ba4f71b 100644 --- a/cocos/web-view/web-view.ts +++ b/cocos/web-view/web-view.ts @@ -29,11 +29,11 @@ import { ccclass, help, executeInEditMode, menu, tooltip, type, displayOrder, serializable, requireComponent } from 'cc.decorator'; import { EDITOR } from 'internal:constants'; -import { UITransform } from '../core/components/ui-base'; +import { UITransform } from '../2d/framework'; import { Component, EventHandler as ComponentEventHandler } from '../core/components'; import { WebViewImplManager } from './web-view-impl-manager'; import { EventType } from './web-view-enums'; -import { legacyCC } from "../core/global-exports"; +import { legacyCC } from '../core/global-exports'; /** * @en diff --git a/editor/engine-features/render-config.json b/editor/engine-features/render-config.json index 8cc3feb294..6ab847a6b1 100644 --- a/editor/engine-features/render-config.json +++ b/editor/engine-features/render-config.json @@ -5,7 +5,8 @@ "label": "Core", "description": "Core module.", "required": true, - "default": ["base"] + "default": ["base"], + "wechatPlugin": true }, "graphcis": { "label": "Graphcis API", @@ -16,27 +17,48 @@ "gfx-webgl": { "required": true, "label": "WebGL 1.0", - "description": "The WebGL 1.0 is required whenever." + "description": "The WebGL 1.0 is required whenever.", + "wechatPlugin": true }, "gfx-webgl2": { - "label": "WebGL 2.0" + "label": "WebGL 2.0", + "wechatPlugin": true } } }, + "3d": { + "default": ["3d"], + "label": "Core", + "description": "3D module", + "wechatPlugin": true, + "category": "3D Features" + }, + "2d": { + "default": ["2d"], + "label": "Core", + "description": "2D module", + "category": "2D Features", + "wechatPlugin": true + }, "ui": { "default": ["ui"], "label": "UI", - "description": "UI module" + "description": "UI module", + "category": "2D Features", + "wechatPlugin": true }, "particle": { "default": ["particle"], "label": "Particle System", - "description": "Particle system module" + "description": "Particle system module", + "category": "3D Features", + "wechatPlugin": true }, "physics": { "label": "Physics", "description": "Physics(implementation).", "default": ["physics-cannon"], + "category": "3D Features", "options": { "physics-ammo": { "label": "ammo.js" @@ -50,9 +72,10 @@ } }, "physics-2d": { - "label": "Physics 2D", + "label": "Physics", "description": "Physics 2D", "default": ["physics-2d-box2d"], + "category": "2D Features", "options": { "physics-2d-box2d": { "label": "box2d" @@ -64,58 +87,87 @@ }, "intersection-2d": { "default": ["intersection-2d"], - "label": "Intersection 2D", - "description": "Intersection 2D." + "label": "Intersection", + "description": "Intersection 2D.", + "wechatPlugin": true, + "category": "2D Features" + }, + "primitive": { + "default": ["primitive"], + "label": "Primitive", + "description": "Primitive", + "wechatPlugin": true, + "category": "3D Features" + }, + "profiler": { + "default": ["profiler"], + "label": "Profiler", + "description": "Profiler", + "wechatPlugin": true }, "particle-2d": { "default": ["particle-2d"], - "label": "Particle 2D", - "description": "Particle 2D." + "label": "Particle", + "description": "Particle 2D", + "wechatPlugin": true, + "category": "2D Features" }, "audio": { "default": ["audio"], "label": "Audio", "description": "Audio support.", - "native": "USE_AUDIO" + "native": "USE_AUDIO", + "wechatPlugin": true }, "video": { "default": ["video"], "label": "VideoPlayer", "description": "VideoPlayer support.", - "native": "USE_VIDEO" + "native": "USE_VIDEO", + "wechatPlugin": true }, "webview": { "default": ["webview"], "label": "WebView", "description": "WebView support.", - "native": "USE_WEBVIEW" + "native": "USE_WEBVIEW", + "wechatPlugin": true }, "tween": { "default": ["tween"], "label": "Tween", - "description": "Tween support." + "description": "Tween support.", + "wechatPlugin": true }, "terrain": { "default": ["terrain"], "label": "Terrain", - "description": "Terrain support" + "description": "Terrain support", + "wechatPlugin": true, + "category": "3D Features" }, "tiled-map": { "default": ["tiled-map"], "label": "TiledMap", - "description": "TimedMap support" + "description": "TiledMap support", + "wechatPlugin": true, + "category": "2D Features" }, "spine": { "default": ["spine"], "label": "Spine", "description": "Spine support", - "native": "USE_SPINE" + "native": "USE_SPINE", + "wechatPlugin": true, + "category": "2D Features" }, "dragon-bones": { "default": ["dragon-bones"], "label": "DragonBones", "description": "Description support", - "native": "USE_DRAGONBONES" + "native": "USE_DRAGONBONES", + "wechatPlugin": true, + "category": "2D Features" } } } diff --git a/editor/engine-features/schema.json b/editor/engine-features/schema.json index 65aea4db5e..c03df9d898 100644 --- a/editor/engine-features/schema.json +++ b/editor/engine-features/schema.json @@ -63,6 +63,9 @@ }, "wechatPlugin": { "type": "boolean" + }, + "category": { + "type": "string" } }, "type": "object" @@ -77,6 +80,12 @@ "base": { "$ref": "#/definitions/BaseItem" }, + "3d": { + "$ref": "#/definitions/Item" + }, + "2d": { + "$ref": "#/definitions/Item" + }, "dragon-bones": { "$ref": "#/definitions/BaseItem" }, @@ -92,6 +101,12 @@ "intersection-2d": { "$ref": "#/definitions/BaseItem" }, + "primitive": { + "$ref": "#/definitions/Item" + }, + "profiler": { + "$ref": "#/definitions/Item" + }, "particle": { "$ref": "#/definitions/BaseItem" }, @@ -152,6 +167,12 @@ "base": { "$ref": "#/definitions/Item" }, + "3d": { + "$ref": "#/definitions/Item" + }, + "2d": { + "$ref": "#/definitions/Item" + }, "dragon-bones": { "$ref": "#/definitions/Item" }, @@ -167,6 +188,12 @@ "intersection-2d": { "$ref": "#/definitions/Item" }, + "primitive": { + "$ref": "#/definitions/Item" + }, + "profiler": { + "$ref": "#/definitions/Item" + }, "particle": { "$ref": "#/definitions/Item" }, diff --git a/editor/engine-features/types.ts b/editor/engine-features/types.ts index e8d4e85b6b..8bcf44c6d7 100644 --- a/editor/engine-features/types.ts +++ b/editor/engine-features/types.ts @@ -6,6 +6,8 @@ export type EngineFeature = | 'gfx-webgl2' | 'base' | 'graphcis' + | '3d' + | '2d' | 'ui' | 'particle' | 'physics' @@ -24,7 +26,9 @@ export type EngineFeature = | 'terrain' | 'tiled-map' | 'spine' - | 'dragon-bones'; + | 'dragon-bones' + | 'primitive' + | 'profiler'; export interface ModuleRenderConfig { $schema?: string; diff --git a/exports/2d.ts b/exports/2d.ts new file mode 100644 index 0000000000..cc106fe5f5 --- /dev/null +++ b/exports/2d.ts @@ -0,0 +1 @@ +export * from '../cocos/2d'; diff --git a/exports/3d.ts b/exports/3d.ts new file mode 100644 index 0000000000..64963fe28b --- /dev/null +++ b/exports/3d.ts @@ -0,0 +1 @@ +export * from '../cocos/3d'; diff --git a/exports/base.ts b/exports/base.ts index 6ddbe227b4..764331efd2 100644 --- a/exports/base.ts +++ b/exports/base.ts @@ -34,20 +34,14 @@ import '../predefine'; // tslint:disable-next-line: ordered-imports import '../cocos/core/legacy'; +import * as renderer from '../cocos/core/renderer'; // LOAD ENGINE CORE export * from '../cocos/core'; -import * as renderer from '../cocos/core/renderer'; + export { renderer }; legacyCC.renderer = renderer; export * from '../extensions/ccpool/node-pool'; export { legacyCC as cclegacy }; - -import * as primitives from '../cocos/core/primitive'; -export { - primitives, -}; -legacyCC.primitives = primitives; -export * from '../cocos/core/primitive/primitive'; diff --git a/exports/primitive.ts b/exports/primitive.ts new file mode 100644 index 0000000000..fcd210a58b --- /dev/null +++ b/exports/primitive.ts @@ -0,0 +1,8 @@ +import * as primitives from '../cocos/primitive'; +import { legacyCC } from '../cocos/core/global-exports'; + +export { + primitives, +}; +legacyCC.primitives = primitives; +export * from '../cocos/primitive/primitive'; diff --git a/exports/profiler.ts b/exports/profiler.ts new file mode 100644 index 0000000000..c1db14c76b --- /dev/null +++ b/exports/profiler.ts @@ -0,0 +1 @@ +export * from '../cocos/profiler/profiler'; diff --git a/exports/ui.ts b/exports/ui.ts index 519bed2aeb..66ee2ceac8 100644 --- a/exports/ui.ts +++ b/exports/ui.ts @@ -28,6 +28,4 @@ * @hidden */ -export * from '../cocos/core/components/ui-base'; - -export * from '../cocos/ui'; \ No newline at end of file +export * from '../cocos/ui'; diff --git a/package-lock.json b/package-lock.json index 3829693c10..a31f7b22d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1523,7 +1523,7 @@ }, "fs-extra": { "version": "8.1.0", - "resolved": "https://registry.npm.taobao.org/fs-extra/download/fs-extra-8.1.0.tgz?cache=0&sync_timestamp=1591229972229&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-extra%2Fdownload%2Ffs-extra-8.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/fs-extra/download/fs-extra-8.1.0.tgz", "integrity": "sha1-SdQ8RaiM2Wd2aMt74bRu/bjS4cA=", "dev": true, "requires": { diff --git a/platforms/minigame/common/engine/AudioPlayer.js b/platforms/minigame/common/engine/AudioPlayer.js index 42067cccc4..4babfc77b0 100644 --- a/platforms/minigame/common/engine/AudioPlayer.js +++ b/platforms/minigame/common/engine/AudioPlayer.js @@ -1,178 +1,180 @@ const AudioPlayer = cc.internal.AudioPlayer; -const { PlayingState, AudioType } = cc.AudioClip; -const AudioManager = cc.internal.AudioManager; -AudioManager.maxAudioChannel = 10; +if (AudioPlayer) { + const { PlayingState, AudioType } = cc.AudioClip; + const AudioManager = cc.internal.AudioManager; + AudioManager.maxAudioChannel = 10; -function loadInnerAudioContext (url) { - return new Promise((resolve, reject) => { - const nativeAudio = __globalAdapter.createInnerAudioContext(); + function loadInnerAudioContext (url) { + return new Promise((resolve, reject) => { + const nativeAudio = __globalAdapter.createInnerAudioContext(); - let timer = setTimeout(() => { - clearEvent(); - resolve(nativeAudio); - }, 8000); - function clearEvent () { - nativeAudio.offCanplay(success); - nativeAudio.offError(fail); - } - function success () { - clearEvent(); - clearTimeout(timer); - resolve(nativeAudio); - } - function fail () { - clearEvent(); - clearTimeout(timer); - reject('failed to load innerAudioContext: ' + err); - } - nativeAudio.onCanplay(success); - nativeAudio.onError(fail); - nativeAudio.src = url; - }); -} - -class AudioManagerMiniGame extends AudioManager { - discardOnePlayingIfNeeded() { - if (this._playingAudios.length < AudioManager.maxAudioChannel) { - return; - } - - // a played audio has a higher priority than a played shot - let audioToDiscard; - let oldestOneShotIndex = this._playingAudios.findIndex(audio => !(audio instanceof AudioPlayerMiniGame)); - if (oldestOneShotIndex > -1) { - audioToDiscard = this._playingAudios[oldestOneShotIndex]; - this._playingAudios.splice(oldestOneShotIndex, 1); - } - else { - audioToDiscard = this._playingAudios.shift(); - } - if (audioToDiscard) { - audioToDiscard.stop(); - } - } -} - - -cc.AudioClip.prototype._getPlayer = function (clip) { - this._loadMode = AudioType.JSB_AUDIO; - return AudioPlayerMiniGame; -}; - -export class AudioPlayerMiniGame extends AudioPlayer { - static _manager = new AudioManagerMiniGame(); - _startTime = 0; - _offset = 0; - _volume = 1; - _loop = false; - - constructor (info) { - super(info); - this._nativeAudio = info.nativeAudio; - - this._nativeAudio.onPlay(() => { - if (this._state === PlayingState.PLAYING) { return; } - this._state = PlayingState.PLAYING; - this._startTime = performance.now(); - this._clip.emit('started'); + let timer = setTimeout(() => { + clearEvent(); + resolve(nativeAudio); + }, 8000); + function clearEvent () { + nativeAudio.offCanplay(success); + nativeAudio.offError(fail); + } + function success () { + clearEvent(); + clearTimeout(timer); + resolve(nativeAudio); + } + function fail () { + clearEvent(); + clearTimeout(timer); + reject('failed to load innerAudioContext: ' + err); + } + nativeAudio.onCanplay(success); + nativeAudio.onError(fail); + nativeAudio.src = url; }); - this._nativeAudio.onPause(() => { - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._offset += performance.now() - this._startTime; - }); - this._nativeAudio.onStop(() => { - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._offset = 0; - }); - this._nativeAudio.onEnded(() => { - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._offset = 0; - this._clip.emit('ended'); - AudioPlayerMiniGame._manager.removePlaying(this); - }); - this._nativeAudio.onError(function (res) { return console.error(res.errMsg);}); } - play () { - if (!this._nativeAudio) { return; } - if (this._blocking) { this._interrupted = true; return; } - if (this._state === PlayingState.PLAYING) { - /* sometimes there is no way to update the playing state - especially when player unplug earphones and the audio automatically stops - so we need to force updating the playing state by pausing audio */ - this.pause(); - // restart if already playing - this.setCurrentTime(0); + class AudioManagerMiniGame extends AudioManager { + discardOnePlayingIfNeeded() { + if (this._playingAudios.length < AudioManager.maxAudioChannel) { + return; + } + + // a played audio has a higher priority than a played shot + let audioToDiscard; + let oldestOneShotIndex = this._playingAudios.findIndex(audio => !(audio instanceof AudioPlayerMiniGame)); + if (oldestOneShotIndex > -1) { + audioToDiscard = this._playingAudios[oldestOneShotIndex]; + this._playingAudios.splice(oldestOneShotIndex, 1); + } + else { + audioToDiscard = this._playingAudios.shift(); + } + if (audioToDiscard) { + audioToDiscard.stop(); + } } - AudioPlayerMiniGame._manager.discardOnePlayingIfNeeded(); - this._nativeAudio.play(); - AudioPlayerMiniGame._manager.addPlaying(this); } - pause () { - if (!this._nativeAudio || this._state !== PlayingState.PLAYING) { return; } - this._nativeAudio.pause(); - AudioPlayerMiniGame._manager.removePlaying(this._clip); - } - stop () { - if (!this._nativeAudio) { return; } - this._nativeAudio.stop(); - AudioPlayerMiniGame._manager.removePlaying(this._clip); - } + cc.AudioClip.prototype._getPlayer = function (clip) { + this._loadMode = AudioType.JSB_AUDIO; + return AudioPlayerMiniGame; + }; - playOneShot (volume) { - loadInnerAudioContext(this._nativeAudio.src).then(innerAudioContext => { - AudioPlayerMiniGame._manager.discardOnePlayingIfNeeded(); - innerAudioContext.volume = volume; - innerAudioContext.play(); - AudioPlayerMiniGame._manager.addPlaying(innerAudioContext); - innerAudioContext.onEnded(() => { - AudioPlayerMiniGame._manager.removePlaying(innerAudioContext); + class AudioPlayerMiniGame extends AudioPlayer { + static _manager = new AudioManagerMiniGame(); + _startTime = 0; + _offset = 0; + _volume = 1; + _loop = false; + + constructor (info) { + super(info); + this._nativeAudio = info.nativeAudio; + + this._nativeAudio.onPlay(() => { + if (this._state === PlayingState.PLAYING) { return; } + this._state = PlayingState.PLAYING; + this._startTime = performance.now(); + this._clip.emit('started'); }); - }); - } - - getCurrentTime () { - if (this._state !== PlayingState.PLAYING) { return this._offset / 1000; } - let current = (performance.now() - this._startTime + this._offset) / 1000; - if (current > this._duration) { - if (!this._loop) return 0; - current -= this._duration; this._startTime += this._duration * 1000; + this._nativeAudio.onPause(() => { + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._offset += performance.now() - this._startTime; + }); + this._nativeAudio.onStop(() => { + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._offset = 0; + }); + this._nativeAudio.onEnded(() => { + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._offset = 0; + this._clip.emit('ended'); + AudioPlayerMiniGame._manager.removePlaying(this); + }); + this._nativeAudio.onError(function (res) { return console.error(res.errMsg);}); } - return current; - } - setCurrentTime (val) { - if (!this._nativeAudio) { return; } - this._offset = cc.math.clamp(val, 0, this._duration) * 1000; - this._startTime = performance.now(); - this._nativeAudio.seek(val); - } + play () { + if (!this._nativeAudio) { return; } + if (this._blocking) { this._interrupted = true; return; } + if (this._state === PlayingState.PLAYING) { + /* sometimes there is no way to update the playing state + especially when player unplug earphones and the audio automatically stops + so we need to force updating the playing state by pausing audio */ + this.pause(); + // restart if already playing + this.setCurrentTime(0); + } + AudioPlayerMiniGame._manager.discardOnePlayingIfNeeded(); + this._nativeAudio.play(); + AudioPlayerMiniGame._manager.addPlaying(this); + } - getVolume () { - return this._volume; - } + pause () { + if (!this._nativeAudio || this._state !== PlayingState.PLAYING) { return; } + this._nativeAudio.pause(); + AudioPlayerMiniGame._manager.removePlaying(this._clip); + } - setVolume (val, immediate) { - this._volume = val; - if (this._nativeAudio) { this._nativeAudio.volume = val; } - } + stop () { + if (!this._nativeAudio) { return; } + this._nativeAudio.stop(); + AudioPlayerMiniGame._manager.removePlaying(this._clip); + } - getLoop () { - return this._loop; - } + playOneShot (volume) { + loadInnerAudioContext(this._nativeAudio.src).then(innerAudioContext => { + AudioPlayerMiniGame._manager.discardOnePlayingIfNeeded(); + innerAudioContext.volume = volume; + innerAudioContext.play(); + AudioPlayerMiniGame._manager.addPlaying(innerAudioContext); + innerAudioContext.onEnded(() => { + AudioPlayerMiniGame._manager.removePlaying(innerAudioContext); + }); + }); + } - setLoop (val) { - this._loop = val; - if (this._nativeAudio) { this._nativeAudio.loop = val; } - } + getCurrentTime () { + if (this._state !== PlayingState.PLAYING) { return this._offset / 1000; } + let current = (performance.now() - this._startTime + this._offset) / 1000; + if (current > this._duration) { + if (!this._loop) return 0; + current -= this._duration; this._startTime += this._duration * 1000; + } + return current; + } - destroy () { - if (this._nativeAudio) { this._nativeAudio.destroy(); } - super.destroy(); + setCurrentTime (val) { + if (!this._nativeAudio) { return; } + this._offset = cc.math.clamp(val, 0, this._duration) * 1000; + this._startTime = performance.now(); + this._nativeAudio.seek(val); + } + + getVolume () { + return this._volume; + } + + setVolume (val, immediate) { + this._volume = val; + if (this._nativeAudio) { this._nativeAudio.volume = val; } + } + + getLoop () { + return this._loop; + } + + setLoop (val) { + this._loop = val; + if (this._nativeAudio) { this._nativeAudio.loop = val; } + } + + destroy () { + if (this._nativeAudio) { this._nativeAudio.destroy(); } + super.destroy(); + } } } diff --git a/platforms/minigame/platforms/alipay/wrapper/engine/AudioPlayer.js b/platforms/minigame/platforms/alipay/wrapper/engine/AudioPlayer.js index 6d2b383c69..954cb4b2cc 100644 --- a/platforms/minigame/platforms/alipay/wrapper/engine/AudioPlayer.js +++ b/platforms/minigame/platforms/alipay/wrapper/engine/AudioPlayer.js @@ -1 +1,3 @@ -cc.internal.AudioManager.maxAudioChannel = 6; \ No newline at end of file +if (cc.internal.AudioManager) { + cc.internal.AudioManager.maxAudioChannel = 6; +} \ No newline at end of file diff --git a/platforms/native/engine/jsb-audio.js b/platforms/native/engine/jsb-audio.js index 0ffa1d4ba6..aac5fe50e0 100644 --- a/platforms/native/engine/jsb-audio.js +++ b/platforms/native/engine/jsb-audio.js @@ -26,128 +26,130 @@ 'use strict'; const AudioPlayer = cc.internal.AudioPlayer; -const { PlayingState, AudioType } = cc.AudioClip; +if (AudioPlayer) { + const { PlayingState, AudioType } = cc.AudioClip; -cc.AudioClip.prototype._getPlayer = function (clip) { - this._loadMode = AudioType.JSB_AUDIO; - return AudioPlayerJSB; -}; + cc.AudioClip.prototype._getPlayer = function (clip) { + this._loadMode = AudioType.JSB_AUDIO; + return AudioPlayerJSB; + }; -class AudioPlayerJSB extends AudioPlayer { - constructor (info) { - super(info); - this._startTime = 0; - this._offset = 0; - this._volume = 1; - this._loop = false; - this._url = info.nativeAudio; - this._audio = -1; - this._onEnded = this._onEnded.bind(this); - } - - play () { - if (this._state === PlayingState.PLAYING) { return; } - if (this._blocking) { this._interrupted = true; return; } - this._doPlay(); - // delay eval here to yield uniform behavior with other platforms - cc.director.once(cc.Director.EVENT_AFTER_UPDATE, this._onPlay, this); - } - - pause () { - if (this._audio < 0) { return; } - this._interrupted = false; - if (this._state !== PlayingState.PLAYING) { return; } - jsb.AudioEngine.pause(this._audio); - this._onPause(); - } - - stop () { - if (this._audio < 0) { return; } - this._interrupted = false; - jsb.AudioEngine.stop(this._audio); - this._audio = -1; - this._onStop(); - } - - playOneShot (volume) { - if (volume === undefined) { volume = 1; } - jsb.AudioEngine.play(this._url, false, volume); - } - - getCurrentTime () { - if (this._state !== PlayingState.PLAYING) { return this._offset / 1000; } - let current = (performance.now() - this._startTime + this._offset) / 1000; - while (current > this._duration) { - if (this._loop) { current -= this._duration; this._startTime += this._duration * 1000; } - else current = 0; // onEnded callback may lag behind a few frames + class AudioPlayerJSB extends AudioPlayer { + constructor (info) { + super(info); + this._startTime = 0; + this._offset = 0; + this._volume = 1; + this._loop = false; + this._url = info.nativeAudio; + this._audio = -1; + this._onEnded = this._onEnded.bind(this); } - return current; - } - setCurrentTime (val) { - if (this._audio < 0) { return; } - val = cc.math.clamp(val, 0, this._duration); - jsb.AudioEngine.setCurrentTime(this._audio, val); - this._offset = val * 1000; - this._startTime = performance.now(); - } + play () { + if (this._state === PlayingState.PLAYING) { return; } + if (this._blocking) { this._interrupted = true; return; } + this._doPlay(); + // delay eval here to yield uniform behavior with other platforms + cc.director.once(cc.Director.EVENT_AFTER_UPDATE, this._onPlay, this); + } - getVolume () { - return this._volume; - } + pause () { + if (this._audio < 0) { return; } + this._interrupted = false; + if (this._state !== PlayingState.PLAYING) { return; } + jsb.AudioEngine.pause(this._audio); + this._onPause(); + } - setVolume (val, immediate) { - this._volume = val; - if (this._audio >= 0) { jsb.AudioEngine.setVolume(this._audio, val); } - } + stop () { + if (this._audio < 0) { return; } + this._interrupted = false; + jsb.AudioEngine.stop(this._audio); + this._audio = -1; + this._onStop(); + } - getLoop () { - return this._loop; - } + playOneShot (volume) { + if (volume === undefined) { volume = 1; } + jsb.AudioEngine.play(this._url, false, volume); + } - setLoop (val) { - this._loop = val; - if (this._audio >= 0) { jsb.AudioEngine.setLoop(this._audio, val); } - } + getCurrentTime () { + if (this._state !== PlayingState.PLAYING) { return this._offset / 1000; } + let current = (performance.now() - this._startTime + this._offset) / 1000; + while (current > this._duration) { + if (this._loop) { current -= this._duration; this._startTime += this._duration * 1000; } + else current = 0; // onEnded callback may lag behind a few frames + } + return current; + } - destroy () { - if (this._audio >= 0) { jsb.AudioEngine.uncache(this._url); this._audio = -1; } - super.destroy(); - } + setCurrentTime (val) { + if (this._audio < 0) { return; } + val = cc.math.clamp(val, 0, this._duration); + jsb.AudioEngine.setCurrentTime(this._audio, val); + this._offset = val * 1000; + this._startTime = performance.now(); + } - _doPlay () { - if (this._audio >= 0) jsb.AudioEngine.resume(this._audio); - else { - this._audio = jsb.AudioEngine.play(this._url, this._loop, this._volume); - jsb.AudioEngine.setErrorCallback(this._audio, console.error); - jsb.AudioEngine.setFinishCallback(this._audio, this._onEnded); + getVolume () { + return this._volume; + } + + setVolume (val, immediate) { + this._volume = val; + if (this._audio >= 0) { jsb.AudioEngine.setVolume(this._audio, val); } + } + + getLoop () { + return this._loop; + } + + setLoop (val) { + this._loop = val; + if (this._audio >= 0) { jsb.AudioEngine.setLoop(this._audio, val); } + } + + destroy () { + if (this._audio >= 0) { jsb.AudioEngine.uncache(this._url); this._audio = -1; } + super.destroy(); + } + + _doPlay () { + if (this._audio >= 0) jsb.AudioEngine.resume(this._audio); + else { + this._audio = jsb.AudioEngine.play(this._url, this._loop, this._volume); + jsb.AudioEngine.setErrorCallback(this._audio, console.error); + jsb.AudioEngine.setFinishCallback(this._audio, this._onEnded); + } + } + + _onPlay () { + if (this._state === PlayingState.PLAYING) { return; } + this._state = PlayingState.PLAYING; + this._startTime = performance.now(); + this._clip.emit('started'); + } + + _onPause () { + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._offset += performance.now() - this._startTime; + } + + _onStop () { + this._offset = 0; + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + } + + _onEnded () { + this._offset = 0; + this._audio = -1; + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._clip.emit('ended'); } } - - _onPlay () { - if (this._state === PlayingState.PLAYING) { return; } - this._state = PlayingState.PLAYING; - this._startTime = performance.now(); - this._clip.emit('started'); - } - - _onPause () { - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._offset += performance.now() - this._startTime; - } - - _onStop () { - this._offset = 0; - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - } - - _onEnded () { - this._offset = 0; - this._audio = -1; - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._clip.emit('ended'); - } -} +} \ No newline at end of file diff --git a/platforms/runtime/common/engine/AudioPlayer.js b/platforms/runtime/common/engine/AudioPlayer.js index 6e6242b88b..d587a83145 100644 --- a/platforms/runtime/common/engine/AudioPlayer.js +++ b/platforms/runtime/common/engine/AudioPlayer.js @@ -26,129 +26,131 @@ 'use strict'; const AudioPlayer = cc.internal.AudioPlayer; -const { PlayingState, AudioType } = cc.AudioClip; +if (AudioPlayer) { + const { PlayingState, AudioType } = cc.AudioClip; -cc.AudioClip.prototype._getPlayer = function (clip) { - this._loadMode = AudioType.JSB_AUDIO; - return AudioPlayerJSB; -}; + cc.AudioClip.prototype._getPlayer = function (clip) { + this._loadMode = AudioType.JSB_AUDIO; + return AudioPlayerJSB; + }; -let rt = loadRuntime(); -class AudioPlayerJSB extends AudioPlayer { - constructor (info) { - super(info); - this._startTime = 0; - this._offset = 0; - this._volume = 1; - this._loop = false; - this._url = info.nativeAudio; - this._audio = -1; - this._onEnded = this._onEnded.bind(this); - } - - play () { - if (this._state === PlayingState.PLAYING) { return; } - if (this._blocking) { this._interrupted = true; return; } - this._doPlay(); - // delay eval here to yield uniform behavior with other platforms - cc.director.once(cc.Director.EVENT_AFTER_UPDATE, this._onPlay, this); - } - - pause () { - if (this._audio < 0) { return; } - this._interrupted = false; - if (this._state !== PlayingState.PLAYING) { return; } - jsb.AudioEngine.pause(this._audio); - this._onPause(); - } - - stop () { - if (this._audio < 0) { return; } - this._interrupted = false; - jsb.AudioEngine.stop(this._audio); - this._audio = -1; - this._onStop(); - } - - playOneShot (volume) { - if (volume === undefined) { volume = 1; } - jsb.AudioEngine.play(this._url, false, volume); - } - - getCurrentTime () { - if (this._state !== PlayingState.PLAYING) { return this._offset / 1000; } - let current = (performance.now() - this._startTime + this._offset) / 1000; - while (current > this._duration) { - if (this._loop) { current -= this._duration; this._startTime += this._duration * 1000; } - else current = 0; // onEnded callback may lag behind a few frames + let rt = loadRuntime(); + class AudioPlayerJSB extends AudioPlayer { + constructor (info) { + super(info); + this._startTime = 0; + this._offset = 0; + this._volume = 1; + this._loop = false; + this._url = info.nativeAudio; + this._audio = -1; + this._onEnded = this._onEnded.bind(this); } - return current; - } - setCurrentTime (val) { - if (this._audio < 0) { return; } - val = cc.math.clamp(val, 0, this._duration); - jsb.AudioEngine.setCurrentTime(this._audio, val); - this._offset = val * 1000; - this._startTime = performance.now(); - } - - getVolume () { - return this._volume; - } - - setVolume (val, immediate) { - this._volume = val; - if (this._audio >= 0) { jsb.AudioEngine.setVolume(this._audio, val); } - } - - getLoop () { - return this._loop; - } - - setLoop (val) { - this._loop = val; - if (this._audio >= 0) { jsb.AudioEngine.setLoop(this._audio, val); } - } - - destroy () { - if (this._audio >= 0) { jsb.AudioEngine.uncache(this._url); this._audio = -1; } - super.destroy(); - } - - _doPlay () { - if (this._audio >= 0) jsb.AudioEngine.resume(this._audio); - else { - this._audio = jsb.AudioEngine.play(this._url, this._loop, this._volume); - jsb.AudioEngine.setErrorCallback(this._audio, console.error); - jsb.AudioEngine.setFinishCallback(this._audio, this._onEnded); + play () { + if (this._state === PlayingState.PLAYING) { return; } + if (this._blocking) { this._interrupted = true; return; } + this._doPlay(); + // delay eval here to yield uniform behavior with other platforms + cc.director.once(cc.Director.EVENT_AFTER_UPDATE, this._onPlay, this); } - } - _onPlay () { - if (this._state === PlayingState.PLAYING) { return; } - this._state = PlayingState.PLAYING; - this._startTime = performance.now(); - this._clip.emit('started'); - } + pause () { + if (this._audio < 0) { return; } + this._interrupted = false; + if (this._state !== PlayingState.PLAYING) { return; } + jsb.AudioEngine.pause(this._audio); + this._onPause(); + } - _onPause () { - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._offset += performance.now() - this._startTime; - } + stop () { + if (this._audio < 0) { return; } + this._interrupted = false; + jsb.AudioEngine.stop(this._audio); + this._audio = -1; + this._onStop(); + } - _onStop () { - this._offset = 0; - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - } + playOneShot (volume) { + if (volume === undefined) { volume = 1; } + jsb.AudioEngine.play(this._url, false, volume); + } - _onEnded () { - this._offset = 0; - this._audio = -1; - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._clip.emit('ended'); + getCurrentTime () { + if (this._state !== PlayingState.PLAYING) { return this._offset / 1000; } + let current = (performance.now() - this._startTime + this._offset) / 1000; + while (current > this._duration) { + if (this._loop) { current -= this._duration; this._startTime += this._duration * 1000; } + else current = 0; // onEnded callback may lag behind a few frames + } + return current; + } + + setCurrentTime (val) { + if (this._audio < 0) { return; } + val = cc.math.clamp(val, 0, this._duration); + jsb.AudioEngine.setCurrentTime(this._audio, val); + this._offset = val * 1000; + this._startTime = performance.now(); + } + + getVolume () { + return this._volume; + } + + setVolume (val, immediate) { + this._volume = val; + if (this._audio >= 0) { jsb.AudioEngine.setVolume(this._audio, val); } + } + + getLoop () { + return this._loop; + } + + setLoop (val) { + this._loop = val; + if (this._audio >= 0) { jsb.AudioEngine.setLoop(this._audio, val); } + } + + destroy () { + if (this._audio >= 0) { jsb.AudioEngine.uncache(this._url); this._audio = -1; } + super.destroy(); + } + + _doPlay () { + if (this._audio >= 0) jsb.AudioEngine.resume(this._audio); + else { + this._audio = jsb.AudioEngine.play(this._url, this._loop, this._volume); + jsb.AudioEngine.setErrorCallback(this._audio, console.error); + jsb.AudioEngine.setFinishCallback(this._audio, this._onEnded); + } + } + + _onPlay () { + if (this._state === PlayingState.PLAYING) { return; } + this._state = PlayingState.PLAYING; + this._startTime = performance.now(); + this._clip.emit('started'); + } + + _onPause () { + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._offset += performance.now() - this._startTime; + } + + _onStop () { + this._offset = 0; + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + } + + _onEnded () { + this._offset = 0; + this._audio = -1; + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._clip.emit('ended'); + } } } diff --git a/platforms/runtime/platforms/huawei-quick-game/engine/AudioPlayer.js b/platforms/runtime/platforms/huawei-quick-game/engine/AudioPlayer.js index ee9eab3466..01d5117573 100644 --- a/platforms/runtime/platforms/huawei-quick-game/engine/AudioPlayer.js +++ b/platforms/runtime/platforms/huawei-quick-game/engine/AudioPlayer.js @@ -1,151 +1,153 @@ const { loadInnerAudioContext } = require('./download-audio'); const AudioPlayer = cc.internal.AudioPlayer; -const { PlayingState, AudioType } = cc.AudioClip; -const AudioManager = cc.internal.AudioManager; -AudioManager.maxAudioChannel = 10; +if (AudioPlayer) { + const { PlayingState, AudioType } = cc.AudioClip; + const AudioManager = cc.internal.AudioManager; + AudioManager.maxAudioChannel = 10; -class AudioManagerMiniGame extends AudioManager { - discardOnePlayingIfNeeded() { - if (this._playingAudios.length < AudioManager.maxAudioChannel) { - return; - } + class AudioManagerMiniGame extends AudioManager { + discardOnePlayingIfNeeded() { + if (this._playingAudios.length < AudioManager.maxAudioChannel) { + return; + } - // a played audio has a higher priority than a played shot - let audioToDiscard; - let oldestOneShotIndex = this._playingAudios.findIndex(audio => !(audio instanceof AudioPlayerRuntime)); - if (oldestOneShotIndex > -1) { - audioToDiscard = this._playingAudios[oldestOneShotIndex]; - this._playingAudios.splice(oldestOneShotIndex, 1); - } - else { - audioToDiscard = this._playingAudios.shift(); - } - if (audioToDiscard) { - audioToDiscard.stop(); + // a played audio has a higher priority than a played shot + let audioToDiscard; + let oldestOneShotIndex = this._playingAudios.findIndex(audio => !(audio instanceof AudioPlayerRuntime)); + if (oldestOneShotIndex > -1) { + audioToDiscard = this._playingAudios[oldestOneShotIndex]; + this._playingAudios.splice(oldestOneShotIndex, 1); + } + else { + audioToDiscard = this._playingAudios.shift(); + } + if (audioToDiscard) { + audioToDiscard.stop(); + } } } -} -cc.AudioClip.prototype._getPlayer = function (clip) { - this._loadMode = AudioType.JSB_AUDIO; - return AudioPlayerRuntime; -}; + cc.AudioClip.prototype._getPlayer = function (clip) { + this._loadMode = AudioType.JSB_AUDIO; + return AudioPlayerRuntime; + }; -export class AudioPlayerRuntime extends AudioPlayer { - static _manager = new AudioManagerMiniGame(); - _startTime = 0; - _offset = 0; - _volume = 1; - _loop = false; + class AudioPlayerRuntime extends AudioPlayer { + static _manager = new AudioManagerMiniGame(); + _startTime = 0; + _offset = 0; + _volume = 1; + _loop = false; - constructor (info) { - super(info); - this._nativeAudio = info.nativeAudio; + constructor (info) { + super(info); + this._nativeAudio = info.nativeAudio; - this._nativeAudio.onPlay(() => { - if (this._state === PlayingState.PLAYING) { return; } - this._state = PlayingState.PLAYING; - this._startTime = performance.now(); - this._clip.emit('started'); - }); - this._nativeAudio.onPause(() => { - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._offset += performance.now() - this._startTime; - }); - this._nativeAudio.onStop(() => { - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._offset = 0; - }); - this._nativeAudio.onEnded(() => { - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._offset = 0; - this._clip.emit('ended'); - AudioPlayerRuntime._manager.removePlaying(this); - }); - this._nativeAudio.onError(function (res) { return console.error(res.errMsg);}); - } - - play () { - if (!this._nativeAudio) { return; } - if (this._blocking) { this._interrupted = true; return; } - if (this._state === PlayingState.PLAYING) { - /* sometimes there is no way to update the playing state - especially when player unplug earphones and the audio automatically stops - so we need to force updating the playing state by pausing audio */ - this.pause(); - // restart if already playing - this.setCurrentTime(0); - } - AudioPlayerRuntime._manager.discardOnePlayingIfNeeded(); - this._nativeAudio.play(); - AudioPlayerRuntime._manager.addPlaying(this); - } - - pause () { - if (!this._nativeAudio || this._state !== PlayingState.PLAYING) { return; } - this._nativeAudio.pause(); - AudioPlayerRuntime._manager.removePlaying(this._clip); - } - - stop () { - if (!this._nativeAudio) { return; } - this._nativeAudio.stop(); - AudioPlayerRuntime._manager.removePlaying(this._clip); - } - - playOneShot (volume) { - loadInnerAudioContext(this._nativeAudio.src).then(innerAudioContext => { - AudioPlayerRuntime._manager.discardOnePlayingIfNeeded(); - innerAudioContext.volume = volume; - innerAudioContext.play(); - AudioPlayerRuntime._manager.addPlaying(innerAudioContext); - innerAudioContext.onEnded(() => { - AudioPlayerRuntime._manager.removePlaying(innerAudioContext); + this._nativeAudio.onPlay(() => { + if (this._state === PlayingState.PLAYING) { return; } + this._state = PlayingState.PLAYING; + this._startTime = performance.now(); + this._clip.emit('started'); }); - }); - } - - getCurrentTime () { - if (this._state !== PlayingState.PLAYING) { return this._offset / 1000; } - let current = (performance.now() - this._startTime + this._offset) / 1000; - if (current > this._duration) { - if (!this._loop) return 0; - current -= this._duration; this._startTime += this._duration * 1000; + this._nativeAudio.onPause(() => { + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._offset += performance.now() - this._startTime; + }); + this._nativeAudio.onStop(() => { + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._offset = 0; + }); + this._nativeAudio.onEnded(() => { + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._offset = 0; + this._clip.emit('ended'); + AudioPlayerRuntime._manager.removePlaying(this); + }); + this._nativeAudio.onError(function (res) { return console.error(res.errMsg);}); } - return current; - } - setCurrentTime (val) { - if (!this._nativeAudio) { return; } - this._offset = cc.math.clamp(val, 0, this._duration) * 1000; - this._startTime = performance.now(); - this._nativeAudio.seek(val); - } + play () { + if (!this._nativeAudio) { return; } + if (this._blocking) { this._interrupted = true; return; } + if (this._state === PlayingState.PLAYING) { + /* sometimes there is no way to update the playing state + especially when player unplug earphones and the audio automatically stops + so we need to force updating the playing state by pausing audio */ + this.pause(); + // restart if already playing + this.setCurrentTime(0); + } + AudioPlayerRuntime._manager.discardOnePlayingIfNeeded(); + this._nativeAudio.play(); + AudioPlayerRuntime._manager.addPlaying(this); + } - getVolume () { - return this._volume; - } + pause () { + if (!this._nativeAudio || this._state !== PlayingState.PLAYING) { return; } + this._nativeAudio.pause(); + AudioPlayerRuntime._manager.removePlaying(this._clip); + } - setVolume (val, immediate) { - this._volume = val; - if (this._nativeAudio) { this._nativeAudio.volume = val; } - } + stop () { + if (!this._nativeAudio) { return; } + this._nativeAudio.stop(); + AudioPlayerRuntime._manager.removePlaying(this._clip); + } - getLoop () { - return this._loop; - } + playOneShot (volume) { + loadInnerAudioContext(this._nativeAudio.src).then(innerAudioContext => { + AudioPlayerRuntime._manager.discardOnePlayingIfNeeded(); + innerAudioContext.volume = volume; + innerAudioContext.play(); + AudioPlayerRuntime._manager.addPlaying(innerAudioContext); + innerAudioContext.onEnded(() => { + AudioPlayerRuntime._manager.removePlaying(innerAudioContext); + }); + }); + } - setLoop (val) { - this._loop = val; - if (this._nativeAudio) { this._nativeAudio.loop = val; } - } + getCurrentTime () { + if (this._state !== PlayingState.PLAYING) { return this._offset / 1000; } + let current = (performance.now() - this._startTime + this._offset) / 1000; + if (current > this._duration) { + if (!this._loop) return 0; + current -= this._duration; this._startTime += this._duration * 1000; + } + return current; + } - destroy () { - if (this._nativeAudio) { this._nativeAudio.destroy(); } - super.destroy(); + setCurrentTime (val) { + if (!this._nativeAudio) { return; } + this._offset = cc.math.clamp(val, 0, this._duration) * 1000; + this._startTime = performance.now(); + this._nativeAudio.seek(val); + } + + getVolume () { + return this._volume; + } + + setVolume (val, immediate) { + this._volume = val; + if (this._nativeAudio) { this._nativeAudio.volume = val; } + } + + getLoop () { + return this._loop; + } + + setLoop (val) { + this._loop = val; + if (this._nativeAudio) { this._nativeAudio.loop = val; } + } + + destroy () { + if (this._nativeAudio) { this._nativeAudio.destroy(); } + super.destroy(); + } } } diff --git a/platforms/runtime/platforms/oppo-mini-game/engine/AudioPlayer.js b/platforms/runtime/platforms/oppo-mini-game/engine/AudioPlayer.js index ee9eab3466..01d5117573 100644 --- a/platforms/runtime/platforms/oppo-mini-game/engine/AudioPlayer.js +++ b/platforms/runtime/platforms/oppo-mini-game/engine/AudioPlayer.js @@ -1,151 +1,153 @@ const { loadInnerAudioContext } = require('./download-audio'); const AudioPlayer = cc.internal.AudioPlayer; -const { PlayingState, AudioType } = cc.AudioClip; -const AudioManager = cc.internal.AudioManager; -AudioManager.maxAudioChannel = 10; +if (AudioPlayer) { + const { PlayingState, AudioType } = cc.AudioClip; + const AudioManager = cc.internal.AudioManager; + AudioManager.maxAudioChannel = 10; -class AudioManagerMiniGame extends AudioManager { - discardOnePlayingIfNeeded() { - if (this._playingAudios.length < AudioManager.maxAudioChannel) { - return; - } + class AudioManagerMiniGame extends AudioManager { + discardOnePlayingIfNeeded() { + if (this._playingAudios.length < AudioManager.maxAudioChannel) { + return; + } - // a played audio has a higher priority than a played shot - let audioToDiscard; - let oldestOneShotIndex = this._playingAudios.findIndex(audio => !(audio instanceof AudioPlayerRuntime)); - if (oldestOneShotIndex > -1) { - audioToDiscard = this._playingAudios[oldestOneShotIndex]; - this._playingAudios.splice(oldestOneShotIndex, 1); - } - else { - audioToDiscard = this._playingAudios.shift(); - } - if (audioToDiscard) { - audioToDiscard.stop(); + // a played audio has a higher priority than a played shot + let audioToDiscard; + let oldestOneShotIndex = this._playingAudios.findIndex(audio => !(audio instanceof AudioPlayerRuntime)); + if (oldestOneShotIndex > -1) { + audioToDiscard = this._playingAudios[oldestOneShotIndex]; + this._playingAudios.splice(oldestOneShotIndex, 1); + } + else { + audioToDiscard = this._playingAudios.shift(); + } + if (audioToDiscard) { + audioToDiscard.stop(); + } } } -} -cc.AudioClip.prototype._getPlayer = function (clip) { - this._loadMode = AudioType.JSB_AUDIO; - return AudioPlayerRuntime; -}; + cc.AudioClip.prototype._getPlayer = function (clip) { + this._loadMode = AudioType.JSB_AUDIO; + return AudioPlayerRuntime; + }; -export class AudioPlayerRuntime extends AudioPlayer { - static _manager = new AudioManagerMiniGame(); - _startTime = 0; - _offset = 0; - _volume = 1; - _loop = false; + class AudioPlayerRuntime extends AudioPlayer { + static _manager = new AudioManagerMiniGame(); + _startTime = 0; + _offset = 0; + _volume = 1; + _loop = false; - constructor (info) { - super(info); - this._nativeAudio = info.nativeAudio; + constructor (info) { + super(info); + this._nativeAudio = info.nativeAudio; - this._nativeAudio.onPlay(() => { - if (this._state === PlayingState.PLAYING) { return; } - this._state = PlayingState.PLAYING; - this._startTime = performance.now(); - this._clip.emit('started'); - }); - this._nativeAudio.onPause(() => { - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._offset += performance.now() - this._startTime; - }); - this._nativeAudio.onStop(() => { - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._offset = 0; - }); - this._nativeAudio.onEnded(() => { - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._offset = 0; - this._clip.emit('ended'); - AudioPlayerRuntime._manager.removePlaying(this); - }); - this._nativeAudio.onError(function (res) { return console.error(res.errMsg);}); - } - - play () { - if (!this._nativeAudio) { return; } - if (this._blocking) { this._interrupted = true; return; } - if (this._state === PlayingState.PLAYING) { - /* sometimes there is no way to update the playing state - especially when player unplug earphones and the audio automatically stops - so we need to force updating the playing state by pausing audio */ - this.pause(); - // restart if already playing - this.setCurrentTime(0); - } - AudioPlayerRuntime._manager.discardOnePlayingIfNeeded(); - this._nativeAudio.play(); - AudioPlayerRuntime._manager.addPlaying(this); - } - - pause () { - if (!this._nativeAudio || this._state !== PlayingState.PLAYING) { return; } - this._nativeAudio.pause(); - AudioPlayerRuntime._manager.removePlaying(this._clip); - } - - stop () { - if (!this._nativeAudio) { return; } - this._nativeAudio.stop(); - AudioPlayerRuntime._manager.removePlaying(this._clip); - } - - playOneShot (volume) { - loadInnerAudioContext(this._nativeAudio.src).then(innerAudioContext => { - AudioPlayerRuntime._manager.discardOnePlayingIfNeeded(); - innerAudioContext.volume = volume; - innerAudioContext.play(); - AudioPlayerRuntime._manager.addPlaying(innerAudioContext); - innerAudioContext.onEnded(() => { - AudioPlayerRuntime._manager.removePlaying(innerAudioContext); + this._nativeAudio.onPlay(() => { + if (this._state === PlayingState.PLAYING) { return; } + this._state = PlayingState.PLAYING; + this._startTime = performance.now(); + this._clip.emit('started'); }); - }); - } - - getCurrentTime () { - if (this._state !== PlayingState.PLAYING) { return this._offset / 1000; } - let current = (performance.now() - this._startTime + this._offset) / 1000; - if (current > this._duration) { - if (!this._loop) return 0; - current -= this._duration; this._startTime += this._duration * 1000; + this._nativeAudio.onPause(() => { + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._offset += performance.now() - this._startTime; + }); + this._nativeAudio.onStop(() => { + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._offset = 0; + }); + this._nativeAudio.onEnded(() => { + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._offset = 0; + this._clip.emit('ended'); + AudioPlayerRuntime._manager.removePlaying(this); + }); + this._nativeAudio.onError(function (res) { return console.error(res.errMsg);}); } - return current; - } - setCurrentTime (val) { - if (!this._nativeAudio) { return; } - this._offset = cc.math.clamp(val, 0, this._duration) * 1000; - this._startTime = performance.now(); - this._nativeAudio.seek(val); - } + play () { + if (!this._nativeAudio) { return; } + if (this._blocking) { this._interrupted = true; return; } + if (this._state === PlayingState.PLAYING) { + /* sometimes there is no way to update the playing state + especially when player unplug earphones and the audio automatically stops + so we need to force updating the playing state by pausing audio */ + this.pause(); + // restart if already playing + this.setCurrentTime(0); + } + AudioPlayerRuntime._manager.discardOnePlayingIfNeeded(); + this._nativeAudio.play(); + AudioPlayerRuntime._manager.addPlaying(this); + } - getVolume () { - return this._volume; - } + pause () { + if (!this._nativeAudio || this._state !== PlayingState.PLAYING) { return; } + this._nativeAudio.pause(); + AudioPlayerRuntime._manager.removePlaying(this._clip); + } - setVolume (val, immediate) { - this._volume = val; - if (this._nativeAudio) { this._nativeAudio.volume = val; } - } + stop () { + if (!this._nativeAudio) { return; } + this._nativeAudio.stop(); + AudioPlayerRuntime._manager.removePlaying(this._clip); + } - getLoop () { - return this._loop; - } + playOneShot (volume) { + loadInnerAudioContext(this._nativeAudio.src).then(innerAudioContext => { + AudioPlayerRuntime._manager.discardOnePlayingIfNeeded(); + innerAudioContext.volume = volume; + innerAudioContext.play(); + AudioPlayerRuntime._manager.addPlaying(innerAudioContext); + innerAudioContext.onEnded(() => { + AudioPlayerRuntime._manager.removePlaying(innerAudioContext); + }); + }); + } - setLoop (val) { - this._loop = val; - if (this._nativeAudio) { this._nativeAudio.loop = val; } - } + getCurrentTime () { + if (this._state !== PlayingState.PLAYING) { return this._offset / 1000; } + let current = (performance.now() - this._startTime + this._offset) / 1000; + if (current > this._duration) { + if (!this._loop) return 0; + current -= this._duration; this._startTime += this._duration * 1000; + } + return current; + } - destroy () { - if (this._nativeAudio) { this._nativeAudio.destroy(); } - super.destroy(); + setCurrentTime (val) { + if (!this._nativeAudio) { return; } + this._offset = cc.math.clamp(val, 0, this._duration) * 1000; + this._startTime = performance.now(); + this._nativeAudio.seek(val); + } + + getVolume () { + return this._volume; + } + + setVolume (val, immediate) { + this._volume = val; + if (this._nativeAudio) { this._nativeAudio.volume = val; } + } + + getLoop () { + return this._loop; + } + + setLoop (val) { + this._loop = val; + if (this._nativeAudio) { this._nativeAudio.loop = val; } + } + + destroy () { + if (this._nativeAudio) { this._nativeAudio.destroy(); } + super.destroy(); + } } } diff --git a/platforms/runtime/platforms/vivo-mini-game/engine/AudioPlayer.js b/platforms/runtime/platforms/vivo-mini-game/engine/AudioPlayer.js index ee9eab3466..01d5117573 100644 --- a/platforms/runtime/platforms/vivo-mini-game/engine/AudioPlayer.js +++ b/platforms/runtime/platforms/vivo-mini-game/engine/AudioPlayer.js @@ -1,151 +1,153 @@ const { loadInnerAudioContext } = require('./download-audio'); const AudioPlayer = cc.internal.AudioPlayer; -const { PlayingState, AudioType } = cc.AudioClip; -const AudioManager = cc.internal.AudioManager; -AudioManager.maxAudioChannel = 10; +if (AudioPlayer) { + const { PlayingState, AudioType } = cc.AudioClip; + const AudioManager = cc.internal.AudioManager; + AudioManager.maxAudioChannel = 10; -class AudioManagerMiniGame extends AudioManager { - discardOnePlayingIfNeeded() { - if (this._playingAudios.length < AudioManager.maxAudioChannel) { - return; - } + class AudioManagerMiniGame extends AudioManager { + discardOnePlayingIfNeeded() { + if (this._playingAudios.length < AudioManager.maxAudioChannel) { + return; + } - // a played audio has a higher priority than a played shot - let audioToDiscard; - let oldestOneShotIndex = this._playingAudios.findIndex(audio => !(audio instanceof AudioPlayerRuntime)); - if (oldestOneShotIndex > -1) { - audioToDiscard = this._playingAudios[oldestOneShotIndex]; - this._playingAudios.splice(oldestOneShotIndex, 1); - } - else { - audioToDiscard = this._playingAudios.shift(); - } - if (audioToDiscard) { - audioToDiscard.stop(); + // a played audio has a higher priority than a played shot + let audioToDiscard; + let oldestOneShotIndex = this._playingAudios.findIndex(audio => !(audio instanceof AudioPlayerRuntime)); + if (oldestOneShotIndex > -1) { + audioToDiscard = this._playingAudios[oldestOneShotIndex]; + this._playingAudios.splice(oldestOneShotIndex, 1); + } + else { + audioToDiscard = this._playingAudios.shift(); + } + if (audioToDiscard) { + audioToDiscard.stop(); + } } } -} -cc.AudioClip.prototype._getPlayer = function (clip) { - this._loadMode = AudioType.JSB_AUDIO; - return AudioPlayerRuntime; -}; + cc.AudioClip.prototype._getPlayer = function (clip) { + this._loadMode = AudioType.JSB_AUDIO; + return AudioPlayerRuntime; + }; -export class AudioPlayerRuntime extends AudioPlayer { - static _manager = new AudioManagerMiniGame(); - _startTime = 0; - _offset = 0; - _volume = 1; - _loop = false; + class AudioPlayerRuntime extends AudioPlayer { + static _manager = new AudioManagerMiniGame(); + _startTime = 0; + _offset = 0; + _volume = 1; + _loop = false; - constructor (info) { - super(info); - this._nativeAudio = info.nativeAudio; + constructor (info) { + super(info); + this._nativeAudio = info.nativeAudio; - this._nativeAudio.onPlay(() => { - if (this._state === PlayingState.PLAYING) { return; } - this._state = PlayingState.PLAYING; - this._startTime = performance.now(); - this._clip.emit('started'); - }); - this._nativeAudio.onPause(() => { - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._offset += performance.now() - this._startTime; - }); - this._nativeAudio.onStop(() => { - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._offset = 0; - }); - this._nativeAudio.onEnded(() => { - if (this._state === PlayingState.STOPPED) { return; } - this._state = PlayingState.STOPPED; - this._offset = 0; - this._clip.emit('ended'); - AudioPlayerRuntime._manager.removePlaying(this); - }); - this._nativeAudio.onError(function (res) { return console.error(res.errMsg);}); - } - - play () { - if (!this._nativeAudio) { return; } - if (this._blocking) { this._interrupted = true; return; } - if (this._state === PlayingState.PLAYING) { - /* sometimes there is no way to update the playing state - especially when player unplug earphones and the audio automatically stops - so we need to force updating the playing state by pausing audio */ - this.pause(); - // restart if already playing - this.setCurrentTime(0); - } - AudioPlayerRuntime._manager.discardOnePlayingIfNeeded(); - this._nativeAudio.play(); - AudioPlayerRuntime._manager.addPlaying(this); - } - - pause () { - if (!this._nativeAudio || this._state !== PlayingState.PLAYING) { return; } - this._nativeAudio.pause(); - AudioPlayerRuntime._manager.removePlaying(this._clip); - } - - stop () { - if (!this._nativeAudio) { return; } - this._nativeAudio.stop(); - AudioPlayerRuntime._manager.removePlaying(this._clip); - } - - playOneShot (volume) { - loadInnerAudioContext(this._nativeAudio.src).then(innerAudioContext => { - AudioPlayerRuntime._manager.discardOnePlayingIfNeeded(); - innerAudioContext.volume = volume; - innerAudioContext.play(); - AudioPlayerRuntime._manager.addPlaying(innerAudioContext); - innerAudioContext.onEnded(() => { - AudioPlayerRuntime._manager.removePlaying(innerAudioContext); + this._nativeAudio.onPlay(() => { + if (this._state === PlayingState.PLAYING) { return; } + this._state = PlayingState.PLAYING; + this._startTime = performance.now(); + this._clip.emit('started'); }); - }); - } - - getCurrentTime () { - if (this._state !== PlayingState.PLAYING) { return this._offset / 1000; } - let current = (performance.now() - this._startTime + this._offset) / 1000; - if (current > this._duration) { - if (!this._loop) return 0; - current -= this._duration; this._startTime += this._duration * 1000; + this._nativeAudio.onPause(() => { + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._offset += performance.now() - this._startTime; + }); + this._nativeAudio.onStop(() => { + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._offset = 0; + }); + this._nativeAudio.onEnded(() => { + if (this._state === PlayingState.STOPPED) { return; } + this._state = PlayingState.STOPPED; + this._offset = 0; + this._clip.emit('ended'); + AudioPlayerRuntime._manager.removePlaying(this); + }); + this._nativeAudio.onError(function (res) { return console.error(res.errMsg);}); } - return current; - } - setCurrentTime (val) { - if (!this._nativeAudio) { return; } - this._offset = cc.math.clamp(val, 0, this._duration) * 1000; - this._startTime = performance.now(); - this._nativeAudio.seek(val); - } + play () { + if (!this._nativeAudio) { return; } + if (this._blocking) { this._interrupted = true; return; } + if (this._state === PlayingState.PLAYING) { + /* sometimes there is no way to update the playing state + especially when player unplug earphones and the audio automatically stops + so we need to force updating the playing state by pausing audio */ + this.pause(); + // restart if already playing + this.setCurrentTime(0); + } + AudioPlayerRuntime._manager.discardOnePlayingIfNeeded(); + this._nativeAudio.play(); + AudioPlayerRuntime._manager.addPlaying(this); + } - getVolume () { - return this._volume; - } + pause () { + if (!this._nativeAudio || this._state !== PlayingState.PLAYING) { return; } + this._nativeAudio.pause(); + AudioPlayerRuntime._manager.removePlaying(this._clip); + } - setVolume (val, immediate) { - this._volume = val; - if (this._nativeAudio) { this._nativeAudio.volume = val; } - } + stop () { + if (!this._nativeAudio) { return; } + this._nativeAudio.stop(); + AudioPlayerRuntime._manager.removePlaying(this._clip); + } - getLoop () { - return this._loop; - } + playOneShot (volume) { + loadInnerAudioContext(this._nativeAudio.src).then(innerAudioContext => { + AudioPlayerRuntime._manager.discardOnePlayingIfNeeded(); + innerAudioContext.volume = volume; + innerAudioContext.play(); + AudioPlayerRuntime._manager.addPlaying(innerAudioContext); + innerAudioContext.onEnded(() => { + AudioPlayerRuntime._manager.removePlaying(innerAudioContext); + }); + }); + } - setLoop (val) { - this._loop = val; - if (this._nativeAudio) { this._nativeAudio.loop = val; } - } + getCurrentTime () { + if (this._state !== PlayingState.PLAYING) { return this._offset / 1000; } + let current = (performance.now() - this._startTime + this._offset) / 1000; + if (current > this._duration) { + if (!this._loop) return 0; + current -= this._duration; this._startTime += this._duration * 1000; + } + return current; + } - destroy () { - if (this._nativeAudio) { this._nativeAudio.destroy(); } - super.destroy(); + setCurrentTime (val) { + if (!this._nativeAudio) { return; } + this._offset = cc.math.clamp(val, 0, this._duration) * 1000; + this._startTime = performance.now(); + this._nativeAudio.seek(val); + } + + getVolume () { + return this._volume; + } + + setVolume (val, immediate) { + this._volume = val; + if (this._nativeAudio) { this._nativeAudio.volume = val; } + } + + getLoop () { + return this._loop; + } + + setLoop (val) { + this._loop = val; + if (this._nativeAudio) { this._nativeAudio.loop = val; } + } + + destroy () { + if (this._nativeAudio) { this._nativeAudio.destroy(); } + super.destroy(); + } } } diff --git a/scripts/module-division/division-config.json b/scripts/module-division/division-config.json index c491ebc305..4a8c9a2b0b 100644 --- a/scripts/module-division/division-config.json +++ b/scripts/module-division/division-config.json @@ -25,10 +25,22 @@ } ] }, + { + "text": "3D", + "description": "3D", + "entry": "3d", + "default": true + }, + { + "text": "2D", + "description": "2D module", + "entry": "2d", + "default": true + }, { "text": "UI", "description": "UI module", - "entry": "ui", + "entry": ["ui", "2d"], "default": true }, { @@ -100,6 +112,18 @@ "entry": "intersection-2d", "default": true }, + { + "text": "Primitive", + "description": "Primitive", + "entry": "primitive", + "default": true + }, + { + "text": "Profiler", + "description": "Profiler", + "entry": "profiler", + "default": true + }, { "text": "Particle 2D", "description": "Particle 2D.", diff --git a/tests/animation/animation-clip.test.ts b/tests/animation/animation-clip.test.ts index 81e9f3ec2a..ea870b2edf 100644 --- a/tests/animation/animation-clip.test.ts +++ b/tests/animation/animation-clip.test.ts @@ -1,4 +1,5 @@ -import { AnimationClip, js, AnimationState, Node, Component, Vec3, AnimationManager } from '../../cocos/core'; +import { js, Node, Component, Vec3 } from '../../cocos/core'; +import { AnimationClip, AnimationState, AnimationManager } from '../../cocos/core/animation'; import { ComponentPath, HierarchyPath } from '../../cocos/core/animation/animation'; import { ccclass } from 'cc.decorator'; diff --git a/tests/animation/animation-events.test.ts b/tests/animation/animation-events.test.ts index c6d58b456e..a434e40d96 100644 --- a/tests/animation/animation-events.test.ts +++ b/tests/animation/animation-events.test.ts @@ -1,4 +1,5 @@ -import { Node, Animation, AnimationClip, math, AnimationState } from '../../cocos/core'; +import { Node, math } from '../../cocos/core'; +import { Animation, AnimationState, AnimationClip } from '../../cocos/core/animation'; test('Animation events(general)', () => { const mockInstance = jest.spyOn((global as any).cc.director, 'getAnimationManager').mockImplementation(() => {