diff --git a/api/@ohos.arkui.component.d.ets b/api/@ohos.arkui.component.d.ets index 461b86ba7a40c72ae5e4d448919f1603512e90c8..fd7da3dd867dc68796df1edfe9e6f8b20d252346 100644 --- a/api/@ohos.arkui.component.d.ets +++ b/api/@ohos.arkui.component.d.ets @@ -154,3 +154,4 @@ export * from './arkui/component/xcomponent'; export * from './arkui/component/resources'; export * from './arkui/component/lazyGridLayout'; export * from './arkui/component/pageTransition'; +export * from './arkui/component/component3d'; diff --git a/api/graphics3d/Scene.d.ts b/api/graphics3d/Scene.d.ts index 838408be3a469c17e0c30952d9764a067d7ef6f9..8b1de11d754f9c583973b25819bfb9ad3de31038 100644 --- a/api/graphics3d/Scene.d.ts +++ b/api/graphics3d/Scene.d.ts @@ -19,12 +19,22 @@ * @arkts 1.1&1.2 */ -/*** if arkts 1.2 */ -import { ResourceStr } from '../arkui/component/units'; -/*** endif */ import { Shader, MaterialType, Material, Animation, Environment, Image, MeshResource, Sampler, SceneResource } from './SceneResources'; import { Camera, LightType, Light, Node, NodeType, Geometry } from './SceneNodes'; import { Position3, Color, GeometryDefinition, Vec2, Vec3, Vec4 } from './SceneTypes'; +/*** if arkts 1.2 */ +import { Resource } from '../global/resource'; + +/** + * Defines the string which can use resource. + * + * @typedef { string | Resource } ResourceStr + * @syscap SystemCapability.ArkUi.Graphics3D + * @since 20 + * @arkts 1.2 + */ +declare type ResourceStr = string | Resource; +/*** endif */ /** * The scene resource parameters type. diff --git a/api/graphics3d/SceneResources.d.ts b/api/graphics3d/SceneResources.d.ts index c26828aa130a9a3958264eb45af4b929a78f5137..a6fc30b942b7d701b4f8ed0d28710f885e9f7927 100644 --- a/api/graphics3d/SceneResources.d.ts +++ b/api/graphics3d/SceneResources.d.ts @@ -19,11 +19,21 @@ * @arkts 1.1&1.2 */ -/*** if arkts 1.2 */ -import { ResourceStr } from '../arkui/component/units'; -/*** endif */ import { Vec2, Vec3, Vec4, Aabb } from './SceneTypes'; import { Callback } from '../@ohos.base'; +/*** if arkts 1.2 */ +import { Resource } from '../global/resource'; + +/** + * Defines the string which can use resource. + * + * @typedef { string | Resource } ResourceStr + * @syscap SystemCapability.ArkUi.Graphics3D + * @since 20 + * @arkts 1.2 + */ +declare type ResourceStr = string | Resource; +/*** endif */ /** * The enum of SceneResource type. diff --git a/build-tools/arkui_transformer/config/none_arkui_files.json b/build-tools/arkui_transformer/config/none_arkui_files.json index 489bd127ec7552a3ae4121b907ab015a6908d9b3..6f5fba878a503ad78df260a0ec610021c94275dc 100644 --- a/build-tools/arkui_transformer/config/none_arkui_files.json +++ b/build-tools/arkui_transformer/config/none_arkui_files.json @@ -1,5 +1,3 @@ { - "files": [ - "component3d" - ] + "files": [] } \ No newline at end of file