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
cf8a7506
Commit
cf8a7506
authored
Jul 25, 2017
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. INFINITY shape handling 2. mymodel -> x3d
parent
e6d3d2e3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
ui_init.js
js/ui_init.js
+1
-1
x3dom_functions.js
js/x3dom_functions.js
+8
-1
x3dom_init.js
js/x3dom_init.js
+2
-0
No files found.
js/ui_init.js
View file @
cf8a7506
...
...
@@ -199,7 +199,7 @@ function light_init(){
var
model
=
$
([
'<group>'
,
' <inline name="
mymodel" namespacename="mymodel
" url="'
+
model_url
+
'"></inline>'
,
' <inline name="
x3d" namespacename="x3d
" url="'
+
model_url
+
'"></inline>'
,
'</group>'
].
join
(
'
\
n'
));
...
...
js/x3dom_functions.js
View file @
cf8a7506
...
...
@@ -65,6 +65,13 @@ function x3dom_getXYPosOr(cnvx,cnvy,round){
var
valid_distance
=
true
;
// check infinity shape
if
(
shootRay
.
pickPosition
!=
null
){
if
(
$
(
shootRay
.
pickObject
).
hasClass
(
'INFINITY'
)){
shootRay
.
pickPosition
=
null
;
}
}
if
(
shootRay
.
pickPosition
!=
null
){
var
index
=
Scene
.
highlighted_marker_index
;
...
...
@@ -97,9 +104,9 @@ function x3dom_getXYPosOr(cnvx,cnvy,round){
}
dist_xyz
=
Math
.
sqrt
(
y
*
y
+
dist_xz
*
dist_xz
);
id
=
$
(
shootRay
.
pickObject
).
attr
(
"id"
);
}
else
{
var
viewingRay
=
elem
.
runtime
.
getViewingRay
(
cnvx
,
cnvy
);
...
...
js/x3dom_init.js
View file @
cf8a7506
...
...
@@ -1242,6 +1242,7 @@ X3DOMObject.displayViewInfo = function(e){
var
camera
=
x3dom_getCameraPosOr
(
true
);
/* do not convert
//convert to real world coordinates
var tmp = xyz_to_real_world(mouse.x,mouse.y,mouse.z);
...
...
@@ -1254,6 +1255,7 @@ X3DOMObject.displayViewInfo = function(e){
camera.x = tmp.x.toFixed(2);
camera.y = tmp.y.toFixed(2);
camera.z = tmp.z.toFixed(2);
*/
// ?!!!
//Map.marker.setAltitude(camera.y);
...
...
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