geo 0.1.5 → 0.1.6

data/ext/geo.c

@@ -33,7 +33,7 @@ extern "C" {
     rb_define_method(rb_cFloat, "intlike?", rb_float_intlike, 0);
 
     VALUE rb_geo = rb_define_module("Geo");
-    rb_define_const(rb_geo, "VERSION", rb_str_new2("0.1.5"));
+    rb_define_const(rb_geo, "VERSION", rb_str_new2("0.1.6"));
 
     rb_triangle_set = rb_define_class_under(rb_geo,
 					    "TriangleSet",
@@ -78,6 +78,7 @@ extern "C" {
     rb_define_method(rb_triangle_set, "_in_segment", rb_triangle_set_structures_in_segment, 2);
     rb_define_method(rb_triangle_set, "indexed", rb_geo_set_get_indexed, 0);
     rb_define_method(rb_triangle_set, "indexed=", rb_geo_set_set_indexed, 1);
+    rb_define_method(rb_triangle_set, "containers", rb_triangle_set_containers, 1);
 
     rb_define_alloc_func(rb_point_set, rb_point_set_alloc);
     rb_define_method(rb_point_set, "<<", rb_point_set_insert, 1);

data/ext/line_set.c

@@ -196,13 +196,13 @@ g_hash_table_each_intersection_free_endpoint(gpointer key, gpointer data, gpoint
   gpointer handler_args = original_args[5];
   GHashTable *seen_points = (GHashTable *) original_args[6];
 
-  *(tmpLine->p1) = *( (Point *) arg_wrapper[1] );
-  *(tmpLine->p2) = *( (Point *) key);
+  tmpLine->p1 = (Point *) arg_wrapper[1];
+  tmpLine->p2 = (Point *) key;
   
   if (*max_distance < 0 || DISTANCE(tmpLine->p1, tmpLine->p2) < *max_distance) {
     if (!line_set_intersects(line_set, tmpLine)) {
       if (g_hash_table_lookup(seen_points, key) == NULL) {
-	handler(line_set, key, handler_args);
+	handler(line_set, tmpLine, handler_args);
 	g_hash_table_insert(seen_points, key, GINT_TO_POINTER(1));
       }
     }
@@ -210,18 +210,16 @@ g_hash_table_each_intersection_free_endpoint(gpointer key, gpointer data, gpoint
 }
 
 static gpointer
-line_set_insert_point_into_rb_ary(GeoSet *line_set, gpointer point, gpointer rval) {
-  rb_ary_push(*( (VALUE *) rval ), ((Point *) point)->rbPoint);
+line_set_insert_p2_into_rb_ary(GeoSet *line_set, gpointer line, gpointer rval) {
+  rb_ary_push(*( (VALUE *) rval ), ((Line *) line)->p2->rbPoint);
   return NULL;
 }
 
 static void
 g_hash_table_each_intersection_free_endpoint_for_point(gpointer key, gpointer data, gpointer user_data) {
-  gpointer my_args[2];
   gpointer *given_args = (gpointer *) user_data;
   GeoSet *endpoints = (GeoSet *) given_args[0];
-  my_args[0] = user_data;
-  my_args[1] = key;
+  gpointer my_args[2] = { user_data, key };
   g_hash_table_foreach(endpoints->table, g_hash_table_each_intersection_free_endpoint, (gpointer) my_args);
 }
  
@@ -232,11 +230,10 @@ line_set_each_intersection_free_endpoint(GeoSet *set,
 					 gdouble max_distance, 
 					 geo_set_structure_handler handler,
 					 gpointer user_data) {
-  Line *line = new_line_with_coordinates(0,0,0,0);
+  Line line;
   GHashTable *seen_points = g_hash_table_new(g_direct_hash, g_direct_equal);
-  gpointer args[7] = { endpoints, &max_distance, line, set, handler, user_data, seen_points };
+  gpointer args[7] = { endpoints, &max_distance, &line, set, handler, user_data, seen_points };
   g_hash_table_foreach(origins->table, g_hash_table_each_intersection_free_endpoint_for_point, args);
-  line_free(line);
   g_hash_table_destroy(seen_points);
 }
 
@@ -349,7 +346,7 @@ rb_line_set_intersection_free_endpoints(int argc, VALUE *argv, VALUE self) {
   GEO_SET(self, me);
   GEO_SET(endpoints, eps);
   rval = rb_ary_new();
-  line_set_each_intersection_free_endpoint(me, ops, eps, max_distance, line_set_insert_point_into_rb_ary, &rval);
+  line_set_each_intersection_free_endpoint(me, ops, eps, max_distance, line_set_insert_p2_into_rb_ary, &rval);
   if (created_ops)
     geo_set_free(ops);
   return rval;

data/ext/triangle.c

@@ -258,7 +258,7 @@ triangle_closest_intersection(Triangle *triangle, Line *line, Point *point) {
   return rval;
 }
 
-static Line*
+Line*
 triangle_overlap(Triangle *triangle, Line *line) {
   if (triangle_contains(triangle, line->p1)) {
     if (triangle_contains(triangle, line->p2)) {

data/ext/triangle.h

@@ -94,6 +94,8 @@ rb_triangle_from_gpointer(gpointer l);
 gchar*
 triangle_inspect(Triangle *t);
 
+Line*
+triangle_overlap(Triangle *triangle, Line *line);
 
 
 

data/ext/triangle_set.c

@@ -103,15 +103,17 @@ triangle_set_add_to_rb_ary(GeoSet *set, gpointer structure, gpointer user_data)
   return NULL;
 }
 
-void
-triangle_set_each_intersector(GeoSet *set, Line *line, geo_set_structure_handler handler, gpointer user_data) {
+gpointer
+triangle_set_each_intersector_until(GeoSet *set, Line *line, geo_set_structure_handler handler, gpointer user_data) {
   gpointer args[3] = { line, handler, user_data };
+  gpointer rval = NULL;
   if (set->indexed) {
     TRIANGLE_SET_REINDEX(set);
-    geo_set_each_structure_having_common_segment_id_with_line_until(set, line, triangle_set_each_intersector_for_triangle, args);
+    rval = geo_set_each_structure_having_common_segment_id_with_line_until(set, line, triangle_set_each_intersector_for_triangle, args);
   } else {
-    geo_set_each_structure_until(set, triangle_set_each_intersector_for_triangle, args);
+    rval = geo_set_each_structure_until(set, triangle_set_each_intersector_for_triangle, args);
   }
+  return rval;
 }
 
 VALUE
@@ -123,7 +125,7 @@ rb_triangle_set_intersectors(VALUE self, VALUE line) {
   GEO_SET(self, me);
   LINE(line, l);
   rval = rb_ary_new();
-  triangle_set_each_intersector(me, l, triangle_set_add_to_rb_ary, &rval);
+  triangle_set_each_intersector_until(me, l, triangle_set_add_to_rb_ary, &rval);
   return rval;
 }
 
@@ -385,6 +387,55 @@ rb_triangle_set_segment_ids_for_triangle(VALUE self, VALUE t) {
   return rval;
 }
 
+static gpointer
+triangle_set_each_container(GeoSet *set, gpointer triangle, gpointer user_data) {
+  gpointer *args = (gpointer *) user_data;
+  Point *point = (Point *) args[0];
+  geo_set_structure_handler handler = (geo_set_structure_handler) args[1];
+  gpointer handler_args = args[2];
+  gpointer rval;
+  if (triangle_contains((Triangle *) triangle, (Point *) point)) {
+    if ((rval = handler(set, triangle, handler_args)) != NULL)
+      return rval;
+  }
+  return NULL;
+}
+
+gpointer
+triangle_set_each_container_until(GeoSet *set, Point *p, geo_set_structure_handler handler, gpointer handler_args) {
+  gpointer rval = NULL;
+  gpointer args[3] = { p, handler, handler_args };
+  if (set->indexed) {
+    TRIANGLE_SET_REINDEX(set);
+    rval = geo_set_each_structure_having_common_segment_id_with_point_until(set,
+									    p,
+									    triangle_set_each_container,
+									    args);
+  } else {
+    rval = geo_set_each_structure_until(set, triangle_set_each_container, args);
+  }
+  return rval;
+}
+
+static gpointer
+geo_set_add_container_to_rb_ary(GeoSet *set, gpointer triangle, gpointer ary) {
+  rb_ary_push(*( (VALUE *) ary ), ( (Triangle *) triangle )->rbTriangle);
+  return NULL;
+}
+
+VALUE
+rb_triangle_set_containers(VALUE self, VALUE p) {
+  Point *point;
+  GeoSet *set;
+  VALUE rval;
+  CHECK_POINT(p);
+  GEO_SET(self, set);
+  POINT(p, point);
+  rval = rb_ary_new();
+  triangle_set_each_container_until(set, point, geo_set_add_container_to_rb_ary, &rval);
+  return rval;
+}
+
 void
 init_triangle_set_o() {
 }

data/ext/triangle_set.h

@@ -52,6 +52,12 @@ rb_triangle_set_intersects(VALUE self, VALUE line);
 VALUE
 rb_triangle_set_first_container(VALUE self, VALUE p);
 
+VALUE
+rb_triangle_set_containers(VALUE self, VALUE p);
+
+gpointer
+triangle_set_each_container_until(GeoSet *set, Point *p, geo_set_structure_handler handler, gpointer handler_args);
+
 VALUE
 rb_triangle_set_contains(VALUE self, VALUE p);
 
@@ -85,7 +91,7 @@ geo_set_each_structure_having_common_segment_id_with_triangle_until(GeoSet *set,
 void
 triangle_set_mark(GeoSet *set);
 
-void
-triangle_set_each_intersector(GeoSet *set, Line *line, geo_set_structure_handler handler, gpointer user_data);
+gpointer
+triangle_set_each_intersector_until(GeoSet *set, Line *line, geo_set_structure_handler handler, gpointer user_data);
 
 #endif

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: geo
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Martin Kihlgren
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-11 00:00:00 +01:00
+date: 2008-01-19 00:00:00 +01:00
 default_executable: 
 dependencies: []