Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vision
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile_robotics
wolf_projects
wolf_lib
plugins
vision
Commits
30784c6f
Commit
30784c6f
authored
2 years ago
by
Joan Solà Ortega
Browse files
Options
Downloads
Patches
Plain Diff
Use derived state blocks
parent
0ef0e121
No related branches found
No related tags found
2 merge requests
!42
devel->main
,
!40
Resolve "follow core 465 Migrate from StateBlock to StateDerived"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/landmark/landmark_point_3d.cpp
+3
-3
3 additions, 3 deletions
src/landmark/landmark_point_3d.cpp
src/sensor/sensor_camera.cpp
+3
-3
3 additions, 3 deletions
src/sensor/sensor_camera.cpp
with
6 additions
and
6 deletions
src/landmark/landmark_point_3d.cpp
+
3
−
3
View file @
30784c6f
...
...
@@ -20,15 +20,15 @@
//
//--------LICENSE_END--------
#include
"vision/landmark/landmark_point_3d.h"
#include
<core/state_block/state_block_derived.h>
namespace
wolf
{
LandmarkPoint3d
::
LandmarkPoint3d
(
Eigen
::
Vector3d
_position
,
cv
::
Mat
_2d_descriptor
)
:
LandmarkBase
(
"LandmarkPoint3d"
,
std
::
make_shared
<
State
Block
>
(
_position
,
false
)),
LandmarkBase
(
"LandmarkPoint3d"
,
std
::
make_shared
<
State
Point3d
>
(
_position
,
false
)),
descriptor_
(
_2d_descriptor
)
{
//LandmarkPoint3d* landmark_ptr = (LandmarkPoint3d*)_p_ptr;
// position_ =
getStateBlock
(
'P'
)
->
setTransformable
();
// descriptor_ = _2d_descriptor;
}
...
...
This diff is collapsed.
Click to expand it.
src/sensor/sensor_camera.cpp
+
3
−
3
View file @
30784c6f
...
...
@@ -23,7 +23,7 @@
#include
"vision/sensor/sensor_camera.h"
#include
"vision/math/pinhole_tools.h"
#include
"core/state_block/state_block.h"
#include
"core/state_block/state_block
_derived
.h"
#include
"core/state_block/state_quaternion.h"
namespace
wolf
...
...
@@ -31,9 +31,9 @@ namespace wolf
SensorCamera
::
SensorCamera
(
const
Eigen
::
VectorXd
&
_extrinsics
,
const
ParamsSensorCamera
&
_intrinsics
)
:
SensorBase
(
"SensorCamera"
,
std
::
make_shared
<
State
Block
>
(
_extrinsics
.
head
(
3
),
true
),
std
::
make_shared
<
State
Point3d
>
(
_extrinsics
.
head
(
3
),
true
),
std
::
make_shared
<
StateQuaternion
>
(
_extrinsics
.
tail
(
4
),
true
),
std
::
make_shared
<
State
Block
>
(
_intrinsics
.
pinhole_model_raw
,
true
),
std
::
make_shared
<
State
Params4
>
(
_intrinsics
.
pinhole_model_raw
,
true
),
1
),
img_width_
(
_intrinsics
.
width
),
//
img_height_
(
_intrinsics
.
height
),
//
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment