Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Vectorization] Bezier enhance #1240

Merged
merged 7 commits into from
Jul 7, 2020
Merged

[Vectorization] Bezier enhance #1240

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d6764e0
redundant code is removed in synfig/synfig-studio/src/synfigapp/vect…
Mar 13, 2020
446f967
indentation fixed
Mar 13, 2020
5b699a3
unnecessary spaces removed
Mar 13, 2020
dd51479
build errors resolved
Mar 13, 2020
eed17f6
fix errors
Mar 14, 2020
50e7624
fix issues
Mar 14, 2020
680769f
Merge branch 'master' into Bezier_enhance
ice0 Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 56 additions & 63 deletions synfig-studio/src/synfigapp/vectorizer/centerlinetostrokes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,76 +84,68 @@ etl::handle<synfig::Layer> BezierToOutline(studio::PointList segment)
for(int i = 0; i < segment_size; ++i)
segment[i][2] = 1.0;

switch(segment_size)// in any case size>=3
int size, flag;

switch (segment_size) // in any case size>=3
{
case 3:{//std::cout<<"This is case 3\n";
bline_point_list.push_back(synfig::BLinePoint());
bline_point_list.push_back(synfig::BLinePoint());
bline_point_list[0].set_vertex(segment[0].to_2d());
bline_point_list[1].set_vertex(segment[2].to_2d());
bline_point_list[0].set_tangent((segment[1].to_2d() - segment[0].to_2d()) * 2);
bline_point_list[1].set_tangent((segment[2].to_2d() - segment[1].to_2d()) * 2);
bline_point_list[0].set_width(segment[0][2]);
bline_point_list[1].set_width(segment[2][2]);

case 3:{ //std::cout<<"This is case 3\n";
size = 2;
flag = 0;
}break;

case 4:{
bline_point_list.push_back(synfig::BLinePoint());
bline_point_list.push_back(synfig::BLinePoint());
bline_point_list[0].set_vertex(segment[0].to_2d());
bline_point_list[1].set_vertex(segment[3].to_2d());
bline_point_list[0].set_tangent((segment[1].to_2d() - segment[0].to_2d()) * 2);
bline_point_list[1].set_tangent((segment[3].to_2d() - segment[2].to_2d()) * 2);
bline_point_list[0].set_width(segment[0][2]);
bline_point_list[1].set_width(segment[3][2]);

case 4:{
size = 3;
flag = 0;
}break;

default:{/*Odd : 1 2 3 , 3 4 5, 5 6 7, 7 8 9
Even : 1 2 3 4, 4 5 6, 6 7 8 */
int num =0,point =0;
if(segment_size & 1)
{
bline_point_list.push_back(synfig::BLinePoint());
bline_point_list.push_back(synfig::BLinePoint());
bline_point_list[0].set_vertex(segment[0].to_2d());// first point
bline_point_list[1].set_vertex(segment[2].to_2d());// second point
bline_point_list[0].set_tangent((segment[1].to_2d() - segment[0].to_2d()) * 2);
bline_point_list[1].set_tangent1((segment[2].to_2d() - segment[1].to_2d()) * 2);
bline_point_list[0].set_width(segment[0][2]);
bline_point_list[1].set_width(segment[2][2]);
num = 2;// represent segment index used
}
else
{
bline_point_list.push_back(synfig::BLinePoint());
bline_point_list.push_back(synfig::BLinePoint());
bline_point_list[0].set_vertex(segment[0].to_2d());// first point
bline_point_list[1].set_vertex(segment[3].to_2d());// second point
bline_point_list[0].set_tangent((segment[1].to_2d() - segment[0].to_2d()) * 2);
bline_point_list[1].set_tangent1((segment[3].to_2d() - segment[2].to_2d()) * 2);
bline_point_list[0].set_width(segment[0][2]);
bline_point_list[1].set_width(segment[3][2]);
num = 3;// represent segment index used
}

for (num,point = 2; num < segment_size - 3;point++, num += 2)
{
bline_point_list.push_back(synfig::BLinePoint());
bline_point_list[point].set_vertex(segment[num+2].to_2d());// last point
bline_point_list[point].set_width(segment[num+2][2]);// last point
bline_point_list[point - 1].set_tangent2((segment[num+1].to_2d() - segment[num].to_2d()) * 2);
bline_point_list[point].set_tangent1((segment[num+2].to_2d() - segment[num+1].to_2d()) * 2);
}
// add last blinepoint and set it's param
bline_point_list.push_back(synfig::BLinePoint());
bline_point_list.back().set_vertex(segment[segment_size-1].to_2d());
bline_point_list.back().set_width(segment[segment_size-1][2]);
bline_point_list.back().set_tangent((segment[segment_size-1].to_2d()-segment[segment_size-2].to_2d())*2);
default:{ /*Odd : 1 2 3 , 3 4 5, 5 6 7, 7 8 9
Even : 1 2 3 4, 4 5 6, 6 7 8 */
int num = 0, point = 0;
if (segment_size & 1)
{
size = 2;
flag = 1;
;
ankit-kumar-dwivedi marked this conversation as resolved.
Show resolved Hide resolved
num = 2; // represent segment index used
}
else
{
size = 3;
flag = 1;
num = 3; // represent segment index used
}
}break;

}

bline_point_list.push_back(synfig::BLinePoint());
bline_point_list.push_back(synfig::BLinePoint());
bline_point_list[0].set_vertex(segment[0].to_2d());
bline_point_list[1].set_vertex(segment[size].to_2d());
bline_point_list[0].set_tangent((segment[1].to_2d() - segment[0].to_2d()) * 2);

if (flag == 0)
bline_point_list[1].set_tangent((segment[size].to_2d() - segment[size - 1].to_2d()) * 2);
else
bline_point_list[1].set_tangent1((segment[size].to_2d() - segment[size - 1].to_2d()) * 2);

bline_point_list[0].set_width(segment[0][2]);
bline_point_list[1].set_width(segment[size][2]);

for (num, point = 2; num < segment_size - 3; point++, num += 2)
{
bline_point_list.push_back(synfig::BLinePoint());
bline_point_list[point].set_vertex(segment[num + 2].to_2d()); // last point
bline_point_list[point].set_width(segment[num + 2][2]); // last point
bline_point_list[point - 1].set_tangent2((segment[num + 1].to_2d() - segment[num].to_2d()) * 2);
bline_point_list[point].set_tangent1((segment[num + 2].to_2d() - segment[num + 1].to_2d()) * 2);
}

// add last blinepoint and set it's param
bline_point_list.push_back(synfig::BLinePoint());
bline_point_list.back().set_vertex(segment[segment_size - 1].to_2d());
bline_point_list.back().set_width(segment[segment_size - 1][2]);
bline_point_list.back().set_tangent((segment[segment_size - 1].to_2d() - segment[segment_size - 2].to_2d()) * 2);

etl::handle<synfig::ValueNode_BLine> bline_value_node;
etl::handle<synfig::ValueNode_DynamicList> value_node;
Expand Down Expand Up @@ -1007,4 +999,5 @@ void studio::conversionToStrokes(std::vector< etl::handle<synfig::Layer> > &stro
}
}