@inweb/viewer-three 26.5.5 → 26.6.1

package/dist/viewer-three.module.js

@@ -2,12 +2,10 @@ import { draggersRegistry, commandsRegistry, componentsRegistry, Loader, loaders
 
 export * from "@inweb/viewer-core";
 
-import { Line, Vector3, BufferGeometry, Float32BufferAttribute, LineBasicMaterial, Mesh, MeshBasicMaterial, DoubleSide, EventDispatcher, MOUSE, TOUCH, Spherical, Quaternion, Vector2, Plane, Object3D, Matrix4, Vector4, Raycaster, Controls, Clock, Box3, Sphere, MathUtils, Color, PMREMGenerator, AmbientLight, DirectionalLight, OrthographicCamera, CylinderGeometry, Sprite, CanvasTexture, SRGBColorSpace, SpriteMaterial, LoadingManager, LoaderUtils, Scene, PerspectiveCamera, WebGLRenderer, LinearToneMapping } from "three";
+import { Line, Vector3, BufferGeometry, Float32BufferAttribute, LineBasicMaterial, Mesh, MeshBasicMaterial, DoubleSide, EventDispatcher, MOUSE, TOUCH, Spherical, Quaternion, Vector2, Plane, Object3D, Matrix4, Vector4, Raycaster, Controls, Clock, Box3, Sphere, MathUtils, Color, AmbientLight, DirectionalLight, HemisphereLight, OrthographicCamera, CylinderGeometry, Sprite, CanvasTexture, SRGBColorSpace, SpriteMaterial, LoadingManager, LoaderUtils, Scene, PerspectiveCamera, WebGLRenderer, LinearToneMapping } from "three";
 
 import { TransformControls } from "three/examples/jsm/controls/TransformControls.js";
 
-import { RoomEnvironment } from "three/examples/jsm/environments/RoomEnvironment.js";
-
 import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
 
 import { EventEmitter2 } from "@inweb/eventemitter2";
@@ -1957,19 +1955,6 @@ class BackgroundComponent {
     }
 }
 
-class RoomEnvironmentComponent {
-    constructor(viewer) {
-        this.viewer = viewer;
-        const environment = new RoomEnvironment;
-        const pmremGenerator = new PMREMGenerator(this.viewer.renderer);
-        this.viewer.scene.environment = pmremGenerator.fromScene(environment).texture;
-        environment.dispose();
-    }
-    dispose() {
-        this.viewer.scene.environment = undefined;
-    }
-}
-
 class CameraComponent {
     constructor(viewer) {
         this.geometryEnd = () => {
@@ -2043,20 +2028,33 @@ class LightComponent {
         this.geometryEnd = () => {
             this.ambientLight.removeFromParent();
             this.directionalLight.removeFromParent();
+            this.frontLight.removeFromParent();
+            this.hemisphereLight.removeFromParent();
             if (this.viewer.extents.isEmpty()) return;
             const extentsCenter = this.viewer.extents.getCenter(new Vector3);
-            const extentsSize = this.viewer.extents.getBoundingSphere(new Sphere).radius * 2;
-            this.directionalLight.position.set(.5, 0, .866).multiplyScalar(extentsSize).add(extentsCenter);
+            const extentsSize = this.viewer.extents.getBoundingSphere(new Sphere).radius;
+            this.directionalLight.position.set(.5, 0, .866).multiplyScalar(extentsSize * 2).add(extentsCenter);
             this.directionalLight.target.position.copy(extentsCenter);
+            this.frontLight.position.set(0, extentsSize * 2, 0).add(extentsCenter);
+            this.frontLight.target.position.copy(extentsCenter);
+            this.hemisphereLight.position.set(0, extentsSize * 3, 0).add(extentsCenter);
             this.viewer.scene.add(this.ambientLight);
             this.viewer.scene.add(this.directionalLight);
+            this.viewer.scene.add(this.frontLight);
+            this.viewer.scene.add(this.hemisphereLight);
         };
         this.viewer = viewer;
-        this.ambientLight = new AmbientLight(16777215, 0);
+        this.ambientLight = new AmbientLight(16777215, 1);
         this.viewer.scene.add(this.ambientLight);
         this.directionalLight = new DirectionalLight(16777215, 1);
         this.directionalLight.position.set(.5, 0, .866);
         this.viewer.scene.add(this.directionalLight);
+        this.frontLight = new DirectionalLight(16777215, 1.25);
+        this.frontLight.position.set(0, 1, 0);
+        this.viewer.scene.add(this.frontLight);
+        this.hemisphereLight = new HemisphereLight(16777215, 4473924, 1.25);
+        this.hemisphereLight.position.set(0, 0, 1);
+        this.viewer.scene.add(this.hemisphereLight);
         this.viewer.addEventListener("databasechunk", this.geometryEnd);
         this.viewer.addEventListener("clear", this.geometryEnd);
     }
@@ -2065,6 +2063,10 @@ class LightComponent {
         this.ambientLight.dispose();
         this.directionalLight.removeFromParent();
         this.directionalLight.dispose();
+        this.frontLight.removeFromParent();
+        this.frontLight.dispose();
+        this.hemisphereLight.removeFromParent();
+        this.hemisphereLight.dispose();
         this.viewer.removeEventListener("databasechunk", this.geometryEnd);
         this.viewer.removeEventListener("clear", this.geometryEnd);
     }
@@ -2230,8 +2232,6 @@ components.registerComponent("CameraComponent", (viewer => new CameraComponent(v
 
 components.registerComponent("BackgroundComponent", (viewer => new BackgroundComponent(viewer)));
 
-components.registerComponent("RoomEnvironmentComponent", (viewer => new RoomEnvironmentComponent(viewer)));
-
 components.registerComponent("LightComponent", (viewer => new LightComponent(viewer)));
 
 components.registerComponent("ResizeCanvasComponent", (viewer => new ResizeCanvasComponent(viewer)));