@urso/core 0.6.13 → 0.6.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.6.13",
+  "version": "0.6.14",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",

package/src/js/modules/objects/models/dragContainer.js

@@ -125,7 +125,7 @@ class ModulesObjectsModelsDragContainer extends ModulesObjectsModelsContainer {
             .filter((container) => container._baseObject.worldVisible)
             .filter((container) => !container._needBlock)
             .filter((container) => {
-                let height = container.getAbsoluteSize().height;
+                const height = container.getAbsoluteSize().height;
                 return container.height - height < 0;
             })
             .sort((firstContainer, secondContainer) => secondContainer.dragIndex - firstContainer.dragIndex);
@@ -184,30 +184,17 @@ class ModulesObjectsModelsDragContainer extends ModulesObjectsModelsContainer {
      * @returns { Array }
      */
     _getObjectPoints(container) {
-        if (Urso.device.desktop) {
-            const { x, y } = this._getScaleAndPositionRecursive(this);
-            const { width, height } = container._mask;
-            const { scaleX, scaleY } = this._getScaleAndPositionRecursive(this);
-
-            return [
-                { x, y },
-                { x: x + width * scaleX, y },
-                { x: x + width * scaleX, y: y + height * scaleY },
-                { x, y: y + height * scaleY }
-            ];
-
-        } else {
-            const { x, y } = container._mask.toGlobal(new PIXI.Point(0, 0));
-            const { width, height } = container._mask;
-            const { scaleX, scaleY } = this._getScaleAndPositionRecursive(this);
-            return [
-                { x, y },
-                { x: x + width * scaleX, y },
-                { x: x + width * scaleX, y: y + height * scaleY },
-                { x, y: y + height * scaleY }
-            ];
-        }
+        const { x, y } = container._mask.toGlobal(new PIXI.Point(0, 0));
+
+        const { width, height } = container._mask;
+        const { scaleX, scaleY } = this._getScaleAndPositionRecursive(this);
 
+        return [
+            { x, y },
+            { x: x + width * scaleX, y },
+            { x: x + width * scaleX, y: y + height * scaleY },
+            { x, y: y + height * scaleY }
+        ];
     }
 
     /**
@@ -495,19 +482,13 @@ class ModulesObjectsModelsDragContainer extends ModulesObjectsModelsContainer {
      * Drags container on pointer move.
      * @param { Object } event 
      */
-    _onPointerMove(event) {
+     _onPointerMove(event) {
         let { data: { global: { x, y } } } = event;
 
-        if (Urso.device.desktop) {
-            x = Urso.scenes.getMouseCoords().x;
-            y = Urso.scenes.getMouseCoords().y;
-        }
-
         if (!this._startPosition) {
             this._startPosition = { x, y };
         }
 
-
         if (!this._isActive({ x, y })) {
             this._moveInProgress = false;
             return;
@@ -633,6 +614,7 @@ class ModulesObjectsModelsDragContainer extends ModulesObjectsModelsContainer {
                 this._moveStartedY = event.changedTouches[0].offsetY || event.changedTouches[0].clientY;
                 this._documentPointerStart(event);
                 break;
+            case 'mousemove':
             case 'touchmove':
                 this._documentPointerMove(event);
                 break;
@@ -643,9 +625,6 @@ class ModulesObjectsModelsDragContainer extends ModulesObjectsModelsContainer {
             case 'wheel':
                 this._documentWheelScroll(event);
                 break;
-            case 'pointermove':
-                this._onPointerMove(event);
-                break;
             default:
                 break;
         }