Added python func Blender.Geometry.LineIntersect2D(v1,v2,v3,v4)

updated archimap and cookie cutter to use it, removed python version from BPyMathutils
archimap island merging is noticibly faster

3 files changed, 111 insertions, 2 deletions

diff --git a/source/blender/python/api2_2x/Geometry.c b/source/blender/python/api2_2x/Geometry.c
index df33d90a3c1..0c3eb056bf0 100644
--- a/source/blender/python/api2_2x/Geometry.c
+++ b/source/blender/python/api2_2x/Geometry.c
@@ -45,13 +45,19 @@
 /* needed for EXPP_ReturnPyObjError and EXPP_check_sequence_consistency */
 #include "gen_utils.h"
 
+//#include "util.h" /* MIN2 and MAX2 */ 
+#include "BKE_utildefines.h"
 
+#define SWAP_FLOAT(a,b,tmp) tmp=a; a=b; b=tmp
+#define eul 0.000001
 /*-------------------------DOC STRINGS ---------------------------*/
 static char M_Geometry_doc[] = "The Blender Geometry module\n\n";
 static char M_Geometry_PolyFill_doc[] = "(veclist_list) - takes a list of polylines (each point a vector) and returns the point indicies for a polyline filled with triangles";
+static char M_Geometry_LineIntersect2D_doc[] = "(lineA_p1, lineA_p2, lineB_p1, lineB_p2) - takes 2 lines (as 4 vectors) and returns a vector for their point of intersection or None";
 /*-----------------------METHOD DEFINITIONS ----------------------*/
 struct PyMethodDef M_Geometry_methods[] = {
 	{"PolyFill", ( PyCFunction ) M_Geometry_PolyFill, METH_VARARGS, M_Geometry_PolyFill_doc},
+	{"LineIntersect2D", ( PyCFunction ) M_Geometry_LineIntersect2D, METH_VARARGS, M_Geometry_LineIntersect2D_doc},
 	{NULL, NULL, 0, NULL}
 };
 /*----------------------------MODULE INIT-------------------------*/
@@ -66,7 +72,7 @@ PyObject *Geometry_Init(void)
 
 /*----------------------------------Geometry.PolyFill() -------------------*/
 /* PolyFill function, uses Blenders scanfill to fill multiple poly lines */
-PyObject *M_Geometry_PolyFill( PyObject * self, PyObject * args )
+static PyObject *M_Geometry_PolyFill( PyObject * self, PyObject * args )
 {
 	PyObject *tri_list; /*return this list of tri's */
 	PyObject *polyLineSeq, *polyLine, *polyVec;
@@ -164,3 +170,98 @@ PyObject *M_Geometry_PolyFill( PyObject * self, PyObject * args )
 	
 	return tri_list;
 }
+
+
+static PyObject *M_Geometry_LineIntersect2D( PyObject * self, PyObject * args )
+{
+	VectorObject *line_a1, *line_a2, *line_b1, *line_b2;
+	float a1x, a1y, a2x, a2y,  b1x, b1y, b2x, b2y, xi, yi, a1,a2,b1,b2, c1,c2, det_inv, m1, m2, newvec[2];
+	if( !PyArg_ParseTuple ( args, "O!O!O!O!",
+	  &vector_Type, &line_a1,
+	  &vector_Type, &line_a2,
+	  &vector_Type, &line_b1,
+	  &vector_Type, &line_b2)
+	)
+		return ( EXPP_ReturnPyObjError
+			 ( PyExc_TypeError, "expected 4 vector types\n" ) );
+	
+	a1x= line_a1->vec[0];
+	a1y= line_a1->vec[1];
+	a2x= line_a2->vec[0];
+	a2y= line_a2->vec[1];
+
+	b1x= line_b1->vec[0];
+	b1y= line_b1->vec[1];
+	b2x= line_b2->vec[0];
+	b2y= line_b2->vec[1];
+	
+	if((MIN2(a1x, a2x) > MAX2(b1x, b2x)) ||
+	   (MAX2(a1x, a2x) < MIN2(b1x, b2x)) ||
+	   (MIN2(a1y, a2y) > MAX2(b1y, b2y)) ||
+	   (MAX2(a1y, a2y) < MIN2(b1y, b2y))  ) {
+		Py_RETURN_NONE;
+	}
+	/* Make sure the hoz/vert line comes first. */
+	if (fabs(b1x - b2x) < eul || fabs(b1y - b2y) < eul) {
+		SWAP_FLOAT(a1x, b1x, xi); /*abuse xi*/
+		SWAP_FLOAT(a1y, b1y, xi);
+		SWAP_FLOAT(a2x, b2x, xi);
+		SWAP_FLOAT(a2y, b2y, xi);
+	}
+	
+	if (fabs(a1x-a2x) < eul) { /* verticle line */
+		if (fabs(b1x-b2x) < eul){ /*verticle second line */
+			Py_RETURN_NONE; /* 2 verticle lines dont intersect. */
+		}
+		else if (fabs(b1y-b2y) < eul) {
+			/*X of vert, Y of hoz. no calculation needed */
+			newvec[0]= a1x;
+			newvec[1]= b1y;
+			return newVectorObject(newvec, 2, Py_NEW);
+		}
+		
+		yi = ((b1y / fabs(b1x - b2x)) * fabs(b2x - a1x)) + ((b2y / fabs(b1x - b2x)) * fabs(b1x - a1x));
+		
+		if (yi > MAX2(a1y, a2y)) {/* New point above seg1's vert line */
+			Py_RETURN_NONE;
+		} else if (yi < MIN2(a1y, a2y)) { /* New point below seg1's vert line */
+			Py_RETURN_NONE;
+		}
+		newvec[0]= a1x;
+		newvec[1]= yi;
+		return newVectorObject(newvec, 2, Py_NEW);
+	} else if (fabs(a2y-a1y) < eul) {  /* hoz line1 */
+		if (fabs(b2y-b1y) < eul) { /*hoz line2*/
+			Py_RETURN_NONE; /*2 hoz lines dont intersect*/
+		}
+		
+		/* Can skip vert line check for seg 2 since its covered above. */
+		xi = ((b1x / fabs(b1y - b2y)) * fabs(b2y - a1y)) + ((b2x / fabs(b1y - b2y)) * fabs(b1y - a1y));
+		if (xi > MAX2(a1x, a2x)) { /* New point right of hoz line1's */
+			Py_RETURN_NONE;
+		} else if (xi < MIN2(a1x, a2x)) { /*New point left of seg1's hoz line */
+			Py_RETURN_NONE;
+		}
+		newvec[0]= xi;
+		newvec[1]= a1y;
+		return newVectorObject(newvec, 2, Py_NEW);
+	}
+	
+	b1 = (a2y-a1y)/(a2x-a1x);
+	b2 = (b2y-b1y)/(b2x-b1x);
+	a1 = a1y-b1*a1x;
+	a2 = b1y-b2*b1x;
+	
+	if (b1 - b2 == 0.0) {
+		Py_RETURN_NONE;
+	}
+	
+	xi = - (a1-a2)/(b1-b2);
+	yi = a1+b1*xi;
+	if ((a1x-xi)*(xi-a2x) >= 0 && (b1x-xi)*(xi-b2x) >= 0 && (a1y-yi)*(yi-a2y) >= 0 && (b1y-yi)*(yi-b2y)>=0) {
+		newvec[0]= xi;
+		newvec[1]= yi;
+		return newVectorObject(newvec, 2, Py_NEW);
+	}
+	Py_RETURN_NONE;
+}
\ No newline at end of file
diff --git a/source/blender/python/api2_2x/Geometry.h b/source/blender/python/api2_2x/Geometry.h
index ed5288f3835..32eb0265e5f 100644
--- a/source/blender/python/api2_2x/Geometry.h
+++ b/source/blender/python/api2_2x/Geometry.h
@@ -38,6 +38,7 @@
 #include "vector.h"
 
 PyObject *Geometry_Init( void );
-PyObject *M_Geometry_PolyFill( PyObject * self, PyObject * args );
+static PyObject *M_Geometry_PolyFill( PyObject * self, PyObject * args );
+static PyObject *M_Geometry_LineIntersect2D( PyObject * self, PyObject * args );
 
 #endif				/* EXPP_Geometry_H */
diff --git a/source/blender/python/api2_2x/doc/Geometry.py b/source/blender/python/api2_2x/doc/Geometry.py
index 5ffc5928cc6..733569cfe76 100644
--- a/source/blender/python/api2_2x/doc/Geometry.py
+++ b/source/blender/python/api2_2x/doc/Geometry.py
@@ -43,3 +43,10 @@ def PolyFill(polylines):
 
     Blender.Redraw()
   """
+
+def LineIntersect2D(vec1, vec2, vec3, vec4):
+	"""
+	Takes 2 lines vec1, vec2 for the 2 points of the first line and vec2, vec3 for the 2 points of the second line.
+	@rtype: Vector
+	@return: a 2D Vector for the intersection or None where there is no intersection.
+	"""
\ No newline at end of file