@combeenation/3d-viewer 5.2.0-alpha1 → 5.2.0-alpha5

package/dist/{lib-es6/src → lib-cjs}/api/util/sceneLoaderHelper.d.ts

@@ -18,7 +18,7 @@ declare const getCustomCbnBabylonLoaderPlugin: (previousLoaderPlugin: ISceneLoad
  * @param concerningMesh Mesh to look for missing materials on, and create/apply to (when found).
  * @returns observer
  */
-declare const getMaterialPostLoadObserver: (targetMeshOrInstance: AbstractMesh, concerningMesh: Mesh) => (_eventData: any, _eventState: any) => void;
+declare const getMaterialPostLoadObserver: (targetMeshOrInstance: AbstractMesh, concerningMesh: Mesh) => () => void;
 /**
  * Adds an "onEnabledStateChanged" observer to the given mesh and all its parents:
  * The added observer (`getMaterialPostLoadObserver`) handles creation of missing materials once the given node is
@@ -31,5 +31,5 @@ declare const addMissingMaterialObserver: (node: BjsNode) => void;
  * @param scene BabylonJs scene
  * @returns PBRMaterial | null
  */
-export declare const getMaterialFromCbnAssets: (materialId: string, scene: Scene) => Material | null;
+export declare const createMaterialFromCbnAssets: (materialId: string, scene: Scene) => Material | null;
 export { getCustomCbnBabylonLoaderPlugin, getMaterialPostLoadObserver, missingMaterialMetadataName, addMissingMaterialObserver, };

package/dist/lib-cjs/{src/api → api}/util/sceneLoaderHelper.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addMissingMaterialObserver = exports.missingMaterialMetadataName = exports.getMaterialPostLoadObserver = exports.getCustomCbnBabylonLoaderPlugin = exports.getMaterialFromCbnAssets = void 0;
+exports.addMissingMaterialObserver = exports.missingMaterialMetadataName = exports.getMaterialPostLoadObserver = exports.getCustomCbnBabylonLoaderPlugin = exports.createMaterialFromCbnAssets = void 0;
 const babylonHelper_1 = require("./babylonHelper");
 const material_1 = require("@babylonjs/core/Materials/material");
 const instancedMesh_1 = require("@babylonjs/core/Meshes/instancedMesh");
@@ -23,7 +23,7 @@ const getCustomCbnBabylonLoaderPlugin = function (previousLoaderPlugin) {
         extensions: '.babylon',
         importMesh: previousLoaderPlugin.importMesh,
         load: previousLoaderPlugin.load,
-        loadAssetContainer: function (scene, data, rootUrl, onError) {
+        loadAssetContainer: function (scene, data, rootUrl) {
             //* 1) --- manipulate ORIGINAL data
             const dataParsed = JSON.parse(data);
             //* 2) --- call default (non-custom) loading method
@@ -45,7 +45,7 @@ exports.getCustomCbnBabylonLoaderPlugin = getCustomCbnBabylonLoaderPlugin;
  * @returns observer
  */
 const getMaterialPostLoadObserver = function (targetMeshOrInstance, concerningMesh) {
-    return (_eventData, _eventState) => {
+    return () => {
         const hasBeenEnabled = concerningMesh.isEnabled(true);
         const materialMissing = (0, has_1.default)(concerningMesh.metadata, missingMaterialMetadataName);
         if (!hasBeenEnabled || !materialMissing)
@@ -55,7 +55,7 @@ const getMaterialPostLoadObserver = function (targetMeshOrInstance, concerningMe
         // try to find material on the scene
         const existingMat = concerningMesh.getScene().getMaterialById(missingMatId);
         // assign either existing material or freshly created one
-        concerningMesh.material = existingMat || (0, exports.getMaterialFromCbnAssets)(missingMatId, concerningMesh.getScene());
+        concerningMesh.material = existingMat || (0, exports.createMaterialFromCbnAssets)(missingMatId, concerningMesh.getScene());
         // since the material is there now, we do not need the related metadata tag anymore
         delete concerningMesh.metadata[missingMaterialMetadataName];
     };
@@ -78,8 +78,6 @@ const addMissingMaterialMetadata = function (dataParsed, container) {
             const materialOnOriginalMesh = currMeshOriginal.materialId;
             if (!materialOnOriginalMesh || materialOnImportedMesh === materialOnOriginalMesh)
                 continue;
-            // TODO: Just for easier debugging. Remove before publishment...
-            console.info(`Adding "${missingMaterialMetadataName}" info on mesh "${currMeshOriginal.name}" with material "${currMeshOriginal.materialId}"`);
             // if we're here, the imported mesh has different material than original one
             (_b = window.Cbn) === null || _b === void 0 ? void 0 : _b.Assets.assertMaterialExists(materialOnOriginalMesh);
             (0, babylonHelper_1.injectNodeMetadata)(currMeshImported, { [missingMaterialMetadataName]: materialOnOriginalMesh }, false);
@@ -129,7 +127,7 @@ exports.addMissingMaterialObserver = addMissingMaterialObserver;
  * @param scene BabylonJs scene
  * @returns PBRMaterial | null
  */
-const getMaterialFromCbnAssets = function (materialId, scene) {
+const createMaterialFromCbnAssets = function (materialId, scene) {
     var _a;
     const materialDefinition = (_a = window.Cbn) === null || _a === void 0 ? void 0 : _a.Assets.getMaterial(materialId);
     // The generic `Material.Parse` actually returns a more specific material like `BABYLON.StandardMaterial`,
@@ -138,5 +136,5 @@ const getMaterialFromCbnAssets = function (materialId, scene) {
     const material = materialDefinition && material_1.Material.Parse(materialDefinition, scene, '');
     return material || null;
 };
-exports.getMaterialFromCbnAssets = getMaterialFromCbnAssets;
+exports.createMaterialFromCbnAssets = createMaterialFromCbnAssets;
 //# sourceMappingURL=sceneLoaderHelper.js.map

package/dist/lib-cjs/api/util/sceneLoaderHelper.js.map

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

package/dist/{lib-es6/src → lib-cjs}/api/util/stringHelper.d.ts

@@ -1,7 +1,7 @@
 /**
  * Creates a random uuidv4.
  */
-declare const uuidv4: () => any;
+declare const uuidv4: () => string;
 /**
  * Converts a string from camel case to snake case.
  */

package/dist/lib-cjs/{src/api → api}/util/stringHelper.js

@@ -5,8 +5,10 @@ exports.camelToSnakeCase = exports.uuidv4 = void 0;
  * Creates a random uuidv4.
  */
 const uuidv4 = function () {
-    // @ts-ignore
-    return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c => (c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))).toString(16));
+    return ([1e7].toString() + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c => {
+        const cNum = parseInt(c);
+        return (cNum ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (cNum / 4)))).toString(16);
+    });
 };
 exports.uuidv4 = uuidv4;
 /**

package/dist/lib-cjs/api/util/stringHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stringHelper.js","sourceRoot":"","sources":["../../../../src/api/util/stringHelper.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAM,MAAM,GAAG;IACb,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE;QAC3E,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACzB,OAAO,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACnG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAcO,wBAAM;AAZf;;GAEG;AACH,MAAM,gBAAgB,GAAG,UAAU,GAAW;IAC5C,OAAO,GAAG;SACP,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;SAC1B,IAAI,EAAE;SACN,KAAK,CAAC,GAAG,CAAC;SACV,IAAI,CAAC,GAAG,CAAC;SACT,WAAW,EAAE,CAAC;AACnB,CAAC,CAAC;AAEe,4CAAgB"}

package/dist/lib-cjs/api/util/structureHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"structureHelper.js","sourceRoot":"","sources":["../../../../src/api/util/structureHelper.ts"],"names":[],"mappings":";;;AAAA,gDAA6C;AAC7C,gDAA6C;AAC7C,gEAA6D;AAC7D,sDAAmD;AAEnD;;;;;GAKG;AACH,MAAM,6BAA6B,GAAG,UAAU,IAAU,EAAE,IAA0B;IACpF,MAAM,SAAS,GAAG,CAAC,SAAe,EAAE,WAAiB,EAAE,EAAE;QACvD,OAAO,SAAS,CAAC,QAAQ,KAAK,WAAW,CAAC,QAAQ,CAAC;IACrD,CAAC,CAAC;IACF,MAAM,YAAY,GAAG,CAAC,OAAgB,EAAE,WAAiB,EAAE,EAAE;QAC3D,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;IACjE,CAAC,CAAC;IACF,MAAM,YAAY,GAAG,CAAC,YAAqB,EAAE,WAAiB,EAAE,EAAE;QAChE,OAAO,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC;IACF,MAAM,oBAAoB,GAAG,CAAC,YAA6B,EAAE,WAAiB,EAAE,EAAE;QAChF,OAAO,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC;IACF,MAAM,KAAK,GAAG,CAAC,iBAAmC,EAAE,IAAU,EAAE,EAAE;QAChE,IAAI,iBAAiB,YAAY,iCAAe,EAAE;YAChD,OAAO,oBAAoB,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SACtD;QACD,IAAI,iBAAiB,YAAY,iBAAO,EAAE;YACxC,OAAO,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC9C;QACD,IAAI,iBAAiB,YAAY,iBAAO,EAAE;YACxC,OAAO,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC9C;QACD,IAAI,iBAAiB,YAAY,WAAI,EAAE;YACrC,OAAO,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC3C;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC;IAChF,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,YAAY,WAAI,EAAE;QAC9C,UAAU,GAAG,6BAA6B,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;KAC/D;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEO,sEAA6B"}

package/dist/lib-cjs/buildinfo.json

@@ -1,3 +1,3 @@
 {
-    "version": "%npm_package_version%"
+    "version": "5.2.0-alpha4"
 }