picrate 2.0.0.pre-java → 2.0.1-java

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

@@ -1756,7 +1756,7 @@ public class PShapeOpenGL extends PShape {
     }
 
     VertexAttribute attrib = polyAttribs.get(name);
-    float[] array = inGeo.fattribs.get(name);
+    float[] array = (float[]) inGeo.fattribs.get(name);
     for (int i = 0; i < values.length; i++) {
       array[attrib.size * index + 0] = values[i];
     }
@@ -1772,7 +1772,7 @@ public class PShapeOpenGL extends PShape {
     }
 
     VertexAttribute attrib = polyAttribs.get(name);
-    int[] array = inGeo.iattribs.get(name);
+    int[] array = (int[]) inGeo.iattribs.get(name);
     for (int i = 0; i < values.length; i++) {
       array[attrib.size * index + 0] = values[i];
     }
@@ -1788,7 +1788,7 @@ public class PShapeOpenGL extends PShape {
     }
 
     VertexAttribute attrib = polyAttribs.get(name);
-    byte[] array = inGeo.battribs.get(name);
+    byte[] array = (byte[]) inGeo.battribs.get(name);
     for (int i = 0; i < values.length; i++) {
       array[attrib.size * index + 0] = (byte)(values[i]?1:0);
     }
@@ -3968,8 +3968,7 @@ public class PShapeOpenGL extends PShape {
       tessGeo.updateAttribBuffer(attrib.name);
       if (!attrib.bufferCreated()) attrib.createBuffer(pgl);
       pgl.bindBuffer(PGL.ARRAY_BUFFER, attrib.buf.glId);
-      pgl.bufferData(PGL.ARRAY_BUFFER, attrib.sizeInBytes(size),
-                     tessGeo.polyAttribBuffers.get(name), glUsage);
+      pgl.bufferData(PGL.ARRAY_BUFFER, attrib.sizeInBytes(size), (Buffer) tessGeo.polyAttribBuffers.get(name), glUsage);
     }
 
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
@@ -4333,7 +4332,7 @@ public class PShapeOpenGL extends PShape {
   protected void copyPolyAttrib(VertexAttribute attrib, int offset, int size) {
     tessGeo.updateAttribBuffer(attrib.name, offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, attrib.buf.glId);
-    Buffer buf = tessGeo.polyAttribBuffers.get(attrib.name);
+    Buffer buf = (Buffer) tessGeo.polyAttribBuffers.get(attrib.name);
     buf.position(attrib.size * offset);
     pgl.bufferSubData(PGL.ARRAY_BUFFER, attrib.sizeInBytes(offset),
                       attrib.sizeInBytes(size), buf);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picrate
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre
+  version: 2.0.1
 platform: java
 authors:
 - monkstone
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-07 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -58,40 +58,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  name: geomerative
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.4
-  name: ruby_wordcram
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.4
 description: |
   A batteries included version of processing in ruby, for raspberrypi and
   linux. Install samples to configures geany ide.
@@ -182,10 +148,11 @@ files:
 - docs/_posts/2018-05-06-install_jruby.md
 - docs/_posts/2018-05-06-processing-api.md
 - docs/_posts/2018-05-11-arch-linux-arm.md
-- docs/_posts/2018-06-26-auto_install_picrate.md
 - docs/_posts/2018-11-18-building-gem.md
 - docs/_posts/2018-11-27-getting_started_geany.md
 - docs/_posts/2019-11-11-getting_started_buster.md
+- docs/_posts/2020-03-09-auto_install_picrate.md
+- docs/_posts/2020-05-11-getting_started_manjaro.md
 - docs/_sass/_base.scss
 - docs/_sass/_layout.scss
 - docs/_sass/_syntax-highlighting.scss
@@ -215,13 +182,15 @@ files:
 - docs/modules.md
 - docs/objects.md
 - lib/export.txt
+- lib/gluegen-rt-natives-linux-aarch64.jar
 - lib/gluegen-rt-natives-linux-amd64.jar
 - lib/gluegen-rt-natives-linux-armv6hf.jar
 - lib/gluegen-rt.jar
+- lib/jogl-all-natives-linux-aarch64.jar
 - lib/jogl-all-natives-linux-amd64.jar
 - lib/jogl-all-natives-linux-armv6hf.jar
 - lib/jogl-all.jar
-- lib/picrate-2.0.0.pre.jar
+- lib/picrate-2.0.1.jar
 - lib/picrate.rb
 - lib/picrate/app.rb
 - lib/picrate/creators/parameters.rb
@@ -346,8 +315,6 @@ files:
 - 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-brcm.glsl
-- src/main/java/processing/opengl/shaders/LightVert-vc4.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
@@ -356,8 +323,6 @@ files:
 - 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-brcm.glsl
-- src/main/java/processing/opengl/shaders/TexLightVert-vc4.glsl
 - src/main/java/processing/opengl/shaders/TexLightVert.glsl
 - src/main/java/processing/opengl/shaders/TexVert.glsl
 - src/main/resources/icon/icon-128.png
@@ -396,11 +361,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
-- java runtime == 11+
+- java runtime == 11
 rubygems_version: 3.0.6
 signing_key:
 specification_version: 4

data/docs/_posts/2018-06-26-auto_install_picrate.md

@@ -1,30 +0,0 @@
----
-layout: post
-title:  "Automated PiCrate Install"
-date:   2018-06-26 07:34:13
-categories: PiCrate update
-permalink: /install_picrate/
----
-
-For a semi-automated setup and install, download and extract [this gist](https://gist.github.com/monkstone/e9df8ea776aed58ce1c4de8e12982aad). To keep your system clean put the file in a folder say
-`~/install_picrate`
-
-```bash
-cd ~/picrate_install
-bash picrate_install.sh # to run default task
-```
-#### What the script does ###
-1. Downloads JRuby
-2. Installs JRuby to `/opt`
-3. Uses `update-alternatives` to configure `jruby`, `jgem` and `jirb`
-4. The script checks for `GEM_HOME`, if undefined it modifies `~/.profile` to define `GEM_HOME` and puts gem binaries on your path, at logon.
-5. Installs `picrate` gem
-6. Downloads and installs `picrate_samples` also configures `geanyIDE` for use with `picrate`
-
-#### Note ####
-`GEM_HOME` and path to `gem` binaries is not available until next logon, to use immediately you could:-
-
-```bash
-source ~/.profile
-```
-NB: this only works in current shell, so if you want to use `geanyIDE` you should logout and logon again.

data/src/main/java/processing/opengl/shaders/LightVert-brcm.glsl

@@ -1,154 +0,0 @@
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2012-15 The Processing Foundation
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-
-  This library 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, version 2.1.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General
-  Public License along with this library; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-*/
-
-uniform mat4 modelviewMatrix;
-uniform mat4 transformMatrix;
-uniform mat3 normalMatrix;
-
-uniform int lightCount;
-uniform vec4 lightPosition[8];
-uniform vec3 lightNormal[8];
-uniform vec3 lightAmbient[8];
-uniform vec3 lightDiffuse[8];
-uniform vec3 lightSpecular[8];
-uniform vec3 lightFalloff[8];
-uniform vec2 lightSpot[8];
-
-attribute vec4 position;
-attribute vec4 color;
-attribute vec3 normal;
-
-attribute vec4 ambient;
-attribute vec4 specular;
-attribute vec4 emissive;
-attribute float shininess;
-
-varying vec4 vertColor;
-varying vec4 backVertColor;
-
-const float zero_float = 0.0;
-const float one_float = 1.0;
-const vec3 zero_vec3 = vec3(0.0);
-const vec3 minus_one_vec3 = vec3(0.0-1.0);
-
-float falloffFactor(vec3 lightPos, vec3 vertPos, vec3 coeff) {
-  vec3 lpv = lightPos - vertPos;
-  vec3 dist = vec3(one_float);
-  dist.z = dot(lpv, lpv);
-  dist.y = sqrt(dist.z);
-  return one_float / dot(dist, coeff);
-}
-
-float spotFactor(vec3 lightPos, vec3 vertPos, vec3 lightNorm, float minCos, float spotExp) {
-  vec3 lpv = normalize(lightPos - vertPos);
-  vec3 nln = minus_one_vec3 * lightNorm;
-  float spotCos = dot(nln, lpv);
-  return spotCos <= minCos ? zero_float : pow(spotCos, spotExp);
-}
-
-float lambertFactor(vec3 lightDir, vec3 vecNormal) {
-  return max(zero_float, dot(lightDir, vecNormal));
-}
-
-float blinnPhongFactor(vec3 lightDir, vec3 vertPos, vec3 vecNormal, float shine) {
-  vec3 np = normalize(vertPos);
-  vec3 ldp = normalize(lightDir - np);
-  return pow(max(zero_float, dot(ldp, vecNormal)), shine);
-}
-
-void main() {
-  // Vertex in clip coordinates
-  gl_Position = transformMatrix * position;
-    
-  // Vertex in eye coordinates
-  vec3 ecVertex = vec3(modelviewMatrix * position);
-  
-  // Normal vector in eye coordinates
-  vec3 ecNormal = normalize(normalMatrix * normal);
-  vec3 ecNormalInv = ecNormal * minus_one_vec3;
-  
-  // Light calculations
-  vec3 totalAmbient = vec3(0, 0, 0);
-  
-  vec3 totalFrontDiffuse = vec3(0, 0, 0);
-  vec3 totalFrontSpecular = vec3(0, 0, 0);
-  
-  vec3 totalBackDiffuse = vec3(0, 0, 0);
-  vec3 totalBackSpecular = vec3(0, 0, 0);
-  
-  // prevent register allocation failure by limiting ourselves to
-  // two lights for now
-  for (int i = 0; i < 2; i++) {
-    if (lightCount == i) break;
-    
-    vec3 lightPos = lightPosition[i].xyz;
-    bool isDir = lightPosition[i].w < one_float;
-    float spotCos = lightSpot[i].x;
-    float spotExp = lightSpot[i].y;
-    
-    vec3 lightDir;
-    float falloff;    
-    float spotf;
-      
-    if (isDir) {
-      falloff = one_float;
-      lightDir = minus_one_vec3 * lightNormal[i];
-    } else {
-      falloff = falloffFactor(lightPos, ecVertex, lightFalloff[i]);  
-      lightDir = normalize(lightPos - ecVertex);
-    }
-  
-    spotf = spotExp > zero_float ? spotFactor(lightPos, ecVertex, lightNormal[i], 
-                                              spotCos, spotExp) 
-                                 : one_float;
-    
-    if (any(greaterThan(lightAmbient[i], zero_vec3))) {
-      totalAmbient       += lightAmbient[i] * falloff;
-    }
-    
-    if (any(greaterThan(lightDiffuse[i], zero_vec3))) {
-      totalFrontDiffuse  += lightDiffuse[i] * falloff * spotf * 
-                            lambertFactor(lightDir, ecNormal);
-      totalBackDiffuse   += lightDiffuse[i] * falloff * spotf * 
-                            lambertFactor(lightDir, ecNormalInv);
-    }
-    
-    if (any(greaterThan(lightSpecular[i], zero_vec3))) {
-      totalFrontSpecular += lightSpecular[i] * falloff * spotf * 
-                            blinnPhongFactor(lightDir, ecVertex, ecNormal, shininess);
-      totalBackSpecular  += lightSpecular[i] * falloff * spotf * 
-                            blinnPhongFactor(lightDir, ecVertex, ecNormalInv, shininess);
-    }     
-  }    
-
-  // Calculating final color as result of all lights (plus emissive term).
-  // Transparency is determined exclusively by the diffuse component.
-  vertColor =     vec4(totalAmbient, 0) * ambient + 
-                  vec4(totalFrontDiffuse, 1) * color + 
-                  vec4(totalFrontSpecular, 0) * specular + 
-                  vec4(emissive.rgb, 0);
-              
-  backVertColor = vec4(totalAmbient, 0) * ambient + 
-                  vec4(totalBackDiffuse, 1) * color + 
-                  vec4(totalBackSpecular, 0) * specular + 
-                  vec4(emissive.rgb, 0);
-}

data/src/main/java/processing/opengl/shaders/LightVert-vc4.glsl

@@ -1,154 +0,0 @@
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2012-15 The Processing Foundation
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-
-  This library 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, version 2.1.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General
-  Public License along with this library; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-*/
-
-uniform mat4 modelviewMatrix;
-uniform mat4 transformMatrix;
-uniform mat3 normalMatrix;
-
-uniform int lightCount;
-uniform vec4 lightPosition[8];
-uniform vec3 lightNormal[8];
-uniform vec3 lightAmbient[8];
-uniform vec3 lightDiffuse[8];
-uniform vec3 lightSpecular[8];
-uniform vec3 lightFalloff[8];
-uniform vec2 lightSpot[8];
-
-attribute vec4 position;
-attribute vec4 color;
-attribute vec3 normal;
-
-attribute vec4 ambient;
-attribute vec4 specular;
-attribute vec4 emissive;
-attribute float shininess;
-
-varying vec4 vertColor;
-varying vec4 backVertColor;
-
-const float zero_float = 0.0;
-const float one_float = 1.0;
-const vec3 zero_vec3 = vec3(0.0);
-const vec3 minus_one_vec3 = vec3(0.0-1.0);
-
-float falloffFactor(vec3 lightPos, vec3 vertPos, vec3 coeff) {
-  vec3 lpv = lightPos - vertPos;
-  vec3 dist = vec3(one_float);
-  dist.z = dot(lpv, lpv);
-  dist.y = sqrt(dist.z);
-  return one_float / dot(dist, coeff);
-}
-
-float spotFactor(vec3 lightPos, vec3 vertPos, vec3 lightNorm, float minCos, float spotExp) {
-  vec3 lpv = normalize(lightPos - vertPos);
-  vec3 nln = minus_one_vec3 * lightNorm;
-  float spotCos = dot(nln, lpv);
-  return spotCos <= minCos ? zero_float : pow(spotCos, spotExp);
-}
-
-float lambertFactor(vec3 lightDir, vec3 vecNormal) {
-  return max(zero_float, dot(lightDir, vecNormal));
-}
-
-float blinnPhongFactor(vec3 lightDir, vec3 vertPos, vec3 vecNormal, float shine) {
-  vec3 np = normalize(vertPos);
-  vec3 ldp = normalize(lightDir - np);
-  return pow(max(zero_float, dot(ldp, vecNormal)), shine);
-}
-
-void main() {
-  // Vertex in clip coordinates
-  gl_Position = transformMatrix * position;
-    
-  // Vertex in eye coordinates
-  vec3 ecVertex = vec3(modelviewMatrix * position);
-  
-  // Normal vector in eye coordinates
-  vec3 ecNormal = normalize(normalMatrix * normal);
-  vec3 ecNormalInv = ecNormal * minus_one_vec3;
-  
-  // Light calculations
-  vec3 totalAmbient = vec3(0, 0, 0);
-  
-  vec3 totalFrontDiffuse = vec3(0, 0, 0);
-  vec3 totalFrontSpecular = vec3(0, 0, 0);
-  
-  vec3 totalBackDiffuse = vec3(0, 0, 0);
-  vec3 totalBackSpecular = vec3(0, 0, 0);
-  
-  // prevent register allocation failure by limiting ourselves to
-  // four lights for now
-  for (int i = 0; i < 4; i++) {
-    if (lightCount == i) break;
-    
-    vec3 lightPos = lightPosition[i].xyz;
-    bool isDir = lightPosition[i].w < one_float;
-    float spotCos = lightSpot[i].x;
-    float spotExp = lightSpot[i].y;
-    
-    vec3 lightDir;
-    float falloff;    
-    float spotf;
-      
-    if (isDir) {
-      falloff = one_float;
-      lightDir = minus_one_vec3 * lightNormal[i];
-    } else {
-      falloff = falloffFactor(lightPos, ecVertex, lightFalloff[i]);  
-      lightDir = normalize(lightPos - ecVertex);
-    }
-  
-    spotf = spotExp > zero_float ? spotFactor(lightPos, ecVertex, lightNormal[i], 
-                                              spotCos, spotExp) 
-                                 : one_float;
-    
-    if (any(greaterThan(lightAmbient[i], zero_vec3))) {
-      totalAmbient       += lightAmbient[i] * falloff;
-    }
-    
-    if (any(greaterThan(lightDiffuse[i], zero_vec3))) {
-      totalFrontDiffuse  += lightDiffuse[i] * falloff * spotf * 
-                            lambertFactor(lightDir, ecNormal);
-      totalBackDiffuse   += lightDiffuse[i] * falloff * spotf * 
-                            lambertFactor(lightDir, ecNormalInv);
-    }
-    
-    if (any(greaterThan(lightSpecular[i], zero_vec3))) {
-      totalFrontSpecular += lightSpecular[i] * falloff * spotf * 
-                            blinnPhongFactor(lightDir, ecVertex, ecNormal, shininess);
-      totalBackSpecular  += lightSpecular[i] * falloff * spotf * 
-                            blinnPhongFactor(lightDir, ecVertex, ecNormalInv, shininess);
-    }     
-  }    
-
-  // Calculating final color as result of all lights (plus emissive term).
-  // Transparency is determined exclusively by the diffuse component.
-  vertColor =     vec4(totalAmbient, 0) * ambient + 
-                  vec4(totalFrontDiffuse, 1) * color + 
-                  vec4(totalFrontSpecular, 0) * specular + 
-                  vec4(emissive.rgb, 0);
-              
-  backVertColor = vec4(totalAmbient, 0) * ambient + 
-                  vec4(totalBackDiffuse, 1) * color + 
-                  vec4(totalBackSpecular, 0) * specular + 
-                  vec4(emissive.rgb, 0);
-}