From eb4ee1bed51f8495f522a2931cfffd1cfe5733c5 Mon Sep 17 00:00:00 2001 From: Nathan Mande Date: Thu, 28 Nov 2024 11:07:24 +0200 Subject: [PATCH] refactor(reactive): drop `threejs` `Addon` imports --- .changeset/polite-moons-tap.md | 7 +++++++ packages/legacy/src/utils/Debug.ts | 2 +- packages/legacy/src/utils/Resources.ts | 3 ++- .../reactive/src/common/interfaces/resource.interface.ts | 2 +- packages/reactive/src/core/app/debug/debug.component.ts | 2 +- packages/reactive/src/core/loader/loader.component.ts | 3 ++- packages/reactive/src/core/loader/loader.module.ts | 2 +- 7 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 .changeset/polite-moons-tap.md diff --git a/.changeset/polite-moons-tap.md b/.changeset/polite-moons-tap.md new file mode 100644 index 000000000..ff477bb44 --- /dev/null +++ b/.changeset/polite-moons-tap.md @@ -0,0 +1,7 @@ +--- +"@quick-threejs/reactive": patch +--- + +# Logs + +## refactor(reactive): drop `threejs` `Addon` imports diff --git a/packages/legacy/src/utils/Debug.ts b/packages/legacy/src/utils/Debug.ts index b23f5ac32..80afce701 100644 --- a/packages/legacy/src/utils/Debug.ts +++ b/packages/legacy/src/utils/Debug.ts @@ -1,5 +1,5 @@ import * as THREE from "three"; -import { OrbitControls } from "three/examples/jsm/Addons"; +import { OrbitControls } from "three/examples/jsm/controls/OrbitControls"; import GUI from "three/examples/jsm/libs/lil-gui.module.min.js"; import Stats from "stats.js"; diff --git a/packages/legacy/src/utils/Resources.ts b/packages/legacy/src/utils/Resources.ts index 2be9c66a2..994c41de8 100644 --- a/packages/legacy/src/utils/Resources.ts +++ b/packages/legacy/src/utils/Resources.ts @@ -1,6 +1,7 @@ import * as THREE from "three"; import { EventEmitter } from "events"; -import { type GLTF, GLTFLoader, DRACOLoader } from "three/examples/jsm/Addons"; +import { type GLTF, GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader"; +import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader"; import { QuickThreejs } from ".."; diff --git a/packages/reactive/src/common/interfaces/resource.interface.ts b/packages/reactive/src/common/interfaces/resource.interface.ts index e62cb5732..00d93e489 100644 --- a/packages/reactive/src/common/interfaces/resource.interface.ts +++ b/packages/reactive/src/common/interfaces/resource.interface.ts @@ -1,5 +1,5 @@ import { CubeTextureLoader, Texture, VideoTexture } from "three"; -import { GLTF } from "three/examples/jsm/Addons"; +import { GLTF } from "three/examples/jsm/loaders/GLTFLoader"; export type LoadedResourceItem = | GLTF diff --git a/packages/reactive/src/core/app/debug/debug.component.ts b/packages/reactive/src/core/app/debug/debug.component.ts index 54b3b1b00..6a39a8661 100644 --- a/packages/reactive/src/core/app/debug/debug.component.ts +++ b/packages/reactive/src/core/app/debug/debug.component.ts @@ -1,6 +1,6 @@ import { inject, singleton } from "tsyringe"; import { AxesHelper, Camera, CameraHelper, GridHelper } from "three"; -import { OrbitControls } from "three/examples/jsm/Addons"; +import { OrbitControls } from "three/examples/jsm/controls/OrbitControls"; import { CameraComponent } from "../camera/camera.component"; import { AppComponent } from "../app.component"; diff --git a/packages/reactive/src/core/loader/loader.component.ts b/packages/reactive/src/core/loader/loader.component.ts index 76a4bde8b..5fb95df96 100644 --- a/packages/reactive/src/core/loader/loader.component.ts +++ b/packages/reactive/src/core/loader/loader.component.ts @@ -6,7 +6,8 @@ import { LoadingManager, VideoTexture } from "three"; -import { DRACOLoader, GLTFLoader } from "three/examples/jsm/Addons"; +import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader"; +import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader"; import { LoadedResourceItem, diff --git a/packages/reactive/src/core/loader/loader.module.ts b/packages/reactive/src/core/loader/loader.module.ts index 24d85b3cf..fba346a2a 100644 --- a/packages/reactive/src/core/loader/loader.module.ts +++ b/packages/reactive/src/core/loader/loader.module.ts @@ -2,7 +2,7 @@ import "reflect-metadata"; import { container, inject, Lifecycle, scoped } from "tsyringe"; import { CanvasTexture } from "three"; -import { DRACOLoader } from "three/examples/jsm/Addons"; +import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader"; import { WorkerThreadModule } from "@quick-threejs/utils"; import { LoaderController } from "./loader.controller";