picrate 1.2.3-java → 2.1.0-java

data/vendors/{picrate_sketches.geany → geany.rb}

@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+
+require 'erb'
+
+def geany_config
+  %(
 [editor]
 line_wrapping=false
 line_break_column=72
@@ -19,7 +25,7 @@ indent_mode=2
 
 [project]
 name=picrate_samples
-base_path=/home/pi/projects/picrate_sketches
+base_path=<%= home %>
 description=Exploring PiCrate
 file_patterns=*.rb;*.glsl;*.txt;
 
@@ -28,14 +34,9 @@ long_line_behaviour=1
 long_line_column=72
 
 [files]
-current_page=3
-FILE_NAME_0=667;Ruby;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fprojects%2Fpicrate_sketches%2Fbasics%2Farrays%2Farray.rb;0;2
-FILE_NAME_1=1664;Ruby;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fprojects%2Fpicrate_sketches%2Fadvanced_data%2Fload_save_json.rb;0;2
-FILE_NAME_2=259;Sh;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fjruby_install.sh;0;2
-FILE_NAME_3=236;Sh;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Ftest.sh;0;2
 
 [VTE]
-last_dir=/home/pi
+last_dir=<%= directory %>
 
 [build-menu]
 EX_00_LB=_Execute
@@ -60,3 +61,27 @@ NF_02_WD=
 RubyFT_02_LB=_Reek
 RubyFT_02_CM=reek --failure-exit-code=0 "%f"
 RubyFT_02_WD=
+  )
+end
+
+# Class to merge ERB template and write config to file
+class GeanyConfig
+  include ERB::Util
+  attr_accessor :home, :directory, :template
+
+  def initialize(home, directory, template = geany_config)
+    @home = home
+    @directory = File.join(home, directory)
+    @template = template
+  end
+
+  def render
+    ERB.new(@template).result(binding)
+  end
+
+  def save(file)
+    File.open(file, 'w+') do |f|
+      f.write(render)
+    end
+  end
+end

metadata

@@ -1,85 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: picrate
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 2.1.0
 platform: java
 authors:
 - monkstone
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '5.10'
+  name: minitest
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
-  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '12.3'
+  name: rake
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: arcball
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: geomerative
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+  name: arcball
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: ruby_wordcram
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 1.0.1
 description: |
   A batteries included version of processing in ruby, for raspberrypi and
   linux. Install samples to configures geany ide.
@@ -170,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
@@ -203,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-1.2.3.jar
+- lib/picrate-2.1.0.jar
 - lib/picrate.rb
 - lib/picrate/app.rb
 - lib/picrate/creators/parameters.rb
@@ -272,8 +253,10 @@ files:
 - src/main/java/monkstone/videoevent/MovieEvent.java
 - src/main/java/monkstone/videoevent/package-info.java
 - src/main/java/processing/awt/PGraphicsJava2D.java
+- src/main/java/processing/awt/PImageAWT.java
 - src/main/java/processing/awt/PShapeJava2D.java
 - src/main/java/processing/awt/PSurfaceAWT.java
+- src/main/java/processing/awt/ShimAWT.java
 - src/main/java/processing/core/PApplet.java
 - src/main/java/processing/core/PConstants.java
 - src/main/java/processing/core/PFont.java
@@ -334,8 +317,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
@@ -344,8 +325,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
@@ -366,8 +345,8 @@ files:
 - test/test_helper.rb
 - test/vecmath_spec_test.rb
 - vendors/Rakefile
+- vendors/geany.rb
 - vendors/picrate.rb
-- vendors/picrate_sketches.geany
 homepage: https://ruby-processing.github.io/PiCrate/
 licenses:
 - GPL-3.0
@@ -388,11 +367,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- java runtime == 8
+- java runtime == 11
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
-summary: ruby wrapper for processing-3.5.3 on raspberrypi and linux64
+summary: ruby implementation of processing-3 on raspberrypi and linux64
 test_files:
 - test/color_group_test.rb
 - test/deglut_spec_test.rb

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);
-}