diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-23 10:07:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-23 10:07:14 +0300 |
| commit | b6cf4f777d2c9ca0b01a746598b8cf149fe59898 (patch) | |
| tree | c60d758b99a464b9c91f3949b4b277de5722c111 | |
| parent | 5c98848895b5bdafd074e86948e53392bde5e6d8 (diff) | |
Use looptri for smoke collisions & particle edit
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 17 | ||||
| -rw-r--r-- | source/blender/editors/physics/particle_edit.c | 4 |
2 files changed, 12 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 28a2c42546d..9f9d476a526 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -727,7 +727,8 @@ static void obstacles_from_derivedmesh(Object *coll_ob, SmokeDomainSettings *sds { DerivedMesh *dm = NULL; MVert *mvert = NULL; - MFace *mface = NULL; + const MLoopTri *looptri; + const MLoop *mloop; BVHTreeFromMesh treeData = {NULL}; int numverts, i, z; @@ -742,7 +743,8 @@ static void obstacles_from_derivedmesh(Object *coll_ob, SmokeDomainSettings *sds dm = CDDM_copy(scs->dm); CDDM_calc_normals(dm); mvert = dm->getVertArray(dm); - mface = dm->getTessFaceArray(dm); + mloop = dm->getLoopArray(dm); + looptri = dm->getLoopTriArray(dm); numverts = dm->getNumVerts(dm); // DG TODO @@ -790,7 +792,7 @@ static void obstacles_from_derivedmesh(Object *coll_ob, SmokeDomainSettings *sds copy_v3_v3(&scs->verts_old[i * 3], co); } - if (bvhtree_from_mesh_faces(&treeData, dm, 0.0f, 4, 6)) { + if (bvhtree_from_mesh_looptri(&treeData, dm, 0.0f, 4, 6)) { #pragma omp parallel for schedule(static) for (z = sds->res_min[2]; z < sds->res_max[2]; z++) { int x, y; @@ -805,13 +807,14 @@ static void obstacles_from_derivedmesh(Object *coll_ob, SmokeDomainSettings *sds /* find the nearest point on the mesh */ if (BLI_bvhtree_find_nearest(treeData.tree, ray_start, &nearest, treeData.nearest_callback, &treeData) != -1) { + const MLoopTri *lt = &looptri[nearest.index]; float weights[4]; - int v1, v2, v3, f_index = nearest.index; + int v1, v2, v3; /* calculate barycentric weights for nearest point */ - v1 = mface[f_index].v1; - v2 = (nearest.flags & BVH_ONQUAD) ? mface[f_index].v3 : mface[f_index].v2; - v3 = (nearest.flags & BVH_ONQUAD) ? mface[f_index].v4 : mface[f_index].v3; + v1 = mloop[lt->tri[0]].v; + v2 = mloop[lt->tri[1]].v; + v3 = mloop[lt->tri[2]].v; interp_weights_face_v3(weights, mvert[v1].co, mvert[v2].co, mvert[v3].co, NULL, nearest.co); // DG TODO diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 877c8ba9a05..f5f3f916606 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -424,8 +424,8 @@ static bool PE_create_shape_tree(PEData *data, Object *shapeob) return false; } - DM_ensure_tessface(dm); - return bvhtree_from_mesh_faces(&data->shape_bvh, dm, 0.0f, 4, 8); + DM_ensure_looptri(dm); + return bvhtree_from_mesh_looptri(&data->shape_bvh, dm, 0.0f, 4, 8); } static void PE_free_shape_tree(PEData *data) |