@combeenation/3d-viewer 4.0.0-alpha8 → 4.0.0-beta3

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

@@ -1,48 +1,46 @@
 /// <reference path="api/util/globalTypes.d.ts" />
-import { Animation as BabylonAnimation } from '@babylonjs/core/Animations/animation';
 import { ArcRotateCamera } from '@babylonjs/core/Cameras/arcRotateCamera';
 import { Engine } from '@babylonjs/core/Engines/engine';
-import { DirectionalLight } from '@babylonjs/core/Lights/directionalLight';
-import { HemisphericLight } from '@babylonjs/core/Lights/hemisphericLight';
 import { Material } from '@babylonjs/core/Materials/material';
 import { PBRMaterial } from '@babylonjs/core/Materials/PBR/pbrMaterial';
 import { StandardMaterial } from '@babylonjs/core/Materials/standardMaterial';
-import { CubeTexture } from '@babylonjs/core/Materials/Textures/cubeTexture';
 import { DynamicTexture } from '@babylonjs/core/Materials/Textures/dynamicTexture';
-import { Texture } from '@babylonjs/core/Materials/Textures/texture';
 import { Color3, Color4 } from '@babylonjs/core/Maths/math.color';
 import { Vector3 } from '@babylonjs/core/Maths/math.vector';
 import { AbstractMesh } from '@babylonjs/core/Meshes/abstractMesh';
 import { InstancedMesh } from '@babylonjs/core/Meshes/instancedMesh';
 import { Mesh } from '@babylonjs/core/Meshes/mesh';
-import { MeshBuilder } from '@babylonjs/core/Meshes/meshBuilder';
 import { TransformNode } from '@babylonjs/core/Meshes/transformNode';
 import { Node } from '@babylonjs/core/node';
-/**
- * Without explicitly importing the "BoundingBoxRenderer", we're getting "scene.getBoundingBoxRenderer is undefined"
- * errors when creating HighlightLayer instances. Not sure why but those errors only happen when using the built
- * version of the viewer (e.g. when pulling it from NPM etc.)...
- */
-import '@babylonjs/core/Rendering/boundingBoxRenderer';
 import { Scene } from '@babylonjs/core/scene';
-import { Parameterizable } from './api/classes/parameterizable';
-import { VariantParameterizable } from './api/classes/variantParameterizable';
+import { VariantInstance } from './api/classes/variantInstance';
+import { Viewer } from './api/classes/viewer';
+import { Event, emitter } from './api/classes/event';
 import { EventEmitter } from 'eventemitter3';
-import { Element } from './api/classes/element';
-import { emitter, Event } from './api/classes/event';
-import { EventBroadcaster } from './api/classes/eventBroadcaster';
 import { Parameter } from './api/classes/parameter';
-import { ParameterObservable } from './api/classes/parameterObservable';
-import { PlacementAnimation } from './api/classes/placementAnimation';
+import { CubeTexture } from '@babylonjs/core/Materials/Textures/cubeTexture';
+import { Animation as BabylonAnimation } from '@babylonjs/core/Animations/animation';
+import { MeshBuilder } from '@babylonjs/core/Meshes/meshBuilder';
+import { Texture } from '@babylonjs/core/Materials/Textures/texture';
+import { DirectionalLight } from '@babylonjs/core/Lights/directionalLight';
+import { HemisphericLight } from '@babylonjs/core/Lights/hemisphericLight';
 import { Variant } from './api/classes/variant';
-import { VariantInstance } from './api/classes/variantInstance';
-import { Viewer } from './api/classes/viewer';
-import { ViewerLight } from './api/classes/viewerLight';
+import { ParameterObservable } from './api/classes/parameterObservable';
+import { ElementParameterizable } from './api/classes/elementParameterizable';
+import { Element } from './api/classes/element';
+import { VariantInstanceManager } from './api/manager/variantInstanceManager';
 import { AnimationManager } from './api/manager/animationManager';
+import { EventBroadcaster } from './api/classes/eventBroadcaster';
 import { SceneManager } from './api/manager/sceneManager';
-import { VariantInstanceManager } from './api/manager/variantInstanceManager';
+import { PlacementAnimation } from './api/classes/placementAnimation';
 import * as BabylonHelper from './api/util/babylonHelper';
+/**
+ * Without explicitly importing the "BoundingBoxRenderer", we're getting "scene.getBoundingBoxRenderer is undefined"
+ * errors when creating HighlightLayer instances. Not sure why but those errors only happen when using the built
+ * version of the viewer (e.g. when pulling it from NPM etc.)...
+ */
+import '@babylonjs/core/Rendering/boundingBoxRenderer';
 /**
  * Expose some frequently used babylon modules by our consumers.
  */
-export { AnimationManager, Variant, VariantInstanceManager, Viewer, ParameterObservable, Parameterizable, VariantParameterizable, ViewerLight, emitter as Emitter, EventEmitter, Event, Parameter, VariantInstance, Color3, Color4, Vector3, AbstractMesh, InstancedMesh, Mesh, TransformNode, Node, Material, PBRMaterial, StandardMaterial, Scene, Engine, ArcRotateCamera, DynamicTexture, CubeTexture, MeshBuilder, Texture, BabylonAnimation, HemisphericLight, DirectionalLight, Element, EventBroadcaster, SceneManager, PlacementAnimation, BabylonHelper, };
+export { AnimationManager, Variant, VariantInstanceManager, Viewer, ParameterObservable, ElementParameterizable, emitter as Emitter, EventEmitter, Event, Parameter, VariantInstance, Color3, Color4, Vector3, AbstractMesh, InstancedMesh, Mesh, TransformNode, Node, Material, PBRMaterial, StandardMaterial, Scene, Engine, ArcRotateCamera, DynamicTexture, CubeTexture, MeshBuilder, Texture, BabylonAnimation, HemisphericLight, DirectionalLight, Element, EventBroadcaster, SceneManager, PlacementAnimation, BabylonHelper, };

package/dist/lib-cjs/index.js

@@ -1,29 +1,19 @@
 "use strict";
 /// <reference path="api/util/globalTypes.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BabylonHelper = exports.PlacementAnimation = exports.SceneManager = exports.EventBroadcaster = exports.Element = exports.DirectionalLight = exports.HemisphericLight = exports.BabylonAnimation = exports.Texture = exports.MeshBuilder = exports.CubeTexture = exports.DynamicTexture = exports.ArcRotateCamera = exports.Engine = exports.Scene = exports.StandardMaterial = exports.PBRMaterial = exports.Material = exports.Node = exports.TransformNode = exports.Mesh = exports.InstancedMesh = exports.AbstractMesh = exports.Vector3 = exports.Color4 = exports.Color3 = exports.VariantInstance = exports.Parameter = exports.Event = exports.EventEmitter = exports.Emitter = exports.ViewerLight = exports.VariantParameterizable = exports.Parameterizable = exports.ParameterObservable = exports.Viewer = exports.VariantInstanceManager = exports.Variant = exports.AnimationManager = void 0;
-var animation_1 = require("@babylonjs/core/Animations/animation");
-Object.defineProperty(exports, "BabylonAnimation", { enumerable: true, get: function () { return animation_1.Animation; } });
+exports.BabylonHelper = exports.PlacementAnimation = exports.SceneManager = exports.EventBroadcaster = exports.Element = exports.DirectionalLight = exports.HemisphericLight = exports.BabylonAnimation = exports.Texture = exports.MeshBuilder = exports.CubeTexture = exports.DynamicTexture = exports.ArcRotateCamera = exports.Engine = exports.Scene = exports.StandardMaterial = exports.PBRMaterial = exports.Material = exports.Node = exports.TransformNode = exports.Mesh = exports.InstancedMesh = exports.AbstractMesh = exports.Vector3 = exports.Color4 = exports.Color3 = exports.VariantInstance = exports.Parameter = exports.Event = exports.EventEmitter = exports.Emitter = exports.ElementParameterizable = exports.ParameterObservable = exports.Viewer = exports.VariantInstanceManager = exports.Variant = exports.AnimationManager = void 0;
 var arcRotateCamera_1 = require("@babylonjs/core/Cameras/arcRotateCamera");
 Object.defineProperty(exports, "ArcRotateCamera", { enumerable: true, get: function () { return arcRotateCamera_1.ArcRotateCamera; } });
 var engine_1 = require("@babylonjs/core/Engines/engine");
 Object.defineProperty(exports, "Engine", { enumerable: true, get: function () { return engine_1.Engine; } });
-var directionalLight_1 = require("@babylonjs/core/Lights/directionalLight");
-Object.defineProperty(exports, "DirectionalLight", { enumerable: true, get: function () { return directionalLight_1.DirectionalLight; } });
-var hemisphericLight_1 = require("@babylonjs/core/Lights/hemisphericLight");
-Object.defineProperty(exports, "HemisphericLight", { enumerable: true, get: function () { return hemisphericLight_1.HemisphericLight; } });
 var material_1 = require("@babylonjs/core/Materials/material");
 Object.defineProperty(exports, "Material", { enumerable: true, get: function () { return material_1.Material; } });
 var pbrMaterial_1 = require("@babylonjs/core/Materials/PBR/pbrMaterial");
 Object.defineProperty(exports, "PBRMaterial", { enumerable: true, get: function () { return pbrMaterial_1.PBRMaterial; } });
 var standardMaterial_1 = require("@babylonjs/core/Materials/standardMaterial");
 Object.defineProperty(exports, "StandardMaterial", { enumerable: true, get: function () { return standardMaterial_1.StandardMaterial; } });
-var cubeTexture_1 = require("@babylonjs/core/Materials/Textures/cubeTexture");
-Object.defineProperty(exports, "CubeTexture", { enumerable: true, get: function () { return cubeTexture_1.CubeTexture; } });
 var dynamicTexture_1 = require("@babylonjs/core/Materials/Textures/dynamicTexture");
 Object.defineProperty(exports, "DynamicTexture", { enumerable: true, get: function () { return dynamicTexture_1.DynamicTexture; } });
-var texture_1 = require("@babylonjs/core/Materials/Textures/texture");
-Object.defineProperty(exports, "Texture", { enumerable: true, get: function () { return texture_1.Texture; } });
 var math_color_1 = require("@babylonjs/core/Maths/math.color");
 Object.defineProperty(exports, "Color3", { enumerable: true, get: function () { return math_color_1.Color3; } });
 Object.defineProperty(exports, "Color4", { enumerable: true, get: function () { return math_color_1.Color4; } });
@@ -35,53 +25,59 @@ var instancedMesh_1 = require("@babylonjs/core/Meshes/instancedMesh");
 Object.defineProperty(exports, "InstancedMesh", { enumerable: true, get: function () { return instancedMesh_1.InstancedMesh; } });
 var mesh_1 = require("@babylonjs/core/Meshes/mesh");
 Object.defineProperty(exports, "Mesh", { enumerable: true, get: function () { return mesh_1.Mesh; } });
-var meshBuilder_1 = require("@babylonjs/core/Meshes/meshBuilder");
-Object.defineProperty(exports, "MeshBuilder", { enumerable: true, get: function () { return meshBuilder_1.MeshBuilder; } });
 var transformNode_1 = require("@babylonjs/core/Meshes/transformNode");
 Object.defineProperty(exports, "TransformNode", { enumerable: true, get: function () { return transformNode_1.TransformNode; } });
 var node_1 = require("@babylonjs/core/node");
 Object.defineProperty(exports, "Node", { enumerable: true, get: function () { return node_1.Node; } });
-/**
- * Without explicitly importing the "BoundingBoxRenderer", we're getting "scene.getBoundingBoxRenderer is undefined"
- * errors when creating HighlightLayer instances. Not sure why but those errors only happen when using the built
- * version of the viewer (e.g. when pulling it from NPM etc.)...
- */
-require("@babylonjs/core/Rendering/boundingBoxRenderer");
 var scene_1 = require("@babylonjs/core/scene");
 Object.defineProperty(exports, "Scene", { enumerable: true, get: function () { return scene_1.Scene; } });
-var parameterizable_1 = require("./api/classes/parameterizable");
-Object.defineProperty(exports, "Parameterizable", { enumerable: true, get: function () { return parameterizable_1.Parameterizable; } });
-var variantParameterizable_1 = require("./api/classes/variantParameterizable");
-Object.defineProperty(exports, "VariantParameterizable", { enumerable: true, get: function () { return variantParameterizable_1.VariantParameterizable; } });
-var eventemitter3_1 = require("eventemitter3");
-Object.defineProperty(exports, "EventEmitter", { enumerable: true, get: function () { return eventemitter3_1.EventEmitter; } });
-var element_1 = require("./api/classes/element");
-Object.defineProperty(exports, "Element", { enumerable: true, get: function () { return element_1.Element; } });
+var variantInstance_1 = require("./api/classes/variantInstance");
+Object.defineProperty(exports, "VariantInstance", { enumerable: true, get: function () { return variantInstance_1.VariantInstance; } });
+var viewer_1 = require("./api/classes/viewer");
+Object.defineProperty(exports, "Viewer", { enumerable: true, get: function () { return viewer_1.Viewer; } });
 var event_1 = require("./api/classes/event");
-Object.defineProperty(exports, "Emitter", { enumerable: true, get: function () { return event_1.emitter; } });
 Object.defineProperty(exports, "Event", { enumerable: true, get: function () { return event_1.Event; } });
-var eventBroadcaster_1 = require("./api/classes/eventBroadcaster");
-Object.defineProperty(exports, "EventBroadcaster", { enumerable: true, get: function () { return eventBroadcaster_1.EventBroadcaster; } });
+Object.defineProperty(exports, "Emitter", { enumerable: true, get: function () { return event_1.emitter; } });
+var eventemitter3_1 = require("eventemitter3");
+Object.defineProperty(exports, "EventEmitter", { enumerable: true, get: function () { return eventemitter3_1.EventEmitter; } });
 var parameter_1 = require("./api/classes/parameter");
 Object.defineProperty(exports, "Parameter", { enumerable: true, get: function () { return parameter_1.Parameter; } });
-var parameterObservable_1 = require("./api/classes/parameterObservable");
-Object.defineProperty(exports, "ParameterObservable", { enumerable: true, get: function () { return parameterObservable_1.ParameterObservable; } });
-var placementAnimation_1 = require("./api/classes/placementAnimation");
-Object.defineProperty(exports, "PlacementAnimation", { enumerable: true, get: function () { return placementAnimation_1.PlacementAnimation; } });
+var cubeTexture_1 = require("@babylonjs/core/Materials/Textures/cubeTexture");
+Object.defineProperty(exports, "CubeTexture", { enumerable: true, get: function () { return cubeTexture_1.CubeTexture; } });
+var animation_1 = require("@babylonjs/core/Animations/animation");
+Object.defineProperty(exports, "BabylonAnimation", { enumerable: true, get: function () { return animation_1.Animation; } });
+var meshBuilder_1 = require("@babylonjs/core/Meshes/meshBuilder");
+Object.defineProperty(exports, "MeshBuilder", { enumerable: true, get: function () { return meshBuilder_1.MeshBuilder; } });
+var texture_1 = require("@babylonjs/core/Materials/Textures/texture");
+Object.defineProperty(exports, "Texture", { enumerable: true, get: function () { return texture_1.Texture; } });
+var directionalLight_1 = require("@babylonjs/core/Lights/directionalLight");
+Object.defineProperty(exports, "DirectionalLight", { enumerable: true, get: function () { return directionalLight_1.DirectionalLight; } });
+var hemisphericLight_1 = require("@babylonjs/core/Lights/hemisphericLight");
+Object.defineProperty(exports, "HemisphericLight", { enumerable: true, get: function () { return hemisphericLight_1.HemisphericLight; } });
 var variant_1 = require("./api/classes/variant");
 Object.defineProperty(exports, "Variant", { enumerable: true, get: function () { return variant_1.Variant; } });
-var variantInstance_1 = require("./api/classes/variantInstance");
-Object.defineProperty(exports, "VariantInstance", { enumerable: true, get: function () { return variantInstance_1.VariantInstance; } });
-var viewer_1 = require("./api/classes/viewer");
-Object.defineProperty(exports, "Viewer", { enumerable: true, get: function () { return viewer_1.Viewer; } });
-var viewerLight_1 = require("./api/classes/viewerLight");
-Object.defineProperty(exports, "ViewerLight", { enumerable: true, get: function () { return viewerLight_1.ViewerLight; } });
+var parameterObservable_1 = require("./api/classes/parameterObservable");
+Object.defineProperty(exports, "ParameterObservable", { enumerable: true, get: function () { return parameterObservable_1.ParameterObservable; } });
+var elementParameterizable_1 = require("./api/classes/elementParameterizable");
+Object.defineProperty(exports, "ElementParameterizable", { enumerable: true, get: function () { return elementParameterizable_1.ElementParameterizable; } });
+var element_1 = require("./api/classes/element");
+Object.defineProperty(exports, "Element", { enumerable: true, get: function () { return element_1.Element; } });
+var variantInstanceManager_1 = require("./api/manager/variantInstanceManager");
+Object.defineProperty(exports, "VariantInstanceManager", { enumerable: true, get: function () { return variantInstanceManager_1.VariantInstanceManager; } });
 var animationManager_1 = require("./api/manager/animationManager");
 Object.defineProperty(exports, "AnimationManager", { enumerable: true, get: function () { return animationManager_1.AnimationManager; } });
+var eventBroadcaster_1 = require("./api/classes/eventBroadcaster");
+Object.defineProperty(exports, "EventBroadcaster", { enumerable: true, get: function () { return eventBroadcaster_1.EventBroadcaster; } });
 var sceneManager_1 = require("./api/manager/sceneManager");
 Object.defineProperty(exports, "SceneManager", { enumerable: true, get: function () { return sceneManager_1.SceneManager; } });
-var variantInstanceManager_1 = require("./api/manager/variantInstanceManager");
-Object.defineProperty(exports, "VariantInstanceManager", { enumerable: true, get: function () { return variantInstanceManager_1.VariantInstanceManager; } });
+var placementAnimation_1 = require("./api/classes/placementAnimation");
+Object.defineProperty(exports, "PlacementAnimation", { enumerable: true, get: function () { return placementAnimation_1.PlacementAnimation; } });
 var BabylonHelper = require("./api/util/babylonHelper");
 exports.BabylonHelper = BabylonHelper;
+/**
+ * Without explicitly importing the "BoundingBoxRenderer", we're getting "scene.getBoundingBoxRenderer is undefined"
+ * errors when creating HighlightLayer instances. Not sure why but those errors only happen when using the built
+ * version of the viewer (e.g. when pulling it from NPM etc.)...
+ */
+require("@babylonjs/core/Rendering/boundingBoxRenderer");
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA,gDAAgD;;;AAEhD,kEAAqF;AAgFpF,iGAhFqB,qBAAgB,OAgFrB;AA/EjB,2EAA0E;AA0EzE,gGA1EQ,iCAAe,OA0ER;AAzEhB,yDAAwD;AAwEvD,uFAxEQ,eAAM,OAwER;AAvEP,4EAA2E;AA+E1E,iGA/EQ,mCAAgB,OA+ER;AA9EjB,4EAA2E;AA6E1E,iGA7EQ,mCAAgB,OA6ER;AA5EjB,+DAA8D;AAiE7D,yFAjEQ,mBAAQ,OAiER;AAhET,yEAAwE;AAiEvE,4FAjEQ,yBAAW,OAiER;AAhEZ,+EAA8E;AAiE7E,iGAjEQ,mCAAgB,OAiER;AAhEjB,8EAA6E;AAqE5E,4FArEQ,yBAAW,OAqER;AApEZ,oFAAmF;AAmElF,+FAnEQ,+BAAc,OAmER;AAlEf,sEAAqE;AAqEpE,wFArEQ,iBAAO,OAqER;AApER,+DAAkE;AAmDjE,uFAnDQ,mBAAM,OAmDR;AACN,uFApDgB,mBAAM,OAoDhB;AAnDP,iEAA4D;AAoD3D,wFApDQ,qBAAO,OAoDR;AAnDR,oEAAmE;AAoDlE,6FApDQ,2BAAY,OAoDR;AAnDb,sEAAqE;AAoDpE,8FApDQ,6BAAa,OAoDR;AAnDd,oDAAmD;AAoDlD,qFApDQ,WAAI,OAoDR;AAnDL,kEAAiE;AA8DhE,4FA9DQ,yBAAW,OA8DR;AA7DZ,sEAAqE;AAmDpE,8FAnDQ,6BAAa,OAmDR;AAlDd,6CAA4C;AAmD3C,qFAnDQ,WAAI,OAmDR;AAjDL;;;;GAIG;AACH,yDAAuD;AACvD,+CAA8C;AA+C7C,sFA/CQ,aAAK,OA+CR;AA9CN,iEAAgE;AA2B/D,gGA3BQ,iCAAe,OA2BR;AA1BhB,+EAA8E;AA2B7E,uGA3BQ,+CAAsB,OA2BR;AA1BvB,+CAA6C;AA6B5C,6FA7BQ,4BAAY,OA6BR;AA5Bb,iDAAgD;AAqD/C,wFArDQ,iBAAO,OAqDR;AApDR,6CAAqD;AA0BzC,wFA1BH,eAAO,OA0BG;AAElB,sFA5BiB,aAAK,OA4BjB;AA3BN,mEAAkE;AAoDjE,iGApDQ,mCAAgB,OAoDR;AAnDjB,qDAAoD;AA2BnD,0FA3BQ,qBAAS,OA2BR;AA1BV,yEAAwE;AAmBvE,oGAnBQ,yCAAmB,OAmBR;AAlBpB,uEAAsE;AAmDrE,mGAnDQ,uCAAkB,OAmDR;AAlDnB,iDAAgD;AAc/C,wFAdQ,iBAAO,OAcR;AAbR,iEAAgE;AAwB/D,gGAxBQ,iCAAe,OAwBR;AAvBhB,+CAA8C;AAc7C,uFAdQ,eAAM,OAcR;AAbP,yDAAwD;AAiBvD,4FAjBQ,yBAAW,OAiBR;AAhBZ,mEAAkE;AASjE,iGATQ,mCAAgB,OASR;AARjB,2DAA0D;AA4CzD,6FA5CQ,2BAAY,OA4CR;AA3Cb,+EAA8E;AAS7E,uGATQ,+CAAsB,OASR;AARvB,wDAA0D;AA4CzD,sCAAa"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA,gDAAgD;;;AAEhD,2EAA0E;AAuEzE,gGAvEQ,iCAAe,OAuER;AAtEhB,yDAAwD;AAqEvD,uFArEQ,eAAM,OAqER;AApEP,+DAA8D;AAgE7D,yFAhEQ,mBAAQ,OAgER;AA/DT,yEAAwE;AAgEvE,4FAhEQ,yBAAW,OAgER;AA/DZ,+EAA8E;AAgE7E,iGAhEQ,mCAAgB,OAgER;AA/DjB,oFAAmF;AAmElF,+FAnEQ,+BAAc,OAmER;AAlEf,+DAAkE;AAoDjE,uFApDQ,mBAAM,OAoDR;AACN,uFArDgB,mBAAM,OAqDhB;AApDP,iEAA4D;AAqD3D,wFArDQ,qBAAO,OAqDR;AApDR,oEAAmE;AAqDlE,6FArDQ,2BAAY,OAqDR;AApDb,sEAAqE;AAqDpE,8FArDQ,6BAAa,OAqDR;AApDd,oDAAmD;AAqDlD,qFArDQ,WAAI,OAqDR;AApDL,sEAAqE;AAqDpE,8FArDQ,6BAAa,OAqDR;AApDd,6CAA4C;AAqD3C,qFArDQ,WAAI,OAqDR;AApDL,+CAA8C;AAwD7C,sFAxDQ,aAAK,OAwDR;AAvDN,iEAAgE;AA2C/D,gGA3CQ,iCAAe,OA2CR;AA1ChB,+CAA8C;AAmC7C,uFAnCQ,eAAM,OAmCR;AAlCP,6CAAqD;AAuCpD,sFAvCQ,aAAK,OAuCR;AAFM,wFArCI,eAAO,OAqCJ;AApCnB,+CAA6C;AAqC5C,6FArCQ,4BAAY,OAqCR;AApCb,qDAAoD;AAsCnD,0FAtCQ,qBAAS,OAsCR;AArCV,8EAA6E;AAsD5E,4FAtDQ,yBAAW,OAsDR;AArDZ,kEAAqF;AAwDpF,iGAxDqB,qBAAgB,OAwDrB;AAvDjB,kEAAiE;AAqDhE,4FArDQ,yBAAW,OAqDR;AApDZ,sEAAqE;AAqDpE,wFArDQ,iBAAO,OAqDR;AApDR,4EAA2E;AAuD1E,iGAvDQ,mCAAgB,OAuDR;AAtDjB,4EAA2E;AAqD1E,iGArDQ,mCAAgB,OAqDR;AApDjB,iDAAgD;AAuB/C,wFAvBQ,iBAAO,OAuBR;AAtBR,yEAAwE;AAyBvE,oGAzBQ,yCAAmB,OAyBR;AAxBpB,+EAA8E;AAyB7E,uGAzBQ,+CAAsB,OAyBR;AAxBvB,iDAAgD;AAmD/C,wFAnDQ,iBAAO,OAmDR;AAlDR,+EAA8E;AAoB7E,uGApBQ,+CAAsB,OAoBR;AAnBvB,mEAAkE;AAiBjE,iGAjBQ,mCAAgB,OAiBR;AAhBjB,mEAAkE;AAiDjE,iGAjDQ,mCAAgB,OAiDR;AAhDjB,2DAA0D;AAiDzD,6FAjDQ,2BAAY,OAiDR;AAhDb,uEAAsE;AAiDrE,mGAjDQ,uCAAkB,OAiDR;AAhDnB,wDAA0D;AAiDzD,sCAAa;AA/Cd;;;;GAIG;AACH,yDAAuD"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@combeenation/3d-viewer",
   "description": "Combeenation 3D Viewer",
-  "version": "4.0.0-alpha8",
+  "version": "4.0.0-beta3",
   "homepage": "https://github.com/Combeenation/3d-viewer#readme",
   "keywords": [],
   "author": "",

package/src/api/classes/element.ts

@@ -1,40 +1,35 @@
 import { HighlightLayer } from '@babylonjs/core/Layers/highlightLayer';
-import { Light } from '@babylonjs/core/Lights/light';
-import { ShadowGenerator } from '@babylonjs/core/Lights/Shadows/shadowGenerator';
 import { Material } from '@babylonjs/core/Materials/material';
 import { StandardMaterial } from '@babylonjs/core/Materials/standardMaterial';
 import { DynamicTexture } from '@babylonjs/core/Materials/Textures/dynamicTexture';
+import { Axis, Space } from '@babylonjs/core/Maths/math.axis';
 import { Color3 } from '@babylonjs/core/Maths/math.color';
 import { AbstractMesh } from '@babylonjs/core/Meshes/abstractMesh';
 import { InstancedMesh } from '@babylonjs/core/Meshes/instancedMesh';
 import { Mesh } from '@babylonjs/core/Meshes/mesh';
 import { TransformNode } from '@babylonjs/core/Meshes/transformNode';
-import { get, isArray, isNumber, isPlainObject, merge, union } from 'lodash-es';
+import { cloneDeep, concat, get, isArray, isNumber, isPlainObject, merge, union } from 'lodash-es';
 import {
 	activateTransformNode as activate,
 	addToHighlightLayer,
-	addToShadowGenerator,
 	assertTransformNode,
 	cloneTransformNode,
 	cloneTransformNodeMaterial,
 	deactivateTransformNode as deactivate,
 	getClientRectFromMesh,
-	injectNodeMetadata,
+	injectTransformNodeMetadata,
 	mapToDottedNodes,
-	moveTransformNode,
 	removeFromHighlightLayer,
-	removeFromShadowGenerator,
-	rotateTransformNode,
 	setMaterial,
 	setMaterialColor,
 	setMaterialMetallness,
 	setMaterialRoughness,
-	setMaterialTexture,
-	setReceiveShadows
+	setMaterialTexture
 } from '../util/babylonHelper';
-import { createImageBitmapFromImgSrc, createImageBitmapFromSvg } from '../util/resourceHelper';
-import { VariantParameterizable } from './../classes/variantParameterizable';
+import { createImageFromSvg, createImageFromImgSrc, mergeMaps } from '../util/resourceHelper';
 import { DottedPath } from './dottedPath';
+import { ElementParameterizable } from './elementParameterizable';
+import { Event } from './event';
 import { Parameter } from './parameter';
 import { Variant } from './variant';
 
@@ -45,20 +40,22 @@ import { Variant } from './variant';
  * When used in typings, refer to via its alias {@link VariantElement} to prevent name clashes with the web APIs
  * [Element](https://developer.mozilla.org/en-US/docs/Web/API/Element) class
  */
-export class Element extends VariantParameterizable {
-
-	public readonly nodes: TransformNode[] = [];
+export class Element extends ElementParameterizable {
 
 	protected readonly _dottedNodes: Map<DottedPath, TransformNode> = new Map();
 
+	protected readonly _parameterObservers: Map<string, ParameterObserver[]> = new Map();
+
 	protected _highlightLayer?: HighlightLayer;
 
+	public readonly nodes: TransformNode[] = [];
+
 	/**
 	 * Constructor.
 	 */
-	protected constructor( public readonly variant: Variant,
+	public constructor( public readonly variant: Variant,
 	                    public readonly name: string ) {
-		super( variant, name );
+		super();
 		if ( process.env.NODE_ENV?.toLowerCase().includes('dev')) {
 			this.assertPathDefinitions();
 		}
@@ -73,13 +70,6 @@ export class Element extends VariantParameterizable {
 		this.addParameterObservers();
 	}
 
-	/**
-	 * Creates an {@link Element} with given name.
-	 */
-	public static async create( variant: Variant, name: string ): Promise<Element> {
-		return new Element( variant, name );
-	}
-
 	/**
 	 * The {@link DottedPath} in the built tree of {@link Element}s.
 	 * E.g. "_.top-1.sub-2.sub-sub-3.el-1"
@@ -166,9 +156,10 @@ export class Element extends VariantParameterizable {
 	 * Gets a node by its {@link DottedPath}.
 	 */
 	public getNode( dottedPath: DottedPathArgument ): TransformNode {
-		// TODO: fix, currently broken
 		const _dottedPath = DottedPath.create( dottedPath );
-		const node = this._dottedNodes.get( _dottedPath );
+		const keys = Array.from( this._dottedNodes.keys() ).map( dp => dp.path );
+		const values = Array.from( this._dottedNodes.values() );
+		const node = values[keys.indexOf( _dottedPath.path )];
 		if( !node ) {
 			throw new Error( `Node with path "${_dottedPath.path}" does not exist for element "${this.id}".` );
 		}
@@ -221,11 +212,41 @@ export class Element extends VariantParameterizable {
 	}
 
 	/**
-	 * @see {@link VariantParameterizable.commitParameters}
+	 * Places the given {@link ParameterBag} in the {@link Element}'s parameters, replaces all patterns in the
+	 * {@link StructureJson} and broadcasts all {@link ParameterObserver}s.
+	 *
 	 * @emit {@link Event.ELEMENT_PARAMETER_COMMITTED}
 	 */
-	public async commitParameters( parameters?: ParameterBag ): Promise<VariantParameterizable> {
-		return super.commitParameters( parameters );
+	public async commitParameters( parameters?: ParameterBag ): Promise<Element> {
+		if( !parameters ) {
+			parameters = {};
+		}
+		const oldParameters = cloneDeep( this.parameters );
+		merge( this.parameters, parameters );
+		// handle parameter observers
+		let observerPromises: Promise<void | ParameterObserver>[] = [];
+		for( const parameter in this.parameters ) {
+			const oldParameterValue = oldParameters[parameter];
+			const newParameterValue = this.parameters[parameter];
+			this.variant.assertParameter( this.variant.inheritedParameterDeclaration, parameter, newParameterValue );
+			if( oldParameterValue === newParameterValue ) {
+				continue;
+			}
+			// parameter changed
+			const parameterObservers = mergeMaps( this._parameterObservers, this.parameterObservers );
+			if( parameterObservers.has( parameter ) ) {
+				const observers = parameterObservers.get( parameter )!;
+				observerPromises = concat(observerPromises, observers.map( observer => {
+					const observerResult = observer( this, oldParameterValue, newParameterValue );
+					return Promise.resolve( observerResult ).then( () => {
+						this.broadcastEvent( Event.ELEMENT_PARAMETER_COMMITTED,
+							this, parameter, oldParameterValue, newParameterValue );
+					} );
+				} ) );
+			}
+		}
+		await Promise.all( observerPromises );
+		return this;
 	}
 
 	/**
@@ -260,7 +281,7 @@ export class Element extends VariantParameterizable {
 	 * Draws a `ImageBitmap` or `OffscreenCanvas` onto a `paintable` defined via {@link PaintableDefinition}.
 	 */
 	public drawPaintable( paintable: string, imageSource: CanvasImageSource ): Element {
-		const paintableDefinition = this.getPaintableDefinition( paintable );
+		// node and material checks and preperation
 		const node = this.getPaintableNode( paintable );
 		if( !(node instanceof AbstractMesh) ) {
 			throw new Error( `The path must be an instance of "AbstractMesh" for paintable "${paintable}" ` +
@@ -275,12 +296,15 @@ export class Element extends VariantParameterizable {
 		node.material.transparencyMode = Material.MATERIAL_ALPHATESTANDBLEND;
 		if( !get( node.metadata, 'dirty.material.texture' ) ) {
 			// inject initial value and mark as dirty
-			injectNodeMetadata( node, { dirty: { material: { texture: true	} } } );
+			injectTransformNodeMetadata( node, { dirty: { material: { texture: true	} } } );
 		}
+
+		// consider width and height of the paintable
 		const widthAndHeight = {
 			width: imageSource.width,
 			height: imageSource.height
 		};
+		const paintableDefinition = this.getPaintableDefinition( paintable );
 		if( isNumber( paintableDefinition.textureOptions ) ) {
 			widthAndHeight.width = paintableDefinition.textureOptions;
 			widthAndHeight.height = paintableDefinition.textureOptions;
@@ -288,17 +312,23 @@ export class Element extends VariantParameterizable {
 			widthAndHeight.width = paintableDefinition.textureOptions.width;
 			widthAndHeight.height = paintableDefinition.textureOptions.height;
 		}
+
+		// create dynamic texture on which the image can be drawn
 		const texture = new DynamicTexture(
 			`${this.id}.${paintable}.texture`,
 			widthAndHeight,
 			this.variant.viewer.scene,
 			false
 		);
-		setMaterialTexture( node, texture, false );
+
+		// draw image on texture
 		const ctx = texture.getContext();
-		// flip texture context horizontal with translate and scale
 		ctx.drawImage( imageSource, 0, 0);
 		texture.update( false );
+
+		// finally apply the texture on the desired node material
+		setMaterialTexture( node, texture, false );
+
 		return this;
 	}
 
@@ -306,16 +336,16 @@ export class Element extends VariantParameterizable {
 	 * Draws a SVG string onto a `paintable` defined via {@link PaintableDefinition}.
 	 */
 	public async drawPaintableFromSvg( paintable: string, svgSource: string ): Promise<Element> {
-		const source = await createImageBitmapFromSvg( svgSource );
-		return this.drawPaintable( paintable, source );
+		const image = await createImageFromSvg( svgSource );
+		return this.drawPaintable( paintable, image );
 	}
 
 	/**
 	 * Draws an Image from source (URL/URI) onto a `paintable` defined via {@link PaintableDefinition}.
 	 */
 	public async drawPaintableFromImgSrc( paintable: string, imgSource: string ): Promise<Element> {
-		const source = await createImageBitmapFromImgSrc( imgSource );
-		return this.drawPaintable( paintable, source );
+		const image = await createImageFromImgSrc( imgSource );
+		return this.drawPaintable( paintable, image );
 	}
 
 	/**
@@ -332,12 +362,12 @@ export class Element extends VariantParameterizable {
 				}
 				if( visible === true ) {
 					element.nodes.forEach( node => {
-						injectNodeMetadata( node, { visibility: node.isEnabled() } );
+						injectTransformNodeMetadata( node, { visibility: node.isEnabled() } );
 						activate( node );
 					} );
 				} else if( visible === false ) {
 					element.nodes.forEach( node => {
-						injectNodeMetadata( node, { visibility: node.isEnabled() } );
+						injectTransformNodeMetadata( node, { visibility: node.isEnabled() } );
 						deactivate( node );
 					} );
 				}
@@ -353,7 +383,7 @@ export class Element extends VariantParameterizable {
 			async ( element: Element, oldValue: ParameterValue, newValue: ParameterValue ) => {
 				const material = element.variant.getMaterial( newValue.toString() );
 				element.nodes.forEach( node => {
-					assertTransformNode(node, (node: AbstractMesh) => {
+					assertTransformNode(node, (node: TransformNode) => {
 						if( node instanceof InstancedMesh ) {
 							throw new Error( `Changing parameter "${Parameter.MATERIAL}" ` +
 								`of an InstancedMesh is not supported. ` +
@@ -368,7 +398,7 @@ export class Element extends VariantParameterizable {
 			async ( element: Element, oldValue: ParameterValue, newValue: ParameterValue ) => {
 				const color = Parameter.parseColor( newValue );
 				element.nodes.forEach( node => {
-					assertTransformNode(node, (node: AbstractMesh) => {
+					assertTransformNode(node, (node: TransformNode) => {
 						if( node instanceof InstancedMesh ) {
 							throw new Error( `Changing parameter "${Parameter.MATERIAL_COLOR}" ` +
 								`of an InstancedMesh is not supported. ` +
@@ -380,7 +410,7 @@ export class Element extends VariantParameterizable {
 					}
 					if( !get( node.metadata, 'dirty.material.color' ) ) {
 						// inject initial value and mark as dirty
-						injectNodeMetadata( node, { dirty: { material: { color: oldValue } } } );
+						injectTransformNodeMetadata( node, { dirty: { material: { color: oldValue } } } );
 					}
 					setMaterialColor( node, color );
 				} );
@@ -390,7 +420,7 @@ export class Element extends VariantParameterizable {
 			async ( element: Element, oldValue: ParameterValue, newValue: ParameterValue ) => {
 				const metallness = Parameter.parseNumber( newValue );
 				element.nodes.forEach( node => {
-					assertTransformNode(node, (node: AbstractMesh) => {
+					assertTransformNode(node, (node: TransformNode) => {
 						if( node instanceof InstancedMesh ) {
 							throw new Error( `Changing parameter "${Parameter.MATERIAL_METALLNESS}" ` +
 								`of an InstancedMesh is not supported. ` +
@@ -402,7 +432,7 @@ export class Element extends VariantParameterizable {
 					}
 					if( !get( node.metadata, 'dirty.material.metallness' ) ) {
 						// inject initial value and mark as dirty
-						injectNodeMetadata( node, { dirty: { material: { metallness: oldValue } } } );
+						injectTransformNodeMetadata( node, { dirty: { material: { metallness: oldValue } } } );
 					}
 					setMaterialMetallness( node, metallness );
 				} );
@@ -412,7 +442,7 @@ export class Element extends VariantParameterizable {
 			async ( element: Element, oldValue: ParameterValue, newValue: ParameterValue ) => {
 				const roughness = Parameter.parseNumber( newValue );
 				element.nodes.forEach( node => {
-					assertTransformNode(node, (node: AbstractMesh) => {
+					assertTransformNode(node, (node: TransformNode) => {
 						if( node instanceof InstancedMesh ) {
 							throw new Error( `Changing parameter "${Parameter.MATERIAL_ROUGHNESS}" ` +
 								`of an InstancedMesh is not supported. ` +
@@ -424,7 +454,7 @@ export class Element extends VariantParameterizable {
 					}
 					if( !get( node.metadata, 'dirty.material.roughness' ) ) {
 						// inject initial value and mark as dirty
-						injectNodeMetadata( node, { dirty: { material: { roughness: oldValue } } } );
+						injectTransformNodeMetadata( node, { dirty: { material: { roughness: oldValue } } } );
 					}
 					setMaterialRoughness( node, roughness );
 				} );
@@ -480,7 +510,7 @@ export class Element extends VariantParameterizable {
 				// Add/Remove meshes to previously created highlight layers.
 				if( highlighted === true ) {
 					element.nodes.forEach( node => {
-						assertTransformNode(node, (node: AbstractMesh) => {
+						assertTransformNode(node, (node: TransformNode) => {
 							if( node instanceof InstancedMesh ) {
 								throw new Error( `Changing parameter "${Parameter.HIGHLIGHTED}" ` +
 									`of an InstancedMesh is not supported. ` +
@@ -507,54 +537,35 @@ export class Element extends VariantParameterizable {
 		this._parameterObservers.set( Parameter.POSITION, [
 			async ( element: Element, oldValue: ParameterValue, newValue: ParameterValue ) => {
 				// we have to deal just with root nodes here due to relative impacts in a node tree
-				element.nodes.forEach( node => moveTransformNode( node, Parameter.parseVector( newValue ) ) );
+				element.nodes.forEach( node => {
+					// remember absolute position and reset it before translating
+					if( !get( node.metadata, 'position' ) ) {
+						node.metadata.position = node.absolutePosition.clone();
+					}
+					node.setAbsolutePosition( node.metadata.position );
+					// move
+					const distance = Parameter.parseVector( newValue );
+					node.translate( Axis.X, distance.x, Space.WORLD );
+					node.translate( Axis.Y, distance.y, Space.WORLD );
+					node.translate( Axis.Z, distance.z, Space.WORLD );
+				} );
 			}
 		] );
 		this._parameterObservers.set( Parameter.ROTATION, [
 			async ( element: Element, oldValue: ParameterValue, newValue: ParameterValue ) => {
 				// we have to deal just with root nodes here due to relative impacts in a node tree
-				element.nodes.forEach( node => rotateTransformNode( node, Parameter.parseRotation( newValue ) ) );
-			}
-		] );
-		this._parameterObservers.set( Parameter.CAST_SHADOW, [
-			async ( element: Element, oldValue: ParameterValue, newValue: ParameterValue ) => {
-				let castShadow;
-				try {
-					castShadow = Parameter.parseBoolean( newValue );
-				} catch( e ) {
-					return;
-				}
-				let lightCsl = element.inheritedParameters[Parameter.CAST_SHADOW_FROM_LIGHTS];
-				if( ! lightCsl ) {
-					lightCsl = element.variant.inheritedViewerLights.map( l => l.name ).join( ',' );
-				}
-				if( castShadow === true ) {
-					await this.castShadowValueHandler( lightCsl, addToShadowGenerator );
-				}
-				if( castShadow === false ) {
-					await this.castShadowValueHandler( lightCsl, removeFromShadowGenerator );
-				}
-			}
-		] );
-		this._parameterObservers.set( Parameter.CAST_SHADOW_FROM_LIGHTS, [
-			async ( element: Element, oldValue: ParameterValue, newValue: ParameterValue ) => {
-				// TODO: Possible performance issue in combination with CAST_SHADOW, since both observers are initially called
-				//       when CAST_SHADOW and CAST_SHADOW_FROM_LIGHTS are defined in the spec.
-				const lightCsl = element.variant.inheritedViewerLights.map( l => l.name ).join( ',' );
-				// cleanup all shadow generators
-				await this.castShadowValueHandler( lightCsl, removeFromShadowGenerator );
-				if( element.castShadow === true ) {
-					// if newValue is undefined or '' then set newValue to lightCsl (use all lights)
-					if( !newValue ) {
-						newValue = lightCsl;
+				element.nodes.forEach( node => {
+					// remember absolute rotation and reset it before translating
+					if(!get( node.metadata, 'rotation' ) ) {
+						node.metadata.rotation = node.rotation.clone();
 					}
-					await this.castShadowValueHandler( newValue, addToShadowGenerator );
-				}
-			}
-		] );
-		this._parameterObservers.set( Parameter.RECEIVE_SHADOWS, [
-			async ( element: Element, oldValue: ParameterValue, newValue: ParameterValue ) => {
-				element.nodes.forEach( node => setReceiveShadows( node, Parameter.parseBoolean( newValue ) ) );
+					node.rotation = node.metadata.rotation;
+					// rotate
+					const rotation = Parameter.parseRotation( newValue );
+					node.rotate( Axis.X, rotation.x, Space.WORLD );
+					node.rotate( Axis.Y, rotation.y, Space.WORLD );
+					node.rotate( Axis.Z, rotation.z, Space.WORLD );
+				} );
 			}
 		] );
 		return this;
@@ -603,25 +614,4 @@ export class Element extends VariantParameterizable {
 		} );
 	}
 
-	/**
-	 * Handles callback for given light parameter.
-	 */
-	private async castShadowValueHandler( lightCsl: ParameterValue, mutator: CallableFunction ) {
-		let lights: Light[] = [];
-		for( const lightName of Parameter.parseCommaSeparatedList( lightCsl ) ) {
-			const viewerLight = await this.variant.getViewerLight( lightName );
-			if( viewerLight ) {
-				lights.push( viewerLight.light );
-			}
-		}
-		const shadowGenerators = lights
-			.map( light => light?.getShadowGenerator() as ShadowGenerator )
-			.filter( Boolean );
-		shadowGenerators.forEach( generator => {
-			this.nodes.forEach( node => {
-				mutator( generator, node );
-			} );
-		} );
-	}
-
 }