From c6618614d900f2647138559a1b1d81ba53b1c0bf Mon Sep 17 00:00:00 2001 From: Shane Frischkorn Date: Wed, 27 Nov 2013 19:21:41 +1000 Subject: [PATCH] fixed mouse wheel scrolling --- .gitignore | 1 + .spyderproject | Bin 91 -> 112 bytes .../templates/three_d_viewer/base.html | 9 +++++---- .../templates/three_d_viewer/detail.html | 8 ++++++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a74ceb7..7789639 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.pyc .DS_Store +.spyderproject reports/ diff --git a/.spyderproject b/.spyderproject index ee9cfc2c2cb79ebc1472f716a874d06a70b75a89..8d700c2c0f83470d123c0cba8deece8b2d040ff7 100644 GIT binary patch literal 112 zcmXZROA3G>6a~=v+enR~e{G?0&@?13Xdiv36zx8Rrsw36E1ENhQv}GBo!zkopApxT vpWKlDQ{Pzm4ayo8LB(&=cj=9|5TU2V+3mPB9ysD5m1P*nm?KSPMZWj|HXbAN literal 91 zcmZo*sx4&H2o)$w%}FdtO^Gik%FjwoE-5Z#iY;Ug6$T4umZioQRF-7q=M^NDWE8T* rhO*=(=B5_1MsP7OFcjq{XP0HBmZugKvW2qc7o_H;rWCSwl + {% endblock %} -
+
{% block pageheader %}

Three D Viewer

@@ -21,8 +22,8 @@ {% endblock %}
-
-
+
+
{% block sidebar %}
{% include "three_d_viewer/sampletree.html" %} @@ -30,7 +31,7 @@ {% endblock %}
-
+
{% block content %}

Put some intro text sort of stuff here

{% endblock %} diff --git a/three_d_viewer/templates/three_d_viewer/detail.html b/three_d_viewer/templates/three_d_viewer/detail.html index 672ef79..21f90c4 100644 --- a/three_d_viewer/templates/three_d_viewer/detail.html +++ b/three_d_viewer/templates/three_d_viewer/detail.html @@ -127,7 +127,7 @@ function webGLStart(){ canvas.onmousemove = handleMouseMove; canvas.onmousewheel = handleMouseWheel; - window.addEventListener("DOMMouseScroll", handleMouseWheel, false); + canvas.addEventListener("DOMMouseScroll", handleMouseWheel, false); tick(); } @@ -314,12 +314,16 @@ function degToRad(degrees){ } function handleMouseWheel(event){ + event.preventDefault(); + var delta = event.wheelDelta | -event.detail; if (delta < 0){ translationMatrix[2] -= .05; }else{ translationMatrix[2] += .05; } + + event.returnValue=false; } function handleMouseDown(event){ @@ -372,6 +376,6 @@ function handleMouseMove(event){ {% endblock %} {% block content %} - +

{% endblock %}