Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
x3domlet
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Elphel
x3domlet
Commits
88630829
Commit
88630829
authored
Jun 12, 2017
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. fixed trembling bug introduced recently (M reassigning before getting correct translation)
parent
eddab0f6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
13 deletions
+11
-13
x3dom_functions.js
js/x3dom_functions.js
+11
-13
No files found.
js/x3dom_functions.js
View file @
88630829
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment