geomerative 1.0.2-java → 1.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33db8a03328c5a03c3b153325f46682f50f8634aea3a7da0336e950b216b8235
-  data.tar.gz: 2939643b373f6f30ec8b65145965e8c80d452d44398c9c0765b622b75c8376bd
+  metadata.gz: 7049f939d3a7ad53e78332318b256d825ae16aa1a035d11314dcf225249ae3ef
+  data.tar.gz: 04ff4522150b547ef03fdb17b1d6842aa793c20d525b9b289a4b76e261f56701
 SHA512:
-  metadata.gz: c6ca44562f42d580bef313099fcaf94054beeb68bd6b5c30e07ad99861663434877346c7947a94e58e9aa0621a5b2a0e32f6274e4f0eac21dc8dbf66b54d4c3e
-  data.tar.gz: 2b5744240f76f8eb282fc1c2902a74c05b4cd64bda069a23e4b25c0f44a7c5ed4f08b041c47d41310bc5c2019e35ad522cbdb0b5ac31e2ddf37cfa2c52c16b7f
+  metadata.gz: e1421d87cfa98aa140aaf95a2094239b7f77a040c040c6f47f14c5c488a6be990f19f74288840165ec67b54cf0b9f2b8306db32e9524ab32b55cc3644a24fc82
+  data.tar.gz: 3073fc69e6df96d01c8fb46347e0524e11eab3509dde45b70a070a49d556ee4412029ab330f8c917ed6448d49f6fa6b202baaef6564fdb9508fbdc567f5650a8

data/.gitignore

@@ -13,3 +13,4 @@ MANIFEST.MF
 hs_err_pid*
 target
 *~
+/nbproject/

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### version-1.1
+Bump versions processing-3.4 (changes to smooth) , jruby-9.2.1.0. Fix `contains(RRoints[])` then rename to `containsPoints` and similarly `contains(RGeomElement shp)` to `containsShape(RShape shp)` in this respect we are deviating for original geomerative library that was flawed (and overloading `contains` method way too much).
+
 ### version-1.0.2
 Bump versions processing-3.3.7 (changes to smooth) , jruby-9.1.17.0
 

data/README.md

@@ -3,7 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/geomerative.svg)](https://badge.fury.io/rb/geomerative)
 ![travis status](https://travis-ci.org/ruby-processing/geomerativegem.svg)
 
-Gem wrapper for [Ricard Marxer Geomerative library][] for [JRubyArt][jruby_art] and [propane][propane]
+Gem wrapper for [Ricard Marxer Geomerative library][] for [JRubyArt][jruby_art], [propane][propane] and [PiCrate][picrate]
 Create amazing stuff with fonts svg etc.
 
 Read more about using the gem on the linked [web pages].
@@ -13,3 +13,4 @@ Read more about using the gem on the linked [web pages].
 [Ricard Marxer Geomerative library]:https://github.com/rikrd/geomerative
 [jruby_art]:https://ruby-processing.github.io/JRubyArt/
 [propane]:https://ruby-processing.github.io/propane/
+[picrate]:https://ruby-processing.github.io/PiCrate/

data/geomerative.gemspec

@@ -6,12 +6,11 @@ require 'geomerative/version'
 Gem::Specification.new do |spec|
   spec.name = 'geomerative'
   spec.version = Geomerative::VERSION
-  spec.has_rdoc = true
   spec.extra_rdoc_files = %w{README.md LICENSE.md}
   spec.summary = %q{Updated geomerative library for JRubyArt}
   spec.description =<<-EOS
   Geomerative java library wrapped in a rubygem. Updated to use String switch
-  etc available since jdk8.
+  etc available since jdk8, and somewhat hacked see CHANGELOG.
   EOS
   spec.licenses = %w{Apache-2.0 AGPL-3.0}
   spec.authors = %w{Ricard\ Marxer Martin\ Prout}
@@ -25,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.platform = 'java'
   spec.requirements << 'A decent graphics card'
   spec.requirements << 'java runtime >= 1.8+'
-  spec.requirements << 'processing = 3.3.7+'
+  spec.requirements << 'processing = 3.4+'
 end

data/lib/geomerative/version.rb

@@ -1,3 +1,3 @@
 module Geomerative
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/pom.rb

@@ -1,7 +1,7 @@
 project 'geomerative' do
 
   model_version '4.0.0'
-  id 'ruby-processing:geomerative:1.0.2'
+  id 'ruby-processing:geomerative:1.1.0'
   packaging 'jar'
 
   description 'geomerative-library for JRubyArt'
@@ -30,7 +30,7 @@ project 'geomerative' do
 
   jar 'org.processing:core:3.3.6'
 
-  plugin( :compiler, '3.5.1',
+  plugin( :compiler, '3.8.0',
           'source' =>  '${maven.compiler.source}',
           'target' =>  '${maven.compiler.target}' )
   plugin( :jar, '3.0.2',

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>geomerative</artifactId>
-  <version>1.0.2</version>
+  <version>1.1.0</version>
   <name>geomerative</name>
   <description>geomerative-library for JRubyArt</description>
   <organization>
@@ -63,7 +63,7 @@ DO NOT MODIFIY - GENERATED CODE
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.8.0</version>
         <configuration>
           <source>${maven.compiler.source}</source>
           <target>${maven.compiler.target}</target>

data/src/geomerative/RGeomElem.java

@@ -17,6 +17,8 @@
  * Geomerative. If not, see <http://www.gnu.org/licenses/>.
  */
 package geomerative;
+import java.util.Arrays;
+import java.util.stream.Stream;
 import processing.core.PApplet;
 import processing.core.PGraphics;
 
@@ -125,8 +127,8 @@ public abstract class RGeomElem {
      * @related containsBounds ( )
      * @related containsHandles ( )
      */
-    public boolean contains(RGeomElem shp) {
-        return contains(shp.getPoints());
+    public boolean containsShape(RShape shp) {
+        return containsPoints(shp.getPoints());
     }
 
     /**
@@ -165,29 +167,25 @@ public abstract class RGeomElem {
      * @related contains ( )
      */
     public boolean containsHandles(RGeomElem shp) {
-        return contains(shp.getHandles());
+        return containsPoints(shp.getHandles());
     }
 
     /**
      * Use this method to test if the shape contains an array of points.
      *
-     * @param ps
+     * @param pts
      * @eexample contains
      * @return boolean, true if the shape contains all the points
-     * @related contains ( )
+     * @related containsShape ( )
      * @related containsBounds ( )
      * @related containsHandles ( )
      */
-    public boolean contains(RPoint[] ps) {
-        boolean contains = false;
-        if (ps != null) {
-            for (RPoint p : ps) {
-                contains &= this.contains(p);
-            }
-        }
-        return contains;
+    public boolean containsPoints(RPoint[] pts) {
+        Stream<RPoint> outside = Arrays.stream(pts).filter(pt -> !contains(pt));
+        return outside.count() == 0;
     }
-
+    
+  
     /**
      * Use this method to test if the shape intersects another shape.
      *

data/src/geomerative/RShape.java

@@ -928,10 +928,10 @@ public class RShape extends RGeomElem {
         }
         RPoint[] verts = pointpaths[0];
         for (int k = 1; k < pointpaths.length; k++) {
-            verts = (RPoint[]) PApplet.append(verts, new RPoint(0F, 0F));
+            verts = (RPoint[]) PApplet.append(verts, new RPoint());
             verts = (RPoint[]) PApplet.concat(verts, pointpaths[k]);
         }
-        verts = (RPoint[]) PApplet.append(verts, new RPoint(0F, 0F));
+        verts = (RPoint[]) PApplet.append(verts, new RPoint());
         if (verts == null) {
             return false;
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geomerative
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: java
 authors:
 - Ricard Marxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-12 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -27,7 +27,7 @@ dependencies:
         version: '12.3'
 description: |2
     Geomerative java library wrapped in a rubygem. Updated to use String switch
-    etc available since jdk8.
+    etc available since jdk8, and somewhat hacked see CHANGELOG.
 email: mamba2928@yahoo.co.uk
 executables: []
 extensions: []
@@ -218,9 +218,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - A decent graphics card
 - java runtime >= 1.8+
-- processing = 3.3.7+
+- processing = 3.4+
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Updated geomerative library for JRubyArt