Revision: 53336
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53336
Author: psy-fi
Date: 2012-12-27 02:52:45 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Fix: rotation of uv islands during stitch did not take uv aspect ratio
of image into account, distorting the islands. Now properly scale the
components before rotating the island.
Modified Paths:
--------------
trunk/blender/source/blender/editors/uvedit/uvedit_intern.h
trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_intern.h
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_intern.h 2012-12-27
01:02:32 UTC (rev 53335)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_intern.h 2012-12-27
02:52:45 UTC (rev 53336)
@@ -73,6 +73,7 @@
/* utility tool functions */
void uvedit_live_unwrap_update(struct SpaceImage *sima, struct Scene *scene,
struct Object *obedit);
+void uvedit_get_aspect(struct Scene *scene, struct Object *ob, struct
BMEditMesh *em, float *aspx, float *aspy);
/* operators */
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
2012-12-27 01:02:32 UTC (rev 53335)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
2012-12-27 02:52:45 UTC (rev 53336)
@@ -136,6 +136,7 @@
/* stitch state object */
typedef struct StitchState {
+ float aspect;
/* use limit flag */
char use_limit;
/* limit to operator, same as original operator */
@@ -285,10 +286,12 @@
}
}
-static void stitch_uv_rotate(float rotation, float medianPoint[2], float uv[2])
+static void stitch_uv_rotate(float rotation, float medianPoint[2], float
uv[2], float aspect)
{
float uv_rotation_result[2];
+ uv[1] /= aspect;
+
uv[0] -= medianPoint[0];
uv[1] -= medianPoint[1];
@@ -297,6 +300,8 @@
uv[0] = uv_rotation_result[0] + medianPoint[0];
uv[1] = uv_rotation_result[1] + medianPoint[1];
+
+ uv[1] *= aspect;
}
/* check if two uvelements are stitchable. This should only operate on
-different- separate UvElements */
@@ -413,9 +418,11 @@
island_stitch_data[i].rotation /=
island_stitch_data[i].num_rot_elements;
island_stitch_data[i].medianPoint[0] /=
island_stitch_data[i].numOfElements;
island_stitch_data[i].medianPoint[1] /=
island_stitch_data[i].numOfElements;
+ island_stitch_data[i].medianPoint[1] /=
state->aspect;
}
island_stitch_data[i].translation[0] /=
island_stitch_data[i].numOfElements;
island_stitch_data[i].translation[1] /=
island_stitch_data[i].numOfElements;
+
numOfIslandUVs = getNumOfIslandUvs(state->element_map,
i);
element =
&state->element_map->buf[state->element_map->islandIndices[i]];
for (j = 0; j < numOfIslandUVs; j++, element++) {
@@ -429,7 +436,7 @@
if (final) {
-
stitch_uv_rotate(island_stitch_data[i].rotation,
island_stitch_data[i].medianPoint, luv->uv);
+
stitch_uv_rotate(island_stitch_data[i].rotation,
island_stitch_data[i].medianPoint, luv->uv, state->aspect);
add_v2_v2(luv->uv,
island_stitch_data[i].translation);
}
@@ -438,7 +445,7 @@
int face_preview_pos =
preview_position[BM_elem_index_get(element->l->f)].data_position;
stitch_uv_rotate(island_stitch_data[i].rotation,
island_stitch_data[i].medianPoint,
-
preview->preview_polys + face_preview_pos + 2 * element->tfindex);
+
preview->preview_polys + face_preview_pos + 2 * element->tfindex,
state->aspect);
add_v2_v2(preview->preview_polys + face_preview_pos + 2 * element->tfindex,
island_stitch_data[i].translation);
@@ -1541,7 +1548,7 @@
Scene *scene = CTX_data_scene(C);
ToolSettings *ts = scene->toolsettings;
ARegion *ar = CTX_wm_region(C);
-
+ float aspx, aspy;
Object *obedit = CTX_data_edit_object(C);
if (!ar)
@@ -1595,6 +1602,9 @@
return 0;
}
+ uvedit_get_aspect(scene, obedit, em, &aspx, &aspy);
+ state->aspect = aspx/aspy;
+
/* Entirely possible if redoing last operator that static island is
bigger than total number of islands.
* This ensures we get no hang in the island checking code in
stitch_stitch_process_data. */
state->static_island %= state->element_map->totalIslands;
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
2012-12-27 01:02:32 UTC (rev 53335)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
2012-12-27 02:52:45 UTC (rev 53336)
@@ -196,7 +196,7 @@
return 0;
}
-static void ED_uvedit_get_aspect(Scene *scene, Object *ob, BMEditMesh *em,
float *aspx, float *aspy)
+void uvedit_get_aspect(Scene *scene, Object *ob, BMEditMesh *em, float *aspx,
float *aspy)
{
int sloppy = TRUE;
int selected = FALSE;
@@ -238,7 +238,7 @@
if (correct_aspect) {
float aspx, aspy;
- ED_uvedit_get_aspect(scene, ob, em, &aspx, &aspy);
+ uvedit_get_aspect(scene, ob, em, &aspx, &aspy);
if (aspx != aspy)
param_aspect_ratio(handle, aspx, aspy);
@@ -423,7 +423,7 @@
if (correct_aspect) {
float aspx, aspy;
- ED_uvedit_get_aspect(scene, ob, em, &aspx, &aspy);
+ uvedit_get_aspect(scene, ob, em, &aspx, &aspy);
if (aspx != aspy)
param_aspect_ratio(handle, aspx, aspy);
@@ -1047,7 +1047,7 @@
BMFace *efa;
float scale, aspx, aspy;
- ED_uvedit_get_aspect(scene, ob, em, &aspx, &aspy);
+ uvedit_get_aspect(scene, ob, em, &aspx, &aspy);
if (aspx == aspy)
return;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
