From e430e552149b835e3f0e11941f94eb2e63c5822e Mon Sep 17 00:00:00 2001 From: Alexandru Popovici Date: Mon, 23 Sep 2024 15:03:30 +0300 Subject: [PATCH] Viewer Exports Update (#2903) * Updated viewer type exports. Added missing types and removed tVector3 and Box3 from three * Updated import source for Vector3 * Updated viewer-sandbox imports --- .../frontend-2/components/viewer/gendo/Item.vue | 2 +- .../viewer-sandbox/src/Extensions/CameraPlanes.ts | 10 ++-------- .../src/Extensions/ExtendedSelection.ts | 10 ++-------- .../viewer-sandbox/src/Extensions/RotateCamera.ts | 3 ++- packages/viewer-sandbox/src/Sandbox.ts | 6 ++---- packages/viewer/src/index.ts | 14 ++++++++++---- 6 files changed, 19 insertions(+), 26 deletions(-) diff --git a/packages/frontend-2/components/viewer/gendo/Item.vue b/packages/frontend-2/components/viewer/gendo/Item.vue index 34ecda11fc..cbbc0902c9 100644 --- a/packages/frontend-2/components/viewer/gendo/Item.vue +++ b/packages/frontend-2/components/viewer/gendo/Item.vue @@ -60,7 +60,7 @@ import { ArrowDownTrayIcon } from '@heroicons/vue/24/outline' import { useCameraUtilities } from '~/lib/viewer/composables/ui' -import type { Vector3 } from '@speckle/viewer' +import type { Vector3 } from 'three' const props = defineProps<{ renderRequest: GendoAiRender diff --git a/packages/viewer-sandbox/src/Extensions/CameraPlanes.ts b/packages/viewer-sandbox/src/Extensions/CameraPlanes.ts index c38e60fee5..7c74db07ef 100644 --- a/packages/viewer-sandbox/src/Extensions/CameraPlanes.ts +++ b/packages/viewer-sandbox/src/Extensions/CameraPlanes.ts @@ -1,11 +1,5 @@ -import { - CameraController, - Extension, - GeometryType, - IViewer, - Vector3 -} from '@speckle/viewer' -import { PerspectiveCamera } from 'three' +import { CameraController, Extension, GeometryType, IViewer } from '@speckle/viewer' +import { PerspectiveCamera, Vector3 } from 'three' export class CameraPlanes extends Extension { private camerController: CameraController diff --git a/packages/viewer-sandbox/src/Extensions/ExtendedSelection.ts b/packages/viewer-sandbox/src/Extensions/ExtendedSelection.ts index 0887743ccd..4e2fdbcbcc 100644 --- a/packages/viewer-sandbox/src/Extensions/ExtendedSelection.ts +++ b/packages/viewer-sandbox/src/Extensions/ExtendedSelection.ts @@ -1,12 +1,6 @@ import { UpdateFlags } from '@speckle/viewer' -import { - Box3, - ObjectLayers, - SelectionEvent, - SelectionExtension, - Vector3 -} from '@speckle/viewer' -import { Object3D } from 'three' +import { ObjectLayers, SelectionEvent, SelectionExtension } from '@speckle/viewer' +import { Object3D, Vector3, Box3 } from 'three' import { TransformControls } from 'three/examples/jsm/controls/TransformControls' export class ExtendedSelection extends SelectionExtension { diff --git a/packages/viewer-sandbox/src/Extensions/RotateCamera.ts b/packages/viewer-sandbox/src/Extensions/RotateCamera.ts index 98bcdbfbbd..d6eb486a06 100644 --- a/packages/viewer-sandbox/src/Extensions/RotateCamera.ts +++ b/packages/viewer-sandbox/src/Extensions/RotateCamera.ts @@ -1,4 +1,5 @@ -import { Vector3, Extension, IViewer, CameraController } from '@speckle/viewer' +import { Extension, IViewer, CameraController } from '@speckle/viewer' +import { Vector3 } from 'three' export class RotateCamera extends Extension { get inject() { diff --git a/packages/viewer-sandbox/src/Sandbox.ts b/packages/viewer-sandbox/src/Sandbox.ts index 1c8013b5bd..95c6e3fb8d 100644 --- a/packages/viewer-sandbox/src/Sandbox.ts +++ b/packages/viewer-sandbox/src/Sandbox.ts @@ -1,4 +1,4 @@ -import { Box3, SectionTool, SpeckleStandardMaterial, TreeNode } from '@speckle/viewer' +import { SectionTool, SpeckleStandardMaterial, TreeNode } from '@speckle/viewer' import { CanonicalView, Viewer, @@ -32,12 +32,10 @@ import Mild2 from '../assets/hdri/Mild2.png' import Sharp from '../assets/hdri/Sharp.png' import Bright from '../assets/hdri/Bright.png' -import { Euler, Vector3 } from 'three' +import { Euler, Vector3, Box3, Color } from 'three' import { GeometryType } from '@speckle/viewer' import { MeshBatch } from '@speckle/viewer' -import { Color } from 'three' - export default class Sandbox { private viewer: Viewer private pane: Pane diff --git a/packages/viewer/src/index.ts b/packages/viewer/src/index.ts index 0f8a5ea79e..ac49211239 100644 --- a/packages/viewer/src/index.ts +++ b/packages/viewer/src/index.ts @@ -32,7 +32,6 @@ import type { } from './modules/queries/Query.js' import { type Utils } from './modules/Utils.js' import { BatchObject } from './modules/batching/BatchObject.js' -import { Box3, Vector3 } from 'three' import { type MeasurementOptions, MeasurementType, @@ -64,7 +63,7 @@ import { Loader, LoaderEvent } from './modules/loaders/Loader.js' import { SpeckleLoader } from './modules/loaders/Speckle/SpeckleLoader.js' import { ObjLoader } from './modules/loaders/OBJ/ObjLoader.js' import { LegacyViewer } from './modules/LegacyViewer.js' -import { SpeckleType } from './modules/loaders/GeometryConverter.js' +import { GeometryConverter, SpeckleType } from './modules/loaders/GeometryConverter.js' import Input, { InputEvent, InputEventPayload } from './modules/input/Input.js' import { GeometryType } from './modules/batching/Batch.js' import { MeshBatch } from './modules/batching/MeshBatch.js' @@ -78,6 +77,10 @@ import { Assets } from './modules/Assets.js' import { SpecklePass } from './modules/pipeline/SpecklePass.js' import { InstancedBatchObject } from './modules/batching/InstancedBatchObject.js' import { HybridCameraController } from './modules/extensions/HybridCameraController.js' +import SpeckleBasicMaterial from './modules/materials/SpeckleBasicMaterial.js' +import LineBatch from './modules/batching/LineBatch.js' +import { PointBatch } from './modules/batching/PointBatch.js' +import TextBatch from './modules/batching/TextBatch.js' export { Viewer, @@ -88,8 +91,6 @@ export { World, BatchObject, InstancedBatchObject, - Box3, - Vector3, WorldTree, VisualDiffMode, MeasurementType, @@ -105,6 +106,7 @@ export { ExplodeExtension, DiffExtension, Loader, + GeometryConverter, SpeckleLoader, ObjLoader, LoaderEvent, @@ -115,7 +117,11 @@ export { ObjectLayers, GeometryType, MeshBatch, + LineBatch, + PointBatch, + TextBatch, SpeckleStandardMaterial, + SpeckleBasicMaterial, SpeckleTextMaterial, SpeckleText, NodeRenderView,