shane/rockviewer
1
0
Fork 0
Code Issues 1 Pull Requests Releases 2 Wiki Activity

fixed mouse wheel scrolling

Browse Source
This commit is contained in:
Shane Frischkorn
2013-11-27 19:21:41 +10:00
parent b9c82f280b
commit c6618614d9
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
*.pyc *.pyc
.DS_Store .DS_Store
.spyderproject
reports/ reports/

BIN
.spyderproject
View File

Binary file not shown.

9
three_d_viewer/templates/three_d_viewer/base.html
View File

@@ -7,13 +7,14 @@
{% block includes %} {% block includes %}
<link href="{% static "three_d_viewer/css/bootstrap.css" %}" rel="stylesheet" media="screen" /> <link href="{% static "three_d_viewer/css/bootstrap.css" %}" rel="stylesheet" media="screen" />
<link href="{% static "three_d_viewer/css/custom.css" %}" rel="stylesheet" media="screen" />
<script type="text/javascript" src="{% static "three_d_viewer/js/jquery-2.0.3.js" %}"></script> <script type="text/javascript" src="{% static "three_d_viewer/js/jquery-2.0.3.js" %}"></script>
<script type="text/javascript" src="{% static "three_d_viewer/js/bootstrap.min.js" %}"></script> <script type="text/javascript" src="{% static "three_d_viewer/js/bootstrap.min.js" %}"></script>
{% endblock %} {% endblock %}
</head> </head>
<body onload={% block loadscript %}""{% endblock %}> <body onload={% block loadscript %}""{% endblock %}>
<div class="container"> <div class="my-fluid-container">
<div class="page-header"> <div class="page-header">
{% block pageheader %} {% block pageheader %}
<h1>Three D Viewer</h1> <h1>Three D Viewer</h1>
@@ -21,8 +22,8 @@
{% endblock %} {% endblock %}
</div> </div>
<div class="row"> <div class="row my-fluid-container">
<div class="col-md-4"> <div class="col-sm-4 col-md-2">
{% block sidebar %} {% block sidebar %}
<div class="row"> <div class="row">
{% include "three_d_viewer/sampletree.html" %} {% include "three_d_viewer/sampletree.html" %}
@@ -30,7 +31,7 @@
{% endblock %} {% endblock %}
</div> </div>
<div id="contentdiv" class="col-md-8" style="border:1px solid black" height="100%"> <div id="contentdiv" class="col-sm-8 col-md-10" style="border:1px solid black" height="100%">
{% block content %} {% block content %}
<p>Put some intro text sort of stuff here</p> <p>Put some intro text sort of stuff here</p>
{% endblock %} {% endblock %}

8
three_d_viewer/templates/three_d_viewer/detail.html
View File

@@ -127,7 +127,7 @@ function webGLStart(){
canvas.onmousemove = handleMouseMove; canvas.onmousemove = handleMouseMove;
canvas.onmousewheel = handleMouseWheel; canvas.onmousewheel = handleMouseWheel;
window.addEventListener("DOMMouseScroll", handleMouseWheel, false); canvas.addEventListener("DOMMouseScroll", handleMouseWheel, false);
tick(); tick();
} }
@@ -314,12 +314,16 @@ function degToRad(degrees){
} }
function handleMouseWheel(event){ function handleMouseWheel(event){
event.preventDefault();
var delta = event.wheelDelta | -event.detail; var delta = event.wheelDelta | -event.detail;
if (delta < 0){ if (delta < 0){
translationMatrix[2] -= .05; translationMatrix[2] -= .05;
}else{ }else{
translationMatrix[2] += .05; translationMatrix[2] += .05;
} }
event.returnValue=false;
} }
function handleMouseDown(event){ function handleMouseDown(event){
@@ -372,6 +376,6 @@ function handleMouseMove(event){
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<canvas id="canvas" style="border: 1px dotted #bfbfbf;" width="640px" height="480px"></canvas> <canvas id="canvas" style="border: 1px dotted #bfbfbf;" width="750px" height="600px"></canvas>
<div><br><span id="progress" style="color: red"></span></div> <div><br><span id="progress" style="color: red"></span></div>
{% endblock %} {% endblock %}