Loading js/util_functions.js +5 −2 Original line number Original line Diff line number Diff line Loading @@ -41,6 +41,7 @@ function convert_color_l2x(color){ /* /* * azimuth by geo coords * azimuth by geo coords */ */ /* function getAzimuth2(p1,p2){ function getAzimuth2(p1,p2){ //p1 - start point //p1 - start point Loading @@ -57,10 +58,11 @@ function getAzimuth2(p1,p2){ return azimuth; return azimuth; } } */ /* /* * azimuth by canvas coords * azimuth by canvas coords */ */ /* function getAzimuth(p1_ll,p2_ll){ function getAzimuth(p1_ll,p2_ll){ var Camera = Map.marker; var Camera = Map.marker; Loading @@ -76,3 +78,4 @@ function getAzimuth(p1_ll,p2_ll){ return azimuth; return azimuth; } } */ No newline at end of file js/x3dom_functions.js +1 −29 Original line number Original line Diff line number Diff line Loading @@ -35,34 +35,6 @@ * for the JavaScript code in this page. * for the JavaScript code in this page. */ */ /** * output in units (meters) */ function x3dom_getViewTranslation(elem){ var vp_mat = elem.runtime.viewMatrix().inverse(); var vp_translation = vp_mat.e3(); return vp_translation; } /** * output in degrees */ function x3dom_getViewDirection(elem){ var vp_mat = elem.runtime.viewMatrix(); var vMatInv = vp_mat.inverse(); var viewDir = vMatInv.multMatrixVec(new x3dom.fields.SFVec3f(0.0, 0.0, -1.0)); var angle = Math.atan2(viewDir.x,-viewDir.z)*180/Math.PI; return angle; } /** /** * get position and orientation in the 3D scene defined by mouse's canvas x,y * get position and orientation in the 3D scene defined by mouse's canvas x,y */ */ Loading Loading @@ -341,7 +313,7 @@ function x3dom_altelev(alt,elev){ } } /** /** * back and forth conversions for test purposes * back and forth conversions for tests */ */ function x3dom_matrix_test(){ function x3dom_matrix_test(){ Loading Loading
js/util_functions.js +5 −2 Original line number Original line Diff line number Diff line Loading @@ -41,6 +41,7 @@ function convert_color_l2x(color){ /* /* * azimuth by geo coords * azimuth by geo coords */ */ /* function getAzimuth2(p1,p2){ function getAzimuth2(p1,p2){ //p1 - start point //p1 - start point Loading @@ -57,10 +58,11 @@ function getAzimuth2(p1,p2){ return azimuth; return azimuth; } } */ /* /* * azimuth by canvas coords * azimuth by canvas coords */ */ /* function getAzimuth(p1_ll,p2_ll){ function getAzimuth(p1_ll,p2_ll){ var Camera = Map.marker; var Camera = Map.marker; Loading @@ -76,3 +78,4 @@ function getAzimuth(p1_ll,p2_ll){ return azimuth; return azimuth; } } */ No newline at end of file
js/x3dom_functions.js +1 −29 Original line number Original line Diff line number Diff line Loading @@ -35,34 +35,6 @@ * for the JavaScript code in this page. * for the JavaScript code in this page. */ */ /** * output in units (meters) */ function x3dom_getViewTranslation(elem){ var vp_mat = elem.runtime.viewMatrix().inverse(); var vp_translation = vp_mat.e3(); return vp_translation; } /** * output in degrees */ function x3dom_getViewDirection(elem){ var vp_mat = elem.runtime.viewMatrix(); var vMatInv = vp_mat.inverse(); var viewDir = vMatInv.multMatrixVec(new x3dom.fields.SFVec3f(0.0, 0.0, -1.0)); var angle = Math.atan2(viewDir.x,-viewDir.z)*180/Math.PI; return angle; } /** /** * get position and orientation in the 3D scene defined by mouse's canvas x,y * get position and orientation in the 3D scene defined by mouse's canvas x,y */ */ Loading Loading @@ -341,7 +313,7 @@ function x3dom_altelev(alt,elev){ } } /** /** * back and forth conversions for test purposes * back and forth conversions for tests */ */ function x3dom_matrix_test(){ function x3dom_matrix_test(){ Loading