tforgione
/
3d-interface
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Re-addded menus in prototype

This commit is contained in:
Thomas FORGIONE 2015-04-28 09:43:24 +02:00
parent d0c4b3e714
commit 09cfce804a
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
prototype/index.md
View File

@ -4,9 +4,8 @@ layout: withjs
extrajs: <script src="/static/js/prototype/main.js"></script> extrajs: <script src="/static/js/prototype/main.js"></script>
extrahead: <link rel="stylesheet" href="/static/css/prototype.css" /> extrahead: <link rel="stylesheet" href="/static/css/prototype.css" />
--- ---
<div id="main-div" style="margin: 10px;"> <div id="main-div">
<div style="display: none;"> <!--<div style="display: none;">-->
<h2>3D Interface</h2> <h2>3D Interface</h2>
<p> <p>
@ -25,7 +24,7 @@ clicking on them. You can reset the camera at anytime by clicking on the reset
button. button.
</p> </p>
<button class="btn btn-primary" id="full" style="margin-bottom: 10px;">Fullscreen</button> <button class="btn btn-primary" id="full" style="margin-bottom: 10px; display: none;">Fullscreen</button>
<button class="btn btn-primary" id="reset" style="margin-bottom:10px">Reset camera</button> <button class="btn btn-primary" id="reset" style="margin-bottom:10px">Reset camera</button>
<input type="checkbox" id="fullarrow" style="margin-bottom:10px"> <input type="checkbox" id="fullarrow" style="margin-bottom:10px">
<label for="fullarrow">Full arrow</label> <label for="fullarrow">Full arrow</label>
@ -34,6 +33,6 @@ button.
<input type="checkbox" id="showarrows" style="margin-bottom:10px" checked> <input type="checkbox" id="showarrows" style="margin-bottom:10px" checked>
<label for="showarrows">Show arrows</label> <label for="showarrows">Show arrows</label>
</div> </div>
</div> <!-- </div> -->
<div id="container" style="padding: 0px; margin: 0px;" tabindex="1"></div> <div id="container" style="padding: 0px; margin: 0px;" tabindex="1"></div>

4
static/js/PointerCamera.js
View File

@ -46,8 +46,8 @@ var PointerCamera = function() {
var onMouseMove = function(event) {self.onMouseMove(event); }; var onMouseMove = function(event) {self.onMouseMove(event); };
var onMouseUp = function(event) {self.onMouseUp(event); }; var onMouseUp = function(event) {self.onMouseUp(event); };
listenerTarget.addEventListener('keydown', onKeyDown, false); document.addEventListener('keydown', onKeyDown, false);
listenerTarget.addEventListener('keyup', onKeyUp, false); document.addEventListener('keyup', onKeyUp, false);
listenerTarget.addEventListener('mousedown', function(event) { if (event.which == 1) onMouseDown(event);}, false); listenerTarget.addEventListener('mousedown', function(event) { if (event.which == 1) onMouseDown(event);}, false);
listenerTarget.addEventListener('mousemove', function(event) { if (event.which == 1) onMouseMove(event);}, false); listenerTarget.addEventListener('mousemove', function(event) { if (event.which == 1) onMouseMove(event);}, false);
listenerTarget.addEventListener('mouseup', onMouseUp, false); listenerTarget.addEventListener('mouseup', onMouseUp, false);