kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for bug #4828: random rotations of uv charts after unwrapping.

Browse Source 
This never worked that well, so now after unwrapping, uv charts are
rotated to fit in their smallest enclosing rectangle. This should give
the expected behavior in the most common cases.
This commit is contained in:
Brecht Van Lommel 2006-09-25 15:40:26 +00:00
parent 99c7e3cb9e
commit 7e4f1425b7
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/blender/src/parametrizer.c
View File

@ -2565,7 +2565,7 @@ static void p_chart_pin_positions(PChart *chart, PVert **pin1, PVert **pin2)
(*pin2)->uv[1] = 0.5f;
}
else {
int diru, dirv, dir;
int diru, dirv, dirx, diry;
float sub[3];
VecSubf(sub, (*pin1)->co, (*pin2)->co);
@ -2573,14 +2573,20 @@ static void p_chart_pin_positions(PChart *chart, PVert **pin1, PVert **pin2)
sub[1] = fabs(sub[1]);
sub[2] = fabs(sub[2]);
if ((sub[0] > sub[1]) && (sub[0] > sub[2]))
dir = 0;
else if ((sub[1] > sub[0]) && (sub[1] > sub[2]))
dir = 1;
else
dir = 2;
if ((sub[0] > sub[1]) && (sub[0] > sub[2])) {
dirx = 0;
diry = (sub[1] > sub[2])? 1: 2;
}
else if ((sub[1] > sub[0]) && (sub[1] > sub[2])) {
dirx = 1;
diry = (sub[0] > sub[2])? 0: 2;
}
else {
dirx = 2;
diry = (sub[0] > sub[1])? 0: 1;
}
if (dir == 2) {
if (dirx == 2) {
diru = 1;
dirv = 0;
}
@ -2589,10 +2595,10 @@ static void p_chart_pin_positions(PChart *chart, PVert **pin1, PVert **pin2)
dirv = 1;
}
(*pin1)->uv[diru] = (*pin1)->co[dir];
(*pin1)->uv[dirv] = (*pin1)->co[(dir+1)%3];
(*pin2)->uv[diru] = (*pin2)->co[dir];
(*pin2)->uv[dirv] = (*pin2)->co[(dir+1)%3];
(*pin1)->uv[diru] = (*pin1)->co[dirx];
(*pin1)->uv[dirv] = (*pin1)->co[diry];
(*pin2)->uv[diru] = (*pin2)->co[dirx];
(*pin2)->uv[dirv] = (*pin2)->co[diry];
}
}
@ -4131,8 +4137,8 @@ void param_lscm_solve(ParamHandle *handle)
if (chart->u.lscm.context) {
result = p_chart_lscm_solve(chart);
/*if (result)
p_chart_rotate_minimum_area(chart);*/
if (result)
p_chart_rotate_minimum_area(chart);
if (!result || (chart->u.lscm.pin1))
p_chart_lscm_end(chart);