Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
494998af
A
apollo
项目概览
Pinoxchio
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
494998af
编写于
9月 25, 2019
作者:
K
kiboliu
提交者:
Calvin Miao
9月 25, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
CR response
上级
27b24a8a
变更
12
展开全部
显示空白变更内容
内联
并排
Showing
12 changed file
with
17 addition
and
27 deletion
+17
-27
modules/dreamview/backend/perception_camera_updater/perception_camera_updater.cc
...nd/perception_camera_updater/perception_camera_updater.cc
+1
-2
modules/dreamview/frontend/dist/app.bundle.js
modules/dreamview/frontend/dist/app.bundle.js
+3
-3
modules/dreamview/frontend/dist/app.bundle.js.map
modules/dreamview/frontend/dist/app.bundle.js.map
+1
-1
modules/dreamview/frontend/dist/worker.bundle.js
modules/dreamview/frontend/dist/worker.bundle.js
+1
-1
modules/dreamview/frontend/dist/worker.bundle.js.map
modules/dreamview/frontend/dist/worker.bundle.js.map
+1
-1
modules/dreamview/frontend/proto_bundle/sim_world_proto_bundle.json
...eamview/frontend/proto_bundle/sim_world_proto_bundle.json
+2
-6
modules/dreamview/frontend/src/components/Layouts/MainView.js
...les/dreamview/frontend/src/components/Layouts/MainView.js
+1
-2
modules/dreamview/frontend/src/components/Scene/index.js
modules/dreamview/frontend/src/components/Scene/index.js
+1
-2
modules/dreamview/frontend/src/renderer/index.js
modules/dreamview/frontend/src/renderer/index.js
+1
-1
modules/dreamview/frontend/src/store/camera_data.js
modules/dreamview/frontend/src/store/camera_data.js
+2
-4
modules/dreamview/frontend/src/styles/main.scss
modules/dreamview/frontend/src/styles/main.scss
+1
-1
modules/dreamview/proto/camera_update.proto
modules/dreamview/proto/camera_update.proto
+2
-3
未找到文件。
modules/dreamview/backend/perception_camera_updater/perception_camera_updater.cc
浏览文件 @
494998af
...
@@ -189,8 +189,7 @@ void PerceptionCameraUpdater::OnImage(
...
@@ -189,8 +189,7 @@ void PerceptionCameraUpdater::OnImage(
}
}
current_image_timestamp_
=
next_image_timestamp
;
current_image_timestamp_
=
next_image_timestamp
;
camera_update_
.
set_image
(
&
(
tmp_buffer
[
0
]),
tmp_buffer
.
size
());
camera_update_
.
set_image
(
&
(
tmp_buffer
[
0
]),
tmp_buffer
.
size
());
camera_update_
.
set_img_width
(
width
);
camera_update_
.
set_image_aspect_ratio
((
double
)
width
/
height
);
camera_update_
.
set_img_height
(
height
);
}
}
void
PerceptionCameraUpdater
::
OnLocalization
(
void
PerceptionCameraUpdater
::
OnLocalization
(
...
...
modules/dreamview/frontend/dist/app.bundle.js
浏览文件 @
494998af
此差异已折叠。
点击以展开。
modules/dreamview/frontend/dist/app.bundle.js.map
浏览文件 @
494998af
此差异已折叠。
点击以展开。
modules/dreamview/frontend/dist/worker.bundle.js
浏览文件 @
494998af
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
modules/dreamview/frontend/dist/worker.bundle.js.map
浏览文件 @
494998af
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
modules/dreamview/frontend/proto_bundle/sim_world_proto_bundle.json
浏览文件 @
494998af
...
@@ -789,13 +789,9 @@
...
@@ -789,13 +789,9 @@
"type"
:
"bytes"
,
"type"
:
"bytes"
,
"id"
:
3
"id"
:
3
},
},
"im
gHeight
"
:
{
"im
ageAspectRatio
"
:
{
"type"
:
"
uint32
"
,
"type"
:
"
double
"
,
"id"
:
4
"id"
:
4
},
"imgWidth"
:
{
"type"
:
"uint32"
,
"id"
:
5
}
}
}
}
}
}
...
...
modules/dreamview/frontend/src/components/Layouts/MainView.js
浏览文件 @
494998af
...
@@ -28,9 +28,8 @@ class SceneView extends React.Component {
...
@@ -28,9 +28,8 @@ class SceneView extends React.Component {
if
(
options
.
showCameraView
)
{
if
(
options
.
showCameraView
)
{
// Set width/height same as camera image ratio to ensure scene align to image
// Set width/height same as camera image ratio to ensure scene align to image
// thus the height won't change no matter whether there's menu under scene
// thus the height won't change no matter whether there's menu under scene
const
ASPECT_RATIO
=
cameraData
.
imageWidth
/
cameraData
.
imageHeight
;
width
=
sceneDimension
.
width
;
width
=
sceneDimension
.
width
;
height
=
width
/
ASPECT_RATIO
;
height
=
width
/
cameraData
.
imageAspectRatio
;
}
else
{
}
else
{
width
=
sceneDimension
.
width
;
width
=
sceneDimension
.
width
;
height
=
sceneDimension
.
height
-
sceneHeightOffset
;
height
=
sceneDimension
.
height
-
sceneHeightOffset
;
...
...
modules/dreamview/frontend/src/components/Scene/index.js
浏览文件 @
494998af
...
@@ -34,8 +34,7 @@ export default class Scene extends React.Component {
...
@@ -34,8 +34,7 @@ export default class Scene extends React.Component {
}}
>
}}
>
{
options
.
showGeo
&&
<
Geolocation
/>
}
{
options
.
showGeo
&&
<
Geolocation
/>
}
<
/div
>
<
/div
>
{
(
options
.
showCameraView
&&
!
RENDERER
.
routingEditor
.
isInEditingMode
())
&&
{
(
options
.
showCameraView
&&
!
options
.
showRouteEditingBar
)
&&
<
img
id
=
"
camera-image
"
/>
}
<
img
id
=
"
camera-image
"
/>
}
<
/React.Fragment
>
<
/React.Fragment
>
);
);
}
}
...
...
modules/dreamview/frontend/src/renderer/index.js
浏览文件 @
494998af
...
@@ -155,7 +155,7 @@ class Renderer {
...
@@ -155,7 +155,7 @@ class Renderer {
}
}
updateDimension
(
width
,
height
)
{
updateDimension
(
width
,
height
)
{
if
(
width
<
Styles
.
minSceneWidth
)
{
if
(
width
<
Styles
.
MIN_SCENE_WIDTH
)
{
// Min width of main view is 600, so we need not update
// Min width of main view is 600, so we need not update
// camera/renderer dimension anymore
// camera/renderer dimension anymore
return
;
return
;
...
...
modules/dreamview/frontend/src/store/camera_data.js
浏览文件 @
494998af
...
@@ -9,8 +9,7 @@ export default class CameraData {
...
@@ -9,8 +9,7 @@ export default class CameraData {
@
observable
initDynamicRotation
=
observable
.
map
();
@
observable
initDynamicRotation
=
observable
.
map
();
@
observable
deltaDynamicRotation
=
observable
.
map
();
@
observable
deltaDynamicRotation
=
observable
.
map
();
@
observable
imageSrcData
=
null
;
@
observable
imageSrcData
=
null
;
@
observable
imageWidth
=
null
;
@
observable
imageAspectRatio
=
null
;
@
observable
imageHeight
=
null
;
constructor
()
{
constructor
()
{
[
'
x
'
,
'
y
'
,
'
z
'
].
forEach
((
axis
)
=>
{
[
'
x
'
,
'
y
'
,
'
z
'
].
forEach
((
axis
)
=>
{
...
@@ -39,8 +38,7 @@ export default class CameraData {
...
@@ -39,8 +38,7 @@ export default class CameraData {
this
.
imageSrcData
=
'
data:image/jpeg;base64,
'
+
new
Buffer
(
data
.
image
).
toString
(
'
base64
'
);
this
.
imageSrcData
=
'
data:image/jpeg;base64,
'
+
new
Buffer
(
data
.
image
).
toString
(
'
base64
'
);
}
}
this
.
imageWidth
=
data
.
imgWidth
;
this
.
imageAspectRatio
=
data
.
imageAspectRatio
;
this
.
imageHeight
=
data
.
imgHeight
;
// Camera dynamic transformation matrix: the dynamic localization matrix
// Camera dynamic transformation matrix: the dynamic localization matrix
const
localizationMatrix
=
new
THREE
.
Matrix4
();
const
localizationMatrix
=
new
THREE
.
Matrix4
();
...
...
modules/dreamview/frontend/src/styles/main.scss
浏览文件 @
494998af
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
$min-scene-width
:
600
;
$min-scene-width
:
600
;
:export
{
minSceneWidth
:
$min-scene-width
;
}
:export
{
MIN_SCENE_WIDTH
:
$min-scene-width
;
}
@mixin
monitor-item-common-properties
(
$text-width
:
calc
(
100%
-
17px
))
{
@mixin
monitor-item-common-properties
(
$text-width
:
calc
(
100%
-
17px
))
{
display
:
flex
;
display
:
flex
;
...
...
modules/dreamview/proto/camera_update.proto
浏览文件 @
494998af
...
@@ -14,7 +14,6 @@ message CameraUpdate {
...
@@ -14,7 +14,6 @@ message CameraUpdate {
// Camera image data
// Camera image data
optional
bytes
image
=
3
;
optional
bytes
image
=
3
;
// Camera image width and height
// Camera image aspect ratio = width / height
optional
uint32
img_height
=
4
;
optional
double
image_aspect_ratio
=
4
;
optional
uint32
img_width
=
5
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录