Revision: 16690
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16690
Author: jaguarandi
Date: 2008-09-23 00:48:44 +0200 (Tue, 23 Sep 2008)
Log Message:
-----------
Fixed shrinkwrap constraint handling of matrixs.
Also since contraint uses BVHCache its now usable and fast.
Being possible to shrinkwrap constraint several objects to another
and only have one BVHTree being build.
Modified Paths:
--------------
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/constraint.c
Modified:
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/constraint.c
2008-09-22 21:49:48 UTC (rev 16689)
+++ branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/constraint.c
2008-09-22 22:48:44 UTC (rev 16690)
@@ -3263,9 +3263,6 @@
{
bShrinkwrapConstraint *scon = (bShrinkwrapConstraint *) con->data;
- if (ct)
- Mat4CpyMat4(ct->matrix, cob->startmat);
-
if( VALID_CONS_TARGET(ct) && (ct->tar->type == OB_MESH) )
{
int fail = FALSE;
@@ -3274,13 +3271,10 @@
float dist;
SpaceTransform transform;
- DerivedMesh *target = CDDM_copy(
object_get_derived_final(ct->tar, CD_MASK_BAREMESH) );
+ DerivedMesh *target = object_get_derived_final(ct->tar,
CD_MASK_BAREMESH);
BVHTreeRayHit hit;
BVHTreeNearest nearest;
- //TODO
- //Its stupid to create a bvhtree.. if we are only going to
project one vertex
- //But lets do it this way.. (so that in future maybe bvhtree
gets a cache system and then the tree would already be build)
BVHTreeFromMesh treeData;
memset( &treeData, 0, sizeof(treeData) );
@@ -3290,15 +3284,22 @@
hit.index = -1;
hit.dist = 100000.0f; //TODO should use FLT_MAX.. but normal
projection doenst yet supports it
+ Mat4One(ct->matrix);
+
if(target != NULL)
{
+ space_transform_from_matrixs(&transform, cob->matrix,
ct->tar->obmat);
- space_transform_from_matrixs(&transform, cob->startmat,
ct->tar->obmat);
-
switch(scon->shrinkType)
{
case MOD_SHRINKWRAP_NEAREST_SURFACE:
- bvhtree_from_mesh_faces(&treeData,
target, 0.0, 2, 6);
+ case MOD_SHRINKWRAP_NEAREST_VERTEX:
+
+ if(scon->shrinkType ==
MOD_SHRINKWRAP_NEAREST_VERTEX)
+
bvhtree_from_mesh_verts(&treeData, target, 0.0, 2, 6);
+ else
+
bvhtree_from_mesh_faces(&treeData, target, 0.0, 2, 6);
+
if(treeData.tree == NULL)
{
fail = TRUE;
@@ -3314,23 +3315,6 @@
space_transform_invert(&transform, co);
break;
- case MOD_SHRINKWRAP_NEAREST_VERTEX:
- bvhtree_from_mesh_verts(&treeData,
target, 0.0, 2, 6);
- if(treeData.tree == NULL)
- {
- fail = TRUE;
- break;
- }
-
-
space_transform_apply_normal(&transform, no);
-
- BLI_bvhtree_find_nearest(treeData.tree,
co, &nearest, treeData.nearest_callback, &treeData);
-
- dist = VecLenf(co, nearest.co);
- VecLerpf(co, co, nearest.co, (dist -
scon->dist)/dist); //linear interpolation
- space_transform_invert(&transform, co);
- break;
-
case MOD_SHRINKWRAP_PROJECT:
if(scon->projAxis &
MOD_SHRINKWRAP_PROJECT_OVER_X_AXIS) no[0] = 1.0f;
if(scon->projAxis &
MOD_SHRINKWRAP_PROJECT_OVER_Y_AXIS) no[1] = 1.0f;
@@ -3365,8 +3349,15 @@
target->release(target);
- if(fail == FALSE)
- VECADD(ct->matrix[3], ct->matrix[3], co);
+ if(fail == TRUE)
+ {
+ //Don't move the point
+ co[0] = co[1] = co[2] = 0.0f;
+ }
+
+ //co is in local object coordinates, change it to
global and update target position
+ VecMat4MulVecfl(co, cob->matrix, co);
+ VECCOPY(ct->matrix[3], co);
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
