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
aa5a0d61
Commit
aa5a0d61
authored
Aug 29, 2017
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testing weights
parent
72e22368
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
align_functions.js
js/align_functions.js
+8
-5
x3dom_init.js
js/x3dom_init.js
+5
-0
No files found.
js/align_functions.js
View file @
aa5a0d61
...
...
@@ -59,8 +59,10 @@ function hll_f_3d_i(i,v){
//var vec = new x3dom.fields.SFVec3f(mark.align.x-base.x,mark.align.y-base.y,mark.align.z-base.z);
var
res
=
Math
.
atan2
(
vec
.
x
,
-
vec
.
z
)
*
180
/
Math
.
PI
+
v
[
2
];
if
(
res
>
180
)
res
=
res
-
360
;
if
(
res
<-
180
)
res
=
res
+
360
;
console
.
log
(
"hll_f_3d_i: "
+
i
+
" "
+
res
);
//if (res> 180) res = res - 360;
//if (res<-180) res = res + 360;
return
res
;
}
...
...
@@ -282,7 +284,8 @@ function art_l_i(i){
function
art_w_i
(
i
,
v
){
//return 1;
return
1
/
art_l_i
(
i
);
//return 1/art_l_i(i);
return
art_l_i
(
i
);
}
/**
...
...
@@ -326,6 +329,6 @@ function art2_l_i(i){
}
function
art2_w_i
(
i
,
v
){
return
1
;
//
return 1/art_l_i(i);
//
return 1;
return
1
/
art_l_i
(
i
);
}
js/x3dom_init.js
View file @
aa5a0d61
...
...
@@ -1464,8 +1464,13 @@ X3DOMObject.displayMarkInfo = function(index){
}
/*
* Called on ctrl-click over scene
*/
X3DOMObject
.
createNewMarker
=
function
(
x
,
y
,
z
){
console
.
log
(
"createNewMarker"
);
x
=
parseFloat
(
x
);
y
=
parseFloat
(
y
);
z
=
parseFloat
(
z
);
...
...
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