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 ee9cfc2..8d700c2 100644 Binary files a/.spyderproject and b/.spyderproject differ diff --git a/three_d_viewer/templates/three_d_viewer/base.html b/three_d_viewer/templates/three_d_viewer/base.html index 1364972..5e10cce 100644 --- a/three_d_viewer/templates/three_d_viewer/base.html +++ b/three_d_viewer/templates/three_d_viewer/base.html @@ -7,13 +7,14 @@ {% block includes %} + {% 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 %}