picrate 2.5.0-java → 2.5.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f42aa12e08e8589abee2166195d85e4a9c5797130f702c777935b2ed37053b2
-  data.tar.gz: 789b7c482d4dd2ba8dd602f0eceba29e9f80e9ebeef8786a822da365a31e51cc
+  metadata.gz: b3f8a1c6f427e8d6496ffa52f10da57bc8763f8dd92d52074652409658684fba
+  data.tar.gz: b0e3cf6d3c457bea3fdda0642d10c0a443528752b13e1ac2dd767f2bb3c0798a
 SHA512:
-  metadata.gz: f4fe171cfa023990fca7e853a28968b959abd0effcd234c458a07a4f2159f0c0f21806ddbbf193c1466dd7a1b2ee87ddacf6cd4bb3f4fd778d58e9db10a69ae0
-  data.tar.gz: fafaa739cf2efb9626e90459e3cd1c698c182bd1b0e79cd0757140c877698a5d84e44647d1fd3d38e3641c9d20fa576a502588cad596b8ff9a16e42ef577afda
+  metadata.gz: 1de09c1115c514a845a63b00d777784550c2d1a1c20662ed59974727460652927ab7706d7380433cea31fd1f7d67c7b31f494bd566b990c9e94152120766b543
+  data.tar.gz: 290f982b1b70b41e58de89182b2603f96c6276f1381d19f10b5d3827aebea20f81af3c609cb07fda2a662a21b02dae5ce72dbd18b9adda12970bf0eca87865c8

data/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+v2.5.1 Update to JRuby-9.3.1.0, under the hood changes in how we access java fields, no using `field` in place of `declared_field`, possible since JRuby-9.3.0.0 required since JRuby-9.3.1.0.
+
 v2.5.0 Update to JRuby-9.3.0.0.
 
 v2.4.2 Update to JRuby-9.2.19, getting ready for JRuby-9.3+.

data/README.md

@@ -19,7 +19,7 @@ Requires java to build (and [jogl-2.4.0-rc jars][jogl_jars]), but uses a maven w
 ```bash
 cd PiCrate # or whatever you call it
 rake # assumes an installed version of vanilla processing
-jgem install picrate-2.5.0-java.gem
+jgem install picrate-2.5.1-java.gem
 
 ```
 To create a template sketch:-

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

@@ -14,7 +14,7 @@ Get the latest version from [http://jruby.org/download][download]
 
 ```bash
 cd /opt
-sudo tar xzvf /pathToDownload/jruby-bin-9.3.0.0.tar.gz
+sudo tar xzvf /pathToDownload/jruby-bin-9.3.1.0.tar.gz
 ```
 
 Then use the excellent `update-alternatives` tool to provide symbolic links to `jruby`, `jgem`, `jirb` and `rake` especially if you haven't installed `mri` ruby.
@@ -42,5 +42,5 @@ The [picrate2_install.sh][bash] script currently installs jruby-9.3.0.0 and picr
 
 If you know better please post on wiki
 
-[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.3.0.0/jruby-dist-9.3.0.0-bin.tar.gz"
+[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.3.1.0/jruby-dist-9.3.1.0-bin.tar.gz"
 [bash]:https://gist.github.com/monkstone/6ae9840d7b7008c177b4a9f589d14ec6

data/docs/_posts/2019-11-11-getting_started_buster.md

@@ -1,6 +1,6 @@
 ---
 layout: post
-title:  "Getting Started Buster"
+title:  "Getting Started RaspbianOS"
 date:   2019-11-11 07:34:13
 categories: PiCrate update
 permalink: /getting_buster/

data/docs/_posts/2020-05-11-getting_started_manjaro.md

@@ -5,19 +5,28 @@ date:   2020-05-11 07:34:13
 categories: PiCrate update
 permalink: /getting_manjaro/
 ---
-If Manjaro does not come with a pre-installed java, then the first step is to install a `jdk` the distro version (jdk14) should work. 
+If Manjaro does not come with a pre-installed java, then the first step is to install a `jdk` the distro version (jdk16) should work.
 
 ```bash
-sudo pacman -S jdk-openjdk # current distro version jdk14
+sudo pacman -S jre-openjdk # current distro version jdk16
 ```
 You can also use pacman to install jruby
 ```bash
-sudo pacman -S jruby # current version jruby-9.2.14.0
+sudo pacman -S jruby # current version jruby-9.3.0.0
 ```
 It is probably a good idea to create a local gem store (rather needing to use sudo to install gems)
+```bash
+sudo pacman -S vim # all you need if your happy with vim
+```
+Vim is not installed by default
+```bash
+sudo pacman -S geany # if you prefer a GUI
+```
+Geany is not installed by default
+
 
 ```bash
-mkdir -p ~/.gem/ruby/2.5.0 # current MRI version supported by jruby
+mkdir -p ~/.gem/ruby/2.6.0 # current MRI version supported by jruby
 ```
 Now set your `GEM_HOME`, `GEM_PATH` and amend your `PATH` as follows:-
 

data/docs/about.md

@@ -4,7 +4,7 @@ title: About
 permalink: /about/
 ---
 ![picrate.png]({{ site.github.url }}/assets/android-chrome-192x192.png)
-PiCrate is both a `library` and an `app` that allows you to create [processing][processing] sketches in ruby on the [RaspberryPI][PI] (or 64 bit linux). PiCrate is available as a gem (from [rubygems][rubygems]), it requires [JRuby][jruby] to both install and run. It does not depend on a vanilla processing install ( _cf_ JRubyArt).Tested on raspbian Buster on RaspberryPI3B+ and RaspberryPI4, also works on Manajaro distro (64bit) on RapsberryPI4.
+PiCrate is both a `library` and an `app` that allows you to create [processing][processing] sketches in ruby on the [RaspberryPI][PI] (or 64 bit linux). PiCrate is available as a gem (from [rubygems][rubygems]), it requires [JRuby][jruby] to both install and run. It does not depend on a vanilla processing install.Tested on RaspbianOS on RaspberryPI3B+ and RaspberryPI4, also works on Manajaro distro (64bit) on RaspberryPI4.
 
 #### Executable ####
 

data/lib/picrate/app.rb

@@ -159,12 +159,6 @@ module Processing
       end
     end
 
-    def proxy_java_fields
-      fields = %w[sketchPath key frameRate mousePressed keyPressed]
-      methods = fields.map { |field| java_class.declared_field(field) }
-      @declared_fields = Hash[fields.zip(methods)]
-    end
-
     # When certain special methods get added to the sketch, we need to let
     # Processing call them by their expected Java names.
     def method_added(method_name) #:nodoc:

data/lib/picrate/helper_methods.rb

@@ -117,14 +117,14 @@ module Processing
     # some methods. Add to this list as needed.
     def proxy_java_fields
       fields = %w[key frameRate mousePressed keyPressed]
-      methods = fields.map { |field| java_class.declared_field(field) }
-      @declared_fields = Hash[fields.zip(methods)]
+      methods = fields.map { |field| java_class.field(field) }
+      @jfields = Hash[fields.zip(methods)]
     end
 
     # Fix java conversion problems getting the last key
     # If it's ASCII, return the character, otherwise the integer
     def key
-      int = @declared_fields['key'].value(java_self)
+      int = @jfields['key'].value(java_self)
       int < 256 ? int.chr : int
     end
 
@@ -161,19 +161,19 @@ module Processing
 
     # frame_rate needs to support reading and writing
     def frame_rate(fps = nil)
-      return @declared_fields['frameRate'].value(java_self) unless fps
+      return @jfields['frameRate'].value(java_self) unless fps
 
       super(fps)
     end
 
     # Is the mouse pressed for this frame?
     def mouse_pressed?
-      @declared_fields['mousePressed'].value(java_self)
+      @jfields['mousePressed'].value(java_self)
     end
 
     # Is a key pressed for this frame?
     def key_pressed?
-      @declared_fields['keyPressed'].value(java_self)
+      @jfields['keyPressed'].value(java_self)
     end
 
     private

data/lib/picrate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PiCrate
-  VERSION = '2.5.0'
+  VERSION = '2.5.1'
 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.5.0'
+  id 'ruby-processing:picrate:2.5.1'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -24,7 +24,7 @@ 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',
-             'jruby.version' => '9.3.0.0',
+             'jruby.version' => '9.3.1.0',
              'batik.version' => '1.14',
              'itextpdf.version' => '5.5.13.2',
              'jruby.api' => 'http://jruby.org/apidocs/',
@@ -34,7 +34,7 @@ project 'picrate', 'http://maven.apache.org' do
              'project.build.sourceEncoding' => 'UTF-8',
              'polyglot.dump.pom' => 'pom.xml')
 
-  jar 'org.jruby:jruby-base:9.3.0.0'
+  jar 'org.jruby:jruby-base:${jruby.version}'
   jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
   jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
   jar 'org.processing:video:3.0.2'
@@ -83,11 +83,10 @@ end
 build do
   resource do
     directory '${source.directory}/main/java'
-    includes '**/**/*.glsl', '**/*.jnilib'
     excludes '**/**/*.java'
   end
   resource do
     directory '${source.directory}/main/resources'
-    includes '**/*.png', '*.txt'
+    includes '**/*.png', '**/*.txt', '**/*.glsl'
   end
 end

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>2.5.0</version>
+  <version>2.5.1</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>
@@ -68,7 +68,7 @@ DO NOT MODIFY - GENERATED CODE
     <itextpdf.version>5.5.13.2</itextpdf.version>
     <jogl.version>2.3.2</jogl.version>
     <jruby.api>http://jruby.org/apidocs/</jruby.api>
-    <jruby.version>9.3.0.0</jruby.version>
+    <jruby.version>9.3.1.0</jruby.version>
     <picrate.basedir>${project.basedir}</picrate.basedir>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
@@ -79,7 +79,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-base</artifactId>
-      <version>9.3.0.0</version>
+      <version>${jruby.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jogamp.jogl</groupId>
@@ -111,10 +111,6 @@ DO NOT MODIFY - GENERATED CODE
     <resources>
       <resource>
         <directory>${source.directory}/main/java</directory>
-        <includes>
-          <include>**/**/*.glsl</include>
-          <include>**/*.jnilib</include>
-        </includes>
         <excludes>
           <exclude>**/**/*.java</exclude>
         </excludes>
@@ -123,7 +119,8 @@ DO NOT MODIFY - GENERATED CODE
         <directory>${source.directory}/main/resources</directory>
         <includes>
           <include>**/*.png</include>
-          <include>*.txt</include>
+          <include>**/*.txt</include>
+          <include>**/*.glsl</include>
         </includes>
       </resource>
     </resources>

data/src/main/java/processing/core/PApplet.java

@@ -167,8 +167,8 @@ public class PApplet implements PConstants {
      * that people use the sketchPath() method and it's inited properly. Call
      * sketchPath() once to set the default.
      */
+   
     private String sketchPath;
-//  public String sketchPath;
 
     static final boolean DEBUG = false;
 //  static final boolean DEBUG = true;

data/src/main/java/processing/opengl/PGraphicsOpenGL.java

@@ -181,32 +181,32 @@ public class PGraphicsOpenGL extends PGraphics {
   // Shaders
 
   static protected URL defColorShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/ColorVert.glsl");
   static protected URL defTextureShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexVert.glsl");
   static protected URL defLightShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LightVert.glsl");
   static protected URL defTexlightShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexLightVert.glsl");
   static protected URL defColorShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/ColorFrag.glsl");
   static protected URL defTextureShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexFrag.glsl");
   static protected URL defLightShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LightFrag.glsl");
   static protected URL defTexlightShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexLightFrag.glsl");
 
   static protected URL defLineShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LineVert.glsl");
   static protected URL defLineShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LineFrag.glsl");
   static protected URL defPointShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/PointVert.glsl");
   static protected URL defPointShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/PointFrag.glsl");
   static protected URL maskShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/MaskFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/MaskFrag.glsl");
 
   protected PShader defColorShader;
   protected PShader defTextureShader;

data/src/main/java/processing/opengl/PSurfaceJOGL.java

@@ -944,10 +944,10 @@ public class PSurfaceJOGL implements PSurface {
       boolean hide = (sketch != null) &&
         (PApplet.platform == PConstants.WINDOWS);
       if (hide) setVisible(false);
-      
+
       ShimAWT.selectFolderImpl(prompt, callbackMethod, file,
         callbackObject, null);
-      
+
       if (hide) setVisible(true);
     });
   }
@@ -963,7 +963,7 @@ public class PSurfaceJOGL implements PSurface {
       String name = cursorNames.get(kind);
       if (name != null) {
         ImageIcon icon =
-          new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
+          new ImageIcon(getClass().getResource("/cursors/" + name + ".png"));
         PImage img = new PImageAWT(icon.getImage());
         // Most cursors just use the center as the hotspot...
         int x = img.width / 2;
@@ -1538,7 +1538,7 @@ public class PSurfaceJOGL implements PSurface {
 //            String name = cursorNames.get(kind);
 //            if (name != null) {
 //                ImageIcon icon
-//                        = new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
+//                        = new ImageIcon(getClass().getResource("/cursors/" + name + ".png"));
 //                PImage img = new PImage(icon.getImage());
 //                // Most cursors just use the center as the hotspot...
 //                int x = img.width / 2;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picrate
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: java
 authors:
 - monkstone
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2021-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +185,7 @@ files:
 - lib/jogl-all-natives-linux-amd64.jar
 - lib/jogl-all-natives-linux-armv6hf.jar
 - lib/jogl-all.jar
-- lib/picrate-2.5.0.jar
+- lib/picrate-2.5.1.jar
 - lib/picrate.rb
 - lib/picrate/app.rb
 - lib/picrate/creators/parameters.rb
@@ -305,28 +305,15 @@ files:
 - src/main/java/processing/opengl/PSurfaceJOGL.java
 - src/main/java/processing/opengl/Texture.java
 - src/main/java/processing/opengl/VertexBuffer.java
-- src/main/java/processing/opengl/cursors/arrow.png
-- src/main/java/processing/opengl/cursors/cross.png
-- src/main/java/processing/opengl/cursors/hand.png
-- src/main/java/processing/opengl/cursors/license.txt
-- src/main/java/processing/opengl/cursors/move.png
-- src/main/java/processing/opengl/cursors/text.png
-- src/main/java/processing/opengl/cursors/wait.png
-- src/main/java/processing/opengl/shaders/ColorFrag.glsl
-- src/main/java/processing/opengl/shaders/ColorVert.glsl
-- src/main/java/processing/opengl/shaders/LightFrag.glsl
-- src/main/java/processing/opengl/shaders/LightVert.glsl
-- src/main/java/processing/opengl/shaders/LineFrag.glsl
-- src/main/java/processing/opengl/shaders/LineVert.glsl
-- src/main/java/processing/opengl/shaders/MaskFrag.glsl
-- src/main/java/processing/opengl/shaders/PointFrag.glsl
-- src/main/java/processing/opengl/shaders/PointVert.glsl
-- src/main/java/processing/opengl/shaders/TexFrag.glsl
-- src/main/java/processing/opengl/shaders/TexLightFrag.glsl
-- src/main/java/processing/opengl/shaders/TexLightVert.glsl
-- src/main/java/processing/opengl/shaders/TexVert.glsl
 - src/main/java/processing/pdf/PGraphicsPDF.java
 - src/main/java/processing/svg/PGraphicsSVG.java
+- src/main/resources/cursors/arrow.png
+- src/main/resources/cursors/cross.png
+- src/main/resources/cursors/hand.png
+- src/main/resources/cursors/license.txt
+- src/main/resources/cursors/move.png
+- src/main/resources/cursors/text.png
+- src/main/resources/cursors/wait.png
 - src/main/resources/icon/icon-128.png
 - src/main/resources/icon/icon-16.png
 - src/main/resources/icon/icon-256.png
@@ -335,6 +322,19 @@ files:
 - src/main/resources/icon/icon-512.png
 - src/main/resources/icon/icon-64.png
 - src/main/resources/license.txt
+- src/main/resources/shaders/ColorFrag.glsl
+- src/main/resources/shaders/ColorVert.glsl
+- src/main/resources/shaders/LightFrag.glsl
+- src/main/resources/shaders/LightVert.glsl
+- src/main/resources/shaders/LineFrag.glsl
+- src/main/resources/shaders/LineVert.glsl
+- src/main/resources/shaders/MaskFrag.glsl
+- src/main/resources/shaders/PointFrag.glsl
+- src/main/resources/shaders/PointVert.glsl
+- src/main/resources/shaders/TexFrag.glsl
+- src/main/resources/shaders/TexLightFrag.glsl
+- src/main/resources/shaders/TexLightVert.glsl
+- src/main/resources/shaders/TexVert.glsl
 - test/color_group_test.rb
 - test/deglut_spec_test.rb
 - test/helper_methods_test.rb
@@ -369,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - java runtime == 11+
-rubygems_version: 3.2.14
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: ruby implementation of processing-3 on raspberrypi and linux64