kitchen-simulator 5.0.0-new-api → 5.0.0-new-api.2

package/es/catalog/catalog.js

@@ -1,7 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-import { PropertyColor, PropertyEnum, PropertyString, PropertyNumber, PropertyLengthMeasure, PropertyToggle, PropertyCheckbox, PropertyHidden, PropertyReadOnly } from "./properties/export";
 import { UNIT_CENTIMETER, UNIT_INCH } from "../constants";
 import { returnReplaceableDeepSearchType } from "../components/viewer2d/utils";
 var Catalog = /*#__PURE__*/function () {
@@ -19,7 +18,6 @@ var Catalog = /*#__PURE__*/function () {
     };
     this.propertyTypes = {};
     this.unit = unit;
-    this.registerMultiplePropertyType([['color', PropertyColor, PropertyColor], ['enum', PropertyEnum, PropertyEnum], ['string', PropertyString, PropertyString], ['number', PropertyNumber, PropertyNumber], ['length-measure', PropertyLengthMeasure, PropertyLengthMeasure], ['toggle', PropertyToggle, PropertyToggle], ['checkbox', PropertyCheckbox, PropertyCheckbox], ['hidden', PropertyHidden, PropertyHidden], ['read-only', PropertyReadOnly, PropertyReadOnly]]);
   }
 
   /**

package/es/catalog/utils/exporter.js

@@ -11,6 +11,7 @@ export default function (_ref) {
     description = _ref.description,
     prototype = _ref.prototype,
     base = _ref.base,
+    gltf = _ref.gltf,
     shape_svg = _ref.shape_svg,
     render2DItem = _ref.render2DItem,
     render3DItem = _ref.render3DItem,
@@ -100,6 +101,7 @@ export default function (_ref) {
       is_corner: is_corner,
       shape_svg: shape_svg
     },
+    gltf: gltf,
     properties: _objectSpread(_objectSpread({
       altitude: {
         label: 'Distance from floor',

package/es/class/area.js

@@ -14,7 +14,6 @@ var Area = /*#__PURE__*/function () {
     key: "add",
     value: function add(state, layerID, type, verticesCoords, catalog) {
       var area;
-      var layer = state.getIn(['scene', 'layers', layerID]);
       var areaID;
       areaID = IDBroker.acquireID();
       var vertices = verticesCoords.map(function (v) {

package/es/class/export.js

@@ -6,13 +6,11 @@ import Hole from "./hole";
 import Vertex from "./vertex";
 import Area from "./area";
 import Item from "./item";
-import FuseUtils from "./FuseUtils";
 import { HorizontalGuide, VerticalGuide } from "./guide";
-export { Project, Group, FuseUtils, Layer, Line, Hole, Vertex, Area, Item, HorizontalGuide, VerticalGuide };
+export { Project, Group, Layer, Line, Hole, Vertex, Area, Item, HorizontalGuide, VerticalGuide };
 export default {
   Project: Project,
   Group: Group,
-  FuseUtils: FuseUtils,
   Layer: Layer,
   Line: Line,
   Hole: Hole,

package/es/components/content.js

@@ -7,18 +7,16 @@ import Viewer3DFirstPerson from "./viewer3d/viewer3d-first-person";
 // import ProjectConfigurator from './configurator/project-configurator';
 import * as constants from "../constants";
 import Front3D from "./viewer3d/front3D";
-export default function Content(_ref, _ref2) {
+export default function Content(_ref) {
   var width = _ref.width,
     height = _ref.height,
     state = _ref.state,
     customContents = _ref.customContents,
-    match = _ref.match,
     setToolbar = _ref.setToolbar,
     replaceCabinet = _ref.replaceCabinet,
     keyDownEnable = _ref.keyDownEnable,
     catalog = _ref.catalog,
     onInternalEvent = _ref.onInternalEvent;
-  var projectActions = _ref2.projectActions;
   var mode = state.get('mode');
 
   // Internal Event for unselect_all

package/es/components/style/export.js

@@ -1,31 +1,5 @@
-import Button from "./button";
-import CancelButton from "./cancel-button";
-import ContentContainer from "./content-container";
-import ContentTitle from "./content-title";
-import DeleteButton from "./delete-button";
-import FormBlock from "./form-block";
-import FormColorInput from "./form-color-input";
-import FormLabel from "./form-label";
 import FormNumberInput from "./form-number-input";
-import FormSelect from "./form-select";
-import FormSlider from "./form-slider";
-import FormSubmitButton from "./form-submit-button";
-import FormTextInput from "./form-text-input";
-import FormNumberInput2 from "./form-number-input_2";
-export { Button, CancelButton, ContentContainer, ContentTitle, DeleteButton, FormBlock, FormColorInput, FormLabel, FormNumberInput, FormSelect, FormSlider, FormSubmitButton, FormTextInput, FormNumberInput2 };
+export { FormNumberInput };
 export default {
-  Button: Button,
-  CancelButton: CancelButton,
-  ContentContainer: ContentContainer,
-  ContentTitle: ContentTitle,
-  DeleteButton: DeleteButton,
-  FormBlock: FormBlock,
-  FormColorInput: FormColorInput,
-  FormLabel: FormLabel,
-  FormNumberInput: FormNumberInput,
-  FormSelect: FormSelect,
-  FormSlider: FormSlider,
-  FormSubmitButton: FormSubmitButton,
-  FormTextInput: FormTextInput,
-  FormNumberInput2: FormNumberInput2
+  FormNumberInput: FormNumberInput
 };

package/es/components/viewer2d/line.js

@@ -5,7 +5,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { GeometryUtils } from "../../utils/export";
 import Ruler from "./ruler";
-import { BASE_CABINET_LAYOUTPOS, LINE_THICKNESS, MODE_DRAGGING_LINE, MODE_DRAWING_LINE, WALL_CABINET_LAYOUTPOS, MAX_ANGLE_SCALE, ROOM_SHAPE_MEASUREMENT_LINE_COLOR, ROOM_ELEMENT_MEASUREMENT_LINE_COLOR, BASE_ITEM_MEASUREMENT_LINE_COLOR, WALL_ITEM_MEASUREMENT_LINE_COLOR, DISTANCE_MEASUREMENT_LINE_COLOR, DASH_LINE_COLOR, TALL_CABINET_LAYOUTPOS, VANITY_CABINET_LAYOUTPOS } from "../../constants";
+import { BASE_CABINET_LAYOUTPOS, LINE_THICKNESS, MODE_DRAGGING_LINE, MODE_DRAWING_LINE, WALL_CABINET_LAYOUTPOS, MAX_ANGLE_SCALE, ROOM_SHAPE_MEASUREMENT_LINE_COLOR, ROOM_ELEMENT_MEASUREMENT_LINE_COLOR, BASE_ITEM_MEASUREMENT_LINE_COLOR, WALL_ITEM_MEASUREMENT_LINE_COLOR, DISTANCE_MEASUREMENT_LINE_COLOR, DASH_LINE_COLOR, TALL_CABINET_LAYOUTPOS, VANITY_CABINET_LAYOUTPOS, ACCESSORIES_LAYOUTPOS } from "../../constants";
 import * as Three from 'three';
 import { isEmpty } from "./utils";
 var STYLE = {
@@ -395,7 +395,7 @@ export default function Line(_ref) {
 
   //base cabinet
   var baseSpace = wallSpace + STEP;
-  var base_item = GeometryUtils.getAllItemSpecified(scene, catalog, [BASE_CABINET_LAYOUTPOS, VANITY_CABINET_LAYOUTPOS]);
+  var base_item = GeometryUtils.getAllItemSpecified(scene, catalog, [BASE_CABINET_LAYOUTPOS, VANITY_CABINET_LAYOUTPOS, ACCESSORIES_LAYOUTPOS]);
 
   // base cabinet
   var baseRuler = [];

package/es/components/viewer2d/viewer2d.js

@@ -30,7 +30,6 @@ var allLines;
 var allLineRects;
 var allLineSnap;
 var allRect;
-var holeRect;
 var allArea;
 
 // /////////

package/es/components/viewer3d/front3D.js

@@ -4,7 +4,7 @@ import Viewer3D from "./viewer3d";
 import State3D from "./ruler-utils/state3D";
 import { isEmpty } from "../viewer2d/utils";
 var k = 0;
-export default function Front3D(_ref, _ref2) {
+export default function Front3D(_ref) {
   var width = _ref.width,
     height = _ref.height,
     state = _ref.state,
@@ -12,7 +12,6 @@ export default function Front3D(_ref, _ref2) {
     replaceCabinet = _ref.replaceCabinet,
     keyDownEnable = _ref.keyDownEnable,
     catalog = _ref.catalog;
-  var viewer2DActions = _ref2.viewer2DActions;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     mode = _useState2[0],

package/es/components/viewer3d/pointer-lock-navigation.js

@@ -22,94 +22,4 @@ export function initPointerLock(camera, rendererElement) {
     pointerlockChangeEvent: pointerlockchange,
     requestPointerLockEvent: requestPointerLockEvent
   };
-}
-
-/* Funzione per il calcolo delle collisioni con gli oggetti contenuti all'interno di un array.
- * L'idea è quella di utilizzare il ray casting. Per tenere conto del fatto che ci possiamo
- * muovere nelle quattro direzioni, applico una matrice di rotazione alla direzione verso la
- * quale l'oggetto del pointer lock è orientato. */
-
-function collision(controls, collisionArray) {
-  var rotationMatrix;
-  var cameraDirection = controls.getDirection(new THREE.Vector3(0, 0, 0)).clone();
-  if (controls.moveForward()) {
-    // Nothing to do!
-  } else if (controls.moveBackward()) {
-    rotationMatrix = new THREE.Matrix4();
-    rotationMatrix.makeRotationY(180 * Math.PI / 180);
-  } else if (controls.moveLeft()) {
-    rotationMatrix = new THREE.Matrix4();
-    rotationMatrix.makeRotationY(90 * Math.PI / 180);
-  } else if (controls.moveRight()) {
-    rotationMatrix = new THREE.Matrix4();
-    rotationMatrix.makeRotationY((360 - 90) * Math.PI / 180);
-  } else return;
-  if (rotationMatrix !== undefined) {
-    cameraDirection.applyMatrix4(rotationMatrix);
-  }
-  var rayCaster = new THREE.Raycaster(controls.getObject().position, cameraDirection.normalize());
-  var intersects = rayCaster.intersectObjects(collisionArray, true);
-  if (intersects.length > 0 && intersects[0].distance < 10) {
-    return true;
-  }
-  return false;
-}
-
-/* Funzione meno raffinata per il calcolo delle collisioni.
- * In pratica viene definita una bounding geometry (in questo caso la skymap) e poi vengono fatti
- * partire una serie di raggi dall'object del controller fino ai vertici di questa geometria. Se uno di questi interseca
- * uno degli oggetti dei quali vogliamo controllare la collisione, allora la funzione restituirà il valore true */
-/*
- function collision(object, boundingGeometry, collisionArray ) {
-
- for (let vertexIndex = 0; vertexIndex < boundingGeometry.geometry.vertices.length; vertexIndex++)	{
- let localVertex = boundingGeometry.geometry.vertices[vertexIndex].clone();
- let globalVertex = localVertex.applyMatrix4( object.matrix );
- let directionVector = globalVertex.sub( object.position );
-
- let ray = new THREE.Raycaster(object.position, directionVector.clone().normalize());
- let collisionResults = ray.intersectObjects(collisionArray, true);
- if (collisionResults.length > 0 && collisionResults[0].distance < directionVector.length() - 1293) {
- console.log("collisione: ",collisionResults[0].distance," ",directionVector.length()-1293);
- return true;
- }
- }
- return false;
- }
- */
-
-/* Questa funzione si occupa di determinare se il controllo si trova su un oggetto, in caso negativo cade verso il basso
- * (vedi esempio pointer lock) */
-
-function translateY(controls, ray, objects) {
-  controls.isOnObject(false);
-  ray.ray.origin.copy(controls.getObject().position);
-  ray.ray.origin.y -= 10;
-  var intersections = ray.intersectObjects(objects, true);
-  if (intersections.length > 0) {
-    var distance = intersections[0].distance;
-    if (distance > 0 && distance < 10) {
-      controls.isOnObject(true);
-    }
-  }
-}
-
-/* Queste funzioni bloccano o sbloccano il movimento del controller (utili in caso di collisione) */
-
-function lockDirection(controls) {
-  if (controls.moveForward()) {
-    controls.lockMoveForward(true);
-  } else if (controls.moveBackward()) {
-    controls.lockMoveBackward(true);
-  } else if (controls.moveLeft()) {
-    controls.lockMoveLeft(true);
-  } else if (controls.moveRight()) {
-    controls.lockMoveRight(true);
-  }
-}
-function unlockAllDirection(controls) {
-  controls.lockMoveForward(false);
-  controls.lockMoveBackward(false);
-  controls.lockMoveLeft(false);
-  controls.lockMoveRight(false);
 }

package/es/components/viewer3d/scene-creator.js

@@ -15,7 +15,6 @@ import { loadTexture } from "../../catalog/utils/item-loader";
 import { returnReplaceableDeepSearchType } from "../viewer2d/utils";
 import { animateDoor, isElevationView, isEmpty, isImmutable, replaceMeshesWithLineSegments, translateDrawer } from "../../utils/helper";
 import { formatNumber } from "../../utils/math";
-var transformBox;
 export var fVLine = [];
 var scene_mode = null;
 export function parseData(sceneData, actions, catalog, camera, renderer, mode) {
@@ -2065,10 +2064,13 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
         }
       }
     }
-    if (item.selected) {
-      var tranformControl = item3D.children[item3D.children.length - 1];
-      transformBox = tranformControl.children[tranformControl.children.length - 1];
-    }
+
+    // if (item.selected) {
+    // let tranformControl = item3D.children[item3D.children.length - 1];
+    // transformBox =
+    //   tranformControl.children[tranformControl.children.length - 1];
+    // }
+
     pivot.rotation.y = item.rotation * Math.PI / 180 + Math.PI;
     // pivot.rotation.y = item.rotation;
     pivot.position.x = item.x;

package/es/components/viewer3d/three-memory-cleaner.js

@@ -2,20 +2,6 @@ import * as Three from 'three';
 function disposeGeometry(geometry) {
   geometry.dispose();
 }
-function disposeTexture(texture) {
-  if (!texture) {
-    return;
-  }
-  texture.dispose();
-}
-function disposeMultimaterial(material) {
-  if (!(material.isMaterial && !Array.isArray(material))) {
-    return;
-  }
-  material.materials.forEach(function (material) {
-    disposeMaterial(material);
-  });
-}
 function disposeMaterial(material) {
   if (!(material instanceof Three.Material)) {
     return;

package/es/components/viewer3d/viewer3d.js

@@ -19,7 +19,7 @@ import { checkCabinetOverlap, createBacksplash, deleteSpecifiedMeshObjects, fVLi
 import { disposeObject, disposeScene } from "./three-memory-cleaner";
 import diff from 'immutablediff';
 import * as SharedStyle from "../../shared-style";
-import { BASE_CABINET_LAYOUTPOS, MODE_3D_VIEW, MODE_DRAGGING_ITEM_3D, MODE_DRAWING_HOLE_3D, MODE_DRAWING_ITEM_3D, MODE_ELEVATION_VIEW, MODE_IDLE_3D, MODE_ROTATING_ITEM_3D, SECONDARY_PURPLE_COLOR, TALL_CABINET_LAYOUTPOS, UNIT_CENTIMETER, WALL_CABINET_LAYOUTPOS, INTERNAL_EVENT_SELECT_ELEMENT, INTERNAL_EVENT_DRAG_ELEMENT, INTERNAL_EVENT_DRAW_ELEMENT, INTERNAL_EVENT_ROTATE_ELEMENT, MODE_ROTATING_ITEM, MODE_DRAGGING_HOLE_3D, INTERNAL_EVENT_REPLACE_CABINET } from "../../constants";
+import { BASE_CABINET_LAYOUTPOS, MODE_3D_VIEW, MODE_DRAGGING_ITEM_3D, MODE_DRAWING_HOLE_3D, MODE_DRAWING_ITEM_3D, MODE_ELEVATION_VIEW, MODE_IDLE_3D, MODE_ROTATING_ITEM_3D, SECONDARY_PURPLE_COLOR, TALL_CABINET_LAYOUTPOS, UNIT_CENTIMETER, WALL_CABINET_LAYOUTPOS, INTERNAL_EVENT_SELECT_ELEMENT, INTERNAL_EVENT_DRAG_ELEMENT, INTERNAL_EVENT_DRAW_ELEMENT, INTERNAL_EVENT_ROTATE_ELEMENT, MODE_DRAGGING_HOLE_3D, INTERNAL_EVENT_REPLACE_CABINET } from "../../constants";
 import { isUndefined } from 'util';
 import { verticesDistance } from "../../utils/geometry";
 import { convert } from "../../utils/convert-units-lite";

package/es/constants.js

@@ -597,6 +597,7 @@ export var BASE_CABINET_LAYOUTPOS = 'Base';
 export var WALL_CABINET_LAYOUTPOS = 'Wall';
 export var TALL_CABINET_LAYOUTPOS = 'Tall';
 export var VANITY_CABINET_LAYOUTPOS = 'Vanity';
+export var ACCESSORIES_LAYOUTPOS = 'Accessories';
 export var TOP_MOLDING_LOCATION = 'Top';
 export var MIDDLE_MOLDING_LOCATION = 'Middle';
 export var BOTTOM_MOLDING_LOCATION = 'Bottom';
@@ -772,8 +773,7 @@ export var DOORSTYLE_SCOPE_ALL = 'all';
 export var DOORSTYLE_SCOPE_SINGLE = 'single';
 export var DOORSTYLE_SCOPE_MULTIPLE = 'multiple';
 export var DEFAULT_MOLDING_PIECE_LENGTH = 96; // in inch, 8 feet, standard length for molding pieces
-
 // default urls
 
-export var DEFAULT_INTERIOR_URL = 'http://localhost:4002/uploads/assets/default/maple.jpg';
-export var DEFAULT_DOOR_HANDLE_TEXTURE_URL = 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg';
+export var DEFAULT_INTERIOR_URL = '/assets/img/default/maple.jpg';
+export var DEFAULT_DOOR_HANDLE_TEXTURE_URL = '/assets/img/default/steel.jpg';