Skip to content

Commit 2fce518

Browse files
committed
rename uint to uint32_t
1 parent 3498255 commit 2fce518

1 file changed

Lines changed: 41 additions & 0 deletions

File tree

patch/ros-lyrical-moveit-task-constructor-core.patch

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,3 +194,44 @@ index b64ce0a..a9eb8a0 100644
194194
return false;
195195
};
196196

197+
diff --git a/src/stages/generate_place_pose.cpp b/src/stages/generate_place_pose.cpp
198+
index 76b9559..042882d 100644
199+
--- a/src/stages/generate_place_pose.cpp
200+
+++ b/src/stages/generate_place_pose.cpp
201+
@@ -109,11 +109,11 @@ void GeneratePlacePose::compute() {
202+
scene->getTransforms().transformPose(pose_msg.header.frame_id, target_pose, target_pose);
203+
204+
// spawn the nominal target object pose, considering flip about z and rotations about z-axis
205+
- auto spawner = [&s, &scene, &ik_frame, this](const Eigen::Isometry3d& nominal, uint z_flips, uint z_rotations = 10) {
206+
- for (uint flip = 0; flip <= z_flips; ++flip) {
207+
+ auto spawner = [&s, &scene, &ik_frame, this](const Eigen::Isometry3d& nominal, uint32_t z_flips, uint32_t z_rotations = 10) {
208+
+ for (uint32_t flip = 0; flip <= z_flips; ++flip) {
209+
// flip about object's x-axis
210+
Eigen::Isometry3d object = nominal * Eigen::AngleAxisd(flip * M_PI, Eigen::Vector3d::UnitX());
211+
- for (uint i = 0; i < z_rotations; ++i) {
212+
+ for (uint32_t i = 0; i < z_rotations; ++i) {
213+
// rotate object at target pose about world's z-axis
214+
Eigen::Vector3d pos = object.translation();
215+
object.pretranslate(-pos)
216+
@@ -139,7 +139,7 @@ void GeneratePlacePose::compute() {
217+
}
218+
};
219+
220+
- uint z_flips = props.get<bool>("allow_z_flip") ? 1 : 0;
221+
+ uint32_t z_flips = props.get<bool>("allow_z_flip") ? 1 : 0;
222+
if (object && object->getShapes().size() == 1) {
223+
switch (object->getShapes()[0]->type) {
224+
case shapes::CYLINDER:
225+
diff --git a/test/test_stage.cpp b/test/test_stage.cpp
226+
index 1c0553c..39bfa92 100644
227+
--- a/test/test_stage.cpp
228+
+++ b/test/test_stage.cpp
229+
@@ -36,7 +36,7 @@ TEST(Stage, registerCallbacks) {
230+
StandaloneGeneratorMockup g{ PredefinedCosts::constant(0.0) };
231+
g.init(getModel());
232+
233+
- uint called = 0;
234+
+ uint32_t called = 0;
235+
auto cb = [&called](const SolutionBase& /* s */) {
236+
++called;
237+
return true;

0 commit comments

Comments
 (0)