@shopware-ag/dive 1.15.4 → 1.15.5

package/build/dive.cjs

@@ -673,6 +673,7 @@ var import_three5 = require("three");
 // src/com/Communication.ts
 var import_MathUtils = require("three/src/math/MathUtils");
 init_SelectTool();
+var import_lodash = require("lodash");
 var _DIVECommunication = class _DIVECommunication {
   constructor(renderer, scene, controls, toolbox) {
     this.registered = /* @__PURE__ */ new Map();
@@ -867,7 +868,7 @@ var _DIVECommunication = class _DIVECommunication {
   }
   addObject(payload) {
     if (this.registered.get(payload.id)) return false;
-    if (payload.parent === void 0) payload.parent = null;
+    if (payload.parentId === void 0) payload.parentId = null;
     this.registered.set(payload.id, payload);
     this.scene.AddSceneObject(payload);
     return true;
@@ -875,7 +876,7 @@ var _DIVECommunication = class _DIVECommunication {
   updateObject(payload) {
     const objectToUpdate = this.registered.get(payload.id);
     if (!objectToUpdate) return false;
-    this.registered.set(payload.id, __spreadValues(__spreadValues({}, objectToUpdate), payload));
+    this.registered.set(payload.id, (0, import_lodash.merge)(objectToUpdate, payload));
     const updatedObject = this.registered.get(payload.id);
     this.scene.UpdateSceneObject(__spreadProps(__spreadValues({}, payload), { id: updatedObject.id, entityType: updatedObject.entityType }));
     Object.assign(payload, updatedObject);
@@ -1385,7 +1386,7 @@ var DIVEPrimitive = class extends DIVENode {
   DropIt() {
     var _a;
     if (!this.parent) {
-      console.warn("DIVEModel: DropIt() called on a model that is not in the scene.", this);
+      console.warn("DIVEPrimitive: DropIt() called on a model that is not in the scene.", this);
       return;
     }
     const bottomY = this._boundingBox.min.y * this.scale.y;
@@ -1407,7 +1408,7 @@ var DIVEPrimitive = class extends DIVENode {
     }
   }
   assembleGeometry(geometry) {
-    switch (geometry.name) {
+    switch (geometry.name.toLowerCase()) {
       case "cylinder":
         return this.createCylinderGeometry(geometry);
       case "sphere":
@@ -1422,8 +1423,10 @@ var DIVEPrimitive = class extends DIVENode {
         return this.createWallGeometry(geometry);
       case "plane":
         return this.createPlaneGeometry(geometry);
-      default:
+      default: {
+        console.warn("DIVEPrimitive: Invalid geometry type:", geometry.name.toLowerCase());
         return new import_three9.BufferGeometry();
+      }
     }
   }
   createCylinderGeometry(geometry) {
@@ -1706,7 +1709,7 @@ var DIVERoot = class extends import_three11.Object3D {
           break;
         }
         default: {
-          console.warn(`Root.updateLight: Unknown light type: ${light.type}`);
+          console.warn(`DIVERoot.updateLight: Unknown light type: ${light.type}`);
           return;
         }
       }
@@ -1719,7 +1722,7 @@ var DIVERoot = class extends import_three11.Object3D {
     if (light.enabled !== void 0 && light.enabled !== null) sceneObject.SetEnabled(light.enabled);
     if (light.color !== void 0 && light.color !== null) sceneObject.SetColor(new import_three11.Color(light.color));
     if (light.visible !== void 0 && light.visible !== null) sceneObject.visible = light.visible;
-    if (light.parent !== void 0) this.setParent(__spreadProps(__spreadValues({}, light), { parent: light.parent }));
+    if (light.parentId !== void 0) this.setParent(__spreadProps(__spreadValues({}, light), { parentId: light.parentId }));
   }
   updateModel(model) {
     let sceneObject = this.GetSceneObject(model);
@@ -1742,7 +1745,7 @@ var DIVERoot = class extends import_three11.Object3D {
     if (model.scale !== void 0) sceneObject.SetScale(model.scale);
     if (model.visible !== void 0) sceneObject.SetVisibility(model.visible);
     if (model.material !== void 0) sceneObject.SetMaterial(model.material);
-    if (model.parent !== void 0) this.setParent(__spreadProps(__spreadValues({}, model), { parent: model.parent }));
+    if (model.parentId !== void 0) this.setParent(__spreadProps(__spreadValues({}, model), { parentId: model.parentId }));
   }
   updatePrimitive(primitive) {
     let sceneObject = this.GetSceneObject(primitive);
@@ -1759,7 +1762,7 @@ var DIVERoot = class extends import_three11.Object3D {
     if (primitive.scale !== void 0) sceneObject.SetScale(primitive.scale);
     if (primitive.visible !== void 0) sceneObject.SetVisibility(primitive.visible);
     if (primitive.material !== void 0) sceneObject.SetMaterial(primitive.material);
-    if (primitive.parent !== void 0) this.setParent(__spreadProps(__spreadValues({}, primitive), { parent: primitive.parent }));
+    if (primitive.parentId !== void 0) this.setParent(__spreadProps(__spreadValues({}, primitive), { parentId: primitive.parentId }));
   }
   updateGroup(group) {
     let sceneObject = this.GetSceneObject(group);
@@ -1775,12 +1778,12 @@ var DIVERoot = class extends import_three11.Object3D {
     if (group.scale !== void 0) sceneObject.SetScale(group.scale);
     if (group.visible !== void 0) sceneObject.SetVisibility(group.visible);
     if (group.bbVisible !== void 0) sceneObject.SetLinesVisibility(group.bbVisible);
-    if (group.parent !== void 0) this.setParent(__spreadProps(__spreadValues({}, group), { parent: group.parent }));
+    if (group.parentId !== void 0) this.setParent(__spreadProps(__spreadValues({}, group), { parentId: group.parentId }));
   }
   deleteLight(light) {
     const sceneObject = this.GetSceneObject(light);
     if (!sceneObject) {
-      console.warn(`Root.deleteLight: Light with id ${light.id} not found`);
+      console.warn(`DIVERoot.deleteLight: Light with id ${light.id} not found`);
       return;
     }
     this.detachTransformControls(sceneObject);
@@ -1789,7 +1792,7 @@ var DIVERoot = class extends import_three11.Object3D {
   deleteModel(model) {
     const sceneObject = this.GetSceneObject(model);
     if (!sceneObject) {
-      console.warn(`Root.deleteModel: Model with id ${model.id} not found`);
+      console.warn(`DIVERoot.deleteModel: Model with id ${model.id} not found`);
       return;
     }
     this.detachTransformControls(sceneObject);
@@ -1798,7 +1801,7 @@ var DIVERoot = class extends import_three11.Object3D {
   deletePrimitive(primitive) {
     const sceneObject = this.GetSceneObject(primitive);
     if (!sceneObject) {
-      console.warn(`Root.deletePrimitive: Primitive with id ${primitive.id} not found`);
+      console.warn(`DIVERoot.deletePrimitive: Primitive with id ${primitive.id} not found`);
       return;
     }
     this.detachTransformControls(sceneObject);
@@ -1807,7 +1810,7 @@ var DIVERoot = class extends import_three11.Object3D {
   deleteGroup(group) {
     const sceneObject = this.GetSceneObject(group);
     if (!sceneObject) {
-      console.warn(`Root.deleteGroup: Group with id ${group.id} not found`);
+      console.warn(`DIVERoot.deleteGroup: Group with id ${group.id} not found`);
       return;
     }
     this.detachTransformControls(sceneObject);
@@ -1824,11 +1827,8 @@ var DIVERoot = class extends import_three11.Object3D {
   setParent(object) {
     const sceneObject = this.GetSceneObject(object);
     if (!sceneObject) return;
-    if (sceneObject.parent) {
-      sceneObject.parent.remove(sceneObject);
-    }
-    if (object.parent !== null) {
-      const parent = this.GetSceneObject(object.parent);
+    if (object.parentId !== null) {
+      const parent = this.GetSceneObject({ id: object.parentId });
       if (!parent) return;
       parent.attach(sceneObject);
     } else {
@@ -2376,6 +2376,70 @@ var DIVEInfo = class {
 };
 DIVEInfo._supportsWebXR = null;
 
+// package.json
+var package_default = {
+  name: "@shopware-ag/dive",
+  version: "1.15.5",
+  description: "Shopware Spatial Framework",
+  type: "module",
+  main: "./build/dive.cjs",
+  module: "./build/dive.js",
+  types: "./build/dive.d.ts",
+  files: [
+    "build",
+    "LICENSE",
+    "package.json",
+    "README.md",
+    "src"
+  ],
+  keywords: [
+    "dive",
+    "shopware",
+    "sw6",
+    "three",
+    "three.js",
+    "3d",
+    "typescript"
+  ],
+  repository: "git@github.com:shopware/dive.git",
+  author: "ffrank <f.frank@shopware.com>",
+  license: "MIT",
+  browserslist: [
+    "> 1%, not dead, not ie 11, not op_mini all"
+  ],
+  dependencies: {
+    "@tweenjs/tween.js": "^23.1.1",
+    lodash: "^4.17.21",
+    three: "^0.163.0",
+    "three-spritetext": "^1.8.2"
+  },
+  devDependencies: {
+    "@eslint/js": "^9.1.1",
+    "@types/jest": "^29.5.12",
+    "@types/lodash": "^4.17.12",
+    "@types/node": "^20.12.7",
+    "@types/three": "^0.163.0",
+    eslint: "^9.1.1",
+    globals: "^15.0.0",
+    jest: "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    jsdom: "^24.0.0",
+    "ts-jest": "^29.1.2",
+    "ts-node": "^10.9.2",
+    tsup: "^8.0.2",
+    typescript: "^5.4.5",
+    "typescript-eslint": "^7.7.1"
+  },
+  scripts: {
+    build: "tsup && yarn genmd",
+    watch: "tsup --watch",
+    lint: "eslint",
+    unit: "jest",
+    coverage: "jest --coverage",
+    genmd: "node ./scripts/genmd.js"
+  }
+};
+
 // src/math/helper/shift.ts
 function shift(value, exponent) {
   const subvalues = (value + "e").split("e");
@@ -2551,7 +2615,7 @@ var DIVE = class _DIVE {
         console.log(this.scene);
       }
     };
-    console.log("DIVE initialized");
+    console.log(`DIVE ${package_default.version} initialized`);
   }
   Dispose() {
     var _a;