picrate 2.1.2-java → 2.4.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e9ef3696c4eb0b3a488c7e25d30546ab03eae3a49e5220ec3d9cf4c862fddf3
-  data.tar.gz: 88f799089492e9507bbb09baa4e9634c335627fea27ec8adf22207cf4678de7b
+  metadata.gz: 0ab492711c3332d165604d48dd5a816b774d1a3d8c3149ad03e06e5ecfefd091
+  data.tar.gz: 581eed24cf663f8752a035a10213240c20e182c3fce6a76f30e79d0df7051dc7
 SHA512:
-  metadata.gz: 57be7c1825b5afe9fac52830070c97e04b18590d6db7d3ff099a83861e757eb7dfba02f1f9a3ad80c5e6b20c1ce73226a13be1ce3aefb3d6e66180af59d742d1
-  data.tar.gz: a94c876edf96da7f89939d0cb11e8ab09f74c03686c5f36eaeae90ea61c5dd44e23c9d7812d521a17215110534a722f4a20ee7c29f8dffc28a1af0b15eac21db
+  metadata.gz: fe19f9cf14758e36a72c98cdd00baa4bab8e9db666f4c624b5ef593bf6621169d34c33f6513c337faa4bea24a8041d1d8c9681205c2ce6d3fd8dc9bd0d3bdbea
+  data.tar.gz: f63af7d23c1c38a2ed7050e8682f5336f6a607dc1094d6c67276c66661272e61c70bf0a86c0e3133eb9e6198cf407b560769dc41de811b71a611662150efee2a

data/.mvn/extensions.xml

@@ -3,7 +3,7 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.4.5
+    <version>0.4.6
     </version>
   </extension>
 </extensions>

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+v2.4.1 patch library loader, add PGS library examples.
+
+v2.4.0 Refactor noise to two modules, FastNoise (default) & SmoothNoise, with terrain noise `:tnoise` option.
+
+v2.3.0 Abandon Processing Value Noise in favour of OpenSimplex2, with choosable options. Added pdf library using iText5.
+
+v2.2.0 Bump to latest JOGL-rc January 2021
+
 v2.1.2 Bump to JRuby-9.2.14.0
 
 v2.1.1 Bump to JRuby-9.2.13.0, include examples using ruby `clamp` in place of processing `constrain`, update to video-2.0 release, add run instruction to help

data/README.md

@@ -14,12 +14,12 @@ jgem install picrate
 
 Clone main branch:-
 
-Requires java to build (and jogl-2.4.0-rc jars), but uses a maven wrapper so you don't need to install maven. Suggest build/test on regular linux box, but is designed for use on both RaspberryPI 3B+ and RaspberryPI4. Needs installed jruby to test/run.
+Requires java to build (and [jogl-2.4.0-rc jars][jogl_jars]), but uses a maven wrapper so you don't need to install maven. Suggest build/test on regular linux box, but is designed for use on both RaspberryPI 3B+ and RaspberryPI4. Needs installed jruby to test/run.
 
 ```bash
 cd PiCrate # or whatever you call it
 rake # assumes an installed version of vanilla processing
-jgem install picrate-2.1.2-java.gem
+jgem install picrate-2.4.1-java.gem
 
 ```
 To create a template sketch:-
@@ -59,3 +59,4 @@ jruby --dev my_sketch.rb # --dev flag speeds start-up
 [propane]:https://ruby-processing.github.io/propane/
 [vim]:https://github.com/ruby-processing/PiCrate/blob/master/docs/_editors/vim.md
 [geany]:https://github.com/ruby-processing/PiCrate/blob/master/docs/_editors/geany.md
+[jogl_jars]:https://jogamp.org/deployment/archive/rc/v2.4.0-rc-20210111/jar/

data/Rakefile

@@ -9,7 +9,7 @@ task default: %i[init compile install test gem]
 # Currently depends on local jogl-2.4.0 jars on path ~/jogl24
 desc 'Copy Jars'
 task :init do
-  jogl24 = File.join(HOME_DIR, 'jogl24')
+  jogl24 = File.join(HOME_DIR, 'jogl-2.4-rc2021011')
   opengl = Dir.entries(jogl24).grep(/amd64|armv6hf|aarch64/).select { |jar| jar =~ /linux/ }
   opengl.concat %w[jogl-all.jar gluegen-rt.jar]
   opengl.each do |gl|
@@ -19,6 +19,7 @@ end
 
 desc 'Install'
 task :install do
+  sh "mvn dependency:copy"
   FileUtils.mv "target/picrate-#{PiCrate::VERSION}.jar", 'lib'
 end
 

data/docs/_includes/footer.html

@@ -29,7 +29,7 @@
       </div>
 
       <div class="footer-col footer-col-3">
-        <p>{{ site.description }}</p>
+        <p>{{ site.description }}
       </div>
     </div>
 

data/docs/_layouts/post.html

@@ -5,7 +5,7 @@ layout: default
 
   <header class="post-header">
     <h1 class="post-title">{{ page.title }}</h1>
-    <p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
+    <p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}
   </header>
 
   <article class="post-content">

data/docs/_methods/noise_mode.md

@@ -0,0 +1,88 @@
+---
+layout: post
+title:  "noise_mode"
+---
+
+### Name ###
+
+`noise_mode` _NB: not currently available in vanilla processing_.
+
+### Examples ###
+
+```ruby
+#!/usr/bin/env jruby -w
+require 'picrate'
+
+class TestNoise < Processing::App
+  attr_reader :z
+
+  def setup
+    stroke(255, 64)
+    @z = 0
+  end
+
+  def draw
+    noise_scale = 0.01
+    background(0)
+    grid(width, height, 10, 10) do |x, y|
+      arrow(x, y, noise(x * noise_scale, y * noise_scale, z * noise_scale) * TWO_PI * 2)
+    end
+    @z += 1
+  end
+
+  def mouse_pressed
+    mode = NoiseMode::OPEN_SMOOTH # Smooth classic OpenSimplex2
+    noise_mode mode
+    sketch_title mode.description
+  end
+
+  def mouse_released
+    mode = NoiseMode::DEFAULT # Fast classic OpenSimplex2
+    noise_mode(mode)
+    sketch_title mode.description
+  end
+
+
+  def arrow(x, y, ang)
+    push_matrix()
+    translate(x, y)
+    rotate(ang)
+    line(0, 0, 20, 0)
+    translate(20, 0)
+    rotate(PI + 0.4)
+    line(0, 0, 5, 0)
+    rotate(-0.8)
+    line(0, 0, 5, 0)
+    pop_matrix()
+  end
+
+  def settings
+    size(600, 400, P2D)
+  end
+end
+
+TestNoise.new
+
+```
+
+### Description	###
+
+Currently supports four implementations of noise:-
+1. DEFAULT # fast classic OpenSimplex2
+2. OPEN_SMOOTH # smoother class OpenSimplex2F
+3. FAST_TERRAIN # more suited to terrain
+4. SMOOTH_TERRAIN # as above but smoother
+
+### Syntax ###
+
+```ruby
+noise_mode(mode) # default is NoiseMode::DEFAULT, a fast classic OpenSimplex2
+```
+
+### Related ###
+
+`noise(x, y, z, w)`
+
+`noise(x, y, z)`
+
+`noise(x, y)`

data/docs/_posts/2018-05-06-install_jruby.md

@@ -38,7 +38,7 @@ export PATH="${PATH}:${GEM_PATH}/bin"
 
 ### Automated install using bash ###
 
-The [picrate2_install.sh][bash] script currently installs jruby-9.2.14.0 and picrate-2.1.2.
+The [picrate2_install.sh][bash] script currently installs jruby-9.2.14.0 and picrate-2.2.0.
 
 If you know better please post on wiki
 

data/docs/_posts/2018-11-18-building-gem.md

@@ -6,7 +6,7 @@ categories: PiCrate update
 ---
 Requirements:-
 
-1. Latest jogl-2.4.0-rc jars (place in ~/jogl24 folder).
+1. Latest jogl-2.4.0-rc jars (place in ~/jogl-2.4-rc2021011 folder see [jogl-jars][jars]).
 
 2. jdk-11+ and maven
 
@@ -16,3 +16,5 @@ git clone --depth 1 https://github.com/ruby-processing/PiCrate.git
 cd PiCrate
 rake # to build gem
 ```
+
+[jars]:https://jogamp.org/deployment/archive/rc/v2.4.0-rc-20210111/jar/

data/docs/classes.md

@@ -5,6 +5,6 @@ title: Classes
 
 {% for class in site.classes %}
   <h2>{{ item.title }}</h2>
-  <p>{{ item.description }}</p>
-  <p><h2><a href="{{ class.url | prepend: site.github.url }}">{{ class.title }}</a></h2></p>
+  <p>{{ item.description }}
+  <p><h2><a href="{{ class.url | prepend: site.github.url }}">{{ class.title }}</a></h2>
 {% endfor %}

data/docs/editors.md

@@ -5,6 +5,6 @@ title: Editors
 
 {% for editor in site.editors %}
   <h2>{{ item.title }}</h2>
-  <p>{{ item.description }}</p>
-  <p><h2><a href="{{ editor.url | prepend: site.github.url }}">{{ editor.title }}</a></h2></p>
+  <p>{{ item.description }}
+  <p><h2><a href="{{ editor.url | prepend: site.github.url }}">{{ editor.title }}</a></h2>
 {% endfor %}

data/docs/gems.md

@@ -4,8 +4,8 @@ title: Gems
 ---
 {% for gem in site.gems %}
   <h2>{{ item.title }}</h2>
-  <p>{{ item.description }}</p>
-  <p><h2><a href="{{ gem.url | prepend: site.github.url }}">{{ gem.title }}</a></h2></p>
+  <p>{{ item.description }}
+  <p><h2><a href="{{ gem.url | prepend: site.github.url }}">{{ gem.title }}</a></h2>
 {% endfor %}
 
-<p>If you are new to ruby, see <a href="http://guides.rubygems.org/what-is-a-gem/">what is a gem here</a></p>
+<p>If you are new to ruby, see <a href="http://guides.rubygems.org/what-is-a-gem/">what is a gem here</a>

data/docs/index.html

@@ -23,6 +23,6 @@ layout: default
     {% endfor %}
   </ul>
 
-  <p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | prepend: site.github.url }}">via RSS</a></p>
+  <p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | prepend: site.github.url }}">via RSS</a>
 
 </div>

data/docs/libraries.md

@@ -6,8 +6,8 @@ It is possible to use vanilla <a href="https://www.processing.org/reference/libr
 
 {% for library in site.libraries %}
   <h2>{{ item.title }}</h2>
-  <p>{{ item.description }}</p>
-  <p><h2><a href="{{ library.url | prepend: site.github.url }}">{{ library.title }}</a></h2></p>
+  <p>{{ item.description }}
+  <p><h2><a href="{{ library.url | prepend: site.github.url }}">{{ library.title }}</a></h2>
 {% endfor %}
 
 <h4>Key To Library Types</h4>

data/docs/live.md

@@ -6,6 +6,6 @@ Spoiler alert, initially a least it is better just to accept the live works...
 
 {% for live_mode in site.live %}
   <h2>{{ item.title }}</h2>
-  <p>{{ item.description }}</p>
-  <p><h2><a href="{{ live_mode.url | prepend: site.github.url }}">{{ live_mode.title }}</a></h2></p>
+  <p>{{ item.description }}
+  <p><h2><a href="{{ live_mode.url | prepend: site.github.url }}">{{ live_mode.title }}</a></h2>
 {% endfor %}

data/docs/magic.md

@@ -6,6 +6,6 @@ Spoiler alert, initially a least it is better just to accept the magic works...
 
 {% for spell in site.magic %}
   <h2>{{ item.title }}</h2>
-  <p>{{ item.description }}</p>
-  <p><h2><a href="{{ spell.url | prepend: site.github.url }}">{{ spell.title }}</a></h2></p>
+  <p>{{ item.description }}
+  <p><h2><a href="{{ spell.url | prepend: site.github.url }}">{{ spell.title }}</a></h2>
 {% endfor %}

data/docs/methods.md

@@ -5,6 +5,6 @@ title: Methods
 
 {% for method in site.methods %}
   <h2>{{ item.title }}</h2>
-  <p>{{ item.description }}</p>
-  <p><h2><a href="{{ method.url | prepend: site.github.url }}">{{ method.title }}</a></h2></p>
+  <p>{{ item.description }}
+  <p><h2><a href="{{ method.url | prepend: site.github.url }}">{{ method.title }}</a></h2>
 {% endfor %}

data/docs/modules.md

@@ -5,8 +5,8 @@ title: Modules
 
 {% for module in site.modules %}
   <h2>{{ item.title }}</h2>
-  <p>{{ item.description }}</p>
-  <p><h2><a href="{{ module.url | prepend: site.github.url }}">{{ module.title }}</a></h2></p>
+  <p>{{ item.description }}
+  <p><h2><a href="{{ module.url | prepend: site.github.url }}">{{ module.title }}</a></h2>
 {% endfor %}
 
-<p>If you are new to ruby, you can read more about <a href="https://www.tutorialspoint.com/ruby/ruby_modules.htm">modules here</a></p>
+<p>If you are new to ruby, you can read more about <a href="https://www.tutorialspoint.com/ruby/ruby_modules.htm">modules here</a>

data/docs/objects.md

@@ -4,6 +4,6 @@ title: Variables and Objects
 ---
 {% for object in site.objects %}
   <h2>{{ item.title }}</h2>
-  <p>{{ item.description }}</p>
-  <p><h2><a href="{{ object.url | prepend: site.github.url }}">{{ object.title }}</a></h2></p>
+  <p>{{ item.description }}
+  <p><h2><a href="{{ object.url | prepend: site.github.url }}">{{ object.title }}</a></h2>
 {% endfor %}

data/lib/picrate/app.rb

@@ -5,7 +5,7 @@ require_relative 'helper_methods'
 require_relative 'library_loader'
 # A wrapper module for the processing App
 module Processing
-  include_package 'processing.core' # imports the processing jar.
+  include_package 'processing.core' # imports the processing classes.
   # Load vecmath, fastmath and mathtool modules
   Java::Monkstone::PicrateLibrary.load(JRuby.runtime)
   SKETCH_ROOT = File.absolute_path('.')
@@ -55,6 +55,7 @@ module Processing
     include HelperMethods
     include MathTool
     include Math
+    include FastNoise
     # Alias some methods for familiarity for Shoes coders.
     alias oval ellipse
     alias stroke_width stroke_weight
@@ -83,7 +84,7 @@ module Processing
     class << self
       # Handy getters and setters on the class go here:
       attr_accessor :sketch_class, :library_loader, :arguments, :options
-      attr_reader :surface
+      attr_reader :surface, :width, :height, :renderer
       def load_libraries(*args)
         library_loader ||= LibraryLoader.new
         library_loader.load_library(*args)
@@ -131,11 +132,11 @@ module Processing
     end
 
     def size(*args)
-      w, h, mode = *args
+      w, h, renderer = *args
       @width ||= w
       @height ||= h
-      @render_mode ||= mode
-      import_opengl if /opengl/ =~ mode
+      @renderer ||= renderer
+      import_opengl if /opengl/ =~ renderer
       super(*args)
     end
 
@@ -144,7 +145,7 @@ module Processing
     def data_path(dat)
       dat_root = File.join(SKETCH_ROOT, 'data')
       Dir.mkdir(dat_root) unless File.exist?(dat_root)
-      File.join(dat_root, dat)
+      File.join(dat_root, dat).to_java(:string)
     end
 
     private

data/lib/picrate/native_folder.rb

@@ -1,5 +1,3 @@
-require 'rbconfig'
-
 # Utility to load native binaries on Java CLASSPATH
 #HACK until jruby returns a more specific 'host_os' than 'linux'
 class NativeFolder
@@ -10,7 +8,7 @@ class NativeFolder
   ARM64 = '-aarch64'.freeze
 
   def initialize
-    @os = RbConfig::CONFIG['host_os'].downcase
+    @os = java.lang.System.get_property('os.name').downcase
     @bit = java.lang.System.get_property('os.arch')
   end
 

data/lib/picrate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PiCrate
-  VERSION = '2.1.2'
+  VERSION = '2.4.2'
 end

data/library/pdf/pdf.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# @TODO usage
+class Processing::App
+  require_relative 'itextpdf-5.5.13.2.jar'
+  java_import Java::ProcessingPdf::PGraphicsPDF
+end

data/library/svg/svg.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# @TODO usage
+class Processing::App
+  require_relative 'batik-all-1.14.jar'
+  java_import Java::ProcessingSvg::PGraphicsSVG
+end

data/picrate.gemspec

@@ -27,12 +27,14 @@ Gem::Specification.new do |gem|
   gem.files << 'lib/jogl-all-natives-linux-amd64.jar'
   gem.files << 'lib/jogl-all-natives-linux-armv6hf.jar'
   gem.files << 'lib/jogl-all-natives-linux-aarch64.jar'
+  gem.files << 'library/pdf/itextpdf-5.5.13.2.jar'
+  gem.files << 'library/svg/batik-all-1.14.jar'
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.add_development_dependency 'minitest', '~> 5.10'
+  gem.add_development_dependency 'minitest', '~> 5.14'
   gem.add_runtime_dependency 'rake', '~> 13.0'
-  gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.1'
+  gem.add_runtime_dependency 'arcball', '~> 1.1', '>= 1.1.1'
   gem.require_paths = ['lib']
   gem.platform      = 'java'
-  gem.requirements << 'java runtime == 11'
+  gem.requirements << 'java runtime == 11+'
 end

data/pom.rb

@@ -2,7 +2,7 @@
 
 project 'picrate', 'http://maven.apache.org' do
   model_version '4.0.0'
-  id 'ruby-processing:picrate:2.1.2'
+  id 'ruby-processing:picrate:2.4.2'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -24,22 +24,43 @@ project 'picrate', 'http://maven.apache.org' do
   issue_management 'https://github.com/ruby-processing/PiCrate/issues', 'Github'
   # Need to update to jogl 2.4.1 as soon as available, then make a dependency
   properties('jogl.version' => '2.3.2',
+             'batik.version' => '1.14',
+             'itextpdf.version' => '5.5.13.2',
              'jruby.api' => 'http://jruby.org/apidocs/',
              'source.directory' => 'src',
              'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
              'picrate.basedir' => '${project.basedir}',
-             'project.build.sourceEncoding' => 'utf-8',
+             'project.build.sourceEncoding' => 'UTF-8',
              'polyglot.dump.pom' => 'pom.xml')
 
-  pom 'org.jruby:jruby:9.2.14.0'
+  pom 'org.jruby:jruby:9.2.19.0'
   jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
   jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
   jar 'org.processing:video:3.0.2'
+  jar 'org.apache.xmlgraphics:batik-all:${batik.version}'
+  jar 'com.itextpdf:itextpdf:${itextpdf.version}'
 end
 
 overrides do
   plugin :resources, '3.1.0'
-  plugin :dependency, '3.1.2'
+  plugin :dependency, '3.1.2' do
+    execute_goals( id: 'default-cli',
+      artifactItems:[
+        { groupId: 'com.itextpdf',
+          artifactId: 'itextpdf',
+          version: '${itextpdf.version}',
+          type: 'jar',
+          outputDirectory: '${picrate.basedir}/library/pdf'
+        },
+        { groupId: 'org.apache.xmlgraphics',
+          artifactId: 'batik-all',
+          version: '${batik.version}',
+          type: 'jar',
+          outputDirectory: '${picrate.basedir}/library/svg'
+        }
+      ]
+    )
+  end
   plugin(:compiler, '3.8.1',
          'release' => '11')
   plugin(:javadoc, '2.10.4',