picrate 1.2.4-java → 1.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ac2e940ede1e29f5b6d6e4856b945d7302487aee87dea6229c68470a32e41c4
-  data.tar.gz: f000acd2d65cf8bea16754c2474ff48c9b22ce62a9c06637de2b64820aa166e3
+  metadata.gz: 674b5526a2444390b3230e1d751b737c6dd45b9d411956a1f2911f8c79c0bf18
+  data.tar.gz: 178aee951ab71107cb59981a6e2edea6952a80067dccb1431879edff8eb7aa32
 SHA512:
-  metadata.gz: eed56464f6ebb5dab6881872de1bfff120cea520babe3cf3d559ec2698d018b1d5b73e914950d215cdcb2e1f28a6cc6ca28fbb94f64e19e78c6b851aa53a0f66
-  data.tar.gz: 69c364b81095fe15803b1ab5020d1a116858edc1f0dfb7732bc9c157634f2bdf2f7b42bfccb10fd8c35855d68aeb822cc795ad9d2aac67544e43f542a72e276c
+  metadata.gz: 3f78af9e8a537e7a28f0e4cd31d44457566eecfee63ad97434c6e33dd70e7b29baa824c628e0f72ba50d3f0ffc77827c70923a443417cdfc5d46b1ecc76012b5
+  data.tar.gz: 0aae76990d4ef5a801d20f22fc177de3f4319e16e45ce426adf1bfaf6d6eb57e20287c7558fbeb2221fe8b1d3ddcb0cb11f8a60a7e535236e78d52df95a7c612

data/.mvn/extensions.xml

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

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

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.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,5 +1,6 @@
-v1.2.4 Extract picrate examples to ~/projects/examples instead of ~/picrate_samples for tighter integration with geany editor. Remove non-functioning sound library as an install option (direct toward minim as option).
+v1.3.0 Last version for jdk8. But should run OK jdk11 with JRuby-9.2.11.0 and with included jogl-2.4.0-rc.
 
+v1.2.4 Extract picrate examples to ~/projects/examples instead of ~/picrate_samples for tighter integration with geany editor. Remove non-functioning sound library as an install option (direct toward minim as option).
 v1.2.3 Favor latest beta Video2 library over GLVideo.
 
 v1.2.2 Removed landscape from example as too taxing for raspberryPI. Improved geany tools.

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
-ruby '2.5.7', :engine => 'jruby', :engine_version => '9.2.9.0'
+ruby '2.5.7', :engine => 'jruby', :engine_version => '9.2.11.0'
 gemspec

data/README.md

@@ -1,13 +1,12 @@
 __C6H3N3O7__ [![Gem Version](https://badge.fury.io/rb/picrate.svg)](https://badge.fury.io/rb/picrate)![Travis CI](https://travis-ci.org/ruby-processing/PiCrate.svg)
 
 # PiCrate
-Version for RaspberryPI `Stretch` and `Oracle JDK8`, will probably also work on `OpenJDK11+` but see `PiCrate-2.0.0` for version targetting `Buster`.
-Create processing sketches in ruby on raspberry-pi and linux (this project is a parallel development of [propane][propane] targetting the raspberry-pi, but will initially be developed on a regular linux box). The aim is to produce a gem installable app that can be run with jruby, with minimal dependencies. Drop the `C` and you get pirate, or and an `e` and get `PiCreate`, a happy coincidence?
+Version for RaspberryPI `Stretch` and `Oracle JDK8`, will probably also work on `OpenJDK11+`. For latest version see auto-install script for [PiCrate-2.0][buster] on Buster (tested on RaspberryPI4). Create processing sketches in ruby on raspberry-pi and linux (this project is a parallel development of [propane][propane] targetting the raspberry-pi, but will initially be developed on a regular linux box). The aim is to produce a gem installable app that can be run with jruby, with minimal dependencies. Drop the `C` and you get pirate, or and an `e` and get `PiCreate`, a happy coincidence?
 
 ### To install from rubygems ###
 
 ```bash
-jgem install picrate -v 1.2.3
+jgem install picrate
 ```
 
 ### To Build and Test ###
@@ -19,7 +18,7 @@ Requires java to build, but uses a maven wrapper so you don't need to install ma
 ```bash
 cd PiCrate
 rake # assumes an installed version of vanilla processing
-jgem install picrate-1.2.3-java.gem
+jgem install picrate-1.2.4-java.gem
 
 ```
 To create a template sketch:-
@@ -55,6 +54,5 @@ MySketch.new
 jruby --dev my_sketch.rb # --dev flag speeds start-up
 ```
 
-
+[buster]:https://gist.github.com/monkstone/6ae9840d7b7008c177b4a9f589d14ec6
 [propane]:https://ruby-processing.github.io/propane/
-[oracle]:http://www.rpiblog.com/2014/03/installing-oracle-jdk-8-on-raspberry-pi.html

data/Rakefile

@@ -9,15 +9,11 @@ task default: %i[init compile install test gem]
 # depends on installed processing, with processing on path
 desc 'Copy Jars'
 task :init do
-  # for Archlinux etc
-  # processing_root = File.dirname(`readlink -f $(which processing)`)
-  # alternative for debian linux etc
-	processing_root = File.join(HOME_DIR, 'processing-3.5.3')
-  jar_dir = File.join(processing_root, 'core', 'library')
-  opengl = Dir.entries(jar_dir).grep(/amd64|armv6hf/).select { |jar| jar =~ /linux/ }
+  jogl24 = File.join(HOME_DIR, 'jogl24')
+  opengl = Dir.entries(jogl24).grep(/amd64|armv6hf/).select { |jar| jar =~ /linux/ }
   opengl.concat %w[jogl-all.jar gluegen-rt.jar]
   opengl.each do |gl|
-    FileUtils.cp(File.join(jar_dir, gl), File.join('.', 'lib'))
+    FileUtils.cp(File.join(jogl24, gl), File.join('.', 'lib'))
   end
 end
 

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.2.9.0.tar.gz
+sudo tar xzvf /pathToDownload/jruby-bin-9.2.11.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.
@@ -44,9 +44,9 @@ mkdir installer
 cd installer
 rake
 ```
-Currently installs jruby-9.2.9.0
+Currently installs jruby-9.2.11.0
 
 If you know better please post on wiki
 
-[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.9.0/jruby-dist-9.2.9.0-bin.tar.gz"
+[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.11.0/jruby-dist-9.2.11.0-bin.tar.gz"
 [rake_gist]:https://gist.github.com/monkstone/159c5a9813c9cd181040b4715e74f6b2

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

@@ -5,7 +5,7 @@ date:   2019-11-11 07:34:13
 categories: PiCrate update
 permalink: /getting_buster/
 ---
-Currently Raspbian Buster does not come with a pre-installed java. So the first step is to install a `jdk` we currently recommend installing openjdk8 (_there a complications you don't need using jdk11_) to benefit from `client` optimisations. There is a bash script [here][buster], that will install `openjdk8`, `jruby-9.2.9.0` and picrate for you.
+Currently Raspbian Buster does not come with a pre-installed java. So the first step is to install a `jdk` we currently recommend installing openjdk8 (_there a complications you don't need using jdk11_) to benefit from `client` optimisations. There is a bash script [here][buster], that will install `openjdk8`, `jruby-9.2.11.0` and picrate for you.
 ```bash
 bash buster_install.sh
 ```
@@ -59,7 +59,7 @@ picrate --install # no args, install samples and geany config
 picrate -i Samples # to omit geany config
 ```
 
-This installs example sketches in `~/sample_sketches` and ties them into a `geany` project `picrate.geany`. It should also be possible to run sketches from the `geany` ide.
+This installs example sketches in `~/projects/examples` and ties them into a `geany` project `examples.geany`. It should also be possible to run sketches from the `geany` ide.
 
 To create a template sketch from the command line:-
 

data/lib/picrate/version.rb

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

data/picrate.gemspec

@@ -22,15 +22,14 @@ Gem::Specification.new do |gem|
   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.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.require_paths = ['lib']

data/pom.rb

@@ -1,7 +1,7 @@
 project 'picrate', 'http://maven.apache.org' do
 
   model_version '4.0.0'
-  id 'ruby-processing:picrate:1.2.4'
+  id 'ruby-processing:picrate:1.3.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -31,7 +31,7 @@ project 'picrate', 'http://maven.apache.org' do
     'polyglot.dump.pom' => 'pom.xml'
   )
 
-  pom 'org.jruby:jruby:9.2.9.0'
+  pom 'org.jruby:jruby:9.2.11.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'

data/pom.xml

@@ -6,12 +6,12 @@ DO NOT MODIFIY - GENERATED CODE
 
 
 -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>1.2.4</version>
+  <version>1.3.0</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.9.0</version>
+      <version>9.2.11.0</version>
       <type>pom</type>
     </dependency>
     <dependency>

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

@@ -3651,7 +3651,7 @@ public class PGraphicsOpenGL extends PGraphics {
    * Ported from the implementation of textCharShapeImpl() in 1.5.1
    *
    * <EM>No attempt has been made to optimize this code</EM>
-   * 
+   *
    * TODO: Implement a FontShape class where each glyph is tessellated and
    * stored inside a larger PShapeOpenGL object (which needs to be expanded as
    * new glyphs are added and exceed the initial capacity in a similar way as
@@ -3659,18 +3659,18 @@ public class PGraphicsOpenGL extends PGraphics {
    * in shape mode, then the correct sequences of vertex indices are computed
    * (akin to the texcoords in the texture case) and used to draw only those
    * parts of the PShape object that are required for the text.
-   * 
+   *
    *
    * Some issues of the original implementation probably remain, so they are
    * reproduced below:
-   * 
+   *
    * Also a problem where some fonts seem to be a bit slight, as if the
    * control points aren't being mapped quite correctly. Probably doing
    * something dumb that the control points don't map to P5's control
    * points. Perhaps it's returning b-spline data from the TrueType font?
    * Though it seems like that would make a lot of garbage rather than
    * just a little flattening.
-   * 
+   *
    * There also seems to be a bug that is causing a line (but not a filled
    * triangle) back to the origin on some letters (i.e. a capital L when
    * tested with Akzidenz Grotesk Light). But this won't be visible
@@ -5352,7 +5352,7 @@ public class PGraphicsOpenGL extends PGraphics {
   // showWarning() and showException() available from PGraphics.
 
   /**
-   * Report on anything from glError().Don't use this inside glBegin/glEnd 
+   * Report on anything from glError().Don't use this inside glBegin/glEnd
    * otherwise it'll throw an GL_INVALID_OPERATION error.
    * @param where
    */
@@ -6366,11 +6366,11 @@ public class PGraphicsOpenGL extends PGraphics {
 
 
   /**
-   * Not an approved function, this will change or be removed in the future.This 
-   * utility method returns the texture associated to the renderer's. drawing 
-   * surface, making sure is updated to reflect the current contents off the 
+   * Not an approved function, this will change or be removed in the future.This
+   * utility method returns the texture associated to the renderer's. drawing
+   * surface, making sure is updated to reflect the current contents off the
    * screen (or offscreen drawing surface).
-   * @return 
+   * @return
    */
   public Texture getTexture() {
     return getTexture(true);
@@ -6380,7 +6380,7 @@ public class PGraphicsOpenGL extends PGraphics {
   /**
    * Not an approved function either, don't use it.
    * @param load
-   * @return 
+   * @return
    */
   public Texture getTexture(boolean load) {
     if (load) loadTexture();
@@ -6393,7 +6393,7 @@ public class PGraphicsOpenGL extends PGraphics {
    * creating and/or updating it if needed.
    *
    * @param img the image to have a texture metadata associated to it
-   * @return 
+   * @return
    */
   public Texture getTexture(PImage img) {
     Texture tex = (Texture)initCache(img);
@@ -6419,7 +6419,7 @@ public class PGraphicsOpenGL extends PGraphics {
   /**
    * Not an approved function, test its use in libraries to grab the FB objects
    * for offscreen PGraphics.
-   * @return 
+   * @return
    */
   public FrameBuffer getFrameBuffer() {
     return getFrameBuffer(false);
@@ -6478,7 +6478,7 @@ public class PGraphicsOpenGL extends PGraphics {
    * This utility method creates a texture for the provided image, and adds it
    * to the metadata cache of the image.
    * @param img the image to have a texture metadata associated to it
-   * @return 
+   * @return
    */
   protected Texture addTexture(PImage img) {
     Texture.Parameters params =
@@ -6892,7 +6892,6 @@ public class PGraphicsOpenGL extends PGraphics {
     OPENGL_VERSION    = pgl.getString(PGL.VERSION);
     OPENGL_EXTENSIONS = pgl.getString(PGL.EXTENSIONS);
     GLSL_VERSION      = pgl.getString(PGL.SHADING_LANGUAGE_VERSION);
-
     npotTexSupported = pgl.hasNpotTexSupport();
     autoMipmapGenSupported = pgl.hasAutoMipmapGenSupport();
     fboMultisampleSupported = pgl.hasFboMultisampleSupport();
@@ -6900,45 +6899,28 @@ public class PGraphicsOpenGL extends PGraphics {
     anisoSamplingSupported = pgl.hasAnisoSamplingSupport();
     readBufferSupported = pgl.hasReadBuffer();
     drawBufferSupported = pgl.hasDrawBuffer();
-
     try {
       pgl.blendEquation(PGL.FUNC_ADD);
       blendEqSupported = true;
     } catch (Exception e) {
       blendEqSupported = false;
     }
-
     depthBits = pgl.getDepthBits();
     stencilBits = pgl.getStencilBits();
-
     pgl.getIntegerv(PGL.MAX_TEXTURE_SIZE, intBuffer);
     maxTextureSize = intBuffer.get(0);
-
-    // work around runtime exceptions in Broadcom's VC IV driver
-    if (false == OPENGL_RENDERER.equals("VideoCore IV HW")) {
-      pgl.getIntegerv(PGL.MAX_SAMPLES, intBuffer);
-      maxSamples = intBuffer.get(0);
-    }
-
+    pgl.getIntegerv(PGL.MAX_SAMPLES, intBuffer);
+    maxSamples = intBuffer.get(0);
     if (anisoSamplingSupported) {
       pgl.getFloatv(PGL.MAX_TEXTURE_MAX_ANISOTROPY, floatBuffer);
       maxAnisoAmount = floatBuffer.get(0);
     }
-
-    // overwrite the default shaders with vendor specific versions
-    // if needed
-    if (OPENGL_RENDERER.equals("VideoCore IV HW")) {  // Broadcom's binary driver for Raspberry Pi
-        defLightShaderVertURL =
-          PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightVert-brcm.glsl");
-        defTexlightShaderVertURL =
-          PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightVert-brcm.glsl");
-    } else if (OPENGL_RENDERER.contains("VC4")) {     // Mesa driver for same hardware
-        defLightShaderVertURL =
-          PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightVert-vc4.glsl");
-        defTexlightShaderVertURL =
-          PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightVert-vc4.glsl");
+    // Broadcom's binary drivers for Raspberry Pi don't work with PiCrate in Buster
+    if (OPENGL_RENDERER.equals("VideoCore IV HW")) {
+      pgl.dispose();
+      System.out.println("Use FakeKMS or FullKMS video driver for P2D and P3D sketches");
+      super.dispose();
     }
-
     glParamsRead = true;
   }
 
@@ -13160,6 +13142,7 @@ public class PGraphicsOpenGL extends PGraphics {
         else if (type == PGL.TRIANGLES) primitive = TRIANGLES;
       }
 
+      @Override
       public void end() {
         if (PGL.MAX_VERTEX_INDEX1 <= vertFirst + vertCount) {
           // We need a new index block for the new batch of

data/vendors/Rakefile

@@ -7,7 +7,7 @@ SOUND = 'sound.zip'
 SOUND_VERSION = 'v1.3.2'
 VIDEO = 'video-2.0-beta4.zip'
 VIDEO_VERSION = 'r6-v2.0-beta4'
-EXAMPLES = '0.5.2'
+EXAMPLES = '0.5.3'
 HOME_DIR = ENV['HOME']
 LIBRARY = File.join(HOME_DIR, '.picrate', 'libraries')
 PROJECT_DIR = File.join(HOME_DIR, 'projects')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picrate
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -209,7 +209,7 @@ files:
 - lib/jogl-all-natives-linux-amd64.jar
 - lib/jogl-all-natives-linux-armv6hf.jar
 - lib/jogl-all.jar
-- lib/picrate-1.2.4.jar
+- lib/picrate-1.3.0.jar
 - lib/picrate.rb
 - lib/picrate/app.rb
 - lib/picrate/creators/parameters.rb