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
eddacfc2
Commit
eddacfc2
authored
Aug 29, 2017
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed: depend on camera current view
parent
3687e096
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
ui_init.js
js/ui_init.js
+1
-0
x3dom_functions.js
js/x3dom_functions.js
+1
-1
No files found.
js/ui_init.js
View file @
eddacfc2
...
@@ -454,6 +454,7 @@ function x3d_initial_camera_placement(){
...
@@ -454,6 +454,7 @@ function x3d_initial_camera_placement(){
R0
:
R0
,
R0
:
R0
,
Up0
:
RC_w
.
e1
(),
Up0
:
RC_w
.
e1
(),
RC_w
:
RC_w
,
RC_w
:
RC_w
,
RC_w0
:
RC_w
};
};
x3dom_setViewpoint
(
RC_w
);
x3dom_setViewpoint
(
RC_w
);
...
...
js/x3dom_functions.js
View file @
eddacfc2
...
@@ -750,7 +750,7 @@ function x3dom_scene_to_real(x,y,z){
...
@@ -750,7 +750,7 @@ function x3dom_scene_to_real(x,y,z){
function
x3dom_scene_to_heading
(
x
,
y
,
z
){
function
x3dom_scene_to_heading
(
x
,
y
,
z
){
//var R0 = Data.camera.Matrices.R0;
//var R0 = Data.camera.Matrices.R0;
var
R0
=
Data
.
camera
.
Matrices
.
RC_w
.
inverse
();
var
R0
=
Data
.
camera
.
Matrices
.
RC_w
0
.
inverse
();
var
p_w
=
new
x3dom
.
fields
.
SFVec3f
(
x
,
y
,
z
);
var
p_w
=
new
x3dom
.
fields
.
SFVec3f
(
x
,
y
,
z
);
var
p_rw
=
R0
.
multMatrixVec
(
p_w
);
var
p_rw
=
R0
.
multMatrixVec
(
p_w
);
...
...
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