Skip to content

Commit

Permalink
Fix Scripta integration
Browse files Browse the repository at this point in the history
  • Loading branch information
@wawanbreton
wawanbreton committed Jan 24, 2024
1 parent db72e72 commit 41a8029
Showing 1 changed file with 25 additions and 25 deletions.
50 changes: 25 additions & 25 deletions src/SkeletalTrapezoidation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,27 +544,27 @@ void SkeletalTrapezoidation::generateToolpaths(std::vector<VariableWidthLines>&
scripta::CellVDI{ "is_central",
[](const auto& edge)
{
return static_cast<int>(edge.data.is_central);
return static_cast<int>(edge.data_.is_central);
} },
scripta::CellVDI{ "type",
[](const auto& edge)
{
return static_cast<int>(edge.data.type);
return static_cast<int>(edge.data_.type_);
} },
scripta::PointVDI{ "distance_to_boundary",
[](const auto& node)
{
return node->data.distance_to_boundary;
return node->data_.distance_to_boundary_;
} },
scripta::PointVDI{ "bead_count",
[](const auto& node)
{
return node->data.bead_count;
return node->data_.bead_count_;
} },
scripta::PointVDI{ "transition_ratio",
[](const auto& node)
{
return node->data.transition_ratio;
return node->data_.transition_ratio_;
} });

filterNoncentralRegions();
Expand All @@ -576,27 +576,27 @@ void SkeletalTrapezoidation::generateToolpaths(std::vector<VariableWidthLines>&
scripta::CellVDI{ "is_central",
[](const auto& edge)
{
return static_cast<int>(edge.data.is_central);
return static_cast<int>(edge.data_.is_central);
} },
scripta::CellVDI{ "type",
[](const auto& edge)
{
return static_cast<int>(edge.data.type);
return static_cast<int>(edge.data_.type_);
} },
scripta::PointVDI{ "distance_to_boundary",
[](const auto& node)
{
return node->data.distance_to_boundary;
return node->data_.distance_to_boundary_;
} },
scripta::PointVDI{ "bead_count",
[](const auto& node)
{
return node->data.bead_count;
return node->data_.bead_count_;
} },
scripta::PointVDI{ "transition_ratio",
[](const auto& node)
{
return node->data.transition_ratio;
return node->data_.transition_ratio_;
} });

generateTransitioningRibs();
Expand All @@ -608,27 +608,27 @@ void SkeletalTrapezoidation::generateToolpaths(std::vector<VariableWidthLines>&
scripta::CellVDI{ "is_central",
[](const auto& edge)
{
return static_cast<int>(edge.data.is_central);
return static_cast<int>(edge.data_.is_central);
} },
scripta::CellVDI{ "type",
[](const auto& edge)
{
return static_cast<int>(edge.data.type);
return static_cast<int>(edge.data_.type_);
} },
scripta::PointVDI{ "distance_to_boundary",
[](const auto& node)
{
return node->data.distance_to_boundary;
return node->data_.distance_to_boundary_;
} },
scripta::PointVDI{ "bead_count",
[](const auto& node)
{
return node->data.bead_count;
return node->data_.bead_count_;
} },
scripta::PointVDI{ "transition_ratio",
[](const auto& node)
{
return node->data.transition_ratio;
return node->data_.transition_ratio_;
} });

generateExtraRibs();
Expand All @@ -640,27 +640,27 @@ void SkeletalTrapezoidation::generateToolpaths(std::vector<VariableWidthLines>&
scripta::CellVDI{ "is_central",
[](const auto& edge)
{
return static_cast<int>(edge.data.is_central);
return static_cast<int>(edge.data_.is_central);
} },
scripta::CellVDI{ "type",
[](const auto& edge)
{
return static_cast<int>(edge.data.type);
return static_cast<int>(edge.data_.type_);
} },
scripta::PointVDI{ "distance_to_boundary",
[](const auto& node)
{
return node->data.distance_to_boundary;
return node->data_.distance_to_boundary_;
} },
scripta::PointVDI{ "bead_count",
[](const auto& node)
{
return node->data.bead_count;
return node->data_.bead_count_;
} },
scripta::PointVDI{ "transition_ratio",
[](const auto& node)
{
return node->data.transition_ratio;
return node->data_.transition_ratio_;
} });

generateSegments();
Expand All @@ -672,27 +672,27 @@ void SkeletalTrapezoidation::generateToolpaths(std::vector<VariableWidthLines>&
scripta::CellVDI{ "is_central",
[](const auto& edge)
{
return static_cast<int>(edge.data.is_central);
return static_cast<int>(edge.data_.is_central);
} },
scripta::CellVDI{ "type",
[](const auto& edge)
{
return static_cast<int>(edge.data.type);
return static_cast<int>(edge.data_.type_);
} },
scripta::PointVDI{ "distance_to_boundary",
[](const auto& node)
{
return node->data.distance_to_boundary;
return node->data_.distance_to_boundary_;
} },
scripta::PointVDI{ "bead_count",
[](const auto& node)
{
return node->data.bead_count;
return node->data_.bead_count_;
} },
scripta::PointVDI{ "transition_ratio",
[](const auto& node)
{
return node->data.transition_ratio;
return node->data_.transition_ratio_;
} });
}

Expand Down

0 comments on commit 41a8029

Please sign in to comment.