picrate 1.3.0-java → 2.1.2-java

data/library/color_group/color_group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 java_import Java::Monkstone::ColorUtil
 
 # class wraps a java color array (of signed int), supports shuffle!, last and

data/library/control_panel/control_panel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Here's a little library for quickly hooking up controls to sketches.
 # For messing with the parameters and such.
 # These controls will set instance variables on the sketches.
@@ -25,7 +27,7 @@ module ControlPanel
       add_change_listener do
         update_label(label, name, value)
         ControlPanel.app_value(name, value)
-        proc.call(value) if proc
+        proc&.call(value)
       end
       ControlPanel.app_value(name, val)
     end
@@ -49,7 +51,7 @@ module ControlPanel
       control_panel.add_element(self, name)
       add_action_listener do
         ControlPanel.app_value(name, value) unless value.nil?
-        proc.call(value) if proc
+        proc&.call(value)
       end
       set_selected_index(initial_value ? elements.index(initial_value) : 0)
     end
@@ -69,7 +71,7 @@ module ControlPanel
       control_panel.add_element(self, name, false)
       add_action_listener do
         ControlPanel.app_value(name, value)
-        proc.call(value) if proc
+        proc&.call(value)
       end
     end
 
@@ -87,7 +89,7 @@ module ControlPanel
       control_panel.add_element(self, name, false, true)
       add_action_listener do
         Processing.app.send(name)
-        proc.call(value) if proc
+        proc&.call(value)
       end
     end
   end
@@ -171,6 +173,7 @@ module ControlPanel
     def control_panel
       @control_panel ||= ControlPanel::Panel.new
       return @control_panel unless block_given?
+
       yield(@control_panel)
       @control_panel.display
       @control_panel.set_visible true

data/library/dxf/dxf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @TODO usage
 class Processing::App
   java_import Java::ProcessingDxf::RawDXF

data/library/jcomplex/jcomplex.rb

@@ -0,0 +1 @@
+java_import Java::MonkstoneComplex::JComplex

data/library/library_proxy/library_proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 java_import Java::MonkstoneCore::LibraryProxy
 java_import Java::ProcessingEvent::KeyEvent
 java_import Java::ProcessingEvent::MouseEvent

data/library/net/net.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @TODO usage
 class Processing::App
   java_import Java::ProcessingNet::Client

data/library/slider/slider.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 # Here's a little library for quickly hooking up in sketch sliders.
-# Copyright (c) 2016-18 Martin Prout.
+# Copyright (c) 2016-20 Martin Prout.
 
 java_import 'monkstone.slider.CustomHorizontalSlider'
 java_import 'monkstone.slider.CustomVerticalSlider'
@@ -8,34 +9,34 @@ java_import 'monkstone.slider.CustomVerticalSlider'
 module Slider
   def self.slider(app:, x:, y:, name:, **opts)
     options = default.merge opts
-    if options[:vertical]
-      slider = CustomVerticalSlider.new(
-        app,
-        x,
-        y,
-        options[:length],
-        options[:range].first,
-        options[:range].last,
-        name
-    )
-    else
-      slider = CustomHorizontalSlider.new(
-        app,
-        x,
-        y,
-        options[:length],
-        options[:range].first,
-        options[:range].last,
-        name
-    )
-    end
+    slider = if options[:vertical]
+               CustomVerticalSlider.new(
+                 app,
+                 x,
+                 y,
+                 options[:length],
+                 options[:range].first,
+                 options[:range].last,
+                 name
+               )
+             else
+               CustomHorizontalSlider.new(
+                 app,
+                 x,
+                 y,
+                 options[:length],
+                 options[:range].first,
+                 options[:range].last,
+                 name
+               )
+             end
     unless opts.empty?
       slider.bar_width(opts.fetch(:bar_width, 10))
       slider.set_value(opts.fetch(:initial_value, 0))
     end
     slider
   end
-  
+
   def self.default
     { length: 100, range: (0..100) }
   end

data/library/vector_utils/vector_utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 PHI ||= (1 + Math.sqrt(5)) / 2 # golden ratio
 GA = PHI * 2 * Math::PI # golden angle
 
@@ -48,6 +50,7 @@ module VectorUtil
   def self.cartesian_to_polar(vec:)
     res = Vec3D.new(vec.mag, 0, 0)
     return Vec3D.new unless res.x > 0
+
     res.y = -Math.atan2(vec.z, vec.x)
     res.z = Math.asin(vec.y / res.x)
     res
@@ -64,6 +67,7 @@ module VectorUtil
 
   def self.polar_to_cartesian(vec:)
     return Vec3D.new if vec.mag <= 0
+
     Vec3D.new(Math.asin(vec.y / vec.mag), vec.mag, -Math.atan2(vec.z, vec.x))
   end
 end

data/library/video_event/video_event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Processing::App
   include Java::MonkstoneVideoevent::MovieEvent
   include Java::MonkstoneVideoevent::CaptureEvent

data/mvnw

@@ -212,9 +212,9 @@ else
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
     if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     fi
     while IFS="=" read key value; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;

data/mvnw.cmd

@@ -120,7 +120,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
 
 FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
     IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
@@ -134,7 +134,7 @@ if exist %WRAPPER_JAR% (
     )
 ) else (
     if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     )
     if "%MVNW_VERBOSE%" == "true" (
         echo Couldn't find %WRAPPER_JAR%, downloading it ...

data/picrate.gemspec

@@ -1,5 +1,6 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'picrate/version'
 
@@ -8,31 +9,30 @@ Gem::Specification.new do |gem|
   gem.version     = PiCrate::VERSION
   gem.authors     = ['monkstone']
   gem.email       = ['mamba2928@yahoo.co.uk']
-  gem.licenses    = %w(GPL-3.0 LGPL-2.0)
+  gem.licenses    = %w[GPL-3.0 LGPL-2.0]
   gem.description = <<~EOS
     A batteries included version of processing in ruby, for raspberrypi and
     linux. Install samples to configures geany ide.
   EOS
-  gem.summary     = %q{ruby implementation of processing-3 on raspberrypi and linux64}
+  gem.summary     = 'ruby implementation of processing-3 on raspberrypi and linux64'
   gem.homepage    = 'https://ruby-processing.github.io/PiCrate/'
-  gem.post_install_message = %q{Use 'picrate --install' to config geany & install samples}
-  gem.files       = `git ls-files`.split($/)
+  gem.post_install_message = "Use 'picrate --install' to config geany & install samples"
+  gem.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.files << "lib/picrate-#{PiCrate::VERSION}.jar"
   gem.files << 'lib/gluegen-rt.jar'
   gem.files << 'lib/jogl-all.jar'
   gem.files << 'lib/gluegen-rt-natives-linux-amd64.jar'
   gem.files << 'lib/gluegen-rt-natives-linux-armv6hf.jar'
+  gem.files << 'lib/gluegen-rt-natives-linux-aarch64.jar'
   gem.files << 'lib/jogl-all-natives-linux-amd64.jar'
   gem.files << 'lib/jogl-all-natives-linux-armv6hf.jar'
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files << 'lib/jogl-all-natives-linux-aarch64.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 'rake', '~> 12.3'
   gem.add_development_dependency 'minitest', '~> 5.10'
-  gem.add_runtime_dependency 'arcball', '~> 1.0.1'
-  # geomerative + wordcram dependency since they may update to jdk11+ soon
-  gem.add_runtime_dependency 'geomerative', '~> 1.1'
-  gem.add_runtime_dependency 'ruby_wordcram', '~> 2.0.4'
+  gem.add_runtime_dependency 'rake', '~> 13.0'
+  gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.1'
   gem.require_paths = ['lib']
   gem.platform      = 'java'
-  gem.requirements << 'java runtime == 8'
+  gem.requirements << 'java runtime == 11'
 end

data/pom.rb

@@ -1,7 +1,8 @@
-project 'picrate', 'http://maven.apache.org' do
+# frozen_string_literal: true
 
+project 'picrate', 'http://maven.apache.org' do
   model_version '4.0.0'
-  id 'ruby-processing:picrate:1.3.0'
+  id 'ruby-processing:picrate:2.1.2'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -21,17 +22,16 @@ project 'picrate', 'http://maven.apache.org' do
   license 'LGPL 2', 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html'
 
   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',
+             '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',
+             'polyglot.dump.pom' => 'pom.xml')
 
-  properties( 'jogl.version' => '2.3.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',
-    'polyglot.dump.pom' => 'pom.xml'
-  )
-
-  pom 'org.jruby:jruby:9.2.11.0'
+  pom 'org.jruby:jruby:9.2.14.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'
@@ -39,20 +39,23 @@ end
 
 overrides do
   plugin :resources, '3.1.0'
-  plugin :dependency, '3.1.1'
-  plugin( :compiler, '3.8.1', 'release' => '8' )
-  plugin(
-    :javadoc,
-    '3.1.1',
-    'detectOfflineLinks' =>  'false',
-    'links' => [ '${processing.api}', '${jruby.api}' ]
-  )
-  plugin(
-    :jar, '3.1.2',
+  plugin :dependency, '3.1.2'
+  plugin(:compiler, '3.8.1',
+         'release' => '11')
+  plugin(:javadoc, '2.10.4',
+         'detectOfflineLinks' => 'false',
+         'links' => ['${processing.api}',
+                     '${jruby.api}'])
+  plugin(:jar, '3.2.0',
     'archive' => {
-      'manifestEntries' => { 'Class-Path' => 'gluegen-rt.jar jog-all.jar' }
+      'manifestEntries' => {
+        'Automatic-Module-Name' => 'processing.core'
+      }
     }
   )
+  plugin :jdeps, '3.1.2' do
+    execute_goals 'jdkinternals', 'test-jdkinternals'
+  end
 end
 
 build do

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>1.3.0</version>
+  <version>2.1.2</version>
   <name>picrate</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>http://maven.apache.org</url>
@@ -76,7 +76,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.11.0</version>
+      <version>9.2.14.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -123,18 +123,18 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>3.1.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.8.1</version>
           <configuration>
-            <release>8</release>
+            <release>11</release>
           </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>2.10.4</version>
           <configuration>
             <detectOfflineLinks>false</detectOfflineLinks>
             <links>
@@ -145,15 +145,27 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.1.2</version>
+          <version>3.2.0</version>
           <configuration>
             <archive>
               <manifestEntries>
-                <Class-Path>gluegen-rt.jar jog-all.jar</Class-Path>
+                <Automatic-Module-Name>processing.core</Automatic-Module-Name>
               </manifestEntries>
             </archive>
           </configuration>
         </plugin>
+        <plugin>
+          <artifactId>maven-jdeps-plugin</artifactId>
+          <version>3.1.2</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>jdkinternals</goal>
+                <goal>test-jdkinternals</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>

data/src/main/java/monkstone/ColorUtil.java

@@ -3,7 +3,7 @@
  * in their sketches. Includes a method to efficiently convert an cols of web
  * strings to an cols of color int, and another to convert an cols of p5 color
  * (int) to a string that can be used in ruby code (to generate web color cols).
- * Copyright (c) 2015-18 Martin Prout.
+ * Copyright (c) 2015-20 Martin Prout.
  * This utility is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at

data/src/main/java/monkstone/MathToolModule.java

@@ -2,7 +2,7 @@
 * The purpose of this tool is to allow JRubyArt users to use an alternative
 * to processing.org map, lerp and norm methods in their sketches and to implement
 * JRubyArt convenenience method grid(width, height, stepW, stepH) { |x, y| do stuff }
-* Copyright (c) 2015-19 Martin Prout. This tool is free software; you can
+* Copyright (c) 2015-20 Martin Prout. This tool is free software; you can
 * redistribute it and/or modify it under the terms of the GNU Lesser General
 * Public License as published by the Free Software Foundation; either version
 * 2.1 of the License, or (at your option) any later version.

data/src/main/java/monkstone/PicrateLibrary.java

@@ -1,10 +1,10 @@
 /**
- * The purpose of this class is to load the MathTool into PiCrate runtime 
- * Copyright (C) 18 Martin Prout. This code is free software; you can 
+ * The purpose of this class is to load the MathTool into PiCrate runtime
+ * Copyright (C) 2018-20 Martin Prout. This code is free software; you can
  * redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version 
+ * Public License as published by the Free Software Foundation; either version
  * 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * Obtain a copy of the license at http://www.gnu.org/licenses/gpl-3.0-standalone.html
  */
 
@@ -23,7 +23,7 @@ import org.jruby.runtime.load.Library;
  * @author Martin Prout
  */
 public class PicrateLibrary implements Library{
-  
+
     /**
      *
      * @param runtime
@@ -33,8 +33,8 @@ public class PicrateLibrary implements Library{
         Deglut.createDeglut(runtime);
         Vec2.createVec2(runtime);
         Vec3.createVec3(runtime);
-    } 
-    
+    }
+
     /**
      *
      * @param runtime
@@ -44,5 +44,5 @@ public class PicrateLibrary implements Library{
     @Override
     public void load(final Ruby runtime, boolean wrap) throws IOException {
         load(runtime);
-    }  
+    }
 }