switched to real world coordinates

js/ui_align.js

@@ -48,6 +48,10 @@ function align_init(){
         x3dom_align_GN();
     });
 
+    $("#align_tr_button").on("click",function(){
+        x3dom_align_tr();
+    });
+
     /*
     $("#align_0").on("click",function(){
         x3dom_align_0();
@@ -381,6 +385,32 @@ function distance_error(x,y,h){
 
 }
 
+function x3dom_align_tr(){
+
+  if (Data.markers.length<2){
+    console.log("Too few points");
+    return;
+  }
+
+  var mark0 = Data.markers[0];
+  var mark1 = Data.markers[1];
+
+  var v0 = { x: mark0.align.x, y: mark0.align.y, z: mark0.align.z};
+  var v1 = { x: mark1.align.x, y: mark1.align.y, z: mark1.align.z};
+
+  var dx = Math.abs(v1.x-v0.x);
+  var dy = Math.abs(v1.y-v0.y);
+  var dz = Math.abs(v1.z-v0.z);
+
+  console.log(dx+" "+dy+" "+dz);
+
+  var tilt = 180/Math.PI*Math.asin(dy/Math.sqrt(dy*dy+dz*dz));
+  var roll = 180/Math.PI*Math.asin(dy/Math.sqrt(dy*dy+dx*dx));
+
+  console.log("Tilt: "+tilt+" Roll: "+roll);
+
+}
+
 /*
  * not used
  */

js/ui_init.js

@@ -617,9 +617,12 @@ function leaf_events(){
 
                 p_w = x3dom_delta_map2scene(p1_ll,p2_ll);
 
-                mark.x = p_w.x;
-                mark.y = p_w.y;
-                mark.z = p_w.z;
+                //conversion to real world coordinates
+                var p_rw = xyz_to_real_world(p_w.x,p_w.y,p_w.z);
+
+                mark.x = p_rw.x;
+                mark.y = p_rw.y;
+                mark.z = p_rw.z;
 
                 mark.d_map = distance;
 
@@ -777,7 +780,7 @@ function leaf_drag_marker(){
         var index = Camera.draggedMarker._index;
 
         var p1_ll = Camera._latlng;
-        var p2_ll = Camera.draggedMarker._latlng;
+        var p2_ll = Camera.draggedMarker.__latlng;
 
         leaf_update_x3dom_marker(p1_ll,p2_ll,index);
         X3DOMObject.displayMarkInfo(index);

js/util_functions.js

@@ -78,3 +78,12 @@ function getAzimuth(p1_ll,p2_ll){
     return azimuth;
 
 }
+
+function xyz_to_real_world(x,y,z){
+
+  var R0 = Data.camera.Matrices.R0;
+  var p_w = new x3dom.fields.SFVec3f(x,y,z);
+  var p_rw = R0.multMatrixVec(p_w);
+
+  return [p_rw.x,p_rw.y,p_rw.z];
+}

js/x3dom_functions.js

@@ -118,6 +118,11 @@ function x3dom_getXYPosOr(cnvx,cnvy,round){
     var p_w = new x3dom.fields.SFVec3f(x,y,z);
     var p_rw = R0.multMatrixVec(p_w);
 
+    //conversion to real world coordinates
+    x = p_rw.x;
+    y = p_rw.y;
+    z = p_rw.z;
+
     if (valid_distance){
         dist_xz = Math.sqrt(p_rw.x*p_rw.x+p_rw.z*p_rw.z);
         dist_xyz = Math.sqrt(p_rw.y*p_rw.y+dist_xz*dist_xz);
@@ -185,6 +190,10 @@ function x3dom_getCameraPosOr(round){
 
     //x3dom_matrix_test();
 
+    //conversion to real world coordinates
+    var tmp = xyz_to_real_world(tr.x,tr.y,tr.z);
+    tr = new x3dom.fields.SFVec3f(tmp[0],tmp[1],tmp[2]);
+
     if (!round){
         return {
             x: tr.x,

viewer.html

@@ -75,6 +75,8 @@ Instructions:
   3. Move all markers on the map to update their location - drag to position more precisely.
   4. Click this button - the results will appear in a dialog window with "apply"/"cancel"
   5. To save the result click upload button (Initial location and heading) in the menu.' class='edit'></div>
+      <!--<div id='align_tr_button' title='Align tilt and roll' class='edit'></div>-->
+      <div id='align_tr_button' title='Align tilt and roll' class='experimental'></div>
     </div>
     <div id='info-wrapper'>
         <div id='window-info'></div>