Commit e5c577b3 authored by Amanda Ghassaei's avatar Amanda Ghassaei

updating controls

parent d16847ce
...@@ -754,6 +754,7 @@ ...@@ -754,6 +754,7 @@
<script type="text/javascript" src="dependencies/VREffect.js"></script> <script type="text/javascript" src="dependencies/VREffect.js"></script>
<script type="text/javascript" src="dependencies/ViveController.js"></script> <script type="text/javascript" src="dependencies/ViveController.js"></script>
<script type="text/javascript" src="dependencies/VRControls.js"></script> <script type="text/javascript" src="dependencies/VRControls.js"></script>
<script type="text/javascript" src="dependencies/VRController.js"></script>
<script type="text/javascript" src="js/dynamic/GLBoilerplate.js"></script> <script type="text/javascript" src="js/dynamic/GLBoilerplate.js"></script>
<script type="text/javascript" src="js/dynamic/GPUMath.js"></script> <script type="text/javascript" src="js/dynamic/GPUMath.js"></script>
......
This diff is collapsed.
...@@ -129,7 +129,7 @@ function initThreeView(globals) { ...@@ -129,7 +129,7 @@ function initThreeView(globals) {
} }
if (globals.simulationRunning) callback(); if (globals.simulationRunning) callback();
if (globals.vrEnabled){ if (globals.vrEnabled){
globals.vive.effect.requestAnimationFrame(function(){ requestAnimationFrame(function(){
_loop(callback); _loop(callback);
}); });
_render(); _render();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment