Commit 87df5200 authored by amandaghassaei's avatar amandaghassaei
Browse files

vive settings

parent 47e12a52
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
......@@ -353,7 +353,7 @@
<script type="text/javascript" src="dependencies/flat-ui.min.js"></script>
<script type="text/javascript" src="dependencies/three.js"></script>
<script type="text/javascript" src="dependencies/binary_stl_writer.js"></script>
<script type="text/javascript" src="dependencies/OrthographicTrackballControls.js"></script>
<script type="text/javascript" src="dependencies/TrackballControls.js"></script>
<script type="text/javascript" src="dependencies/Projector.js"></script>
<script type="text/javascript" src="dependencies/SVGRenderer.js"></script>
<script type="text/javascript" src="dependencies/underscore-min.js"></script>
......
File mode changed from 100644 to 100755
......@@ -15,7 +15,7 @@ function initViveInterface(globals){
$status.html("No device connected.");
$("#VRoptions").show();
var mesh = new THREE.Mesh(new THREE.CubeGeometry(1, 1,1 ), new THREE.MeshLambertMaterial({color:0xff0000}));
var mesh = new THREE.Mesh(new THREE.CubeGeometry(1,1,1), new THREE.MeshLambertMaterial({color:0xff0000}));
var controls = new THREE.VRControls(globals.threeView.camera);
controls.standing = true;
......@@ -44,16 +44,18 @@ function initViveInterface(globals){
document.body.appendChild(button);
var callback = button.onclick;
button.onclick = function () {
if (display.isPresenting) globals.vrEnabled = false;
else globals.vrEnabled = true;
globals.vrEnabled = !display.isPresenting;
var y = 0;
if (globals.vrEnabled) y = 1;
globals.threeView.modelWrapper.position.set(0,y,0);
// var scale = 0.01;
// globals.threeView.modelWrapper.scale.set(scale, scale, scale);
if (callback) callback();
};
} );
}
function disconnect(){
}
function render(){
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
Supports Markdown
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