Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
c4e0c294
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,发现更多精彩内容 >>
提交
c4e0c294
编写于
9月 24, 2018
作者:
J
jmtao
提交者:
Jiangtao Hu
9月 24, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
perception: migrate discortion_model and test
上级
087139ba
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
62 addition
and
11 deletion
+62
-11
modules/perception/base/BUILD
modules/perception/base/BUILD
+49
-0
modules/perception/base/distortion_model.cc
modules/perception/base/distortion_model.cc
+5
-4
modules/perception/base/distortion_model.h
modules/perception/base/distortion_model.h
+5
-1
modules/perception/base/distortion_model_test.cc
modules/perception/base/distortion_model_test.cc
+0
-0
modules/perception/base/omnidirectional_model.cc
modules/perception/base/omnidirectional_model.cc
+2
-1
modules/perception/base/omnidirectional_model.h
modules/perception/base/omnidirectional_model.h
+1
-1
modules/perception/base/omnidirectional_model_test.cc
modules/perception/base/omnidirectional_model_test.cc
+0
-0
modules/perception/base/test/test_helper.h
modules/perception/base/test/test_helper.h
+0
-4
未找到文件。
modules/perception/base/BUILD
浏览文件 @
c4e0c294
...
...
@@ -2,6 +2,15 @@ load("//tools:cpplint.bzl", "cpplint")
package
(
default_visibility
=
[
"//visibility:public"
])
cc_library
(
name
=
"base_type"
,
hdrs
=
[
"sensor_meta.h"
,
],
deps
=
[
],
)
cc_library
(
name
=
"blob"
,
srcs
=
[
...
...
@@ -84,6 +93,46 @@ cc_library(
"common.h"
,
],
deps
=
[
"@cuda"
,
],
)
cc_test
(
name
=
"common_test"
,
size
=
"small"
,
srcs
=
[
"common_test.cc"
,
],
deps
=
[
":common"
,
"@gtest//:main"
,
],
)
cc_library
(
name
=
"distortion_model"
,
srcs
=
[
"distortion_model.cc"
,
],
hdrs
=
[
"distortion_model.h"
,
],
deps
=
[
":camera"
,
"//framework:cybertron"
,
"@eigen"
,
],
)
cc_test
(
name
=
"distortion_model_test"
,
size
=
"small"
,
srcs
=
[
"distortion_model_test.cc"
,
],
deps
=
[
":distortion_model"
,
"@gtest//:main"
,
],
)
...
...
modules/perception/base/distortion_model.cc
浏览文件 @
c4e0c294
...
...
@@ -15,8 +15,8 @@
*****************************************************************************/
#include "modules/perception/base/distortion_model.h"
#include <cmath>
#include "glog/logging.h"
#include "
modules/perception/base/camera
.h"
#include "
cybertron/common/log
.h"
namespace
apollo
{
namespace
perception
{
...
...
@@ -66,8 +66,9 @@ Eigen::Vector2f BrownCameraDistortionModel::Project(
return
pt2d_img
;
}
BaseCameraModelPtr
BrownCameraDistortionModel
::
get_camera_model
()
{
PinholeCameraModelPtr
camera_model
(
new
PinholeCameraModel
());
std
::
shared_ptr
<
BaseCameraModel
>
BrownCameraDistortionModel
::
get_camera_model
()
{
std
::
shared_ptr
<
PinholeCameraModel
>
camera_model
(
new
PinholeCameraModel
());
camera_model
->
set_width
(
width_
);
camera_model
->
set_height
(
height_
);
camera_model
->
set_intrinsic_params
(
intrinsic_params_
);
...
...
modules/perception/base/distortion_model.h
浏览文件 @
c4e0c294
...
...
@@ -51,9 +51,11 @@ class BaseCameraDistortionModel {
size_t
height_
=
0
;
};
/* TODO(all): to remove
typedef std::shared_ptr<BaseCameraDistortionModel> BaseCameraDistortionModelPtr;
typedef std::shared_ptr<const BaseCameraDistortionModel>
BaseCameraDistortionModelConstPtr;
*/
class
BrownCameraDistortionModel
:
public
BaseCameraDistortionModel
{
public:
...
...
@@ -62,7 +64,7 @@ class BrownCameraDistortionModel : public BaseCameraDistortionModel {
Eigen
::
Vector2f
Project
(
const
Eigen
::
Vector3f
&
point3d
)
override
;
BaseCameraModelPtr
get_camera_model
()
override
;
std
::
shared_ptr
<
BaseCameraModel
>
get_camera_model
()
override
;
std
::
string
name
()
const
override
{
return
"BrownCameraDistortionModel"
;
}
...
...
@@ -82,10 +84,12 @@ class BrownCameraDistortionModel : public BaseCameraDistortionModel {
Eigen
::
Matrix
<
float
,
5
,
1
>
distort_params_
;
};
/* TODO(all): to remove
typedef std::shared_ptr<BrownCameraDistortionModel>
BrownCameraDistortionModelPtr;
typedef std::shared_ptr<const BrownCameraDistortionModel>
BrownCameraDistortionModelConstPtr;
*/
}
// namespace base
}
// namespace perception
...
...
modules/perception/base/
test/base_
distortion_model_test.cc
→
modules/perception/base/distortion_model_test.cc
浏览文件 @
c4e0c294
文件已移动
modules/perception/base/omnidirectional_model.cc
浏览文件 @
c4e0c294
...
...
@@ -54,7 +54,8 @@ Eigen::Vector2f OmnidirectionalCameraDistortionModel::Project(
return
projection
;
}
BaseCameraModelPtr
OmnidirectionalCameraDistortionModel
::
get_camera_model
()
{
std
::
shared_ptr
<
BaseCameraModel
>
OmnidirectionalCameraDistortionModel
::
get_camera_model
()
{
PinholeCameraModelPtr
camera_model
(
new
PinholeCameraModel
());
camera_model
->
set_width
(
width_
);
camera_model
->
set_height
(
height_
);
...
...
modules/perception/base/omnidirectional_model.h
浏览文件 @
c4e0c294
...
...
@@ -34,7 +34,7 @@ class OmnidirectionalCameraDistortionModel : public BaseCameraDistortionModel {
Eigen
::
Vector2f
Project
(
const
Eigen
::
Vector3f
&
point3d
)
override
;
BaseCameraModelPtr
get_camera_model
()
override
;
std
::
shared_ptr
<
BaseCameraModel
>
get_camera_model
()
override
;
std
::
string
name
()
const
override
{
return
"OmnidirectionalCameraDistortionModel"
;
...
...
modules/perception/base/
test/base_
omnidirectional_model_test.cc
→
modules/perception/base/omnidirectional_model_test.cc
浏览文件 @
c4e0c294
文件已移动
modules/perception/base/test/test_helper.h
浏览文件 @
c4e0c294
...
...
@@ -24,13 +24,9 @@
using
std
::
cout
;
using
std
::
endl
;
#ifdef CMAKE_BUILD
#include "caffe_config.h"
#else
#define CUDA_TEST_DEVICE -1
#define EXAMPLES_SOURCE_DIR "examples/"
#define ABS_TEST_DATA_DIR "src/caffe/test/test_data"
#endif
namespace
apollo
{
namespace
perception
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录