Merge branch 'feature/relationConnectorController' into development

Aaron Sillus · Aaron Sillus · commit 1d07d63db462 · 2018-12-20T17:36:23.000+01:00
diff --git a/ui/scripts/RelationConnector/AframeRelationConnectorController.js b/ui/scripts/RelationConnector/AframeRelationConnectorController.js
@@ -337,7 +337,7 @@ var relationConnectorController = function(){
     function calculateBorderPosition(sourceOfRay, targetOfRay, entity){
 		let object = document.getElementById(entity.id);
 		let raycaster = new THREE.Raycaster();
-		raycaster.set(sourcePosition, targetPosition.subVectors(targetPosition, sourcePosition).normalize());
+		raycaster.set(sourceOfRay, targetOfRay.subVectors(targetOfRay, sourceOfRay).normalize());
 		let intersection = raycaster.intersectObject(object.object3DMap.mesh);
 		return intersection[0].point;
 	}

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ var relationConnectorController = function(){`
`337`	`337`	`function calculateBorderPosition(sourceOfRay, targetOfRay, entity){`
`338`	`338`	`let object = document.getElementById(entity.id);`
`339`	`339`	`let raycaster = new THREE.Raycaster();`
`340`		`- raycaster.set(sourcePosition, targetPosition.subVectors(targetPosition, sourcePosition).normalize());`
	`340`	`+ raycaster.set(sourceOfRay, targetOfRay.subVectors(targetOfRay, sourceOfRay).normalize());`
`341`	`341`	`let intersection = raycaster.intersectObject(object.object3DMap.mesh);`
`342`	`342`	`return intersection[0].point;`
`343`	`343`	`}`