geo 0.1.6 → 0.1.7

data/ext/common.c

@@ -48,6 +48,3 @@ gpointer_compare_as_uint(gconstpointer p1, gconstpointer p2) {
   return GPOINTER_TO_UINT(p1) - GPOINTER_TO_UINT(p2);
 }
 
-void
-init_common_o() {
-}

data/ext/geo.c

@@ -33,7 +33,6 @@ 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.6"));
 
     rb_triangle_set = rb_define_class_under(rb_geo,
 					    "TriangleSet",
@@ -155,6 +154,7 @@ extern "C" {
     rb_define_method(rb_line, "contains?", rb_line_contains, 1);
     rb_define_method(rb_line, "parallel", rb_line_parallel, 1);
     rb_define_method(rb_line, "<=>", rb_line_cmp, 1);
+    rb_define_method(rb_line, "mirror", rb_line_mirror, 1);
 
     rb_define_alloc_func(rb_point, rb_point_alloc);
     rb_define_method(rb_point, "initialize", rb_point_initialize, 2);
@@ -180,8 +180,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-
-void
-init_geo_o() {
-}
-

data/ext/geo_set.c

@@ -530,7 +530,3 @@ rb_geo_set_height(VALUE self) {
   return rb_float_new(GEO_SET_HEIGHT(set));
 }
 
-void
-init_geo_set_o() {
-}
-

data/ext/intersection.c

@@ -73,7 +73,3 @@ rb_intersection(Intersection *intersection, Point *from) {
   }
 }
 
-void
-init_intersection_o() {
-}
-

data/ext/line.c

@@ -95,7 +95,7 @@ rb_line_initialize(int argc, VALUE *argv, VALUE self) {
     RB_POINT(p1, rb_point);
     RB_POINT(p2, rb_point);
   } else {
-    rb_raise(rb_eTypeError, "Arguments to %s#new have to be 2 Grueserve::Map::Points or 4 numbers.", rb_obj_classname(self));
+    rb_raise(rb_eTypeError, "Arguments to %s#new have to be 2 Geo::Points or 4 numbers.", rb_obj_classname(self));
   }
   LINE(self, l);
   l->p1 = p1;
@@ -193,7 +193,7 @@ rb_line_within(VALUE self, VALUE arg) {
       return Qfalse;
     }
   } else {
-    rb_raise(rb_eTypeError, "Argument to %s#within? has to be either Grueserve::Map::Line or Grueserve::Map::Point.", rb_obj_classname(self));
+    rb_raise(rb_eTypeError, "Argument to %s#within? has to be either Geo::Line or Geo::Point.", rb_obj_classname(self));
   }
 }
 
@@ -225,7 +225,7 @@ rb_line_outside(VALUE self, VALUE arg) {
       return Qfalse;
     }
   } else {
-    rb_raise(rb_eTypeError, "Argument to %s#outside? has to be either Grueserve::Map::Line or Grueserve::Map::Point.", rb_obj_classname(self));
+    rb_raise(rb_eTypeError, "Argument to %s#outside? has to be either Geo::Line or Geo::Point.", rb_obj_classname(self));
   }
 }
 
@@ -386,8 +386,10 @@ rb_line_cmp(VALUE self, VALUE o) {
 VALUE
 rb_line_reverse(VALUE self) {
   Line *me;
+  Line *rval;
   LINE(self, me);
-  return RB_LINE(new_line_with_points(me->p2, me->p1), rb_line);
+  rval = new_line_with_points(me->p2, me->p1);
+  return RB_LINE(rval, CLASS(self));
 }
 
 VALUE
@@ -417,8 +419,8 @@ rb_line_angle(VALUE self) {
 void
 line_set_abs(Line *me, double new_abs) {
   double ratio = new_abs / DISTANCE(me->p1, me->p2);
-  me->p2->x = me->p2->x * ratio;
-  me->p2->y = me->p2->y * ratio;
+  me->p2->x = me->p1->x + ((me->p2->x - me->p1->x) * ratio);
+  me->p2->y = me->p1->y + ((me->p2->y - me->p1->y) * ratio);
 }
 
 VALUE
@@ -442,6 +444,67 @@ rb_line_clone(VALUE self) {
   return RB_LINE(rval, CLASS(self));
 }
 
+static Point*
+line_mirror_point(Line *l, Point *p) {
+  Point *rval;
+  if (DBL_EQL(l->p1->x, l->p2->x)) {
+    rval = new_point(-p->x + (2 * l->p1->x),
+		     p->y);
+  } else {
+    gdouble line_k1 = (l->p2->y - l->p1->y) / (l->p2->x - l->p1->x);
+    gdouble line_k2 = l->p1->y - (line_k1 * l->p1->x);
+
+    gdouble normal_x_coord = line_k1;
+    gdouble normal_y_coord = -1.0;
+    gdouble normal_abs = sqrt((normal_x_coord * normal_x_coord) + (normal_y_coord * normal_y_coord));
+
+    // here we translate the point by subtracting line_k2 from p->y to force the projection to be against the line as it crosses origo
+    gdouble projection_factor = ((p->x * normal_x_coord + (p->y - line_k2) * normal_y_coord) / 
+				 (normal_abs * normal_abs));
+    gdouble projection_x_coord = normal_x_coord * projection_factor;
+    gdouble projection_y_coord = normal_y_coord * projection_factor;
+
+    rval = new_point(p->x - (2 * projection_x_coord),
+		     p->y - (2 * projection_y_coord));
+  }
+  return rval;
+}
+
+static VALUE
+rb_line_mirror_point(Line *me, Point *p) {
+  Point *rval = line_mirror_point(me, p);
+  return RB_POINT(rval, CLASS(p->rbPoint));
+}
+
+static VALUE 
+rb_line_mirror_line(Line *me, Line *o) {
+  Point *p1 = line_mirror_point(me, o->p1);
+  Point *p2 = line_mirror_point(me, o->p2);
+  Line *rval;
+  RB_POINT(p1, CLASS(o->p1->rbPoint));
+  RB_POINT(p2, CLASS(o->p2->rbPoint));
+  rval = new_line_with_points(p1, p2);
+  return RB_LINE(rval, CLASS(o->rbLine));
+}
+
+VALUE
+rb_line_mirror(VALUE self, VALUE other) {
+  Line *me;
+  if (LINE_P(other)) {
+    Line *o;
+    LINE(self, me);
+    LINE(other, o);
+    return rb_line_mirror_line(me, o);
+  } else if (POINT_P(other)) {
+    Point *o;
+    LINE(self, me);
+    POINT(other, o);
+    return rb_line_mirror_point(me, o);
+  } else {
+    rb_raise(rb_eTypeError, "Argument to %s#mirror have to be either Geo::Line or Geo::Point.", rb_obj_classname(self));
+  }
+}
+
 VALUE
 rb_line_side(VALUE self, VALUE p) {
   Line *me;
@@ -598,6 +661,3 @@ line_hash(gconstpointer l) {
   return (guint) (line->p1->x + line->p1->y + line->p2->x + line->p2->y);
 }
 
-void
-init_line_o() {
-}

data/ext/line.h

@@ -199,4 +199,7 @@ line_equals(gconstpointer a, gconstpointer b);
 void
 line_free(Line *l);
 
+VALUE
+rb_line_mirror(VALUE self, VALUE other);
+
 #endif

data/ext/line_set.c

@@ -374,8 +374,10 @@ rb_line_set_closest_intersection(VALUE self, VALUE l) {
 VALUE
 rb_line_set_clone(VALUE self) {
   GeoSet *me;
+  GeoSet *rval;
   GEO_SET(self, me);
-  return RB_LINE_SET(geo_set_clone(me), CLASS(self));
+  rval = geo_set_clone(me);
+  return RB_LINE_SET(rval, CLASS(self));
 }
 
 VALUE
@@ -522,7 +524,3 @@ rb_line_set_reindex(VALUE self) {
   return GBOOL2RB(line_set_reindex(me));
 }
 
-void
-init_line_set_o() {
-}
-

data/ext/point.c

@@ -233,7 +233,7 @@ rb_point_to(int argc, VALUE *argv, VALUE self) {
     rval = new_line_with_points(me, other_end);
     return RB_LINE(rval, rb_line);
   } else {
-    rb_raise(rb_eTypeError, "Arguments to %s#to has to be either a Grueserve::Map::Point or 2 numbers.", rb_obj_classname(self));
+    rb_raise(rb_eTypeError, "Arguments to %s#to has to be either a Geo::Point or 2 numbers.", rb_obj_classname(self));
   }
 }
 
@@ -301,6 +301,3 @@ point_hash(gconstpointer p) {
   return (guint) (point->x + point->y);
 }
 
-void
-init_point_o() {
-}

data/ext/point_set.c

@@ -86,8 +86,10 @@ rb_point_set_each(VALUE self) {
 VALUE
 rb_point_set_clone(VALUE self) {
   GeoSet *me;
+  GeoSet *rval;
   GEO_SET(self, me);
-  return RB_POINT_SET(geo_set_clone(me), CLASS(self));
+  rval = geo_set_clone(me);
+  return RB_POINT_SET(rval, CLASS(self));
 }
 
 gpointer
@@ -109,6 +111,3 @@ geo_set_each_structure_having_common_segment_id_with_point_until(GeoSet *set,
   return rval;
 }
 
-void
-init_point_set_o() {
-}

data/ext/triangle.c

@@ -82,7 +82,7 @@ rb_triangle_initialize(int argc, VALUE *argv, VALUE self) {
     RB_POINT(p2, rb_point);
     RB_POINT(p3, rb_point);
   } else {
-    rb_raise(rb_eTypeError, "Arguments to %s#new have to be 3 Grueserve::Map::Points or 6 numbers.", rb_obj_classname(self));
+    rb_raise(rb_eTypeError, "Arguments to %s#new have to be 3 Geo::Points or 6 numbers.", rb_obj_classname(self));
   }
   TRIANGLE(self, t);
   t->p1 = p1;
@@ -446,6 +446,3 @@ rb_triangle_from_gpointer(gpointer l) {
   return ( (Triangle *) l)->rbTriangle;
 }
 
-void
-init_triangle_o() {
-}

data/ext/triangle_set.c

@@ -211,8 +211,10 @@ rb_triangle_set_contains(VALUE self, VALUE p) {
 VALUE
 rb_triangle_set_clone(VALUE self) {
   GeoSet *me;
+  GeoSet *rval;
   GEO_SET(self, me);
-  return RB_TRIANGLE_SET(geo_set_clone(me), CLASS(self));
+  rval = geo_set_clone(me);
+  return RB_TRIANGLE_SET(rval, CLASS(self));
 }
 
 VALUE
@@ -436,6 +438,3 @@ rb_triangle_set_containers(VALUE self, VALUE p) {
   return rval;
 }
 
-void
-init_triangle_set_o() {
-}

metadata

@@ -1,38 +1,41 @@
 --- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.0
+specification_version: 1
 name: geo
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
+date: 2008-08-19 00:00:00 +02:00
+summary: A 2D geometry engine.
+require_paths: 
+- lib
+email: geo at troja dot ath dot cx
+homepage: 
+rubyforge_project: 
+description: 
+autorequire: 
+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: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
 authors: 
 - Martin Kihlgren
-autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2008-01-19 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
 - ext/extconf.rb
-- ext/geo.c
-- ext/geo_set.c
-- ext/geo_set.h
 - ext/intersection.c
 - ext/intersection.h
 - ext/line.c
 - ext/line.h
-- ext/line_set.c
 - ext/line_set.h
 - ext/point.c
 - ext/point.h
@@ -42,35 +45,25 @@ files:
 - ext/triangle.h
 - ext/triangle_set.c
 - ext/triangle_set.h
+- ext/geo_set.c
+- ext/geo_set.h
+- ext/geo.c
+- ext/line_set.c
 - ext/types.h
 - examples/intersects.rb
 - README
-has_rdoc: true
-homepage: 
-post_install_message: 
+test_files: []
+
 rdoc_options: 
 - --line-numbers
 - --inline-source
-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: 
+extra_rdoc_files: 
+- README
+executables: []
+
+extensions: 
+- ext/extconf.rb
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
-signing_key: 
-specification_version: 2
-summary: A 2D geometry engine.
-test_files: []
+dependencies: []