Commit 88630829 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

1. fixed trembling bug introduced recently (M reassigning before getting correct translation)

parent eddab0f6
...@@ -282,17 +282,15 @@ function x3dom_altelev(alt,elev){ ...@@ -282,17 +282,15 @@ function x3dom_altelev(alt,elev){
var mat = Scene.element.runtime.viewMatrix().inverse(); var mat = Scene.element.runtime.viewMatrix().inverse();
var R0 = Data.camera.Matrices.R0; var R0 = Data.camera.Matrices.R0;
//var T = x3dom_toYawPitchRoll(); //var T = x3dom_toYawPitchRoll();
var from = mat.e3();
from.y = alt;
var mat = R0.mult(mat); var mat = R0.mult(mat);
var ypr = x3dom_YawPitchRoll_nc(mat); var ypr = x3dom_YawPitchRoll_nc(mat);
var ypr2 = x3dom_YawPitchRoll_nc_degs(mat); var ypr2 = x3dom_YawPitchRoll_nc_degs(mat);
console.log("Check1"); //console.log("Check1");
console.log(ypr2); //console.log(ypr2);
var from = mat.e3();
console.log(from);
from.y = alt;
var az = ypr.yaw; var az = ypr.yaw;
var el = elev; var el = elev;
...@@ -309,8 +307,8 @@ function x3dom_altelev(alt,elev){ ...@@ -309,8 +307,8 @@ function x3dom_altelev(alt,elev){
var R_w = R0.inverse().mult(R_rw); var R_w = R0.inverse().mult(R_rw);
var ypr2 = x3dom_YawPitchRoll_nc_degs(R_rw); var ypr2 = x3dom_YawPitchRoll_nc_degs(R_rw);
console.log("Check2"); //console.log("Check2");
console.log(ypr2); //console.log(ypr2);
var matt = x3dom.fields.SFMatrix4f.translation(from); var matt = x3dom.fields.SFMatrix4f.translation(from);
...@@ -318,8 +316,6 @@ function x3dom_altelev(alt,elev){ ...@@ -318,8 +316,6 @@ function x3dom_altelev(alt,elev){
x3dom_setViewpoint(newmat); x3dom_setViewpoint(newmat);
console.log(newmat.e3());
} }
/** /**
...@@ -599,6 +595,8 @@ function x3dom_update_map(){ ...@@ -599,6 +595,8 @@ function x3dom_update_map(){
// uses globals // uses globals
function x3dom_setViewpoint(m){ function x3dom_setViewpoint(m){
console.log("Setting a viewpoint");
var Q = new x3dom.fields.Quaternion(0, 0, 1, 0); var Q = new x3dom.fields.Quaternion(0, 0, 1, 0);
Q.setValue(m); Q.setValue(m);
var AA = Q.toAxisAngle(); var AA = Q.toAxisAngle();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment