[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55319] trunk/blender/source/blender/ editors/mesh/editmesh_knife.c: error in last commit, also rename var_squared --> var_sq (was getting too verbose)

Campbell Barton ideasman42 at gmail.com
Fri Mar 15 21:45:39 CET 2013


Revision: 55319
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55319
Author:   campbellbarton
Date:     2013-03-15 20:45:39 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
error in last commit, also rename var_squared --> var_sq (was getting too verbose)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh_knife.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c	2013-03-15 20:39:56 UTC (rev 55318)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c	2013-03-15 20:45:39 UTC (rev 55319)
@@ -1070,7 +1070,7 @@
 
 	if (kcd->totlinehit > 0) {
 		const float vthresh4 = kcd->vthresh / 4.0f;
-		const float vthresh4_squared = vthresh4 * vthresh4;
+		const float vthresh4_sq = vthresh4 * vthresh4;
 
 		BMEdgeHit *lh;
 		int i;
@@ -1090,12 +1090,12 @@
 			knife_project_v3(kcd, lh->kfe->v2->cageco, sv2);
 			knife_project_v3(kcd, lh->cagehit, lh->schit);
 
-			if (len_squared_v2v2(lh->schit, sv1) < vthresh4_squared) {
+			if (len_squared_v2v2(lh->schit, sv1) < vthresh4_sq) {
 				copy_v3_v3(lh->cagehit, lh->kfe->v1->cageco);
 				glVertex3fv(lh->cagehit);
 				lh->v = lh->kfe->v1;
 			}
-			else if (len_squared_v2v2(lh->schit, sv2) < vthresh4_squared) {
+			else if (len_squared_v2v2(lh->schit, sv2) < vthresh4_sq) {
 				copy_v3_v3(lh->cagehit, lh->kfe->v2->cageco);
 				glVertex3fv(lh->cagehit);
 				lh->v = lh->kfe->v2;
@@ -1187,7 +1187,7 @@
 	/* for comparing distances, error of intersection depends on triangle scale.
 	 * need to scale down before squaring for accurate comparison */
 	const float depsilon = (FLT_EPSILON / 2.0f) * len_v3_tri_side_max(v1, v2, v3);
-	const float depsilon_squared = depsilon * depsilon;
+	const float depsilon_sq = depsilon * depsilon;
 
 	copy_v3_v3(cos + 0, v1);
 	copy_v3_v3(cos + 3, v2);
@@ -1221,14 +1221,14 @@
 
 				interp_v3_v3v3(p, kfe->v1->cageco, kfe->v2->cageco, lambda);
 
-				if (kcd->curr.vert && len_squared_v3v3(kcd->curr.vert->cageco, p) < depsilon_squared) {
+				if (kcd->curr.vert && len_squared_v3v3(kcd->curr.vert->cageco, p) < depsilon_sq) {
 					continue;
 				}
-				if (kcd->prev.vert && len_squared_v3v3(kcd->prev.vert->cageco, p) < depsilon_squared) {
+				if (kcd->prev.vert && len_squared_v3v3(kcd->prev.vert->cageco, p) < depsilon_sq) {
 					continue;
 				}
-				if (len_squared_v3v3(kcd->prev.cage, p) < depsilon_squared ||
-				    len_squared_v3v3(kcd->curr.cage, p) < depsilon_squared)
+				if (len_squared_v3v3(kcd->prev.cage, p) < depsilon_sq ||
+				    len_squared_v3v3(kcd->curr.cage, p) < depsilon_sq)
 				{
 					continue;
 				}
@@ -1274,8 +1274,8 @@
 				if (!hitf && !BLI_smallhash_haskey(ehash, (intptr_t)kfe)) {
 					BMEdgeHit hit;
 	
-					if (len_squared_v3v3(p, kcd->curr.co) < depsilon_squared ||
-					    len_squared_v3v3(p, kcd->prev.co) < depsilon_squared)
+					if (len_squared_v3v3(p, kcd->curr.co) < depsilon_sq ||
+					    len_squared_v3v3(p, kcd->prev.co) < depsilon_sq)
 					{
 						continue;
 					}
@@ -1534,10 +1534,10 @@
 	f = knife_find_closest_face(kcd, co, cageco, &is_space);
 
 	if (f && !is_space) {
-		const float radius_squared = radius * radius;
+		const float radius_sq = radius * radius;
 		ListBase *lst;
 		Ref *ref;
-		float dis_squared;
+		float dis_sq;
 		int c = 0;
 
 		knife_project_v3(kcd, cageco, sco);
@@ -1552,8 +1552,8 @@
 
 				knife_project_v3(kcd, kfv->cageco, kfv->sco);
 
-				dis_squared = len_v2v2(kfv->sco, sco);
-				if (dis_squared < radius_squared) {
+				dis_sq = len_squared_v2v2(kfv->sco, sco);
+				if (dis_sq < radius_sq) {
 					if (kcd->vc.rv3d->rflag & RV3D_CLIPPING) {
 						if (ED_view3d_clipping_test(kcd->vc.rv3d, kfv->cageco, TRUE) == 0) {
 							c++;
@@ -1704,10 +1704,11 @@
 	kcd->curr.bmface = f;
 
 	if (f) {
+		const float maxdist_sq = maxdist * maxdist;
 		ListBase *lst;
 		Ref *ref;
 		KnifeVert *curv = NULL;
-		float dis, curdis = FLT_MAX;
+		float dis_sq, curdis_sq = FLT_MAX;
 
 		knife_project_v3(kcd, cageco, sco);
 
@@ -1721,17 +1722,17 @@
 
 				knife_project_v3(kcd, kfv->cageco, kfv->sco);
 
-				dis = len_v2v2(kfv->sco, sco);
-				if (dis < curdis && dis < maxdist) {
+				dis_sq = len_squared_v2v2(kfv->sco, sco);
+				if (dis_sq < curdis_sq && dis_sq < maxdist_sq) {
 					if (kcd->vc.rv3d->rflag & RV3D_CLIPPING) {
 						if (ED_view3d_clipping_test(kcd->vc.rv3d, kfv->cageco, TRUE) == 0) {
 							curv = kfv;
-							curdis = dis;
+							curdis_sq = dis_sq;
 						}
 					}
 					else {
 						curv = kfv;
-						curdis = dis;
+						curdis_sq = dis_sq;
 					}
 				}
 			}




More information about the Bf-blender-cvs mailing list