Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support @base/debug module #16287

Merged
merged 11 commits into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ jobs:
- checkout
- run: sudo npm install -g gulp
- run: npm install
- run: gulp build-debug-infos
- run: npm test

workflows:
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ rules:

lines-between-class-members: off # be more lenient on member declarations
max-classes-per-file: off # helper classes are common
max-len: [warn, 150] # more lenient on max length per line
max-len: off # no max line length limitation
no-console: error # prefer the uniform logging methods
no-plusplus: off # allow increment/decrement operators
no-continue: off # allow unlabeled continues
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/native-ts-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npx gulp build-debug-infos
- name: Download external
run: |
EXT_VERSION=`node ./.github/workflows/get-native-external-version.js`
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/web-npm_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ jobs:
- name: npm install
run: |
npm install

- name: build-debug-infos
run: |
gulp build-debug-infos

- name: run test
run: |
Expand Down
15 changes: 0 additions & 15 deletions DebugInfos.d.ts

This file was deleted.

3 changes: 2 additions & 1 deletion cocos/2d/assembler/label/bmfontUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
import { JSB } from 'internal:constants';
import { IConfig, FontAtlas } from '../../assets/bitmap-font';
import { SpriteFrame } from '../../assets/sprite-frame';
import { Rect, error } from '../../../core';
import { Rect } from '../../../core';
import { error } from '@base/debug';
import { Label, Overflow, CacheMode } from '../../components/label';
import { UITransform } from '../../framework/ui-transform';
import { LetterAtlas, shareLabelInfo } from './font-utils';
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/assembler/label/font-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
*/

import { FontAtlas } from '../../assets/bitmap-font';
import { Color, macro, warn, warnID, ImageData } from '../../../core';
import { Color, macro, ImageData } from '../../../core';
import { warn, warnID } from '@base/debug';
import { ImageAsset, Texture2D } from '../../../asset/assets';
import { PixelFormat } from '../../../asset/assets/asset-enum';
import { BufferTextureCopy } from '../../../gfx';
Expand Down
2 changes: 1 addition & 1 deletion cocos/2d/assembler/label/text-processing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { Texture2D } from '../../../asset/assets';
import { WrapMode } from '../../../asset/assets/asset-enum';
import { cclegacy } from '@base/global';
import { Color, Pool, Rect, Vec2 } from '../../../core';
import { log, logID, warn } from '../../../core/platform';
import { log, logID, warn } from '@base/debug';
import { SpriteFrame } from '../../assets';
import { FontLetterDefinition } from '../../assets/bitmap-font';
import { HorizontalTextAlignment, Overflow, VerticalTextAlignment } from '../../components/label';
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/assembler/sprite/bar-filled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
THE SOFTWARE.
*/

import { Mat4, errorID } from '../../../core';
import { Mat4 } from '../../../core';
import { errorID } from '@base/debug';
import { IRenderData, RenderData } from '../../renderer/render-data';
import { IBatcher } from '../../renderer/i-batcher';
import { Sprite } from '../../components';
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/assembler/sprite/tiled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@

import { JSB } from 'internal:constants';
import { IUV, SpriteFrame } from '../../assets/sprite-frame';
import { Mat4, Vec3, Color, error } from '../../../core';
import { Mat4, Vec3, Color } from '../../../core';
import { error } from '@base/debug';
import { IRenderData, RenderData } from '../../renderer/render-data';
import { IBatcher } from '../../renderer/i-batcher';
import { Sprite } from '../../components/sprite';
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/assets/bitmap-font.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ import { ccclass, type, serializable, editable } from 'cc.decorator';
import { Font } from './font';
import { SpriteFrame } from './sprite-frame';
import { cclegacy } from '@base/global';
import { js, warn } from '../../core';
import { js } from '../../core';
import { warn } from '@base/debug';

export interface IConfig {
[key: string]: any;
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/assets/sprite-frame.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
import { ccclass } from 'cc.decorator';
import { EDITOR, TEST, BUILD } from 'internal:constants';
import { IMemoryImageSource } from '../../../pal/image/types';
import { Mat4, Rect, Size, Vec2, Vec3, Vec4, errorID, warnID, js } from '../../core';
import { Mat4, Rect, Size, Vec2, Vec3, Vec4, js } from '../../core';
import { errorID, warnID } from '@base/debug';
import { cclegacy, ccwindow } from '@base/global';
import { Asset } from '../../asset/assets/asset';
import { TextureBase } from '../../asset/assets/texture-base';
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/components/graphics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ import { JSB } from 'internal:constants';
import { builtinResMgr } from '../../asset/asset-manager';
import { InstanceMaterialType, UIRenderer } from '../framework/ui-renderer';
import { director } from '../../game/director';
import { Color, warnID } from '../../core';
import { Color } from '../../core';
import { warnID } from '@base/debug';
import { cclegacy } from '@base/global';
import { scene } from '../../render-scene';
import { IAssembler } from '../renderer/base';
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/components/mask.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@

import { ccclass, help, executionOrder, menu, tooltip, displayOrder, type, visible, serializable, range, slide, executeInEditMode } from 'cc.decorator';
import { JSB } from 'internal:constants';
import { clamp, Color, Mat4, Vec2, Vec3, warnID, ccenum, error } from '../../core';
import { clamp, Color, Mat4, Vec2, Vec3, ccenum } from '../../core';
import { warnID, error } from '@base/debug';
import { cclegacy } from '@base/global';
import { Graphics } from './graphics';
import { TransformBit } from '../../scene-graph/node-enum';
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/components/rich-text.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ import { ccclass, executeInEditMode, executionOrder, help, menu, tooltip, multil
import { DEBUG, DEV, EDITOR } from 'internal:constants';
import { Font, SpriteAtlas, TTFFont, SpriteFrame } from '../assets';
import { EventTouch } from '../../input/types';
import { assert, warnID, Color, Vec2, CCObject, js, Size } from '../../core';
import { assert, warnID } from '@base/debug';
import { Color, Vec2, CCObject, js, Size } from '../../core';
import { cclegacy } from '@base/global';
import { BASELINE_RATIO, fragmentText, isUnicodeCJK, isUnicodeSpace, getEnglishWordPartAtFirst, getEnglishWordPartAtLast } from '../utils/text-utils';
import { HtmlTextParser, IHtmlTextParserResultObj, IHtmlTextParserStack } from '../utils/html-text-parser';
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/components/sprite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ import { ccclass, help, executionOrder, menu, tooltip, displayOrder, type, range
import { BUILD, EDITOR } from 'internal:constants';
import { SpriteAtlas } from '../assets/sprite-atlas';
import { SpriteFrame } from '../assets/sprite-frame';
import { Vec2, ccenum, clamp, warn } from '../../core';
import { Vec2, ccenum, clamp } from '../../core';
import { warn } from '@base/debug';
import { cclegacy } from '@base/global';
import { IBatcher } from '../renderer/i-batcher';
import { UIRenderer, InstanceMaterialType } from '../framework/ui-renderer';
Expand Down
2 changes: 1 addition & 1 deletion cocos/2d/components/ui-mesh-renderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { NativeUIModelProxy } from '../renderer/native-2d';
import { uiRendererManager } from '../framework/ui-renderer-manager';
import { RenderEntity, RenderEntityType } from '../renderer/render-entity';
import { MeshRenderData, RenderData } from '../renderer/render-data';
import { assert, warn } from '../../core';
import { assert, warn } from '@base/debug';
import { cclegacy } from '@base/global';
import { RenderDrawInfoType } from '../renderer/render-draw-info';
import type { UIRenderer } from '../framework/ui-renderer';
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/framework/ui-renderer-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
*/

import { DEBUG } from 'internal:constants';
import { assert, js } from '../../core';
import { assert } from '@base/debug';
import { js } from '../../core';
import { UIMeshRenderer } from '../components';
import { UIRenderer } from './ui-renderer';

Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/framework/ui-renderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@

import { DEBUG, EDITOR, JSB } from 'internal:constants';
import { ccclass, executeInEditMode, requireComponent, tooltip, type, displayOrder, serializable, override, visible, displayName, disallowAnimation } from 'cc.decorator';
import { Color, assert, ccenum } from '../../core';
import { Color, ccenum } from '../../core';
import { assert } from '@base/debug';
import { cclegacy } from '@base/global';
import { builtinResMgr } from '../../asset/asset-manager';
import { Material } from '../../asset/assets';
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/framework/ui-transform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
import { ccclass, help, executeInEditMode, executionOrder, menu, tooltip, displayOrder, serializable, disallowMultiple } from 'cc.decorator';
import { EDITOR } from 'internal:constants';
import { Component, Node } from '../../scene-graph';
import { Mat4, Rect, Size, Vec2, Vec3, geometry, warnID, visibleRect, approx, EPSILON } from '../../core';
import { Mat4, Rect, Size, Vec2, Vec3, geometry, visibleRect, approx, EPSILON } from '../../core';
import { warnID } from '@base/debug';
import { Director, director } from '../../game/director';
import { NodeEventType } from '../../scene-graph/node-event';
import { IMask } from '../../scene-graph/node-event-processor';
Expand Down
6 changes: 3 additions & 3 deletions cocos/2d/renderer/batcher-2d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@

import { DEBUG, JSB } from 'internal:constants';
import { cclegacy } from '@base/global';
import { assert } from '@base/debug';
import { Camera, Model } from '../../render-scene/scene';
import { Material } from '../../asset/assets/material';
import { RenderRoot2D, UIRenderer } from '../framework';
import { Texture, Device, Attribute, Sampler, DescriptorSetInfo, Buffer, BufferInfo, BufferUsageBit,
MemoryUsageBit, DescriptorSet, InputAssembler, deviceManager, PrimitiveMode } from '../../gfx';
import { CachedArray, Pool, Mat4, assertIsTrue, assert, approx, EPSILON } from '../../core';
import { Texture, Device, Attribute, Sampler, DescriptorSetInfo, Buffer, BufferInfo, BufferUsageBit, MemoryUsageBit, DescriptorSet, InputAssembler, deviceManager, PrimitiveMode } from '../../gfx';
import { CachedArray, Pool, Mat4, assertIsTrue, approx, EPSILON } from '../../core';
import { Root } from '../../root';
import { Node } from '../../scene-graph';
import { Stage, StencilManager } from './stencil-manager';
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/renderer/deprecated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
import * as VertexFormat from './vertex-format';
import { Batcher2D } from './batcher-2d';
import { DrawBatch2D } from './draw-batch';
import { markAsWarning, replaceProperty, removeProperty, warnID } from '../../core';
import { markAsWarning, replaceProperty, removeProperty } from '../../core';
import { warnID } from '@base/debug';
import { MeshBuffer } from './mesh-buffer';
import { MeshRenderData } from './render-data';

Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/renderer/linear-buffer-accessor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
import { InputAssembler, Device, Attribute } from '../../gfx';
import { MeshBuffer } from './mesh-buffer';
import { BufferAccessor } from './buffer-accessor';
import { assertID, macro, assertIsNonNullable } from '../../core';
import { assertID } from '@base/debug';
import { macro, assertIsNonNullable } from '../../core';

export class LinearBufferAccessor extends BufferAccessor {
public static IB_SCALE = 4; // ib size scale based on vertex count
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/renderer/mesh-buffer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
import { JSB } from 'internal:constants';
import { Device, BufferUsageBit, MemoryUsageBit, Attribute, Buffer, BufferInfo, InputAssembler, InputAssemblerInfo } from '../../gfx';
import { getAttributeStride } from './vertex-format';
import { sys, getError, warnID, assertIsTrue } from '../../core';
import { sys, assertIsTrue } from '../../core';
import { getError, warnID } from '@base/debug';
import { NativeUIMeshBuffer } from './native-2d';

interface IIARef {
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/renderer/render-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ import { DEBUG, JSB } from 'internal:constants';
import { director } from '../../game/director';
import { Material } from '../../asset/assets/material';
import { TextureBase } from '../../asset/assets/texture-base';
import { Color, Pool, RecyclePool, murmurhash2_32_gc, assert, assertIsTrue } from '../../core';
import { Color, Pool, RecyclePool, murmurhash2_32_gc, assertIsTrue } from '../../core';
import { assert } from '@base/debug';
import { SpriteFrame } from '../assets/sprite-frame';
import { UIRenderer } from '../framework/ui-renderer';
import { StaticVBAccessor, StaticVBChunk } from './static-vb-accessor';
Expand Down
3 changes: 2 additions & 1 deletion cocos/2d/renderer/static-vb-accessor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ import { JSB } from 'internal:constants';
import { Device, Attribute } from '../../gfx';
import { MeshBuffer } from './mesh-buffer';
import { BufferAccessor } from './buffer-accessor';
import { assertID, errorID, Pool, macro, assertIsTrue } from '../../core';
import { assertID, errorID } from '@base/debug';
import { Pool, macro, assertIsTrue } from '../../core';
import { director } from '../../game';

interface IFreeEntry {
Expand Down
2 changes: 1 addition & 1 deletion cocos/2d/utils/dynamic-atlas/atlas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { ImageAsset } from '../../../asset/assets/image-asset';
import { Texture2D } from '../../../asset/assets/texture-2d';
import { BufferTextureCopy } from '../../../gfx';
import { cclegacy } from '@base/global';
import { warn } from '../../../core';
import { warn } from '@base/debug';
import { SpriteFrame } from '../../assets/sprite-frame';

const space = 2;
Expand Down
2 changes: 1 addition & 1 deletion cocos/2d/utils/font-loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
THE SOFTWARE.
*/

import { warnID } from '../../core';
import { warnID } from '@base/debug';
import { safeMeasureText } from './text-utils';
import downloader from '../../asset/asset-manager/downloader';
import factory from '../../asset/asset-manager/factory';
Expand Down
3 changes: 2 additions & 1 deletion cocos/3d/assets/mesh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ import { Asset } from '../../asset/assets/asset';
import { IDynamicGeometry } from '../../primitive/define';
import { BufferBlob } from '../misc/buffer-blob';
import { Skeleton } from './skeleton';
import { geometry, sys, warnID, Mat4, Quat, Vec3, assertIsTrue, murmurhash2_32_gc, errorID } from '../../core';
import { geometry, sys, Mat4, Quat, Vec3, assertIsTrue, murmurhash2_32_gc } from '../../core';
import { warnID, errorID } from '@base/debug';
import { cclegacy } from '@base/global';
import { RenderingSubMesh } from '../../asset/assets';
import { Attribute, Device, Buffer, BufferInfo, AttributeName, BufferUsageBit, Feature, Format, FormatInfos, FormatType, MemoryUsageBit, PrimitiveMode, getTypedArrayConstructor, DrawInfo, FormatInfo, deviceManager } from '../../gfx';
Expand Down
3 changes: 2 additions & 1 deletion cocos/3d/assets/morph-rendering.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ import { Texture2D } from '../../asset/assets/texture-2d';
import { ImageAsset } from '../../asset/assets/image-asset';
import { UBOMorph, UNIFORM_NORMAL_MORPH_TEXTURE_BINDING, UNIFORM_POSITION_MORPH_TEXTURE_BINDING, UNIFORM_TANGENT_MORPH_TEXTURE_BINDING } from '../../rendering/define';
import { Morph, SubMeshMorph } from './morph';
import { assertIsNonNullable, assertIsTrue, warn, bits, nextPow2 } from '../../core';
import { assertIsNonNullable, assertIsTrue, bits, nextPow2 } from '../../core';
import { warn } from '@base/debug';
import { cclegacy } from '@base/global';
import { IMacroPatch } from '../../render-scene';
import { PixelFormat } from '../../asset/assets/asset-enum';
Expand Down
3 changes: 2 additions & 1 deletion cocos/3d/framework/mesh-renderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ import { displayOrder, group, range } from 'cc.decorator';
import { Texture2D, TextureCube } from '../../asset/assets';
import { Material } from '../../asset/assets/material';
import { Mesh } from '../assets/mesh';
import { Vec4, Enum, CCBoolean, CCFloat, assertIsTrue, _decorator, CCInteger, EventTarget, warnID } from '../../core';
import { Vec4, Enum, CCBoolean, CCFloat, assertIsTrue, _decorator, CCInteger, EventTarget } from '../../core';
import { warnID } from '@base/debug';
import { cclegacy } from '@base/global';
import { scene } from '../../render-scene';
import { MorphModel } from '../models/morph-model';
Expand Down
3 changes: 2 additions & 1 deletion cocos/3d/lights/directional-light-component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
import { Light } from './light-component';
import { scene } from '../../render-scene';
import { cclegacy } from '@base/global';
import { clamp, warnID, CCBoolean, CCFloat, _decorator, settings, Settings, CCInteger } from '../../core';
import { clamp, CCBoolean, CCFloat, _decorator, settings, Settings, CCInteger } from '../../core';
import { warnID } from '@base/debug';
import { Camera, PCFType, Shadows, ShadowType, CSMOptimizationMode, CSMLevel } from '../../render-scene/scene';
import { Root } from '../../root';
import { MeshRenderer } from '../framework/mesh-renderer';
Expand Down
3 changes: 2 additions & 1 deletion cocos/3d/lod/lodgroup-component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
*/
import { EDITOR, JSB } from 'internal:constants';
import { ccclass, editable, executeInEditMode, menu, serializable, type } from 'cc.decorator';
import { Vec3, Mat4, geometry, CCInteger, CCFloat, error, warn } from '../../core';
import { Vec3, Mat4, geometry, CCInteger, CCFloat } from '../../core';
import { error, warn } from '@base/debug';
import { Node } from '../../scene-graph/node';
import { Component } from '../../scene-graph/component';
import { MeshRenderer } from '../framework/mesh-renderer';
Expand Down
3 changes: 2 additions & 1 deletion cocos/3d/misc/batch-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@

import { MeshRenderer } from '../framework/mesh-renderer';
import { Mesh } from '../assets/mesh';
import { Mat4, error } from '../../core';
import { Mat4 } from '../../core';
import { error } from '@base/debug';
import { Node } from '../../scene-graph/node';

function checkMaterialisSame (comp1: MeshRenderer, comp2: MeshRenderer): boolean {
Expand Down
3 changes: 2 additions & 1 deletion cocos/3d/misc/mesh-codec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
import { WASM_SUPPORT_MODE } from 'internal:constants';
import { ensureWasmModuleReady, instantiateWasm } from 'pal/wasm';

import { sys, logID } from '../../core';
import { sys } from '../../core';
import { logID } from '@base/debug';
import { cclegacy } from '@base/global';

import { WebAssemblySupportMode } from '../../misc/webassembly-support';
Expand Down
3 changes: 2 additions & 1 deletion cocos/3d/models/skinning-model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ import { Material } from '../../asset/assets/material';
import { RenderingSubMesh } from '../../asset/assets/rendering-sub-mesh';
import { Mesh } from '../assets/mesh';
import { Skeleton } from '../assets/skeleton';
import { geometry, Mat4, Vec3, warnID } from '../../core';
import { geometry, Mat4, Vec3 } from '../../core';
import { warnID } from '@base/debug';
import { BufferUsageBit, MemoryUsageBit, DescriptorSet, Buffer, BufferInfo, Attribute, FormatFeatureBit, Format } from '../../gfx';
import { UBOSkinning, UNIFORM_REALTIME_JOINT_TEXTURE_BINDING } from '../../rendering/define';
import { Node } from '../../scene-graph/node';
Expand Down
3 changes: 2 additions & 1 deletion cocos/3d/reflection-probe/reflection-probe-component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
*/
import { ccclass, executeInEditMode, help, menu, playOnFocus, serializable, tooltip, type, visible } from 'cc.decorator';
import { EDITOR, EDITOR_NOT_IN_PREVIEW } from 'internal:constants';
import { CCBoolean, CCObject, Color, Enum, Vec3, warn } from '../../core';
import { CCBoolean, CCObject, Color, Enum, Vec3 } from '../../core';
import { warn } from '@base/debug';

import { TextureCube } from '../../asset/assets';
import { scene } from '../../render-scene';
Expand Down
3 changes: 2 additions & 1 deletion cocos/3d/skeletal-animation/skeletal-animation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
import { ccclass, executeInEditMode, executionOrder, help, menu, type, serializable, editable } from 'cc.decorator';
import { EDITOR_NOT_IN_PREVIEW } from 'internal:constants';
import { SkinnedMeshRenderer } from '../skinned-mesh-renderer';
import { Mat4, js, assertIsTrue, warn } from '../../core';
import { Mat4, js, assertIsTrue } from '../../core';
import { warn } from '@base/debug';
import { cclegacy } from '@base/global';
import { DataPoolManager } from './data-pool-manager';
import { Node } from '../../scene-graph/node';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ import { Material } from '../../asset/assets/material';
import { Mesh } from '../assets/mesh';
import { Skeleton } from '../assets/skeleton';
import { Texture2D } from '../../asset/assets/texture-2d';
import { CCString, Mat4, Vec2, Vec3, warn } from '../../core';
import { CCString, Mat4, Vec2, Vec3 } from '../../core';
import { warn } from '@base/debug';
import { cclegacy } from '@base/global';
import { AttributeName, FormatInfos, Format, Type, Attribute, BufferTextureCopy } from '../../gfx';
import { mapBuffer, readBuffer, writeBuffer } from '../misc/buffer';
Expand Down
Loading