Revision: 47726
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47726
Author: nicholasbishop
Date: 2012-06-11 08:37:35 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
Fix applying object transform to multires objects.
Bug [#31785] Applying a transform to an object with multires weird result
Was reading interleaved coord/mask data incorrectly since paint mask
merge. Fixed by using two separate CCGKeys.
Some additional code cleanup: deduplicate multires tangent matrix
calculation.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/multires.c
Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c 2012-06-11
08:28:04 UTC (rev 47725)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2012-06-11
08:37:35 UTC (rev 47726)
@@ -548,13 +548,6 @@
}
}
-static void column_vectors_to_mat3(float mat[][3], float v1[3], float v2[3],
float v3[3])
-{
- copy_v3_v3(mat[0], v1);
- copy_v3_v3(mat[1], v2);
- copy_v3_v3(mat[2], v3);
-}
-
static void multires_copy_grid(float (*gridA)[3], float (*gridB)[3], int
sizeA, int sizeB)
{
int x, y, j, skip;
@@ -962,7 +955,7 @@
multires_subdivide(mmd, ob, mmd->totlvl + 1, updateblock, simple);
}
-void grid_tangent(const CCGKey *key, int x, int y, int axis, CCGElem *grid,
float t[3])
+static void grid_tangent(const CCGKey *key, int x, int y, int axis, CCGElem
*grid, float t[3])
{
if (axis == 0) {
if (x == key->grid_size - 1) {
@@ -986,6 +979,19 @@
}
}
+/* Construct 3x3 tangent-space matrix in 'mat' */
+static void grid_tangent_matrix(float mat[3][3], const CCGKey *key,
+ int x, int y,
CCGElem *grid)
+{
+ grid_tangent(key, x, y, 0, grid, mat[0]);
+ normalize_v3(mat[0]);
+
+ grid_tangent(key, x, y, 1, grid, mat[1]);
+ normalize_v3(mat[1]);
+
+ copy_v3_v3(mat[2], CCG_grid_elem_no(key, grid, x, y));
+}
+
static void multiresModifier_disp_run(DerivedMesh *dm, Mesh *me, DerivedMesh
*dm2, DispOp op, CCGElem **oldGridData, int totlvl)
{
CCGDerivedMesh *ccgdm = (CCGDerivedMesh *)dm;
@@ -1067,23 +1073,12 @@
for (x = 0; x < gridSize; x++) {
float *co = CCG_grid_elem_co(&key,
grid, x, y);
float *sco = CCG_grid_elem_co(&key,
subgrid, x, y);
- float *no = CCG_grid_elem_no(&key,
subgrid, x, y);
float *data = dispgrid[dGridSize * y *
dSkip + x * dSkip];
- float mat[3][3], tx[3], ty[3], disp[3],
d[3], mask;
+ float mat[3][3], disp[3], d[3], mask;
/* construct tangent space matrix */
- grid_tangent(&key, x, y, 0,
subGridData[gIndex], tx);
- normalize_v3(tx);
+ grid_tangent_matrix(mat, &key, x, y,
subgrid);
- grid_tangent(&key, x, y, 1,
subGridData[gIndex], ty);
- normalize_v3(ty);
-
- //mul_v3_fl(tx, 1.0f/(gridSize-1));
- //mul_v3_fl(ty, 1.0f/(gridSize-1));
- //cross_v3_v3v3(no, tx, ty);
-
- column_vectors_to_mat3(mat, tx, ty, no);
-
switch (op) {
case APPLY_DISPLACEMENTS:
/* Convert displacement
to object space
@@ -1344,18 +1339,12 @@
for (y = 0; y < gridSize; y++) {
for (x = 0; x < gridSize; x++) {
float *data = dispgrid[dGridSize * y *
dSkip + x * dSkip];
- float *no = CCG_grid_elem_no(&key,
subgrid, x, y);
float *co = CCG_grid_elem_co(&key,
subgrid, x, y);
- float mat[3][3], tx[3], ty[3], dco[3];
+ float mat[3][3], dco[3];
/* construct tangent space matrix */
- grid_tangent(&key, x, y, 0,
subGridData[gIndex], tx);
- normalize_v3(tx);
+ grid_tangent_matrix(mat, &key, x, y,
subgrid);
- grid_tangent(&key, x, y, 1,
subGridData[gIndex], ty);
- normalize_v3(ty);
- column_vectors_to_mat3(mat, tx, ty, no);
-
/* convert to absolute coordinates in
space */
if (from == MULTIRES_SPACE_TANGENT) {
mul_v3_m3v3(dco, mat, data);
@@ -1368,8 +1357,6 @@
copy_v3_v3(dco, data);
}
- column_vectors_to_mat3(mat, tx, ty, no);
-
/*now, convert to desired displacement
type*/
if (to == MULTIRES_SPACE_TANGENT) {
invert_m3(mat);
@@ -2142,7 +2129,7 @@
{
DerivedMesh *dm = NULL, *cddm = NULL, *subdm = NULL;
CCGElem **gridData, **subGridData;
- CCGKey key;
+ CCGKey dm_key, subdm_key;
Mesh *me = (Mesh *)ob->data;
MPoly *mpoly = me->mpoly;
/* MLoop *mloop = me->mloop; */ /* UNUSED */
@@ -2180,12 +2167,12 @@
dm = subsurf_dm_create_local(ob, cddm, high_mmd.totlvl,
high_mmd.simple, 0, mmd->flags & eMultiresModifierFlag_PlainUv, 0);
cddm->release(cddm);
- /*numGrids = dm->getNumGrids(dm);*/ /*UNUSED*/
gridSize = dm->getGridSize(dm);
gridData = dm->getGridData(dm);
gridOffset = dm->getGridOffset(dm);
- dm->getGridKey(dm, &key);
+ dm->getGridKey(dm, &dm_key);
subGridData = subdm->getGridData(subdm);
+ subdm->getGridKey(subdm, &subdm_key);
dGridSize = multires_side_tot[high_mmd.totlvl];
dSkip = (dGridSize - 1) / (gridSize - 1);
@@ -2203,21 +2190,14 @@
for (y = 0; y < gridSize; y++) {
for (x = 0; x < gridSize; x++) {
- float *co = CCG_grid_elem_co(&key,
grid, x, y);
- float *sco = CCG_grid_elem_co(&key,
subgrid, x, y);
- float *no = CCG_grid_elem_no(&key,
grid, x, y);
+ float *co = CCG_grid_elem_co(&dm_key,
grid, x, y);
+ float *sco =
CCG_grid_elem_co(&subdm_key, subgrid, x, y);
float *data = dispgrid[dGridSize * y *
dSkip + x * dSkip];
- float mat[3][3], tx[3], ty[3], disp[3];
+ float mat[3][3], disp[3];
/* construct tangent space matrix */
- grid_tangent(&key, x, y, 0,
gridData[gIndex], tx);
- normalize_v3(tx);
+ grid_tangent_matrix(mat, &dm_key, x, y,
grid);
- grid_tangent(&key, x, y, 1,
gridData[gIndex], ty);
- normalize_v3(ty);
-
- column_vectors_to_mat3(mat, tx, ty, no);
-
/* scale subgrid coord and calculate
displacement */
mul_m3_v3(smat, sco);
sub_v3_v3v3(disp, sco, co);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
