Merge pull request #132 from BernatBC/fix-intersection

Fix intersection

interaction.js

@@ -174,8 +174,8 @@ function createJSON(objectArray) {
 
     objectArray.forEach((object) => {
         const real_pos = get2DCoords(C, object.position);
+        if (object.userData.intersection == null) intersection_pos = real_pos;
         const intersection_pos = get2DCoords(C, object.userData.intersection);
-        if (intersection_pos == null) return;
         json.push({
             name: object.name,
             x_real: real_pos.x,

single-image-loader.js

@@ -138,19 +138,18 @@ function setIntersectionPosition(scene) {
             i.position,
             i.userData.direction
         );
-        if (intersectionPosition == null) i.userData.intersection = null;
-        else i.userData.intersection = new THREE.Vector3().copy(intersectionPosition);
+        i.userData.intersection = new THREE.Vector3().copy(intersectionPosition);
     });
 }
 
 function getIntersectionPosition(scene, position, direction) {
     raycaster.set(position, direction);
     var intersections = raycaster.intersectObject(scene, true);
-    if (intersections.length == 0) return null;
+    if (intersections.length == 0) return position;
     for (let i = 0; i < intersections.length; i++) {
         if (intersections[i].object.name != "wireframe") return intersections[i].point;
     }
-    return null;
+    return position;
 }
 
 export { loadImage, setSize, setOffset, getAllImages, setWireframe, setIntersectionPosition };