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
3870060b
Commit
3870060b
authored
Jun 29, 2017
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'gulp'
# Conflicts: # index.html # js/ui_init.js # js/x3dom_init.js # test.html
parents
f47abc96
2d563289
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
620 additions
and
605 deletions
+620
-605
index.css
js/index.css
+1
-1
index.js
js/index.js
+44
-44
L.extra.js
js/leaflet/L.extra.js
+9
-9
leaflet.camera-view-marker-controls.js
js/leaflet/leaflet.camera-view-marker-controls.js
+23
-23
leaflet.camera-view-marker.js
js/leaflet/leaflet.camera-view-marker.js
+114
-114
leaflet.camera-view-marker.measure.js
js/leaflet/leaflet.camera-view-marker.measure.js
+87
-87
leaflet_init.js
js/leaflet_init.js
+20
-20
map.css
js/map.css
+1
-1
map.js
js/map.js
+19
-19
nomap_init.js
js/nomap_init.js
+21
-21
nomap_vr_init.js
js/nomap_vr_init.js
+20
-20
ui.css
js/ui.css
+4
-3
ui_align.js
js/ui_align.js
+14
-14
ui_functions.js
js/ui_functions.js
+7
-7
ui_help.js
js/ui_help.js
+5
-5
ui_menu.js
js/ui_menu.js
+17
-17
util_functions.js
js/util_functions.js
+20
-20
x3dom.css
js/x3dom/x3dom.css
+9
-9
x3dom_functions.js
js/x3dom_functions.js
+131
-131
x3dom_init.js
js/x3dom_init.js
+54
-40
No files found.
js/index.css
View file @
3870060b
js/index.js
View file @
3870060b
js/leaflet/L.extra.js
View file @
3870060b
js/leaflet/leaflet.camera-view-marker-controls.js
View file @
3870060b
js/leaflet/leaflet.camera-view-marker.js
View file @
3870060b
js/leaflet/leaflet.camera-view-marker.measure.js
View file @
3870060b
js/leaflet_init.js
View file @
3870060b
js/map.css
View file @
3870060b
js/map.js
View file @
3870060b
js/nomap_init.js
View file @
3870060b
js/nomap_vr_init.js
View file @
3870060b
js/ui.css
View file @
3870060b
body
{
user-select
:
none
;
padding
:
0px
;
font-family
:
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
margin
:
0px
;
...
...
js/ui_align.js
View file @
3870060b
js/ui_functions.js
View file @
3870060b
js/ui_help.js
View file @
3870060b
js/ui_menu.js
View file @
3870060b
js/util_functions.js
View file @
3870060b
js/x3dom/x3dom.css
View file @
3870060b
js/x3dom_functions.js
View file @
3870060b
js/x3dom_init.js
View file @
3870060b
...
...
@@ -711,6 +711,7 @@ X3DOMObject.Marker.prototype._registerEvents = function(){
marker
.
on
(
'mousedown'
,
function
(
e
){
var
self
=
this
;
var
elem
=
$
(
this
).
parent
().
parent
().
parent
();
var
index
=
parseInt
(
$
(
elem
).
attr
(
"id"
).
substr
(
PREFIX
.
length
));
...
...
@@ -727,6 +728,13 @@ X3DOMObject.Marker.prototype._registerEvents = function(){
Scene
.
element
.
addEventListener
(
'mousemove'
,
X3DOMObject
.
Marker
.
mouseMove
,
true
);
Scene
.
element
.
addEventListener
(
'mouseup'
,
X3DOMObject
.
Marker
.
mouseUp
,
true
);
// check for button released outside the window
$
(
window
).
on
(
'mouseover.drag_marker'
,
function
(
e
)
{
if
(
e
&&
e
.
buttons
===
0
&&
Scene
.
markerToDrag
)
{
X3DOMObject
.
Marker
.
mouseUp
.
apply
(
self
,[
event
]);
}
});
});
marker
.
on
(
'mouseup'
,
function
(
e
){
...
...
@@ -752,8 +760,10 @@ X3DOMObject.Marker.mouseUp = function(){
}
*/
Scene
.
markerToDrag
=
null
;
Scene
.
element
.
removeEventListener
(
'mouseup'
,
X3DOMObject
.
Marker
.
mouseUp
,
true
);
Scene
.
element
.
removeEventListener
(
'mousemove'
,
X3DOMObject
.
Marker
.
mouseMove
,
true
);
$
(
window
).
off
(
'.drag_marker'
);
Scene
.
draggedTransformNode
=
null
;
Scene
.
draggingUpVec
=
null
;
...
...
@@ -768,6 +778,8 @@ X3DOMObject.Marker.mouseUp = function(){
// from https://x3dom.org/x3dom/example/MovingObjectsWithDOMEvents.html
X3DOMObject
.
Marker
.
dragStart
=
function
(
elem
){
Scene
.
markerToDrag
=
elem
;
// move up from <shape> to <transform>
var
transformNode
=
$
(
elem
).
parent
();
var
tr0
=
$
(
transformNode
).
attr
(
"translation"
);
...
...
@@ -825,7 +837,9 @@ X3DOMObject.Marker.mouseMove = function(event){
if
(
!
SETTINGS
.
slidingdrag
){
X3DOMObject
.
Marker
.
drag
(
event
.
offsetX
-
Scene
.
lastMouseX
,
event
.
offsetY
-
Scene
.
lastMouseY
);
}
else
{
Scene
.
markerToDrag
.
isPickable
=
false
;
var
sr
=
Scene
.
element
.
runtime
.
shootRay
(
event
.
clientX
,
event
.
clientY
);
Scene
.
markerToDrag
.
isPickable
=
true
;
if
(
sr
.
pickObject
!=
null
){
if
(
!
$
(
sr
.
pickObject
).
hasClass
(
"shapemarker"
)){
var
sphere
=
Scene
.
draggedTransformNode
.
parent
().
parent
();
...
...
@@ -1205,42 +1219,42 @@ X3DOMObject.displayViewInfo = function(e){
//Map.marker.setAltitude(camera.y);
//Map.marker.setElevation(camera.e*Math.PI/180);
var
msg
=
[
'<table>'
,
'<tr>'
,
' <td></td>'
,
' <td colspan="3" align="center">position, m</td>'
,
' <td colspan="3" align="center">orientation, °</td>'
,
'</tr>'
,
'<tr>'
,
' <th></th>'
,
' <th style="width:60px;">x</th>'
,
' <th style="width:60px;">y</th>'
,
' <th style="width:60px;">z</th>'
,
' <th>azimuth</th>'
,
' <th>elevation</th>'
,
' <th>skew</th>'
,
'</tr>'
,
'<tr>'
,
' <td>mouse</td>'
,
' <td>'
+
mouse
.
x
+
'</td>'
,
' <td>'
+
mouse
.
y
+
'</td>'
,
' <td>'
+
mouse
.
z
+
'</td>'
,
' <td>'
+
mouse
.
a
+
'</td>'
,
' <td>'
+
mouse
.
e
+
'</td>'
,
' <td>'
+
mouse
.
s
+
'</td>'
,
'</tr>'
,
'<tr>'
,
' <td>camera</td>'
,
' <td>'
+
camera
.
x
+
'</td>'
,
' <td>'
+
camera
.
y
+
'</td>'
,
' <td>'
+
camera
.
z
+
'</td>'
,
' <td>'
+
camera
.
a
+
'</td>'
,
' <td>'
+
camera
.
e
+
'</td>'
,
' <td>'
+
camera
.
s
+
'</td>'
,
'</tr>'
,
'</table>'
].
join
(
'
\
n'
)
;
var
msg
=
`
<table>
<tr>
<td></td>
<td colspan='3' align='center'>position, m</td>
<td colspan='3' align='center'>orientation, °</td>
</tr>
<tr>
<th></th>
<th style='width:60px;'>x</th>
<th style='width:60px;'>y</th>
<th style='width:60px;'>z</th>
<th>azimuth</th>
<th>elevation</th>
<th>skew</th>
</tr>
<tr>
<td>mouse</td>
<td>`
+
mouse
.
x
+
`</td>
<td>`
+
mouse
.
y
+
`</td>
<td>`
+
mouse
.
z
+
`</td>
<td>`
+
mouse
.
a
+
`</td>
<td>`
+
mouse
.
e
+
`</td>
<td>`
+
mouse
.
s
+
`</td>
</tr>
<tr>
<td>camera</td>
<td>`
+
camera
.
x
+
`</td>
<td>`
+
camera
.
y
+
`</td>
<td>`
+
camera
.
z
+
`</td>
<td>`
+
camera
.
a
+
`</td>
<td>`
+
camera
.
e
+
`</td>
<td>`
+
camera
.
s
+
`</td>
</tr>
</table>
`
;
if
(
SETTINGS
.
viewinfo
){
ui_showMessage
(
"window-viewinfo"
,
msg
);
...
...
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