From 6a1f47bcf963a06ddd4586d466f3523ce3b8f029 Mon Sep 17 00:00:00 2001 From: Thomas FORGIONE Date: Fri, 24 Apr 2015 16:00:23 +0200 Subject: [PATCH] Corrected bug when scrolling --- static/js/prototype/main.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/static/js/prototype/main.js b/static/js/prototype/main.js index 80bd2e5..9a65740 100644 --- a/static/js/prototype/main.js +++ b/static/js/prototype/main.js @@ -270,7 +270,7 @@ function render() { width = container.offsetWidth / 5; height = container.offsetHeight / 5; left = prev.x - width/2; - bottom = prev.y + height/5; + bottom = renderer.domElement.height - prev.y + height/5; // Draw border @@ -329,9 +329,9 @@ function show(object) { function updateMouse(event) { - if (event !== undefined && event.clientX !== undefined) { - mouse.x = event.clientX - renderer.domElement.offsetLeft; - mouse.y = container.offsetHeight - (event.clientY - renderer.domElement.offsetTop); + if (event !== undefined) { + mouse.x = event.offsetX == undefined ? event.layerX : event.offsetX; + mouse.y = event.offsetY == undefined ? event.layerY : event.offsetY; } var hovered = pointedCamera(event); @@ -355,8 +355,8 @@ function click(event) { function pointedCamera(event) { var returnCamera; - var x = (mouse.x / renderer.domElement.width ) * 2 - 1; - var y = - ((container.offsetHeight - mouse.y) / renderer.domElement.height) * 2 + 1; + var x = ( mouse.x / renderer.domElement.width ) * 2 - 1; + var y = - (mouse.y / renderer.domElement.height) * 2 + 1; var camera = cameras.mainCamera();