@inweb/viewer-three 26.12.0 → 26.12.3

package/lib/Viewer/loaders/GLTFFileDynamicLoader.d.ts

@@ -6,7 +6,7 @@ export declare class GLTFFileDynamicLoader extends Loader {
     private gltfLoader;
     private manager;
     private gltf;
-    private bin;
+    private glb;
     constructor(viewer: Viewer);
     dispose(): void;
     isSupport(file: any, format?: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-three",
-  "version": "26.12.0",
+  "version": "26.12.3",
   "description": "JavaScript library for rendering CAD and BIM files in a browser using Three.js",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -35,10 +35,10 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~26.12.0",
-    "@inweb/eventemitter2": "~26.12.0",
-    "@inweb/markup": "~26.12.0",
-    "@inweb/viewer-core": "~26.12.0"
+    "@inweb/client": "~26.12.3",
+    "@inweb/eventemitter2": "~26.12.3",
+    "@inweb/markup": "~26.12.3",
+    "@inweb/viewer-core": "~26.12.3"
   },
   "devDependencies": {
     "@types/three": "^0.180.0",

package/src/Viewer/Viewer.ts

@@ -24,11 +24,11 @@
 import {
   Box3,
   LinearSRGBColorSpace,
-  // LinearToneMapping,
   Object3D,
   OrthographicCamera,
   PerspectiveCamera,
   Plane,
+  Raycaster,
   Scene,
   Sphere,
   Vector2,
@@ -832,7 +832,11 @@ export class Viewer
   }
 
   // IWorldTransform
-
+  // ===================== AI-CODE-START ======================
+  // Source: Claude Sonnet 4.5
+  // Date: 2025-11-25
+  // Reviewer: vitaly.ivanov@opendesign.com
+  // Issue: CLOUD-5990
   screenToWorld(position: { x: number; y: number }): { x: number; y: number; z: number } {
     if (!this.renderer) return { x: position.x, y: position.y, z: 0 };
 
@@ -840,11 +844,36 @@ export class Viewer
     const x = position.x / (rect.width / 2) - 1;
     const y = -position.y / (rect.height / 2) + 1;
 
-    const point = new Vector3(x, y, -1);
-    point.unproject(this.camera);
+    if (this.camera["isPerspectiveCamera"]) {
+      // Create a raycaster from the screen position
+      const raycaster = new Raycaster();
+      const mouse = new Vector2(x, y);
+      raycaster.setFromCamera(mouse, this.camera);
+
+      // Create a plane perpendicular to the camera direction at the target point
+      const cameraDirection = new Vector3();
+      this.camera.getWorldDirection(cameraDirection);
+      const targetPlane = new Plane().setFromNormalAndCoplanarPoint(cameraDirection, this.target);
+
+      // Intersect the ray with the target plane
+      const intersectionPoint = new Vector3();
+      raycaster.ray.intersectPlane(targetPlane, intersectionPoint);
+
+      // If intersection fails (ray parallel to plane), fallback to near plane unprojection
+      if (!intersectionPoint) {
+        const point = new Vector3(x, y, -1);
+        point.unproject(this.camera);
+        return { x: point.x, y: point.y, z: point.z };
+      }
+      return { x: intersectionPoint.x, y: intersectionPoint.y, z: intersectionPoint.z };
+    } else {
+      const point = new Vector3(x, y, -1);
+      point.unproject(this.camera);
 
-    return { x: point.x, y: point.y, z: point.z };
+      return { x: point.x, y: point.y, z: point.z };
+    }
   }
+  // ===================== AI-CODE-END ======================
 
   worldToScreen(position: { x: number; y: number; z: number }): { x: number; y: number } {
     if (!this.renderer) return { x: position.x, y: position.y };

package/src/Viewer/loaders/DynamicGltfLoader/GltfStructure.js

@@ -46,7 +46,6 @@ export class GltfStructure {
   constructor(id, loadController) {
     this.id = `${id}`;
     this.json = null;
-    this.baseUrl = "";
     this.loadController = loadController;
     this.loader = null;
     this.batchDelay = 10;
@@ -66,14 +65,12 @@ export class GltfStructure {
 
   async initialize(loader) {
     this.json = await this.loadController.loadJson();
-    this.baseUrl = await this.loadController.baseUrl();
     this.loader = loader;
     this.uri = this.json.buffers[0].uri || "";
   }
 
   clear() {
     this.json = null;
-    this.baseUrl = "";
     this.loadController = null;
     this.pendingRequests = [];
     if (this.batchTimeout) {
@@ -397,12 +394,8 @@ export class GltfStructure {
       const image = this.json.images[imageIndex];
 
       if (image.uri) {
-        if (image.uri.startsWith("data:")) {
-          return await this.textureLoader.loadAsync(image.uri);
-        } else {
-          const fullUrl = this.baseUrl + image.uri;
-          return await this.textureLoader.loadAsync(fullUrl);
-        }
+        const fullUrl = await this.loadController.resolveURL(image.uri);
+        return this.textureLoader.loadAsync(fullUrl);
       } else if (image.bufferView !== undefined) {
         const bufferView = this.json.bufferViews[image.bufferView];
         const array = await this.getBufferView(bufferView.byteOffset || 0, bufferView.byteLength, 5121);

package/src/Viewer/loaders/GLTFCloudDynamicLoader.ts

@@ -21,7 +21,7 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { Group } from "three";
+import { Group, LoaderUtils } from "three";
 import { Loader, LoadParams } from "@inweb/viewer-core";
 
 import { Viewer } from "../Viewer";
@@ -118,7 +118,11 @@ export class GLTFCloudDynamicLoader extends Loader {
         );
       },
 
-      baseUrl: () => Promise.resolve(`${model.httpClient.serverUrl}${model.path}/`),
+      resolveURL: (uri) => {
+        const path = `${model.httpClient.serverUrl}${model.path}/`;
+        const url = LoaderUtils.resolveURL(uri, path);
+        return Promise.resolve(url);
+      },
     };
 
     const structure = new GltfStructure(modelImpl.id, loadController);

package/src/Viewer/loaders/GLTFFileDynamicLoader.ts

@@ -37,7 +37,7 @@ export class GLTFFileDynamicLoader extends Loader {
   private gltfLoader: DynamicGltfLoader;
   private manager: GLTFLoadingManager;
   private gltf: any;
-  private bin: ArrayBuffer;
+  private glb: ArrayBuffer;
 
   constructor(viewer: Viewer) {
     super();
@@ -106,7 +106,11 @@ export class GLTFFileDynamicLoader extends Loader {
 
         const extension = new GLTFBinaryExtension(data as ArrayBuffer);
         this.gltf = JSON.parse(extension.content);
-        this.bin = extension.body;
+        this.glb = extension.body;
+
+        if (/\.glb$/i.test(this.manager.fileURL) && !this.glb) {
+          throw new Error("GLTFFileDynamicLoader: Binary buffer chunk not found or type not supported.");
+        }
 
         return this.gltf;
       },
@@ -117,7 +121,7 @@ export class GLTFFileDynamicLoader extends Loader {
         loader.setWithCredentials(params.withCredentials || false);
         loader.setAbortSignal(this.gltfLoader.abortController.signal);
 
-        if (this.bin) return loader.extractRanges(this.bin, ranges);
+        if (this.glb) return loader.extractRanges(this.glb, ranges);
 
         const path = this.manager.path || this.manager.resourcePath;
         const url = LoaderUtils.resolveURL(uri, path);
@@ -125,9 +129,10 @@ export class GLTFFileDynamicLoader extends Loader {
         return loader.load(this.manager.resolveURL(url), ranges);
       },
 
-      baseUrl: () => {
+      resolveURL: (uri) => {
         const path = this.manager.path || this.manager.resourcePath;
-        return Promise.resolve(path);
+        const url = LoaderUtils.resolveURL(uri, path);
+        return Promise.resolve(this.manager.resolveURL(url));
       },
     };