CanvasHoverController working with tooltips

AframeActionController.js now adds cursor coordinates as attributes .layerX and .layerY to "mouseenter" and "mouseleave" events. The cursors position gets stored on every "mousemove" event.

Author: Aaron Sillus

ui/scripts/AframeActionController.js

@@ -19,6 +19,9 @@ var actionController = (function () {
     var hoveredEntity = null;
     var latestMouseButtonPressed = null;
 
+    var cursorX = 0;
+    var cursorY = 0;
+
     //actions object
     var actions = {
         mouse: {
@@ -137,6 +140,8 @@ var actionController = (function () {
                         hoveredEntity = component;
                     }
                     if(eventObject.target.id != canvasId) {
+                        eventObject.layerX = cursorX;
+                        eventObject.layerY = cursorY;
                         hoverAction(actions.mouse, eventObject);
                     }
 
@@ -150,6 +155,8 @@ var actionController = (function () {
                 });
                 this.el.addEventListener("mouseleave", function (eventObject) {
                     if(eventObject.target.id != canvasId) {
+                        eventObject.layerX = cursorX;
+                        eventObject.layerY = cursorY;
                         unhoverAction(actions.mouse, eventObject);
                     }
                     hoveredEntity = canvas;
@@ -165,6 +172,8 @@ var actionController = (function () {
                 //  interrupts mousedown events somehow
                 this.el.addEventListener("mousemove", function (eventObject) {
                     moveAction(actions.mouse.move, eventObject);
+                    cursorX = eventObject.layerX;
+                    cursorY = eventObject.layerY;
 
                     if (actions.mouse.move.bubbles) {
                         return true;

ui/scripts/CanvasHover/AframeCanvasHoverController.js

@@ -101,23 +101,23 @@ var canvasHoverController = (function() {
 		var entity = model.getEntityById(eventObject.target.id);
 		if(entity === undefined){
 			entity = eventObject.target.id;
-			events.log.error.publish({ text: "Entity of partID " + multipartEvent.partID + " not in model data."});
+			events.log.error.publish({ text: "Entity of partID " + eventObject.target.id + " not in model data."});
 			return;
 		}
 
 		var applicationEvent = {
 			sender		: canvasHoverController,
 			entities	: [entity],
-			/*posX		: multipartEvent.layerX,
-			posY		: multipartEvent.layerY*/
+			posX		: eventObject.layerX,
+			posY		: eventObject.layerY
 		};
 		events.hovered.on.publish(applicationEvent);		
 	}
 
 	function handleOnMouseLeave(eventObject) {
 		var entity = model.getEntityById(eventObject.target.id);
 		if(entity === undefined){
-			events.log.error.publish({ text: "Entity of partID " + multipartEvent.partID + " not in model data."});
+			events.log.error.publish({ text: "Entity of partID " + eventObject.target.id + " not in model data."});
 			return;
 		}