Viewer Exports Update

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

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

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 {

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() {

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

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,