diff options
| author | Justin Berger <j.david.berger@gmail.com> | 2018-03-18 23:15:54 -0600 |
|---|---|---|
| committer | Justin Berger <j.david.berger@gmail.com> | 2018-03-20 16:09:07 -0600 |
| commit | 8ec5d7facc76e05859444335adbdbfd2bbbad852 (patch) | |
| tree | 9a07a479dadebe56365ad1affe3e55878aeecfb7 /tools | |
| parent | 5cd3cca4191737ab4ae566975190c3b28bf11f2e (diff) | |
| download | libsurvive-8ec5d7facc76e05859444335adbdbfd2bbbad852.tar.gz libsurvive-8ec5d7facc76e05859444335adbdbfd2bbbad852.tar.bz2 | |
Added code to cancel out object rotation when calibrating
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/viz/survive_viewer.js | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/tools/viz/survive_viewer.js b/tools/viz/survive_viewer.js index 3aa2cf7..ab6a200 100644 --- a/tools/viz/survive_viewer.js +++ b/tools/viz/survive_viewer.js @@ -280,18 +280,21 @@ $(function() { create_object(obj); } else if (obj.type === "imu") { if (objs[obj.tracker]) { - if (!downAxes[obj.tracker]) { + if (!downAxes[obj.tracker] && objs[obj.tracker]) { downAxes[obj.tracker] = new THREE.Geometry(); - downAxes[obj.tracker].vertices.push( - new THREE.Vector3(0, 0, 0), - new THREE.Vector3(obj.accelgyro[0], obj.accelgyro[1], obj.accelgyro[2])); + downAxes[obj.tracker].vertices.push(new THREE.Vector3(0, 0, 0), new THREE.Vector3(0, 0, 0)); var line = new THREE.Line(downAxes[obj.tracker], new THREE.LineBasicMaterial({color : 0xffffff})); - objs[obj.tracker].add(line); - } else { + scene.add(line); + } + + if (objs[obj.tracker].position) { var q = obj.accelgyro; + + downAxes[obj.tracker].vertices[0] = objs[obj.tracker].position; downAxes[obj.tracker].vertices[1].fromArray(q); + downAxes[obj.tracker].vertices[1].add(objs[obj.tracker].position); downAxes[obj.tracker].verticesNeedUpdate = true; } } @@ -382,6 +385,9 @@ init() { var skyBoxMaterial = new THREE.MeshBasicMaterial({color : 0x888888, side : THREE.BackSide}); var skyBox = new THREE.Mesh(skyBoxGeometry, skyBoxMaterial); scene.add(skyBox); + + var axes = new THREE.AxesHelper(5); + scene.add(axes); } function animate() { |