From 8d2788b3188d8f91b18ce2c6393e2a98660ab9f9 Mon Sep 17 00:00:00 2001 From: Rob L Date: Tue, 2 Aug 2016 08:22:40 -0400 Subject: [PATCH] Fix issue with finding some planets and bases --- js/mapviewgl.js | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/js/mapviewgl.js b/js/mapviewgl.js index 3482c17..95fa6ad 100644 --- a/js/mapviewgl.js +++ b/js/mapviewgl.js @@ -188,7 +188,6 @@ function animate() { function render () { //requestAnimationFrame( render ); renderer.render( scene, camera ); - // find intersections } @@ -210,16 +209,13 @@ function listobjects(type) { function zoomfocus(name) { - var types = ['planets','stations']; - for (var type in types) { - var objects = listobjects(types[type]); - for ( var key in objects ) { - if (key == name) { - var object = objects[key]; - controls.target.x = object.x; - controls.target.y = object.y; - controls.target.z = object.z; - var focus = new THREE.Vector3( object.x, object.y, object.z ); + + var zoomto = grabPositionByName(name) + if (zoomto != null) { + controls.target.x = zoomto.x; + controls.target.y = zoomto.y; + controls.target.z = zoomto.z; + var focus = new THREE.Vector3( zoomto.x, zoomto.y, zoomto.z ); var vantage = new THREE.Vector3( 5, 60 , 150 ); focus.add(vantage); camera.position.set(focus.x,focus.y,focus.z); @@ -229,9 +225,7 @@ function zoomfocus(name) { } - } - } }