Update some versions for jdk8

Author: monkstone

.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>

.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

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 --add-opens in ~/.jruby.java_opts to suppress reflective access warnings.
 
+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.

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

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

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
 ```

lib/picrate/version.rb

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

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 @@
     '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'

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>

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

@@ -3651,26 +3651,26 @@ protected void textCharModelImpl(FontTexture.TextureInfo info,
    * 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
    * the textures in FontTexture work). When a string of text is to be rendered
    * 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 @@ protected void backgroundImpl() {
   // 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 @@ protected void blendModeImpl() {
 
 
   /**
-   * 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 Texture getTexture() {
   /**
    * 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 Texture getTexture(boolean load) {
    * 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 Texture getTexture(PImage img) {
   /**
    * 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 @@ protected void unbindFrontTexture() {
    * 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,53 +6892,35 @@ protected void getGLParameters() {
     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();
     packedDepthStencilSupported = pgl.hasPackedDepthStencilSupport();
     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 void begin(int type) {
         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