ruby_clipper 5.0.3 → 6.2.1.5.2

data/ext/clipper/rbclipper.cpp

@@ -1,4 +1,4 @@
-/* 
+/*
  * Clipper Ruby Bindings
  * Copyright 2010 Mike Owens <http://mike.filespanker.com/>
  * Changed by Dag Rende for Clipper after 2.9
@@ -7,7 +7,7 @@
  *
  */
 
-#include <clipper.hpp>
+#include "clipper.hpp"
 #include <ruby.h>
 
 #ifndef DBL2NUM
@@ -26,6 +26,11 @@ static ID id_ex_polygons;
 static ID id_jtSquare;
 static ID id_jtMiter;
 static ID id_jtRound;
+static ID id_etClosedPolygon;
+static ID id_etClosedLine;
+static ID id_etOpenButt;
+static ID id_etOpenSquare;
+static ID id_etOpenRound;
 
 static inline Clipper*
 XCLIPPER(VALUE x)
@@ -35,6 +40,14 @@ XCLIPPER(VALUE x)
   return clipper;
 }
 
+static inline ClipperOffset*
+XCLIPPEROFFSET(VALUE x)
+{
+  ClipperOffset* clipperOffset;
+  Data_Get_Struct(x, ClipperOffset, clipperOffset);
+  return clipperOffset;
+}
+
 static inline PolyFillType
 sym_to_filltype(VALUE sym)
 {
@@ -53,6 +66,26 @@ sym_to_filltype(VALUE sym)
   rb_raise(rb_eArgError, "%s", "Expected :even_odd, :non_zero, :positive or :negative");
 }
 
+static inline EndType
+sym_to_endtype(VALUE sym)
+{
+  ID inp = rb_to_id(sym);
+
+  if (inp == id_etClosedPolygon) {
+    return etClosedPolygon;
+  } else if (inp == id_etClosedLine) {
+    return etClosedLine;
+  } else if (inp == id_etOpenButt) {
+    return etOpenButt;
+  } else if (inp == id_etOpenSquare) {
+    return etOpenSquare;
+  } else if (inp == id_etOpenRound) {
+    return etOpenRound;
+  }
+
+  rb_raise(rb_eArgError, "%s", "Expected :etClosedPolygon, :etClosedLine or :etOpenButt or :etOpenSquare or :etOpenRound");
+}
+
 static inline JoinType
 sym_to_jointype(VALUE sym)
 {
@@ -71,11 +104,16 @@ sym_to_jointype(VALUE sym)
 
 extern "C" {
 
+static inline IntPoint
+xy_to_intpoint(VALUE px, VALUE py, double multiplier) {
+  return IntPoint((long64)(NUM2DBL(px) * multiplier), (long64)(NUM2DBL(py) * multiplier));
+}
+
 static void
-ary_to_polygon(VALUE ary, ClipperLib::Polygon* poly, double multiplier)
+ary_to_polygon(VALUE ary, ClipperLib::Path* poly, double multiplier)
 {
   const char* earg =
-    "Polygons have format: [[p0_x, p0_y], [p1_x, p1_y], ...]";
+    "Paths have format: [[p0_x, p0_y], [p1_x, p1_y], ...]";
 
   Check_Type(ary, T_ARRAY);
 
@@ -99,6 +137,12 @@ rbclipper_free(void* ptr)
   delete (Clipper*) ptr;
 }
 
+static void
+rbclipperoffset_free(void* ptr)
+{
+  delete (ClipperOffset*) ptr;
+}
+
 static VALUE
 rbclipper_new(VALUE klass)
 {
@@ -109,30 +153,40 @@ rbclipper_new(VALUE klass)
   return r;
 }
 
+static VALUE
+rbclipperoffset_new(VALUE klass)
+{
+  ClipperOffset* ptr = new ClipperOffset;
+  VALUE r = Data_Wrap_Struct(klass, 0, rbclipperoffset_free, ptr);
+  rb_obj_call_init(r, 0, 0);
+  rb_iv_set(r, "@multiplier", INT2NUM(1048576));
+  return r;
+}
+
 static VALUE
 rbclipper_add_polygon_internal(VALUE self, VALUE polygon,
                                PolyType polytype)
 {
-  ClipperLib::Polygon tmp;
+  ClipperLib::Path tmp;
   double multiplier = NUM2DBL(rb_iv_get(self, "@multiplier"));
   ary_to_polygon(polygon, &tmp, multiplier);
-  XCLIPPER(self)->AddPolygon(tmp, polytype);
+  XCLIPPER(self)->AddPath(tmp, polytype, true);
   return Qnil;
 }
 
 static VALUE
 rbclipper_add_polygons_internal(VALUE self, VALUE polygonsValue, PolyType polytype) {
   double multiplier = NUM2DBL(rb_iv_get(self, "@multiplier"));
-  Polygons polygons;
+  Paths polygons;
   for(long i = 0; i != RARRAY_LEN(polygonsValue); i++) {
     VALUE sub = rb_ary_entry(polygonsValue, i);
     Check_Type(sub, T_ARRAY);
 
-    ClipperLib::Polygon tmp;
+    ClipperLib::Path tmp;
     ary_to_polygon(sub, &tmp, multiplier);
     polygons.push_back(tmp);
   }
-  XCLIPPER(self)->AddPolygons(polygons, polytype);
+  XCLIPPER(self)->AddPaths(polygons, polytype, true);
   return Qnil;
 }
 
@@ -167,6 +221,13 @@ rbclipper_clear(VALUE self)
   return Qnil;
 }
 
+static VALUE
+rbclipperoffset_clear(VALUE self)
+{
+  XCLIPPEROFFSET(self)->Clear();
+  return Qnil;
+}
+
 static VALUE
 rbclipper_multiplier(VALUE self)
 {
@@ -184,10 +245,9 @@ static VALUE
 rbclipper_orientation(VALUE self, VALUE polygonValue)
 {
     double multiplier = NUM2DBL(rb_iv_get(self, "@multiplier"));
-    ClipperLib::Polygon polygon;
+    ClipperLib::Path polygon;
     ary_to_polygon(polygonValue, &polygon, multiplier);
 
-    Polygons resultPolygons;
     return ClipperLib::Orientation(polygon) ? Qtrue : Qfalse;
 }
 
@@ -195,44 +255,50 @@ static VALUE
 rbclipper_area(VALUE self, VALUE polygonValue)
 {
     double multiplier = NUM2DBL(rb_iv_get(self, "@multiplier"));
-    ClipperLib::Polygon polygon;
+    ClipperLib::Path polygon;
     ary_to_polygon(polygonValue, &polygon, multiplier);
 
-    Polygons resultPolygons;
     return DBL2NUM(ClipperLib::Area(polygon) / multiplier / multiplier);
 }
 
+static VALUE
+rbclipper_point_in_polygon(VALUE self, VALUE px, VALUE py, VALUE polygonValue)
+{
+    double multiplier = NUM2DBL(rb_iv_get(self, "@multiplier"));
+    ClipperLib::Path polygon;
+    ary_to_polygon(polygonValue, &polygon, multiplier);
+
+    return abs(ClipperLib::PointInPolygon(xy_to_intpoint(px, py, multiplier), polygon)) == 1 ? Qtrue : Qfalse;
+}
 
 static VALUE
-rbclipper_offset_polygons(int argc, VALUE* argv, VALUE self) 
+rbclipper_offset_polygons(int argc, VALUE* argv, VALUE self)
 {
     double multiplier = NUM2DBL(rb_iv_get(self, "@multiplier"));
     double inv_multiplier = 1.0 / multiplier;
-    VALUE polygonsValue, deltaValue, joinTypeValue, miterLimitValue;
+    VALUE polygonsValue, deltaValue, joinTypeValue, endTypeValue;
 
-    rb_scan_args(argc, argv, "31", &polygonsValue, &deltaValue, &joinTypeValue, &miterLimitValue);
+    rb_scan_args(argc, argv, "31", &polygonsValue, &deltaValue, &joinTypeValue, &endTypeValue);
 
-    Polygons polygons;
+    Paths polygons;
     for(long i = 0; i != RARRAY_LEN(polygonsValue); i++) {
         VALUE sub = rb_ary_entry(polygonsValue, i);
         Check_Type(sub, T_ARRAY);
 
-        ClipperLib::Polygon tmp;
+        ClipperLib::Path tmp;
         ary_to_polygon(sub, &tmp, multiplier);
         polygons.push_back(tmp);
     }
-    double miterLimit = 0;
-    if (!NIL_P(miterLimitValue)) {
-        miterLimit = NUM2DBL(miterLimitValue);
-    }
 
-    Polygons resultPolygons;
-    ClipperLib::OffsetPolygons(polygons, resultPolygons, NUM2DBL(deltaValue) * multiplier, sym_to_jointype(joinTypeValue), miterLimit * multiplier);
+    Paths resultPaths;
+
+    XCLIPPEROFFSET(self)->AddPaths(polygons, sym_to_jointype(joinTypeValue), sym_to_endtype(endTypeValue));
+    XCLIPPEROFFSET(self)->Execute(resultPaths, NUM2DBL(deltaValue) * multiplier);
 
     VALUE r = rb_ary_new();
-    for(Polygons::iterator i = resultPolygons.begin(); i != resultPolygons.end(); ++i) {
+    for(Paths::iterator i = resultPaths.begin(); i != resultPaths.end(); ++i) {
         VALUE sub = rb_ary_new();
-        for(Polygon::iterator p = i->begin(); p != i->end(); ++p) {
+        for(Path::iterator p = i->begin(); p != i->end(); ++p) {
             rb_ary_push(sub, rb_ary_new3(2, DBL2NUM(p->X * inv_multiplier), DBL2NUM(p->Y * inv_multiplier)));
         }
         rb_ary_push(r, sub);
@@ -260,43 +326,18 @@ rbclipper_execute_internal(VALUE self, ClipType cliptype,
 
   VALUE r = rb_ary_new();
   if (resulttype == ID2SYM(id_polygons)) {
-      Polygons solution;
+      Paths solution;
       XCLIPPER(self)->Execute((ClipType) cliptype,
                               solution,
                               sym_to_filltype(subjfill),
                               sym_to_filltype(clipfill));
-      for(Polygons::iterator i = solution.begin(); i != solution.end(); ++i) {
+      for(Paths::iterator i = solution.begin(); i != solution.end(); ++i) {
         VALUE sub = rb_ary_new();
-        for(Polygon::iterator p = i->begin(); p != i->end(); ++p) {
+        for(Path::iterator p = i->begin(); p != i->end(); ++p) {
           rb_ary_push(sub, rb_ary_new3(2, DBL2NUM(p->X * inv_multiplier), DBL2NUM(p->Y * inv_multiplier)));
         }
         rb_ary_push(r, sub);
       }
-  } else {
-      ExPolygons solution;
-      XCLIPPER(self)->Execute((ClipType) cliptype,
-                              solution,
-                              sym_to_filltype(subjfill),
-                              sym_to_filltype(clipfill));
-      for(ExPolygons::iterator i = solution.begin(); i != solution.end(); ++i) {
-        VALUE expolygon_arr = rb_ary_new();
-
-        VALUE outer_arr = rb_ary_new();
-        for(Polygon::iterator p = i->outer.begin(); p != i->outer.end(); ++p) {
-          rb_ary_push(outer_arr, rb_ary_new3(2, DBL2NUM(p->X * inv_multiplier), DBL2NUM(p->Y * inv_multiplier)));
-        }
-        rb_ary_push(expolygon_arr, outer_arr);
-
-        for(Polygons::iterator ps = i->holes.begin(); ps != i->holes.end(); ++ps) {
-          VALUE hole_arr = rb_ary_new();
-          for(Polygon::iterator p = ps->begin(); p != ps->end(); ++p) {
-            rb_ary_push(hole_arr, rb_ary_new3(2, DBL2NUM(p->X * inv_multiplier), DBL2NUM(p->Y * inv_multiplier)));
-          }
-          rb_ary_push(expolygon_arr, hole_arr);
-        }
-
-        rb_ary_push(r, expolygon_arr);
-      }
   }
   return r;
 }
@@ -335,10 +376,10 @@ rbclipper_xor(int argc, VALUE* argv, VALUE self)
   return rbclipper_execute_internal(self, ctXor, subjfill, clipfill, resulttype);
 }
 
-
 typedef VALUE (*ruby_method)(...);
 
 void Init_clipper() {
+
     id_even_odd = rb_intern("even_odd");
     id_non_zero = rb_intern("non_zero");
     id_positive = rb_intern("positive");
@@ -348,6 +389,11 @@ void Init_clipper() {
     id_jtSquare = rb_intern("jtSquare");
     id_jtMiter = rb_intern("jtMiter");
     id_jtRound = rb_intern("jtRound");
+    id_etClosedPolygon = rb_intern("etClosedPolygon");
+    id_etClosedLine = rb_intern("etClosedLine");
+    id_etOpenButt = rb_intern("etOpenButt");
+    id_etOpenSquare = rb_intern("etOpenSquare");
+    id_etOpenRound = rb_intern("etOpenRound");
 
     VALUE mod   = rb_define_module("Clipper");
 
@@ -357,10 +403,12 @@ void Init_clipper() {
 
     rb_define_method(k, "orientation",
                    (ruby_method) rbclipper_orientation, 1);
+    rb_define_method(k, "pt_in_polygon",
+                   (ruby_method) rbclipper_point_in_polygon, 3);
     rb_define_method(k, "area",
                    (ruby_method) rbclipper_area, 1);
-    rb_define_method(k, "offset_polygons",
-                   (ruby_method) rbclipper_offset_polygons, -1);
+    // rb_define_method(k, "offset_polygons",
+    //                (ruby_method) rbclipper_offset_polygons, -1);
     rb_define_method(k, "add_subject_polygon",
                    (ruby_method) rbclipper_add_subject_polygon, 1);
     rb_define_method(k, "add_clip_polygon",
@@ -384,6 +432,19 @@ void Init_clipper() {
                    (ruby_method) rbclipper_multiplier, 0);
     rb_define_method(k, "multiplier=",
                    (ruby_method) rbclipper_multiplier_eq, 1);
-}
+
+    VALUE ko = rb_define_class_under(mod, "ClipperOffset", rb_cObject);
+    rb_define_singleton_method(ko, "new",
+                             (ruby_method) rbclipperoffset_new, 0);
+    rb_define_method(ko, "offset_polygons",
+                  (ruby_method) rbclipper_offset_polygons, -1);
+    rb_define_method(ko, "clear!",
+                   (ruby_method) rbclipperoffset_clear, 0);
+
+    rb_define_method(ko, "multiplier",
+                  (ruby_method) rbclipper_multiplier, 0);
+    rb_define_method(ko, "multiplier=",
+                  (ruby_method) rbclipper_multiplier_eq, 1);
+  }
 
 } /* extern "C" */

data/lib/clipper/version.rb

@@ -2,5 +2,5 @@ module Clipper
   # Keep first two components sync'd to Clipper's major/minor.
   # Last is our build number based on that.  Hopefully there
   # won't be too much churn re: Clipper's version vs. the bindings.
-  VERSION = "5.0.3"
+  VERSION = "6.2.1.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_clipper
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 6.2.1.5.2
 platform: ruby
 authors:
 - Angus Johnson
@@ -12,22 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
 description: Builds a native ruby extension for Clipper
 email:
 - simon@sfcgeorge.co.uk
@@ -76,3 +76,4 @@ signing_key:
 specification_version: 4
 summary: Ruby wrapper for Clipper, Angus Johnson's excellent polygon clipping library
 test_files: []
+has_rdoc: