chore: isolate common logic

Exabyte-io · Jan 16, 2024 · d9c9fbc · d9c9fbc
1 parent ed6dfe5
commit d9c9fbc
Showing 1 changed file with 21 additions and 22 deletions.
diff --git a/src/mixins/measurement.js b/src/mixins/measurement.js
@@ -153,18 +153,7 @@ export const MeasurementMixin = (superclass) =>
          * @Param event -> simple javascript DOM event
          */
         onPointerMove(event) {
-            this.checkMouseCoordinates(event);
-            const atomGroup = this.getAtomGroups();
-            const searchedIntersects = [...atomGroup];
-            //  TODO: Probably will be better to set this.atomConnections.children to optional target
-            if (this.measurementSettings.isDistanceShown) {
-                searchedIntersects.push(...this.atomConnections.children);
-            }
-            if (this.measurementSettings.isAnglesShown) {
-                searchedIntersects.push(...this.angles.children);
-            }
-
-            const intersects = this.raycaster.intersectObjects(searchedIntersects, false);
+            const intersects = this.getIntersectedObjects(event);
 
             for (let i = 0; i < intersects.length; i++) {
                 const intersectItem = intersects[i].object;
@@ -299,16 +288,8 @@ export const MeasurementMixin = (superclass) =>
          * @Param event -> js DOM event
          */
         onClick(updateState, event) {
-            this.checkMouseCoordinates(event);
-            const atomGroup = this.getAtomGroups();
-            const searchedIntersects = [...atomGroup];
-            if (this.measurementSettings.isDistanceShown) {
-                searchedIntersects.push(...this.atomConnections.children);
-            }
-            if (this.measurementSettings.isAnglesShown) {
-                searchedIntersects.push(...this.angles.children);
-            }
-            const intersects = this.raycaster.intersectObjects(searchedIntersects, false);
+            const intersects = this.getIntersectedObjects(event);
+
             for (let i = 0; i < intersects.length; i++) {
                 const intersectItem = intersects[i].object;
 
@@ -358,6 +339,24 @@ export const MeasurementMixin = (superclass) =>
             }
         }
 
+        /**
+         * Returns array of intersected objects.
+         * @param event
+         * @returns {[]}
+         */
+        getIntersectedObjects(event) {
+            this.checkMouseCoordinates(event);
+            const atomGroup = this.getAtomGroups();
+            const searchedIntersects = [...atomGroup];
+            if (this.measurementSettings.isDistanceShown) {
+                searchedIntersects.push(...this.atomConnections.children);
+            }
+            if (this.measurementSettings.isAnglesShown) {
+                searchedIntersects.push(...this.angles.children);
+            }
+            return this.raycaster.intersectObjects(searchedIntersects, false);
+        }
+
         /**
          *
          * @param {Array} atomArray - array to be checked