Revision: 15644
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15644
Author: jaguarandi
Date: 2008-07-19 17:22:38 +0200 (Sat, 19 Jul 2008)
Log Message:
-----------
Following the same optimization as bvh raycast:
*Made nearest surface also use "quad" bvh tree (instead of splitting quads in 2
bvh nodes).
Again that leaded to improvements in build and query time.
*BLI_bvhtree_find_nearest api is now following the same concept as
BLI_bvhtree_ray_cast
removed code relative to bvhtree_from_mesh_tris.
Modified Paths:
--------------
branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/BLI_kdopbvh.c
Modified:
branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_shrinkwrap.h
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_shrinkwrap.h
2008-07-19 13:07:47 UTC (rev 15643)
+++ branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_shrinkwrap.h
2008-07-19 15:22:38 UTC (rev 15644)
@@ -55,11 +55,11 @@
void space_transform_setup(SpaceTransform *data, struct Object *local, struct
Object *target);
-void space_transform_apply (SpaceTransform *data, float *co);
-void space_transform_invert(SpaceTransform *data, float *co);
+void space_transform_apply (const SpaceTransform *data, float *co);
+void space_transform_invert(const SpaceTransform *data, float *co);
-void space_transform_apply_normal (SpaceTransform *data, float *co);
-void space_transform_invert_normal(SpaceTransform *data, float *co);
+void space_transform_apply_normal (const SpaceTransform *data, float *co);
+void space_transform_invert_normal(const SpaceTransform *data, float *co);
/* Shrinkwrap stuff */
Modified:
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
2008-07-19 13:07:47 UTC (rev 15643)
+++ branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
2008-07-19 15:22:38 UTC (rev 15644)
@@ -129,25 +129,23 @@
Mat4Invert(data->target2local, data->local2target);
}
-void space_transform_apply(/* const */ SpaceTransform *data, float *co)
+void space_transform_apply(const SpaceTransform *data, float *co)
{
VecMat4MulVecfl(co, data->local2target, co);
-// Mat4Mul3Vecfl(data->local2target, co);
}
-void space_transform_invert(/* const */SpaceTransform *data, float *co)
+void space_transform_invert(const SpaceTransform *data, float *co)
{
VecMat4MulVecfl(co, data->target2local, co);
-// Mat4Mul3Vecfl(data->target2local, co);
}
-void space_transform_apply_normal(/* const */ SpaceTransform *data, float *no)
+void space_transform_apply_normal(const SpaceTransform *data, float *no)
{
Mat4Mul3Vecfl(data->local2target, no);
Normalize(no); // TODO: could we just determine de scale value from the
matrix?
}
-void space_transform_invert_normal(/* const */ SpaceTransform *data, float *no)
+void space_transform_invert_normal(const SpaceTransform *data, float *no)
{
Mat4Mul3Vecfl(data->target2local, no);
Normalize(no); // TODO: could we just determine de scale value from the
matrix?
@@ -200,48 +198,6 @@
}
/*
- * Builds a bvh tree.. where nodes are the faces of the given mesh. Quads are
splitted in 2 triangles
- */
-static BVHTree* bvhtree_from_mesh_tri(DerivedMesh *mesh, float epsilon, int
tree_type, int axis)
-{
- int i;
- int numFaces= mesh->getNumFaces(mesh), totFaces;
- MVert *vert = mesh->getVertDataArray(mesh, CD_MVERT);
- MFace *face = mesh->getFaceDataArray(mesh, CD_MFACE);
- BVHTree *tree= NULL;
-
- /* Count needed faces */
- for(totFaces=numFaces, i=0; i<numFaces; i++)
- if(face[i].v4) totFaces++;
-
- /* Create a bvh-tree of the given target */
- tree = BLI_bvhtree_new(totFaces, epsilon, tree_type, axis);
- if(tree != NULL)
- {
- for(i = 0; i < numFaces; i++)
- {
- float co[3][3];
-
- VECCOPY(co[0], vert[ face[i].v1 ].co);
- VECCOPY(co[1], vert[ face[i].v2 ].co);
- VECCOPY(co[2], vert[ face[i].v3 ].co);
- BLI_bvhtree_insert(tree, 2*i, co[0], 3);
- if(face[i].v4)
- {
- /* second face is v1,v3,v4 */
- VECCOPY(co[1], vert[ face[i].v3 ].co);
- VECCOPY(co[2], vert[ face[i].v4 ].co);
- BLI_bvhtree_insert(tree, 2*i+1, co[0], 3);
- }
- }
-
- BLI_bvhtree_balance(tree);
- }
-
- return tree;
-}
-
-/*
* Builds a bvh tree.. where nodes are the faces of the given mesh.
*/
static BVHTree* bvhtree_from_mesh_faces(DerivedMesh *mesh, float epsilon, int
tree_type, int axis)
@@ -278,63 +234,48 @@
}
/*
- * Loads the coordinates of the requested tri
+ * Callback to bvh tree nearest point. The tree must bust have been built
using bvhtree_from_mesh_faces.
+ * userdata must be a BVHMeshCallbackUserdata built from the same mesh as the
tree.
*/
-static void bvhtree_from_mesh_get_tri(BVHMeshCallbackUserdata* userdata, int
index, float **v0, float **v1, float **v2)
+static void mesh_faces_nearest_point(void *userdata, int index, const float
*co, BVHTreeNearest *nearest)
{
const BVHMeshCallbackUserdata *data = (BVHMeshCallbackUserdata*)
userdata;
MVert *vert = data->vert;
- MFace *face = data->face + index / 2;
+ MFace *face = data->face + index;
- if(index & 1)
- *v0 = vert[ face->v1 ].co, *v1 = vert[ face->v3 ].co, *v2 =
vert[ face->v4 ].co;
- else
- *v0 = vert[ face->v1 ].co, *v1 = vert[ face->v2 ].co, *v2 =
vert[ face->v3 ].co;
-}
+ float *t0, *t1, *t2, *t3;
+ t0 = vert[ face->v1 ].co;
+ t1 = vert[ face->v2 ].co;
+ t2 = vert[ face->v3 ].co;
+ t3 = face->v4 ? vert[ face->v4].co : NULL;
-/*
- * Callback to bvh tree nearest point. The tree must bust have been built
using bvhtree_from_mesh_tri.
- * userdata must be a BVHMeshCallbackUserdata built from the same mesh as the
tree.
- */
-static float mesh_tri_nearest_point(void *userdata, int index, const float
*co, float *nearest)
-{
- float *t0, *t1, *t2;
+
+ do
+ {
+ float nearest_tmp[3], dist;
- bvhtree_from_mesh_get_tri( (BVHMeshCallbackUserdata*)userdata, index,
&t0, &t1, &t2);
- return nearest_point_in_tri_surface(co,t0, t1, t2, nearest);
-}
+ dist = nearest_point_in_tri_surface(co,t0, t1, t2, nearest_tmp);
+ if(dist < nearest->dist)
+ {
+ nearest->index = index;
+ nearest->dist = dist;
+ VECCOPY(nearest->co, nearest_tmp);
+ CalcNormFloat((float*)t0, (float*)t1, (float*)t2,
nearest->no); //TODO.. (interpolate normals from the vertexs coordinates?
+ }
-/*
- * Callback to bvh tree raycast. The tree must bust have been built using
bvhtree_from_mesh_tri.
- * userdata must be a BVHMeshCallbackUserdata built from the same mesh as the
tree.
- */
-static float mesh_tri_spherecast(void *userdata, int index, const BVHTreeRay
*ray, BVHTreeRayHit *hit)
-{
- float dist;
- float *t0, *t1, *t2;
+ t1 = t2;
+ t2 = t3;
+ t3 = NULL;
- bvhtree_from_mesh_get_tri( (BVHMeshCallbackUserdata*)userdata, index,
&t0, &t1, &t2);
-
- if(((BVHMeshCallbackUserdata*)userdata)->sphere_radius == 0.0f)
- dist = ray_tri_intersection(ray, hit->dist, t0, t1, t2);
- else
- dist = sphereray_tri_intersection(ray,
((BVHMeshCallbackUserdata*)userdata)->sphere_radius, hit->dist, t0, t1, t2);
-
- if(dist >= 0 && dist < hit->dist)
- {
- hit->index = index;
- hit->dist = dist;
- VECADDFAC(hit->co, ray->origin, ray->direction, dist);
- }
- return dist;
+ } while(t2);
}
/*
* Callback to bvh tree raycast. The tree must bust have been built using
bvhtree_from_mesh_faces.
* userdata must be a BVHMeshCallbackUserdata built from the same mesh as the
tree.
*/
-static float mesh_faces_spherecast(void *userdata, int index, const BVHTreeRay
*ray, BVHTreeRayHit *hit)
+static void mesh_faces_spherecast(void *userdata, int index, const BVHTreeRay
*ray, BVHTreeRayHit *hit)
{
const BVHMeshCallbackUserdata *data = (BVHMeshCallbackUserdata*)
userdata;
MVert *vert = data->vert;
@@ -370,7 +311,7 @@
} while(t2);
- return hit->dist;
+ //return hit->dist;
}
/*
@@ -742,6 +683,12 @@
//point-plane distance and calculate axis
normal_dist = point_plane_distance(point, v0, dw);
+ // OPTIMIZATION
+ // if we are only interested in nearest distance if its closer
than some distance already found
+ // we can:
+ // if(normal_dist*normal_dist >= best_dist_so_far) return
FLOAT_MAX;
+ //
+
VECSUB(du, v1, v0);
Normalize(du);
Crossf(dv, dw, du);
@@ -1316,7 +1263,7 @@
if(nearest.index != -1)
{
- nearest.dist = squared_dist(tmp_co, nearest.nearest);
+ nearest.dist = squared_dist(tmp_co, nearest.co);
}
else nearest.dist = FLT_MAX;
@@ -1325,7 +1272,7 @@
if(index != -1)
{
float dist;
-
+ VECCOPY(tmp_co, nearest.co);
space_transform_invert(&calc->local2target, tmp_co);
dist = VecLenf(vert[i].co, tmp_co);
if(dist > 1e-5) weight *= (dist - calc->keptDist)/dist;
@@ -1448,6 +1395,7 @@
static int normal_projection_project_vertex(char options, const float *vert,
const float *dir,/* const */ SpaceTransform *transf, BVHTree *tree,
BVHTreeRayHit *hit, BVHTree_RayCastCallback callback, BVHMeshCallbackUserdata
*userdata)
{
float tmp_co[3], tmp_no[3];
+ const float *co, *no;
BVHTreeRayHit hit_tmp;
memcpy( &hit_tmp, hit, sizeof(hit_tmp) );
@@ -1456,16 +1404,23 @@
{
VECCOPY( tmp_co, vert );
space_transform_apply( transf, tmp_co );
- vert = tmp_co;
+ co = tmp_co;
VECCOPY( tmp_no, dir );
space_transform_apply_normal( transf, tmp_no );
- dir = tmp_no;
+ no = tmp_no;
+
+ hit_tmp.dist *= Mat4ToScalef( transf->local2target );
}
+ else
+ {
+ co = vert;
+ no = dir;
+ }
hit_tmp.index = -1;
- BLI_bvhtree_ray_cast(tree, vert, dir, &hit_tmp, callback, userdata);
+ BLI_bvhtree_ray_cast(tree, co, no, &hit_tmp, callback, userdata);
if(hit_tmp.index != -1)
{
@@ -1476,11 +1431,13 @@
return FALSE; //Ignore hit
- //Inverting space transform (TODO readjust dist)
+ //Inverting space transform (TODO make coeherent with the
initial dist readjust)
if(transf)
{
space_transform_invert( transf, hit_tmp.co );
space_transform_invert_normal( transf, hit_tmp.no );
+
+ hit_tmp.dist = VecLenf( vert, hit_tmp.co );
}
memcpy(hit, &hit_tmp, sizeof(hit_tmp) );
@@ -1547,6 +1504,7 @@
float tmp_co[3], tmp_no[3];
float lim = 1000; //TODO: we should use FLT_MAX
here, but sweepsphere code isnt prepared for that
float weight = vertexgroup_get_vertex_weight(dvert, i, vgroup);
+ char moved = FALSE;
if(weight == 0.0f) continue;
@@ -1557,21 +1515,29 @@
hit.index = -1;
hit.dist = lim;
-/* if(limit_tree)
- {
- normal_projection_project_vertex(0, tmp_co, tmp_no,
&local2cut, limit_tree, &hit, callback, &userdata);
- }
-*/
+
if(use_normal & MOD_SHRINKWRAP_ALLOW_DEFAULT_NORMAL)
{
- normal_projection_project_vertex(calc->smd->shrinkOpts,
tmp_co, tmp_no, &calc->local2target, tree, &hit, callback, &userdata);
+/*
+ if(limit_tree)
+ normal_projection_project_vertex(0, tmp_co,
tmp_no, &local2cut, limit_tree, &hit, limit_callback, &limit_userdata);
+*/
+
+
if(normal_projection_project_vertex(calc->smd->shrinkOpts, tmp_co, tmp_no,
&calc->local2target, tree, &hit, callback, &userdata))
+ moved = TRUE;
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
