@combeenation/3d-viewer 17.1.0-beta1 → 18.0.0-beta1

package/dist/lib-cjs/viewer.d.ts

@@ -1,5 +1,5 @@
 import * as Index from './index';
-import { BoundingInfo, CameraManager, DebugManager, DefaultSceneSettings, Engine, EngineOptions, EventManager, GltfExportManager, MaterialManager, ModelManager, ParameterManager, ParameterSubject, Scene, SceneManager, TextureManager, TransformNode } from './index';
+import { AbstractEngine, CameraManager, DebugManager, DefaultSceneSettings, EngineOptions, EventManager, GltfExportManager, MaterialManager, ModelManager, ParameterManager, ParameterSubject, Scene, SceneManager, TextureManager, TransformNode } from './index';
 /**
  * Use this to define geometry to be excluded from autofocus, GLB export, etc.
  */
@@ -46,7 +46,7 @@ export declare type ViewerSettings = {
  * (e.g. `modelManager` for loading models into the scene)
  */
 export declare class Viewer {
-    readonly canvas: HTMLCanvasElement;
+    readonly canvas?: HTMLCanvasElement | undefined;
     static readonly version: string;
     protected _scene: Scene;
     protected _cameraManager: CameraManager;
@@ -61,7 +61,7 @@ export declare class Viewer {
     protected _viewerSettings: ViewerSettings;
     protected _isRenderLoopPaused: boolean;
     get scene(): Scene;
-    get engine(): Engine;
+    get engine(): AbstractEngine;
     get cameraManager(): CameraManager;
     get debugManager(): DebugManager;
     get eventManager(): EventManager;
@@ -86,7 +86,7 @@ export declare class Viewer {
      * @param defaultSceneSettings Can be overwritten to tweak settings for the automatically create Babylon.js scene.\
      *                             This scene contains a camera and an environment per default.
      */
-    constructor(canvas: HTMLCanvasElement, viewerSettings?: DeepPartial<ViewerSettings>, defaultSceneSettings?: DeepPartial<DefaultSceneSettings>);
+    constructor(canvas?: HTMLCanvasElement | undefined, viewerSettings?: DeepPartial<ViewerSettings>, defaultSceneSettings?: DeepPartial<DefaultSceneSettings>);
     /**
      * Pause rendering can be usefull when doing internal scene processings that should not be visible to the user,
      * e.g. cloning meshes for gltf export
@@ -100,15 +100,6 @@ export declare class Viewer {
      * Destroys this viewer instance and disposes Babylon.js engine and all scene content
      */
     destroy(): void;
-    /**
-     * Calculates size of the current scene.\
-     * Only takes meshes into considerations that:
-     * - are visible
-     * - are not excluded by "excludeGeometry" parameter
-     * - do not have a material of type "BackgroundMaterial"
-     * - do not have an infinite distance (like sky boxes)
-     */
-    calculateBoundingInfo(excludeGeometry?: ExcludedGeometryList): BoundingInfo;
     /**
      * Set up viewer (engine and scene) and initialize all managers
      */

package/dist/lib-cjs/viewer.js

@@ -32,7 +32,6 @@ const Index = __importStar(require("./index"));
 const index_1 = require("./index");
 const cbn_custom_babylon_loader_plugin_1 = require("./internal/cbn-custom-babylon-loader-plugin");
 const device_helper_1 = require("./internal/device-helper");
-const geometry_helper_1 = require("./internal/geometry-helper");
 const lodash_es_1 = require("lodash-es");
 /**
  * This is the entry point into the application.\
@@ -139,41 +138,6 @@ class Viewer {
         this.eventManager.removeAllListeners();
         this.engine.dispose();
     }
-    /**
-     * Calculates size of the current scene.\
-     * Only takes meshes into considerations that:
-     * - are visible
-     * - are not excluded by "excludeGeometry" parameter
-     * - do not have a material of type "BackgroundMaterial"
-     * - do not have an infinite distance (like sky boxes)
-     */
-    calculateBoundingInfo(excludeGeometry) {
-        // CB-6062: workaround for BoundingBox not respecting render loop
-        this.scene.render();
-        const { max, min } = this.scene.meshes
-            .filter(mesh => {
-            const isEnabled = mesh.isEnabled();
-            // ignore meshes with invalid bounding infos
-            const hasValidBBoxInfo = mesh.getBoundingInfo().boundingSphere.radius > 0;
-            // ignore meshes with infinite distance, typically these are sky boxes
-            const hasInfiniteDistance = mesh.infiniteDistance;
-            // ignore meshes with "BackgroundMaterial" - usually a ground or skybox
-            const hasBackgroundMaterial = mesh.material instanceof index_1.BackgroundMaterial;
-            // ignore excluded meshes
-            const isExcluded = excludeGeometry ? (0, geometry_helper_1.isNodeExcluded)(mesh, excludeGeometry) : false;
-            return isEnabled && hasValidBBoxInfo && !hasInfiniteDistance && !hasBackgroundMaterial && !isExcluded;
-        })
-            .reduce((accBBoxMinMax, curMesh, idx) => {
-            curMesh.refreshBoundingInfo(true, true);
-            const bBox = curMesh.getBoundingInfo().boundingBox;
-            // use the first entry in the array as default value and get the resulting maximum/minimum values
-            const max = idx === 0 ? bBox.maximumWorld : index_1.Vector3.Maximize(accBBoxMinMax.max, bBox.maximumWorld);
-            const min = idx === 0 ? bBox.minimumWorld : index_1.Vector3.Minimize(accBBoxMinMax.min, bBox.minimumWorld);
-            return { max, min };
-        }, { max: new index_1.Vector3(), min: new index_1.Vector3() });
-        const boundingInfo = new index_1.BoundingInfo(min, max);
-        return boundingInfo;
-    }
     /**
      * Set up viewer (engine and scene) and initialize all managers
      */
@@ -187,7 +151,9 @@ class Viewer {
         // - `DebugManager.showCoordinateSystem`
         // - probably dimensions line handling (not implemented yet)
         index_1.TransformNode.BillboardUseParentOrientation = true;
-        const engine = new index_1.Engine(this.canvas, this._viewerSettings.antialiasing, (0, lodash_es_1.cloneDeep)(this._viewerSettings.engineOptions), this._viewerSettings.adaptToDeviceRatio);
+        const engine = this.canvas
+            ? new index_1.Engine(this.canvas, this._viewerSettings.antialiasing, (0, lodash_es_1.cloneDeep)(this._viewerSettings.engineOptions), this._viewerSettings.adaptToDeviceRatio)
+            : new index_1.NullEngine();
         const isScaledDownDevice = (0, device_helper_1.getIsScaledDownDevice)(this._viewerSettings.limitTextureSize);
         if (this._viewerSettings.limitTextureSize && isScaledDownDevice) {
             engine.getCaps().maxTextureSize = this._viewerSettings.limitTextureSize.size;

package/dist/lib-cjs/viewer.js.map

@@ -1 +1 @@
-{"version":3,"file":"viewer.js","sourceRoot":"","sources":["../../src/viewer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"viewer.js","sourceRoot":"","sources":["../../src/viewer.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@combeenation/3d-viewer",
-  "version": "17.1.0-beta1",
+  "version": "18.0.0-beta1",
   "description": "Combeenation 3D Viewer",
   "homepage": "https://github.com/Combeenation/3d-viewer#readme",
   "bugs": {
@@ -41,14 +41,18 @@
     "pub-beta": "npm run dist-cjs && npm publish --tag beta",
     "pub-final": "npm run dist-cjs && npm publish",
     "pub-rc": "npm run dist-cjs && npm publish --tag rc",
-    "replace-version": "cross-env-shell replace \"@VERSION@\" $npm_package_version dist -r"
+    "replace-version": "cross-env-shell replace \"@VERSION@\" $npm_package_version dist -r",
+    "sleep5s": "node -e \"setTimeout(() => process.exit(0), 5000)\"",
+    "start-asset-server": "cross-env NODE_ENV='production' webpack serve --config build/webpack.test.conf.js",
+    "test": "vitest",
+    "test-delayed": "npm run sleep5s && npm run test"
   },
   "prettier": "@combeenation/prettier-config",
   "dependencies": {
-    "@babylonjs/core": "7.43.0",
-    "@babylonjs/gui": "7.43.0",
-    "@babylonjs/loaders": "7.43.0",
-    "@babylonjs/serializers": "7.43.0",
+    "@babylonjs/core": "7.47.3",
+    "@babylonjs/gui": "7.47.3",
+    "@babylonjs/loaders": "7.47.3",
+    "@babylonjs/serializers": "7.47.3",
     "eventemitter3": "4.0.7",
     "is-svg": "^5.0.0",
     "lodash-es": "4.17.21"
@@ -63,6 +67,7 @@
     "cross-env": "7.0.3",
     "eslint": "8.25.0",
     "html-webpack-plugin": "5.5.0",
+    "jsdom": "^26.0.0",
     "prettier": "2.7.1",
     "replace": "1.2.1",
     "rimraf": "3.0.2",
@@ -71,6 +76,7 @@
     "typedoc": "0.23.15",
     "typedoc-plugin-merge-modules": "4.0.1",
     "typescript": "4.8.4",
+    "vitest": "2.1.8",
     "webpack": "5.74.0",
     "webpack-bundle-analyzer": "4.6.1",
     "webpack-cli": "4.10.0",
@@ -78,16 +84,19 @@
     "webpack-merge": "5.8.0"
   },
   "optionalDependencies": {
-    "@babylonjs/gui-editor": "7.43.0",
-    "@babylonjs/inspector": "7.43.0",
-    "@babylonjs/materials": "7.43.0",
-    "@babylonjs/node-editor": "7.43.0",
-    "@babylonjs/node-geometry-editor": "7.43.0"
+    "@babylonjs/gui-editor": "7.47.3",
+    "@babylonjs/inspector": "7.47.3",
+    "@babylonjs/materials": "7.47.3",
+    "@babylonjs/node-editor": "7.47.3",
+    "@babylonjs/node-geometry-editor": "7.47.3"
   },
   "dependenciesComments": {
-    "@babylonjs": "Latest version 7.43.0 comes with getters for tagged entities in asset containers, as requested by us (see [PR](https://github.com/BabylonJS/Babylon.js/pull/16029))"
+    "@babylonjs": "Latest version 7.47.3 added lower camera target y limit, as requested from us (https://github.com/BabylonJS/Babylon.js/pull/16125)"
   },
   "optionalDependenciesComments": {
     "@babylonjs": "Defining the inspector package (and it's dependencies) as optional is required to omit these packages in the production build of the CBN react-app (see CB-9269)"
+  },
+  "scriptsComments": {
+    "test-delayed": "Didn't manage to wait 5 seconds for starting up the asset server as an individual VS Code task, therefore it's solved as npm script"
   }
 }

package/src/index.ts

@@ -19,7 +19,9 @@ export * from '@babylonjs/core/Cameras/camera';
 export * from '@babylonjs/core/Culling';
 export * from '@babylonjs/core/Debug/axesViewer';
 export * from '@babylonjs/core/Debug/debugLayer';
+export * from '@babylonjs/core/Engines/abstractEngine';
 export * from '@babylonjs/core/Engines/engine';
+export * from '@babylonjs/core/Engines/nullEngine';
 export * from '@babylonjs/core/Engines/thinEngine';
 export * from '@babylonjs/core/Lights';
 export * from '@babylonjs/core/Loading';

package/src/internal/asset-helper.ts

@@ -0,0 +1,115 @@
+import { AssetContainer, SceneAssetSettings, SceneLoader, Viewer, ViewerError, ViewerErrorIds } from '..';
+import { CbnBabylonFileData, ExtendedAssetContainer } from './cbn-custom-babylon-loader-plugin';
+import { getInternalMetadataValue } from './metadata-helper';
+
+export type AssetState = 'notLoaded' | 'loading' | 'loaded' | 'inScene';
+
+/**
+ * Common base asset for model and scene asset
+ */
+export type BaseAsset = {
+  name: string;
+  url: string;
+  state: AssetState;
+  assetContainer: AssetContainer;
+};
+
+/**
+ * Help function for loading asset as asset container, with some special tweaks and fixes that we need in our CBN
+ * environment:
+ * - reconstruct current environment texture and intensity, as it get overwritten by Babylon.js basic loading function
+ * - explicitely define plugin extension for gzipped babylon files
+ * - extract and return cbn custom data from babylon file
+ * - crop materials from asset containers and add them to scene directly, as we treat materials as a global entity,
+ *   which can be used from all models alike
+ *
+ * This function is used by model and scene asset alike.
+ */
+export async function loadAsset(
+  asset: BaseAsset,
+  viewer: Viewer
+): Promise<{ cbnData?: CbnBabylonFileData; sceneSettingsData?: SceneAssetSettings }> {
+  asset.state = 'loading';
+  const curEnvTexture = viewer.scene.environmentTexture;
+  const curEnvIntensity = viewer.scene.environmentIntensity;
+
+  // CB-9240: Babylon.js doesn't recognize gzipped babylon files (`.babylon.gz`) as such, leading to a warning
+  // message, therefore we overwrite the plugin extension actively for such files
+  let pluginExtension;
+  try {
+    // URL constructor can throw for "valid" URL, which happened to be the case for the test asset environment where
+    // the urls are relative (starting with ".")
+    const urlObj = new URL(asset.url);
+    if (urlObj.pathname.endsWith('.babylon.gz')) {
+      pluginExtension = '.babylon';
+    }
+  } catch (e) {}
+
+  let extendedAssetContainer;
+  try {
+    extendedAssetContainer = (await SceneLoader.LoadAssetContainerAsync(
+      '',
+      asset.url,
+      viewer.scene,
+      undefined,
+      pluginExtension
+    )) as ExtendedAssetContainer;
+  } catch (e) {
+    throw new ViewerError({
+      id: ViewerErrorIds.AssetLoadingFailed,
+      message: (e as Error).message,
+    });
+  }
+
+  const { cbnData, sceneSettingsData } = extendedAssetContainer;
+  delete extendedAssetContainer.cbnData;
+  delete extendedAssetContainer.sceneSettingsData;
+
+  // from here it's a basic asset container again
+  const assetContainer = extendedAssetContainer as AssetContainer;
+
+  // materials should be a "global" thing and not assigned to an asset container
+  // this is not relevant for model assets in most of the cases, since materials are cropped from babylon models on the
+  // CBN server anyway
+  assetContainer.materials.forEach(material => {
+    viewer.scene.addMaterial(material);
+    material._parentContainer = null;
+    viewer.parameterManager.applyParameterValuesToMaterial(material);
+  });
+  assetContainer.materials = [];
+
+  // environment texture and intensity has been overwritten by load asset container function
+  viewer.scene.environmentTexture = curEnvTexture;
+  viewer.scene.environmentIntensity = curEnvIntensity;
+
+  asset.assetContainer = assetContainer;
+  asset.state = 'loaded';
+
+  return { cbnData, sceneSettingsData };
+}
+
+/**
+ * Help function for applying parameter values and "deferred" material to asset (model or scene asset), before using it
+ * in the scene
+ */
+export async function prepareAssetForScene(asset: BaseAsset, viewer: Viewer): Promise<void> {
+  await viewer.parameterManager.applyAllParameterValuesToModel(asset.assetContainer);
+  // parameter manager did his job, now apply the deferred materials to all meshes that are not explicitely hidden by
+  // the parameter manager
+  await _applyDeferredMaterialsForAllVisibleMeshes(asset, viewer);
+}
+
+/**
+ * Creates and assigns each "deferred" material to the corresponding mesh, if the mesh is visible.
+ * Model should be ready to use immediately after this function has done it's job.
+ */
+async function _applyDeferredMaterialsForAllVisibleMeshes(asset: BaseAsset, viewer: Viewer): Promise<void> {
+  const setMaterialProms = asset.assetContainer.meshes.map(async mesh => {
+    const deferredMaterial = getInternalMetadataValue(mesh, 'deferredMaterial');
+    const visible = viewer.parameterManager.getNestedVisibilityParameterValueOfNode(mesh);
+    if (deferredMaterial && visible) {
+      await viewer.materialManager.setMaterialOnMesh(deferredMaterial as string, mesh);
+    }
+  });
+  await Promise.all(setMaterialProms);
+}

package/src/internal/cbn-custom-babylon-loader-plugin.ts

@@ -1,9 +1,10 @@
 import {
   AssetContainer,
-  ExtendedAssetContainer,
+  Color4,
   ISceneLoaderPlugin,
   InstancedMesh,
   ParsedDecalConfiguration,
+  SceneAssetSettings,
   SceneLoader,
   ViewerError,
   ViewerErrorIds,
@@ -13,6 +14,23 @@ import { setInternalMetadataValue } from './metadata-helper';
 import { deleteAllTags, getTagsAsStrArr, setTagsAsString } from './tags-helper';
 import { isArray, isString } from 'lodash-es';
 
+/**
+ * Contains cbn custom data, like decals or scene settings.
+ * This is just a temporary type, as the `loadAssetContainer` function only returns an asset container, which can be
+ * altered by our file loader plugin.
+ * After loading the model, `cbnData` is cropped and a pure asset container is available for further processing.
+ * @internal
+ */
+export class ExtendedAssetContainer extends AssetContainer {
+  cbnData?: CbnBabylonFileData;
+  sceneSettingsData?: SceneAssetSettings;
+}
+
+/**
+ * @internal
+ */
+export type CbnBabylonFileData = { decals?: ParsedDecalConfiguration[] };
+
 type DataWithMeshes = { meshes: unknown[] };
 type DataWithDecalConfigurations = { cbnData: { decals: unknown[] } };
 
@@ -59,7 +77,11 @@ export function registerCustomCbnBabylonLoaderPlugin(): void {
     load: previousLoaderPlugin.load,
     loadAssetContainer: (scene, data, rootUrl, onError): ExtendedAssetContainer => {
       const dataParsed = JSON.parse(data as string);
-      const importedContainer = previousLoaderPlugin.loadAssetContainer(scene, data, rootUrl);
+      // root url parameter is left empty for the following reasons:
+      // - cube texture creation (for environment) breaks, as Babylon.js tries to prefix absolute paths (e.g. from
+      //   Babylon.js server) with the root url
+      // - we always have absolute paths anyway => links to 3d model, material & textures assets
+      const importedContainer = previousLoaderPlugin.loadAssetContainer(scene, data, '');
 
       _addMissingMaterialMetadata(dataParsed, importedContainer);
       _reconstructTagsForInstancedMeshes(dataParsed, importedContainer);
@@ -73,9 +95,14 @@ export function registerCustomCbnBabylonLoaderPlugin(): void {
         onError?.((e as Error).message);
       }
 
-      // add `cbnData` to output asset container, so that this information can be store as metadata for the model
+      // add `cbnData` to output asset container, so that this information can be stored as metadata for the model
+      // same with `sceneSettingsData`, which is used in the scene asset
       const extendedContainer = importedContainer as ExtendedAssetContainer;
       extendedContainer.cbnData = dataParsed.cbnData;
+      extendedContainer.sceneSettingsData = {
+        environmentIntensity: dataParsed.environmentIntensity,
+        clearColor: dataParsed.clearColor && Color4.FromArray(dataParsed.clearColor),
+      };
 
       return extendedContainer;
     },

package/src/internal/texture-parameter-helper.ts

@@ -73,17 +73,21 @@ export function createBuiltInTextureParameter(parameterManager: ParameterManager
           const texture = _getTextureFromParameterChannel(pbrMaterial, channel);
 
           if (texture) {
-            // create a clone of the texture, in this way we can load the image before assigning it to the material
-            // channel
-            const clonedTexture = texture.clone();
-            // update texture and await loading time right away
-            await new Promise<void>(resolve => clonedTexture.updateURL(url, undefined, resolve));
-
-            _assignTextureParameterChannel(clonedTexture, pbrMaterial, channel);
+            if (url) {
+              // create a clone of the texture, in this way we can load the image before assigning it to the material
+              // channel
+              const clonedTexture = texture.clone();
+              // update texture and await loading time right away
+              await new Promise<void>(resolve => clonedTexture.updateURL(url, undefined, resolve));
+
+              _assignTextureParameterChannel(clonedTexture, pbrMaterial, channel);
+            } else {
+              _removeFromTextureParameterChannel(pbrMaterial, channel);
+            }
 
             // dispose old texture
             texture.dispose();
-          } else {
+          } else if (url) {
             // no texture, or wrong type => create texture from scratch
             // first we check if some settings were provided in the material definition
             const addMatSettings = await window.Cbn?.Assets.getMaterial(pbrMaterial.id);
@@ -341,6 +345,19 @@ function _assignTextureParameterChannel(
   }
 }
 
+/**
+ * Remove runtime texture from dedicated channel in the PBR material
+ */
+function _removeFromTextureParameterChannel(pbrMaterial: PBRMaterial, channel: ParameterTextureChannelsKeys): void {
+  if (channel === 'metallicRoughnessTexture') {
+    pbrMaterial.metallicTexture = null;
+  } else if (channel === 'detailmapTexture') {
+    pbrMaterial.detailMap.texture = null;
+  } else {
+    pbrMaterial[channel] = null;
+  }
+}
+
 /**
  * Similar to `_getTextureFromParameterChannel`, whereas the input is a plain JSON object instead of a runtime material
  */

package/src/manager/camera-manager.ts

@@ -131,7 +131,7 @@ export class CameraManager {
     }
 
     // get bounding box of all visible meshes, this is the base for the autofocus algorithm
-    const boundingInfo = this.viewer.calculateBoundingInfo(settings?.exclude);
+    const boundingInfo = this.viewer.sceneManager.calculateBoundingInfo(settings?.exclude);
     // optionally show bounding sphere for debugging purpose
     this.viewer.eventManager.fireEvent(ViewerEvent.AutofocusStart, boundingInfo.boundingSphere);
 
@@ -272,7 +272,9 @@ export class CameraManager {
     const screenshotCam = this.viewer.scene.activeCamera?.clone(
       CameraManager._SCREENSHOT_CAMERA_NAME
     ) as ArcRotateCamera;
-    const boundingInfo = settings?.autofocusScene ? this.viewer.calculateBoundingInfo(settings.exclude) : undefined;
+    const boundingInfo = settings?.autofocusScene
+      ? this.viewer.sceneManager.calculateBoundingInfo(settings.exclude)
+      : undefined;
 
     if (settings?.alpha !== undefined) {
       screenshotCam.alpha = settings.alpha;

package/src/manager/debug-manager.ts

@@ -91,7 +91,7 @@ The inspector can only be used in development builds.`);
   public showCoordinateSystem(node?: TransformNode, size?: number): void {
     // calculate the default size of not provided
     if (!size) {
-      const sceneBoundingInfo = this.viewer.calculateBoundingInfo();
+      const sceneBoundingInfo = this.viewer.sceneManager.calculateBoundingInfo();
       const radius = sceneBoundingInfo.boundingSphere.radius;
 
       // takes a third of the radius from scene boundingsphere