geomerative 0.2.0-java → 0.3.2-java

data/src/geomerative/RPolygon.java

@@ -18,7 +18,11 @@
  */
 package geomerative;
 
-import processing.core.*;
+//import processing.core.*;
+
+import processing.core.PApplet;
+import processing.core.PGraphics;
+
 
 /**
  * RPolygon is a reduced interface for creating, holding and drawing complex
@@ -504,7 +508,7 @@ public class RPolygon extends RGeomElem {
         }
 
         RPoint[] result = null;
-        RPoint[] newresult = null;
+        RPoint[] newresult;
         for (int i = 0; i < numContours; i++) {
             RPoint[] newPoints = contours[i].getHandles();
             if (newPoints != null) {
@@ -538,7 +542,7 @@ public class RPolygon extends RGeomElem {
         }
 
         RPoint[] result = null;
-        RPoint[] newresult = null;
+        RPoint[] newresult;
         for (int i = 0; i < numContours; i++) {
             RPoint[] newPoints = contours[i].getPoints();
             if (newPoints != null) {

data/src/geomerative/RSVG.java

@@ -19,8 +19,11 @@
 
 package geomerative;
 
-import processing.core.*;
-import processing.data.*;
+
+import processing.core.PApplet;
+import processing.core.PConstants;
+import processing.core.PGraphics;
+import processing.data.XML;
 
 /**
  * @extended
@@ -90,8 +93,8 @@ public class RSVG
   }
 
   public float unitsToPixels(String units, float originalPxSize, float dpi) {
-    int chars = 0;
-    float multiplier = 1.0f;
+    int chars;
+    float multiplier;
 
     if (units.endsWith("em")) {
       chars = 2;
@@ -295,13 +298,13 @@ public class RSVG
       result += "stroke-linecap:";
 
       switch (style.strokeCap) {
-      case RG.PROJECT:
+      case PConstants.PROJECT:
         result += "butt";
         break;
-      case RG.ROUND:
+      case PConstants.ROUND:
         result += "round";
         break;
-      case RG.SQUARE:
+      case PConstants.SQUARE:
         result += "square";
         break;
 
@@ -316,13 +319,13 @@ public class RSVG
       result += "stroke-linejoin:";
 
       switch (style.strokeJoin) {
-      case RG.MITER:
+      case PConstants.MITER:
         result += "miter";
         break;
-      case RG.ROUND:
+      case PConstants.ROUND:
         result += "round";
         break;
-      case RG.BEVEL:
+      case PConstants.BEVEL:
         result += "bevel";
         break;
 

data/src/geomerative/RShape.java

@@ -18,7 +18,12 @@
  */
 package geomerative;
 
-import processing.core.*;
+
+
+import processing.core.PApplet;
+import processing.core.PConstants;
+import processing.core.PGraphics;
+
 
 /**
  * RShape is a reduced interface for creating, holding and drawing complex
@@ -749,7 +754,7 @@ public class RShape extends RGeomElem {
         int numPaths = countPaths();
 
         RPoint[] result = null;
-        RPoint[] newresult = null;
+        RPoint[] newresult;
         for (int i = 0; i < numPaths; i++) {
             RPoint[] newPoints = paths[i].getHandles();
             if (newPoints != null) {
@@ -819,7 +824,7 @@ public class RShape extends RGeomElem {
 
         RCommand.segmentAccOffset = RCommand.segmentOffset;
         RPoint[] result = null;
-        RPoint[] newresult = null;
+        RPoint[] newresult;
         for (int i = 0; i < numPaths; i++) {
             RPoint[] newPoints = paths[i].getPoints();
             if (newPoints != null) {
@@ -931,7 +936,7 @@ public class RShape extends RGeomElem {
             return false;
         }
         int nvert = verts.length;
-        int i, j = 0;
+        int i, j;
         boolean c = false;
         for (i = 0, j = nvert - 1; i < nvert; j = i++) {
             if (((verts[i].y > testy) != (verts[j].y > testy))
@@ -950,11 +955,12 @@ public class RShape extends RGeomElem {
      * @return RPoint[], the points returned in an array.
      *
      */
+    @Override
     public RPoint[] getTangents() {
         int numPaths = countPaths();
 
         RPoint[] result = null;
-        RPoint[] newresult = null;
+        RPoint[] newresult;
         for (int i = 0; i < numPaths; i++) {
             RPoint[] newPoints = paths[i].getTangents();
             if (newPoints != null) {
@@ -995,11 +1001,12 @@ public class RShape extends RGeomElem {
      * @return RPoint[], the points returned in an array.
      *
      */
+    @Override
     public RPoint[][] getPointsInPaths() {
         int numPaths = countPaths();
 
         RPoint[][] result = null;
-        RPoint[][] newresult = null;
+        RPoint[][] newresult;
         for (int i = 0; i < numPaths; i++) {
             RPoint[][] newPointPaths = paths[i].getPointsInPaths();
             if (newPointPaths != null) {
@@ -1042,7 +1049,7 @@ public class RShape extends RGeomElem {
         int numPaths = countPaths();
 
         RPoint[][] result = null;
-        RPoint[][] newresult = null;
+        RPoint[][] newresult;
         for (int i = 0; i < numPaths; i++) {
             RPoint[][] newHandlePaths = paths[i].getHandlesInPaths();
             if (newHandlePaths != null) {
@@ -1084,7 +1091,7 @@ public class RShape extends RGeomElem {
         }
 
         RPoint[][] result = null;
-        RPoint[][] newresult = null;
+        RPoint[][] newresult;
         for (int i = 0; i < numPaths; i++) {
             RPoint[][] newTangentPaths = paths[i].getTangentsInPaths();
             if (newTangentPaths != null) {
@@ -1305,7 +1312,7 @@ public class RShape extends RGeomElem {
         int numPaths = countPaths();
 
         RPoint[] result = null;
-        RPoint[] newresult = null;
+        RPoint[] newresult;
         for (int i = 0; i < numPaths; i++) {
             RPoint[] newPoints = paths[i].intersectionPoints(other);
             if (newPoints != null) {
@@ -1344,7 +1351,7 @@ public class RShape extends RGeomElem {
         int numPaths = countPaths();
 
         RPoint[] result = null;
-        RPoint[] newresult = null;
+        RPoint[] newresult;
 
         for (int i = 0; i < numPaths; i++) {
             RPoint[] newPoints = paths[i].intersectionPoints(other);
@@ -1384,7 +1391,7 @@ public class RShape extends RGeomElem {
         int numPaths = countPaths();
 
         RPoint[] result = null;
-        RPoint[] newresult = null;
+        RPoint[] newresult;
 
         for (int i = 0; i < numPaths; i++) {
             RPoint[] newPoints = other.polygonIntersectionPoints(paths[i]);

data/src/geomerative/RStrip.java

@@ -18,7 +18,11 @@
  */
 package geomerative;
 
-import processing.core.*;
+
+
+import processing.core.PConstants;
+import processing.core.PGraphics;
+
 
 /**
  * RStrip is a reduced interface for creating, holding and drawing triangle

data/src/geomerative/RStyle.java

@@ -18,7 +18,11 @@
 */
 
 package geomerative ;
-import processing.core.*;
+
+import processing.core.PApplet;
+import processing.core.PConstants;
+import processing.core.PGraphics;
+import processing.core.PImage;
 
 /**
  * @extended
@@ -44,10 +48,10 @@ public class RStyle{
   public float strokeWeight = 1F;
 
   public boolean strokeCapDef = false;
-  public int strokeCap = RG.PROJECT;
+  public int strokeCap = PConstants.PROJECT;
 
   public boolean strokeJoinDef = false;
-  public int strokeJoin = RG.MITER;
+  public int strokeJoin = PConstants.MITER;
 
   private boolean oldFill = false;
   private int oldFillColor = 0;
@@ -55,8 +59,8 @@ public class RStyle{
   private boolean oldStroke = false;
   private int oldStrokeColor = 0;
   private float oldStrokeWeight = 1F;
-  private int oldStrokeCap = RG.PROJECT;
-  private int oldStrokeJoin = RG.MITER;
+  private int oldStrokeCap = PConstants.PROJECT;
+  private int oldStrokeJoin = PConstants.MITER;
 
   public RStyle(){}
 
@@ -192,13 +196,13 @@ public class RStyle{
 
       switch (str) {
           case "butt":
-              strokeCap = RG.PROJECT;
+              strokeCap = PConstants.PROJECT;
               break;
           case "round":
-              strokeCap = RG.ROUND;
+              strokeCap = PConstants.ROUND;
               break;
           case "square":
-              strokeCap = RG.SQUARE;
+              strokeCap = PConstants.SQUARE;
               break;
       }
   }
@@ -209,13 +213,13 @@ public class RStyle{
 
       switch (str) {
           case "miter":
-              strokeJoin = RG.MITER;
+              strokeJoin = PConstants.MITER;
               break;
           case "round":
-              strokeJoin = RG.ROUND;
+              strokeJoin = PConstants.ROUND;
               break;
           case "bevel":
-              strokeJoin = RG.BEVEL;
+              strokeJoin = PConstants.BEVEL;
               break;
       }
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geomerative
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.2
 platform: java
 authors:
 - Ricard Marxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby_art
@@ -39,20 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
 description: |2
     Geomerative java library wrapped in a rubygem. Updated to use String switch
     etc available since jdk8.
@@ -64,25 +50,39 @@ extra_rdoc_files:
 - LICENSE.md
 files:
 - ".gitignore"
+- ".mvn/extensions.xml"
+- ".mvn/wrapper/maven-wrapper.properties"
+- ".travis.yml"
+- CHANGELOG.md
+- COPYING.md
 - Gemfile
 - LICENSE
 - LICENSE.md
 - README.md
 - Rakefile
 - examples/README.md
+- examples/Rakefile
 - examples/data/FreeSans.ttf
 - examples/data/ReplicaBold.ttf
 - examples/data/bot1.svg
 - examples/data/lion.svg
+- examples/data/ruby.svg
+- examples/f_agent.rb
+- examples/font_agent.rb
 - examples/hello_polygonize.rb
 - examples/hello_svg_to_pdf.rb
 - examples/hello_world.rb
+- examples/jruby_merge.rb
 - examples/physics_type.rb
 - examples/rotate_first_letter.rb
+- examples/typo_deform.rb
+- examples/typo_extra_bright.rb
+- examples/typo_merge.rb
 - geomerative.gemspec
 - lib/geomerative.jar
 - lib/geomerative.rb
 - lib/geomerative/version.rb
+- pom.rb
 - pom.xml
 - src/geomerative/FastRClip.java
 - src/geomerative/RClip.java
@@ -199,10 +199,9 @@ requirements:
 - A decent graphics card
 - java runtime >= 1.8+
 - processing = 3.0.1+
-- maven = 3.3.3
 - jruby_art = 1.0+
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Updated geomerative library for JRubyArt