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
a0d0d970
Commit
a0d0d970
authored
6 years ago
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
toggle LIDAR mode
parent
9124fdc1
master
No related merge requests found
Pipeline
#644
failed with stages
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
4 deletions
+28
-4
ui.css
js/ui.css
+6
-0
ui_init.js
js/ui_init.js
+6
-4
ui_menu.js
js/ui_menu.js
+14
-0
viewer.html
viewer.html
+2
-0
No files found.
js/ui.css
View file @
a0d0d970
...
...
@@ -200,6 +200,7 @@ html, body, #x3d_wrapper {
height
:
25px
;
}
#toggle_lidar_button
,
#exit_button
,
#align_button
,
#align_button_heading
,
...
...
@@ -221,6 +222,10 @@ html, body, #x3d_wrapper {
margin-bottom
:
2px
;
}
#toggle_lidar_button
{
background-image
:
url('images/baseline_track_changes_black_48dp.png')
;
}
#exit_button
{
background-image
:
url('images/ic_exit_to_app_black_48dp_1x.png')
;
}
...
...
@@ -253,6 +258,7 @@ html, body, #x3d_wrapper {
background-color
:
rgba
(
240
,
150
,
150
,
1
);
}
#toggle_lidar_button
:hover
,
#align_button
:hover
,
#align_button_heading
:hover
,
#align_button_location
:hover
,
...
...
This diff is collapsed.
Click to expand it.
js/ui_init.js
View file @
a0d0d970
...
...
@@ -80,8 +80,8 @@ var SETTINGS = {
y
:
0
,
z
:
-
0.12
},
'clipnear'
:
-
2000
0
,
'clipfar'
:
200
00
'clipnear'
:
0
,
'clipfar'
:
200
// 'kml' : "scene.kml"
}
...
...
@@ -111,6 +111,8 @@ var MPR = {
// recorded marks restored
var
MPR_MARKS_LOADED
=
false
;
var
LIDAR_MODE
=
false
;
// no comments
function
parseURL
(){
var
parameters
=
location
.
href
.
replace
(
/
\?
/ig
,
"&"
).
split
(
"&"
);
...
...
@@ -286,8 +288,8 @@ function light_init(){
' <transform id=
\'
x3d_transform
\'
class=
\'
inline_wrapper
\'
>'
,
' <transform translation=
\'
'
+
([
SETTINGS
.
mountshift
.
x
,
SETTINGS
.
mountshift
.
y
,
SETTINGS
.
mountshift
.
z
].
join
(
','
))
+
'
\'
>'
,
' <inline name="x3d_'
+
model_name
+
'" namespacename="x3d_'
+
model_name
+
'" url="'
+
model_url
+
'"></inline>'
,
' <clipplane id=
\'
clipfar_cp
\'
enabled="true" on="true" plane="0,0,1,200
00"></clipplane>'
,
' <clipplane id=
\'
clipnear_cp
\'
enabled="true" on="true" plane="0,0,-1,2000
0"></clipplane>'
,
' <clipplane id=
\'
clipfar_cp
\'
class=
\'
clipplanes
\'
enabled="true" on="false" plane="0,0,1,2
00"></clipplane>'
,
' <clipplane id=
\'
clipnear_cp
\'
class=
\'
clipplanes
\'
enabled="true" on="false" plane="0,0,-1,
0"></clipplane>'
,
' </transform>'
,
' </transform>'
,
' </switch>'
,
...
...
This diff is collapsed.
Click to expand it.
js/ui_menu.js
View file @
a0d0d970
...
...
@@ -103,6 +103,20 @@ function menu_init(){
});
$
(
"#toggle_lidar_button"
).
on
(
'click'
,
function
(
e
){
if
(
LIDAR_MODE
===
false
){
$
(
this
).
css
({
"background-color"
:
"rgba(200,250,200,1)"
});
$
(
'.clipplanes'
).
attr
(
'on'
,
true
);
}
else
{
$
(
this
).
css
({
"background-color"
:
"white"
});
$
(
'.clipplanes'
).
attr
(
'on'
,
false
);
}
LIDAR_MODE
=
!
LIDAR_MODE
;
});
$
(
"#window-error"
).
on
(
'click'
,
function
(){
$
(
this
).
hide
();
});
...
...
This diff is collapsed.
Click to expand it.
viewer.html
View file @
a0d0d970
...
...
@@ -98,6 +98,8 @@
<div
id=
'download_button_ml'
title=
'Download source files for ml'
></div>
<div
id=
'view_src_images_button'
title=
'View/slideshow source images (processed)'
></div>
<div
id=
'menu_button'
title=
'Menu'
></div>
<div
id=
'toggle_lidar_button'
title=
'Toggle LIDAR mode. This limits the distance of the displayed model to the maximum acquisition distance of a LIDAR.
To change LIDAR scan distance, edit near and far clipping planes in the menu'
></div>
<div
id=
'extra_models_button'
title=
'Load extra models'
class=
'experimental'
></div>
<div
id=
'align_button'
title=
'Run least squares fitting algorithm (Gauss-Newton) for camera heading and location using markers.
Instructions:
...
...
This diff is collapsed.
Click to expand it.
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