Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
3ba3ec53
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,发现更多精彩内容 >>
提交
3ba3ec53
编写于
8月 16, 2017
作者:
U
unacao
提交者:
siyangy
8月 16, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
separate arrows for obstacle velocity and heading (#868)
上级
8e14f4ac
变更
9
展开全部
隐藏空白更改
内联
并排
Showing
9 changed file
with
25 addition
and
11 deletion
+25
-11
modules/dreamview/backend/simulation_world/simulation_world_service.cc
...view/backend/simulation_world/simulation_world_service.cc
+2
-0
modules/dreamview/backend/simulation_world/simulation_world_service_test.cc
...backend/simulation_world/simulation_world_service_test.cc
+1
-0
modules/dreamview/frontend/dist/app.bundle.js
modules/dreamview/frontend/dist/app.bundle.js
+2
-2
modules/dreamview/frontend/dist/app.bundle.js.map
modules/dreamview/frontend/dist/app.bundle.js.map
+1
-1
modules/dreamview/frontend/src/components/SideBar/Menu.js
modules/dreamview/frontend/src/components/SideBar/Menu.js
+2
-1
modules/dreamview/frontend/src/renderer/obstacles.js
modules/dreamview/frontend/src/renderer/obstacles.js
+9
-3
modules/dreamview/frontend/src/store/config/MenuData.js
modules/dreamview/frontend/src/store/config/MenuData.js
+2
-1
modules/dreamview/frontend/src/store/config/parameters.yml
modules/dreamview/frontend/src/store/config/parameters.yml
+2
-1
modules/dreamview/frontend/src/store/options.js
modules/dreamview/frontend/src/store/options.js
+4
-2
未找到文件。
modules/dreamview/backend/simulation_world/simulation_world_service.cc
浏览文件 @
3ba3ec53
...
...
@@ -112,6 +112,8 @@ void SetObstacleInfo(const PerceptionObstacle &obstacle, Object *world_object) {
world_object
->
set_height
(
obstacle
.
height
());
world_object
->
set_speed
(
std
::
hypot
(
obstacle
.
velocity
().
x
(),
obstacle
.
velocity
().
y
()));
world_object
->
set_speed_heading
(
std
::
atan2
(
obstacle
.
velocity
().
y
(),
obstacle
.
velocity
().
x
()));
world_object
->
set_timestamp_sec
(
obstacle
.
timestamp
());
}
...
...
modules/dreamview/backend/simulation_world/simulation_world_service_test.cc
浏览文件 @
3ba3ec53
...
...
@@ -233,6 +233,7 @@ TEST_F(SimulationWorldServiceTest, UpdatePerceptionObstacles) {
EXPECT_DOUBLE_EQ
(
5.0
,
object
.
width
());
EXPECT_DOUBLE_EQ
(
6.0
,
object
.
height
());
EXPECT_DOUBLE_EQ
(
5.0
,
object
.
speed
());
EXPECT_NEAR
(
0.927295
,
object
.
speed_heading
(),
kEpsilon
);
EXPECT_EQ
(
0
,
object
.
polygon_point_size
());
EXPECT_EQ
(
Object_Type_VEHICLE
,
object
.
type
());
}
else
{
...
...
modules/dreamview/frontend/dist/app.bundle.js
浏览文件 @
3ba3ec53
此差异已折叠。
点击以展开。
modules/dreamview/frontend/dist/app.bundle.js.map
浏览文件 @
3ba3ec53
此差异已折叠。
点击以展开。
modules/dreamview/frontend/src/components/SideBar/Menu.js
浏览文件 @
3ba3ec53
...
...
@@ -26,7 +26,8 @@ const MenuIdOptionMapping = {
perceptionUnknownUnmovable
:
'
showObstaclesUnknownUnmovable
'
,
perceptionUnknown
:
'
showObstaclesUnknown
'
,
perceptionVirtual
:
'
showObstaclesVirtual
'
,
perceptionArrow
:
'
showObstaclesArrow
'
,
perceptionVelocity
:
'
showObstaclesVelocity
'
,
perceptionHeading
:
'
showObstaclesHeading
'
,
perceptionId
:
'
showObstaclesId
'
,
predictionMajor
:
'
showPredictionMajor
'
,
predictionMinor
:
'
showPredictionMinor
'
,
...
...
modules/dreamview/frontend/src/renderer/obstacles.js
浏览文件 @
3ba3ec53
...
...
@@ -60,14 +60,20 @@ export default class PerceptionObstacles {
obstacle
.
positionY
,
(
obstacle
.
height
||
DEFAULT_HEIGHT
)
/
2
));
const
color
=
ObstacleColorMapping
[
obstacle
.
type
]
||
DEFAULT_COLOR
;
if
(
STORE
.
options
.
showObstacles
Arrow
&&
obstacle
.
type
&&
if
(
STORE
.
options
.
showObstacles
Velocity
&&
obstacle
.
type
&&
obstacle
.
type
!==
'
UNKNOWN_UNMOVABLE
'
&&
obstacle
.
speed
>
0.5
)
{
const
arrowMesh
=
this
.
updateArrow
(
position
,
obstacle
.
heading
,
color
,
arrowIdx
++
,
scene
);
const
arrowMesh
=
this
.
updateArrow
(
position
,
obstacle
.
speedHeading
,
color
,
arrowIdx
++
,
scene
);
const
scale
=
1
+
Math
.
log2
(
obstacle
.
speed
);
arrowMesh
.
scale
.
set
(
scale
,
scale
,
scale
);
arrowMesh
.
visible
=
true
;
}
if
(
STORE
.
options
.
showObstaclesHeading
)
{
const
arrowMesh
=
this
.
updateArrow
(
position
,
obstacle
.
heading
,
0xFFFFFF
,
arrowIdx
++
,
scene
);
arrowMesh
.
scale
.
set
(
1
,
1
,
1
);
arrowMesh
.
visible
=
true
;
}
if
(
STORE
.
options
.
showObstaclesId
)
{
this
.
updateId
(
obstacle
.
id
,
new
THREE
.
Vector3
(
position
.
x
,
position
.
y
,
obstacle
.
height
),
...
...
modules/dreamview/frontend/src/store/config/MenuData.js
浏览文件 @
3ba3ec53
...
...
@@ -10,7 +10,8 @@ export default [
perceptionUnknownMovable
:
'
Unknown Movable
'
,
perceptionUnknownUnmovable
:
'
Unknown Stationary
'
,
perceptionUnknown
:
'
Unknown
'
,
perceptionArrow
:
'
Heading & Speed
'
,
perceptionVelocity
:
'
Velocity
'
,
perceptionHeading
:
'
Heading
'
,
perceptionId
:
'
Id
'
}
},
{
...
...
modules/dreamview/frontend/src/store/config/parameters.yml
浏览文件 @
3ba3ec53
...
...
@@ -48,7 +48,8 @@ options:
showObstaclesUnknownUnmovable
:
true
showObstaclesUnknown
:
true
showObstaclesVirtual
:
false
showObstaclesArrow
:
true
showObstaclesVelocity
:
true
showObstaclesHeading
:
true
showObstaclesId
:
true
cameraAngle
:
Default
debug
:
...
...
modules/dreamview/frontend/src/store/options.js
浏览文件 @
3ba3ec53
...
...
@@ -22,8 +22,10 @@ export default class Options {
PARAMETERS
.
options
.
defaults
.
showObstaclesUnknown
;
@
observable
showObstaclesVirtual
=
PARAMETERS
.
options
.
defaults
.
showObstaclesVirtual
;
@
observable
showObstaclesArrow
=
PARAMETERS
.
options
.
defaults
.
showObstaclesArrow
;
@
observable
showObstaclesVelocity
=
PARAMETERS
.
options
.
defaults
.
showObstaclesVelocity
;
@
observable
showObstaclesHeading
=
PARAMETERS
.
options
.
defaults
.
showObstaclesHeading
;
@
observable
showObstaclesId
=
PARAMETERS
.
options
.
defaults
.
showObstaclesId
;
@
observable
cameraAngle
=
PARAMETERS
.
options
.
defaults
.
cameraAngle
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录