Changeset 8055

Timestamp:

Oct 29, 2010, 11:01:25 AM (14 years ago)

Author:

habili

Message:

Changed function names from "polyline" to "line"

File:

• trunk/anuga_core/source/anuga/utilities/polygon_ext.c (modified) (10 diffs)

trunk/anuga_core/source/anuga/utilities/polygon_ext.c

@@ -440 +440 @@
 
 
-int __triangle_polyline_overlap(double* polyline,
-                                double* triangle)
+int __triangle_line_intersect(double* line,
+                              double* triangle)
 {
     int j, jj, A, B;
@@ -450 +450 @@
     double a, b;
     
-    p0_x = polyline[0];
-    p0_y = polyline[1];
-    p1_x = polyline[2];
-    p1_y = polyline[3];
+    p0_x = line[0];
+    p0_y = line[1];
+    p1_x = line[2];
+    p1_y = line[3];
     
     pp_x = -(p1_y - p0_y);
@@ -494 +494 @@
             if (a >= 0.0f && a <= 1.0f && b >=0.0f && b <=1.0f)
             {
-                return 1; //overlap
+                return 1; //intersect
             }
             
@@ -514 +514 @@
     if (A >= 1 && B >= 1)
     {
-        return 1; //overlap
+        return 1; //polygon sits completely inside a triangle
     }
     
-    return 0; //no overlap
+    return 0; //no intersection
 }
                  
 
-int __polyline_overlap(double* polyline,
-                      double* triangles,
-                      long* indices,
-                      int M) //number of triangles
+int __line_intersect(double* line,
+                     double* triangles,
+                     long* indices,
+                     int M) //number of triangles
 {
     double* triangle;
     int i, inside_index, outside_index;
     
-    inside_index = 0;    // Keep track of triangles that overlap
-    outside_index = M - 1; // Keep track of triangles that don't overlap (starting from end)
+    inside_index = 0;    // Keep track of triangles that intersect
+    outside_index = M - 1; // Keep track of triangles that don't intersect (starting from end)
     
     for (i = 0; i < M; i++)
@@ -536 +536 @@
         triangle = triangles + 6*i;
         
-        if (__triangle_polyline_overlap(polyline, 
-                                        triangle))
+        if (__triangle_line_intersect(line, 
+                                      triangle))
         {
             indices[inside_index] = i;
@@ -854 +854 @@
 }
 
-PyObject *_polyline_overlap(PyObject *self, PyObject *args) 
+PyObject *_line_intersect(PyObject *self, PyObject *args) 
 {
   //
@@ -900 +900 @@
   
   PyArrayObject
-    *polyline,
+    *line,
     *triangles,
     *indices;
@@ -910 +910 @@
   // Convert Python arguments to C
   if (!PyArg_ParseTuple(args, "OOO",
-                        &polyline,
+                        &line,
                         &triangles,
             &indices)) {
@@ -920 +920 @@
 
   // Call underlying routine
-  res = __polyline_overlap((double*) polyline->data,
-                             (double*) triangles->data,
-                 (long*) indices->data,
-                 (int) triangles->dimensions[0]/3);                                                    
+  res = __line_intersect((double*) line->data,
+                                     (double*) triangles->data,
+                         (long*) indices->data,
+                         (int) triangles->dimensions[0]/3);                                                    
 
 
@@ -1103 +1103 @@
   {"_polygon_overlap", _polygon_overlap, 
                                  METH_VARARGS, "Print out"},
-  {"_polyline_overlap", _polyline_overlap, 
+  {"_line_intersect", _line_intersect, 
                                  METH_VARARGS, "Print out"},                               
   {"_is_inside_triangle", _is_inside_triangle,