geo 0.1.4 → 0.1.5

data/ext/triangle.h

@@ -19,7 +19,7 @@
 #ifndef TRIANGLE_H
 #define TRIANGLE_H
 
-#include "common.h"
+#include <common.h>
 
 
 extern VALUE rb_triangle;
@@ -28,7 +28,7 @@ extern VALUE rb_triangle;
 #define TRIANGLE(rb_triangle,triangle_pointer) Data_Get_Struct((rb_triangle), Triangle, (triangle_pointer))
 #define TRIANGLE_EQUALS(t1,t2) (POINT_EQUALS((t1)->p1, (t2)->p1) && POINT_EQUALS((t1)->p2, (t2)->p2) && POINT_EQUALS((t1)->p3, (t2)->p3))
 #define TRIANGLE_P(t) (!NIL_P((t)) && rb_is_a((t), rb_triangle))
-#define CHECK_TRIANGLE(t) if (!TRIANGLE_P((t))) rb_raise(rb_eTypeError, "Expected Grueserve::Map::Triangle!")
+#define CHECK_TRIANGLE(t) if (!TRIANGLE_P((t))) rb_raise(rb_eTypeError, "Expected Geo::Triangle!")
 #define TRIANGLE_BOUNDS(t,bottom_left,top_right) (bottom_left)->x = MIN(t->p1->x, MIN(t->p2->x, t->p3->x)); \
   (bottom_left)->y = MIN(t->p1->y, MIN(t->p2->y, t->p3->y));		\
   (top_right)->x = MAX(t->p1->x, MAX(t->p2->x, t->p3->x));		\
@@ -91,6 +91,8 @@ rb_triangle_intersects(VALUE self, VALUE line);
 VALUE
 rb_triangle_from_gpointer(gpointer l);
 
+gchar*
+triangle_inspect(Triangle *t);
 
 
 

data/ext/triangle_set.c

@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
-#include "common.h"
+#include <common.h>
 
 VALUE rb_triangle_set;
 
@@ -28,7 +28,7 @@ g_hash_table_mark_triangle(gpointer key, gpointer value, gpointer user_data) {
   rb_gc_mark( ( (Triangle *) key )->rbTriangle);
 }
 
-static void
+void
 triangle_set_mark(GeoSet *set) {
   g_hash_table_foreach(set->table, g_hash_table_mark_triangle, NULL);
 }
@@ -70,48 +70,61 @@ rb_triangle_set_delete(VALUE self, VALUE triangle) {
   return geo_set_delete(me, (gpointer) t, triangle);
 }
 
-static void
-g_hash_table_yield_triangle(gpointer key, gpointer value, gpointer user_data) {
-  rb_yield(( (Triangle *) key )->rbTriangle);
+static gpointer
+g_hash_table_yield_triangle(GeoSet *set, gpointer structure, gpointer user_data) {
+  rb_yield(( (Triangle *) structure )->rbTriangle);
+  return NULL;
 }
 
 VALUE
 rb_triangle_set_each(VALUE self) {
   GeoSet *set;
   GEO_SET(self, set);
-  geo_set_foreach(set, g_hash_table_yield_triangle);
+  geo_set_each_structure_until(set, g_hash_table_yield_triangle, NULL);
   return self;
 }
 
 static gpointer
-triangle_set_collect_triangle_intersectors_in_rb_ary(GeoSet *set, gpointer structure, gpointer user_data) {
+triangle_set_each_intersector_for_triangle(GeoSet *set, gpointer structure, gpointer user_data) {
   gpointer *args = (gpointer *) user_data;
   Triangle *triangle = (Triangle *) structure;
   Line *line = (Line *) args[0];
-  VALUE *rval = (VALUE *) args[1];
+  geo_set_structure_handler handler = (geo_set_structure_handler) args[1];
+  gpointer handler_args = args[2];
   if (triangle_intersects(triangle, line)) {
-    rb_ary_push(*rval, triangle->rbTriangle);
+    handler(set, triangle, handler_args);
   }
   return NULL;
 }
 
-static VALUE
-triangle_set_intersectors(GeoSet *set, Line *line) {
-  VALUE rval = rb_ary_new();
-  gpointer args[2] = { line, &rval };
-  TRIANGLE_SET_REINDEX(set);
-  geo_set_each_structure_having_common_segment_id_with_line_until(set, line, triangle_set_collect_triangle_intersectors_in_rb_ary, args);
-  return rval;
+static gpointer
+triangle_set_add_to_rb_ary(GeoSet *set, gpointer structure, gpointer user_data) {
+  rb_ary_push(*( (VALUE *) user_data), ( (Triangle *) structure)->rbTriangle);
+  return NULL;
+}
+
+void
+triangle_set_each_intersector(GeoSet *set, Line *line, geo_set_structure_handler handler, gpointer user_data) {
+  gpointer args[3] = { line, handler, user_data };
+  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);
+  } else {
+    geo_set_each_structure_until(set, triangle_set_each_intersector_for_triangle, args);
+  }
 }
 
 VALUE
 rb_triangle_set_intersectors(VALUE self, VALUE line) {
   GeoSet *me;
   Line *l;
+  VALUE rval;
   CHECK_LINE(line);
   GEO_SET(self, me);
   LINE(line, l);
-  return triangle_set_intersectors(me, l);
+  rval = rb_ary_new();
+  triangle_set_each_intersector(me, l, triangle_set_add_to_rb_ary, &rval);
+  return rval;
 }
 
 static gpointer
@@ -126,10 +139,16 @@ triangle_set_intersecting(GeoSet *set, gpointer triangle_gp, gpointer line_gp) {
 static gboolean
 triangle_set_intersects(GeoSet *set, Line *line) {
   TRIANGLE_SET_REINDEX(set);
-  return GBOOL2RB(geo_set_each_structure_having_common_segment_id_with_line_until(set, 
-										  line, 
-										  triangle_set_intersecting, 
-										  line) != NULL);
+  if (set->indexed) {
+    return GBOOL2RB(geo_set_each_structure_having_common_segment_id_with_line_until(set, 
+										    line, 
+										    triangle_set_intersecting, 
+										    line) != NULL);
+  } else {
+    return GBOOL2RB(geo_set_each_structure_until(set, 
+						 triangle_set_intersecting, 
+						 line) != NULL);
+  }
 }
 
 VALUE
@@ -153,11 +172,15 @@ triangle_set_find_container(GeoSet *Set, gpointer triangle_gp, gpointer point_gp
 
 static Triangle*
 triangle_set_first_container(GeoSet *set, Point *point) {
-  TRIANGLE_SET_REINDEX(set);
-  return ( (Triangle *) geo_set_each_structure_having_common_segment_id_with_point_until(set,
-											 point,
-											 triangle_set_find_container,
-											 point));
+  if (set->indexed) {
+    TRIANGLE_SET_REINDEX(set);
+    return ( (Triangle *) geo_set_each_structure_having_common_segment_id_with_point_until(set,
+											   point,
+											   triangle_set_find_container,
+											   point));
+  } else {
+    return ( (Triangle *) geo_set_each_structure_until(set, triangle_set_find_container, point));
+  }
 }
 
 VALUE
@@ -362,3 +385,6 @@ rb_triangle_set_segment_ids_for_triangle(VALUE self, VALUE t) {
   return rval;
 }
 
+void
+init_triangle_set_o() {
+}

data/ext/triangle_set.h

@@ -19,13 +19,14 @@
 #ifndef TRIANGLE_SET_H
 #define TRIANGLE_SET_H
 
-#include "common.h"
+#include <common.h>
 
 extern VALUE rb_triangle_set;
 
 
-#define RB_TRIANGLE_SET(triangle_set_pointer,klass) Data_Wrap_Struct(klass, triangle_set_mark, geo_set_free, (triangle_set_pointer))
-#define TRIANGLE_SET_REINDEX(set) if (set->index_dirty) triangle_set_reindex(set)
+#define RB_TRIANGLE_SET(triangle_set_pointer,klass) ((triangle_set_pointer)->rbGeoSet = Data_Wrap_Struct(klass, triangle_set_mark, geo_set_free, (triangle_set_pointer)))
+#define TRIANGLE_SET_REINDEX(set) if (set->index_dirty && set->indexed) triangle_set_reindex(set)
+#define TRIANGLE_SET_P(l) (!NIL_P((l)) && rb_is_a((l), rb_triangle_set))
 
 VALUE
 rb_triangle_set_alloc(VALUE class);
@@ -81,5 +82,10 @@ geo_set_each_structure_having_common_segment_id_with_triangle_until(GeoSet *set,
 								    geo_set_structure_handler handler, 
 								    gpointer user_data);
 
+void
+triangle_set_mark(GeoSet *set);
+
+void
+triangle_set_each_intersector(GeoSet *set, Line *line, geo_set_structure_handler handler, gpointer user_data);
 
 #endif

data/ext/types.h

@@ -59,6 +59,8 @@ typedef struct {
   GHashTable *segments; // x-index_from_left(0) << 16 + y-index_from_top(ymax)
   GHashTable *segment_lines; // x-index_from_left(0) << 16 + y-index_from_top(ymax)
   gboolean index_dirty;
+  gboolean indexed;
+  VALUE rbGeoSet;
 } GeoSet;
 
 

metadata

@@ -1,33 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: geo
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
-date: 2007-12-17 00:00:00 +01:00
-summary: A 2D geometry engine.
-require_paths: 
-- lib
-email: geo at troja dot ath dot cx
-homepage: 
-rubyforge_project: 
-description: 
-autorequire: geo
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.1.5
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Martin Kihlgren
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-01-11 00:00:00 +01:00
+default_executable: 
+dependencies: []
+
+description: 
+email: geo at troja dot ath dot cx
+executables: []
+
+extensions: 
+- ext/extconf.rb
+extra_rdoc_files: 
+- README
 files: 
 - ext/common.c
 - ext/common.h
@@ -52,18 +45,32 @@ files:
 - ext/types.h
 - examples/intersects.rb
 - README
-test_files: []
-
+has_rdoc: true
+homepage: 
+post_install_message: 
 rdoc_options: 
 - --line-numbers
 - --inline-source
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: 
-- ext/extconf.rb
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: A 2D geometry engine.
+test_files: []