diff options
author | dpeter99 <dpeter99@gmail.com> | 2018-03-26 22:05:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-26 22:05:21 +0200 |
commit | 4c373617220aca69a4acb7a32c12457a057f4e48 (patch) | |
tree | 6598f0185c010dc3d48067060a6303d9e58ce74f /tools/viz/survive_viewer.js | |
parent | d106e045d8a145ceb733075e541f6aaaee5bd3a7 (diff) | |
parent | 18e717642be3af3b9f72b630dcad68ca17c32dc9 (diff) | |
download | libsurvive-4c373617220aca69a4acb7a32c12457a057f4e48.tar.gz libsurvive-4c373617220aca69a4acb7a32c12457a057f4e48.tar.bz2 |
Merge branch 'master' into master
Diffstat (limited to 'tools/viz/survive_viewer.js')
-rw-r--r-- | tools/viz/survive_viewer.js | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/tools/viz/survive_viewer.js b/tools/viz/survive_viewer.js index 70aecfa..67e65f0 100644 --- a/tools/viz/survive_viewer.js +++ b/tools/viz/survive_viewer.js @@ -164,16 +164,20 @@ function create_tracked_object(info) { group.sensors = []; if (info.config && info.config.lighthouse_config) { for (var idx in info.config.lighthouse_config.modelPoints) { - var p = info.config.lighthouse_config.modelPoints[idx]; - var color = 0xFFFFFF; // / info.points.length * idx; - if (idx === 10) + var p = info.config.lighthouse_config.modelPoints[idx]; + var pn = info.config.lighthouse_config.modelNormals[idx]; + var color = idx / info.config.lighthouse_config.modelPoints * 0xFFFFFF; + if (idx === 0) color = 0x00ff00; - if (idx === 12) - color = 0x0000ff; var sensorMaterial = new THREE.MeshBasicMaterial({color : color}); var newSensor = new THREE.Mesh(sensorGeometry, sensorMaterial); newSensor.position.set(p[0], p[1], p[2]); + var normalGeom = new THREE.Geometry(); + normalGeom.vertices.push(newSensor.position, + new THREE.Vector3(p[0] + pn[0] * .02, p[1] + pn[1] * .02, p[2] + pn[2] * .02)); + var normal= new THREE.Line(normalGeom, new THREE.LineBasicMaterial({color : idx == 4 ? 0xFF0000 : 0x00FF00})); + group.add(normal); group.sensors[idx] = sensorMaterial; group.add(newSensor); } @@ -236,7 +240,6 @@ var survive_log_handlers = { objs[obj.tracker].position.set(obj.position[0], obj.position[1], obj.position[2]); objs[obj.tracker].quaternion.set(obj.quat[1], obj.quat[2], obj.quat[3], obj.quat[0]); objs[obj.tracker].verticesNeedUpdate = true; - timecode[obj.tracker] = obj.timecode; if (trails) { @@ -296,7 +299,7 @@ var survive_log_handlers = { downAxes[obj.tracker] = new THREE.Geometry(); 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})); + var line = new THREE.Line(downAxes[obj.tracker], new THREE.LineBasicMaterial({color : 0xffffff})); scene.add(line); } @@ -333,7 +336,7 @@ $(function() { var url = new URL(window.location.href); var remote = url.searchParams.get("remote"); - if (remote.length) { + if (remote && remote.length) { survive_ws = new WebSocket("ws://" + remote + "/ws"); } else if (window.location.protocol === "file:") { survive_ws = new WebSocket("ws://localhost:8080/ws"); |