propane 2.9.0-java → 2.9.1-java

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

@@ -96,8 +96,8 @@ void main() {
   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++) {
+  // four lights for now
+  for (int i = 0; i < 4; i++) {
     if (lightCount == i) break;
     
     vec3 lightPos = lightPosition[i].xyz;

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

@@ -0,0 +1,160 @@
+/*
+  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 mat4 texMatrix;
+
+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 vec2 texCoord;
+
+attribute vec4 ambient;
+attribute vec4 specular;
+attribute vec4 emissive;
+attribute float shininess;
+
+varying vec4 vertColor;
+varying vec4 backVertColor;
+varying vec4 vertTexCoord;
+
+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);
+                  
+  // Calculating texture coordinates, with r and q set both to one
+  vertTexCoord = texMatrix * vec4(texCoord, 1.0, 1.0);        
+}

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

@@ -99,8 +99,8 @@ void main() {
   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++) {
+  // four lights for now
+  for (int i = 0; i < 4; i++) {
     if (lightCount == i) break;
     
     vec3 lightPos = lightPosition[i].xyz;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-23 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,8 +58,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: "  A batteries included version of processing in ruby, for MacOS and
-  linux64.\n"
+description: "  A batteries included version of processing in ruby.\n"
 email:
 - mamba2928@yahoo.co.uk
 executables:
@@ -79,15 +78,19 @@ files:
 - README.md
 - Rakefile
 - bin/propane
+- lib/.gitignore
 - lib/PROCESSING_LICENSE.txt
+- lib/apple.jar
 - lib/export.txt
-- lib/gluegen-rt-2.3.2-natives-linux-amd64.jar
-- lib/gluegen-rt-2.3.2-natives-macosx-universal.jar
-- lib/gluegen-rt-2.3.2.jar
-- lib/jogl-all-2.3.2-natives-linux-amd64.jar
-- lib/jogl-all-2.3.2-natives-macosx-universal.jar
-- lib/jogl-all-2.3.2.jar
-- lib/propane-2.9.0.jar
+- lib/gluegen-rt-natives-linux-amd64.jar
+- lib/gluegen-rt-natives-macosx-universal.jar
+- lib/gluegen-rt-natives-windows-amd64.jar
+- lib/gluegen-rt.jar
+- lib/jogl-all-natives-linux-amd64.jar
+- lib/jogl-all-natives-macosx-universal.jar
+- lib/jogl-all-natives-windows-amd64.jar
+- lib/jogl-all.jar
+- lib/propane-2.9.1.jar
 - lib/propane.rb
 - lib/propane/app.rb
 - lib/propane/creators/sketch_class.rb
@@ -163,6 +166,8 @@ files:
 - src/main/java/processing/core/PSurfaceNone.java
 - src/main/java/processing/core/PVector.java
 - src/main/java/processing/core/ThinkDifferent.java
+- src/main/java/processing/data/DoubleDict.java
+- src/main/java/processing/data/DoubleList.java
 - src/main/java/processing/data/FloatDict.java
 - src/main/java/processing/data/FloatList.java
 - src/main/java/processing/data/IntDict.java
@@ -170,6 +175,8 @@ files:
 - src/main/java/processing/data/JSONArray.java
 - src/main/java/processing/data/JSONObject.java
 - src/main/java/processing/data/JSONTokener.java
+- src/main/java/processing/data/LongDict.java
+- src/main/java/processing/data/LongList.java
 - src/main/java/processing/data/Sort.java
 - src/main/java/processing/data/StringDict.java
 - src/main/java/processing/data/StringList.java
@@ -206,6 +213,7 @@ 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
@@ -215,6 +223,7 @@ 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
@@ -257,12 +266,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- java runtime >= 1.8.0_171+
+- java runtime >= 1.8.0_181+
 rubyforge_project: 
 rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: ruby wrapper for processing-3.4 on MacOS and linux64 bit only for opengl
+summary: ruby wrapper for processing-3.4 on MacOS, linux and windows (64bit only)
 test_files:
 - test/create_test.rb
 - test/deglut_spec_test.rb