propane 3.2.0-java → 3.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27e0f6d8547d0ab680c183052c93de07386e196ef645111564ad033172ccccbe
-  data.tar.gz: cc8cf473457ddfbe7e423e202276d209d629942b2d04bedfd07c577ca1fefb43
+  metadata.gz: 580882cb5f9d0a497b538b8537ae10d51d17b922ba81c01f1912fd6f161d23ab
+  data.tar.gz: 47b5945a4e46a9287c7856d6726f79668154bf502eadecba8045beacc831ed63
 SHA512:
-  metadata.gz: 501f170bf9899573c5085c292a0fe8796df82588dd74b2b07b80c8dda96498a7cbd26352fce2a8623a69b1ff0d4703bb265dcf55b81292efdbe3c52322100fc1
-  data.tar.gz: 4b8a78d2f4b924111b16a8269d922107f84f186465e5568972237944886bfcb2c23fa5178e5c2b8046aa559b74ea167932795c25a97849322ec9c991ab274a24
+  metadata.gz: d2cf96f90b7377e091c01d9b188a63d618001408675c2f945d72ee00da8cccbe057d372255010ef04a4adaffe54ae6afdad5d70713d00469b223edf8cb172067
+  data.tar.gz: 3e2d188cd042052892f0c5b1f33229b4faf28214c3ad3d739af052f6961e9430b050d59076f3965d6521ccb740d227c3b0f65f8c8fa1f42c8b00076b83153074

data/.mvn/extensions.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+  <extension>
+    <groupId>io.takari.polyglot</groupId>
+    <artifactId>polyglot-ruby</artifactId>
+    <version>0.4.0</version>
+  </extension>
+</extensions>
+

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

@@ -1 +1,3 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
+
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
+

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-**v3.2** Now is the time for some serious refactoring for jdk11. Might even work on MacOS and Windows, ahead of vanilla processing.
+**v3.3.0** Compile with jdk12. Changed AppRender to GfxRender (PGraphics instead of PApplet). Attempt fix for macOS icons
+
+**v3.2.0** Now is the time for some serious refactoring for jdk11. Might even work on MacOS and Windows, ahead of vanilla processing.
 
 **v2.9.1** Attempt to bring 64 bit Windows users to party. Use non versioned jogl/opengl jars from processing distro, including processing.org apple.jar in case it's needed, MacOS users are being very opaque on this.
 

data/README.md

@@ -1,8 +1,8 @@
 # Propane
 
-This version is intended to work with openjdk11+, @sampottinger is currently working on [vanilla processing][vanilla] which will enable JRubyArt to catch up.
+This version is intended to work with openjdk11+, @sampottinger is currently working on [vanilla processing][vanilla] which will enable JRubyArt to catch up. Unfortunately there is a cockup in debian distributions, and it is currently safer to use the Oracle version on debian (Archlinux openjdk version is fine).
 
-A slim layer to communicate with Processing from JRuby, features maven build. We have created a configuration free version of ruby processing, for processing-3.5+, where we include a modified processing core (`public runPropane()` to replace `protected runSketch()`. These jars are small enough to include in a gem distribution, and hence we do not require configuration. This has created a scriptable version, ie files get run direct from jruby. Currently JavaFX is unsupported again @sampottinger is currently working on [vanilla processing][vanilla] to use OpenJFX.
+A slim layer to communicate with Processing from JRuby, features maven build. We have created a configuration free version of ruby processing, for processing-4.0+, where we include a modified processing core (`public runPropane()` to replace `protected runSketch()`. These jars are small enough to include in a gem distribution, and hence we do not require configuration. This has created a scriptable version, ie files get run direct from jruby. Currently JavaFX is unsupported again @sampottinger is currently working on [vanilla processing][vanilla] to use OpenJFX. It would be nice make use of java modules, but I think we should let jruby project do that first (unless processing.org beat them to it).
 
 adjust above for your OS/distro setup.
 
@@ -24,10 +24,10 @@ rake javadoc
 
 ```bash
 jgem install propane # from rubygems
-jgem install propane-3.2.0-java.gem # local install
+jgem install propane-3.3.0-java.gem # local install
 # Alternative
 jruby -S gem install propane # from rubygems
-jruby -S gem install propane-3.2.0-java.gem # local install
+jruby -S gem install propane-3.3.0-java.gem # local install
 ```
 
 ## Check Install

data/lib/propane/app.rb

@@ -10,7 +10,7 @@ module Propane
   SKETCH_ROOT = File.absolute_path('.')
 
   module Render
-    java_import 'monkstone.vecmath.AppRender'
+    java_import 'monkstone.vecmath.GfxRender'
     java_import 'monkstone.vecmath.ShapeRender'
   end
 

data/lib/propane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-  VERSION = '3.2.0'.freeze
+  VERSION = '3.3.0'.freeze
 end

data/pom.rb

@@ -0,0 +1,79 @@
+project 'propane', 'https://github.com/monkstone/propane' do
+
+  model_version '4.0.0'
+  id 'propane:propane:3.3.0'
+  packaging 'jar'
+
+  description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
+
+  developer 'monkstone' do
+    name 'Martin Prout'
+    roles 'developer'
+  end
+
+  developer 'benfry' do
+    name 'Ben Fry'
+    roles 'developer'
+  end
+
+  developer 'REAS' do
+    name 'Casey Reas'
+    roles 'developer'
+  end
+
+  developer 'codeanticode' do
+    name 'Andres Colubri'
+    roles 'developer'
+  end
+
+  issue_management 'https://github.com/ruby-processing/propane/issues', 'Github'
+
+  source_control( :url => 'https://github.com/ruby-processing/propane',
+                  :connection => 'scm:git:git://github.com/ruby-processing/propane.git',
+                  :developer_connection => 'scm:git:git@github.com/ruby-processing/propane.git' )
+
+  properties( 'propane.basedir' => '${project.basedir}',
+              'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
+              'source.directory' => 'src',
+              'polyglot.dump.pom' => 'pom.xml',
+              'project.build.sourceEncoding' => 'utf-8',
+              'jogl.version' => '2.3.2',
+              'jruby.api' => 'http://jruby.org/apidocs/' )
+
+  pom 'org.jruby:jruby:9.2.7.0'
+  jar 'org.processing:video:3.2.3'
+  jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
+  jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
+
+  overrides do
+    plugin( 'org.codehaus.mojo:versions-maven-plugin:2.7',
+            'generateBackupPoms' =>  'false' )
+    plugin( :compiler, '3.8.0',
+            'release' =>  '11' )
+    plugin( :javadoc, '3.0.1',
+            'detectOfflineLinks' =>  'false',
+            'links' => [ '${jruby.api}',
+                         '${processing.api}' ] )
+    plugin( :jar, '3.1.0',
+            'archive' => {
+              'manifestFile' =>  'MANIFEST.MF'
+            } )
+  end
+
+
+  build do
+
+    resource do
+      directory '${source.directory}/main/java'
+      includes '**/**/*.glsl', '**/*.jnilib'
+      excludes '**/**/*.java'
+    end
+
+    resource do
+      directory '${source.directory}/main/resources'
+      includes '**/*.png', '*.txt'
+      excludes
+    end
+  end
+
+end

data/pom.xml

@@ -1,27 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+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"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>3.2.0</version>
+  <version>3.3.0</version>
   <name>propane</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>https://github.com/monkstone/propane</url>
-  <organization>
-    <name>ruby-processing</name>
-    <url>https://ruby-processing.github.io</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>GPL 3</name>
-      <url>http://www.gnu.org/licenses/gpl-3.0-standalone.html</url>
-    </license>
-    <license>
-      <name>LGPL 2</name>
-      <url>https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html</url>
-    </license>
-  </licenses>
   <developers>
     <developer>
       <id>monkstone</id>
@@ -64,9 +57,6 @@
   <properties>
     <jogl.version>2.3.2</jogl.version>
     <jruby.api>http://jruby.org/apidocs/</jruby.api>
-    <!--<maven.compiler.release>8</maven.compiler.release>-->
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
@@ -77,7 +67,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.6.0</version>
+      <version>9.2.7.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -127,7 +117,6 @@
           </configuration>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.8.0</version>
           <configuration>
@@ -135,26 +124,26 @@
           </configuration>
         </plugin>
         <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.0.1</version>
-        <configuration>
-          <detectOfflineLinks>false</detectOfflineLinks>
-          <links>
-            <link>${jruby.api}</link>
-            <link>${processing.api}</link>
-          </links>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.1.0</version>
-        <configuration>
-          <archive>
-            <manifestFile>MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </pluginManagement>
-</build>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.0.1</version>
+          <configuration>
+            <detectOfflineLinks>false</detectOfflineLinks>
+            <links>
+              <link>${jruby.api}</link>
+              <link>${processing.api}</link>
+            </links>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.1.0</version>
+          <configuration>
+            <archive>
+              <manifestFile>MANIFEST.MF</manifestFile>
+            </archive>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>

data/propane.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |gem|
   gem.description  = <<-EOS
   A batteries included version of processing in ruby targetting jdk11.
   EOS
-  gem.summary       = %q{ruby wrapper for processing-3.5 on MacOS, linux and windows (64bit only)}
+  gem.summary       = %q{ruby implementation of processing-4.0 on MacOS, linux and windows (64bit only)}
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
   gem.files         = `git ls-files`.split($/)
-  gem.files << 'lib/propane-3.2.0.jar'
+  gem.files << 'lib/propane-3.3.0.jar'
   gem.files << 'lib/gluegen-rt.jar'
   gem.files << 'lib/jogl-all.jar'
   gem.files << 'lib/gluegen-rt-natives-linux-amd64.jar'

data/src/main/java/japplemenubar/JAppleMenuBar.java

@@ -16,65 +16,71 @@
   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
- */
+*/ 
 package japplemenubar;
 
 import java.io.*;
 
 import processing.core.PApplet;
 
+
 /**
- * Starting point for the application. General initialization should be done
- * inside the ApplicationController's init() method. If certain kinds of
- * non-Swing initialization takes too long, it should happen in a new Thread and
- * off the Swing event dispatch thread (EDT).
- *
+ * Starting point for the application. General initialization should be done 
+ * inside the ApplicationController's init() method. If certain kinds of 
+ * non-Swing initialization takes too long, it should happen in a new Thread 
+ * and off the Swing event dispatch thread (EDT).
+ * 
  * @author hansi
  */
 public class JAppleMenuBar {
+  static JAppleMenuBar instance;
+  static final String FILENAME = "libjAppleMenuBar.jnilib";
+  
+	static {
+	  try {
+	    File temp = File.createTempFile("processing", "menubar");
+	    temp.delete();  // remove the file itself
+	    temp.mkdirs();  // create a directory out of it
+	    temp.deleteOnExit();
 
-    static JAppleMenuBar instance;
-    static final String FILENAME = "libjAppleMenuBar.jnilib";
-
-    static {
-        try {
-            File temp = File.createTempFile("processing", "menubar");
-            temp.delete();  // remove the file itself
-            temp.mkdirs();  // create a directory out of it
-            temp.deleteOnExit();
+	    File jnilibFile = new File(temp, FILENAME);
+	    InputStream input = JAppleMenuBar.class.getResourceAsStream(FILENAME);
+	    if (input != null) {
+	      if (PApplet.saveStream(jnilibFile, input)) {
+	        System.load(jnilibFile.getAbsolutePath());
+	        instance = new JAppleMenuBar();
 
-            File jnilibFile = new File(temp, FILENAME);
-            InputStream input = JAppleMenuBar.class.getResourceAsStream(FILENAME);
-            if (input != null) {
-                if (PApplet.saveStream(jnilibFile, input)) {
-                    System.load(jnilibFile.getAbsolutePath());
-                    instance = new JAppleMenuBar();
-
-                } else {
-                    sadness("Problem saving " + FILENAME + " for full screen use.");
-                }
-            } else {
-                sadness("Could not load " + FILENAME + " from core.jar");
-            }
-        } catch (IOException e) {
-            sadness("Unknown error, here's the stack trace.");
-            e.printStackTrace();
-        }
-    }
-
-    static void sadness(String msg) {
-        System.err.println("Full screen mode disabled. " + msg);
-    }
+	      } else {
+	        sadness("Problem saving " + FILENAME + " for full screen use.");
+	      }
+	    } else {
+        sadness("Could not load " + FILENAME + " from core.jar");
+	    }
+	  } catch (IOException e) {
+	    sadness("Unknown error, here's the stack trace.");
+	    e.printStackTrace();
+	  }
+	}
+	
+	
+	static void sadness(String msg) {
+	  System.err.println("Full screen mode disabled. " + msg);
+	}
 
+	
 //	static public void show() {
 //	  instance.setVisible(true);
 //	}
-    static public void hide() {
-        instance.setVisible(false, false);
-    }
 
-    public native void setVisible(boolean visibility, boolean kioskMode);
+	
+	static public void hide() {
+	  instance.setVisible(false, false);
+	}
+
+	
+	public native void setVisible(boolean visibility, boolean kioskMode); 
 
+	
 //  public void setVisible(boolean visibility) {
 //    // Keep original API in-tact.  Default kiosk-mode to off.
 //    setVisible(visibility, false);

data/src/main/java/monkstone/vecmath/{AppRender.java → GfxRender.java}

@@ -1,21 +1,21 @@
 package monkstone.vecmath;
 
-import processing.core.PApplet;
+import processing.core.PGraphics;
 
 /**
  *
  * @author Martin Prout
  */
-public class AppRender implements JRender {
+public class GfxRender implements JRender {
 
-    final PApplet app;
+    final PGraphics graphics;
 
     /**
      *
-     * @param app PApplet
+     * @param graphics PGraphics
      */
-    public AppRender(final PApplet app) {
-        this.app = app;
+    public GfxRender(final PGraphics graphics) {
+        this.graphics = graphics;
     }
 
     /**
@@ -25,7 +25,7 @@ public class AppRender implements JRender {
      */
     @Override
     public void vertex(double x, double y) {
-        app.vertex((float) x, (float) y);
+        graphics.vertex((float) x, (float) y);
     }
 
     /**
@@ -35,7 +35,7 @@ public class AppRender implements JRender {
      */
     @Override
     public void curveVertex(double x, double y) {
-        app.curveVertex((float) x, (float) y);
+        graphics.curveVertex((float) x, (float) y);
     }
 
     /**
@@ -46,7 +46,7 @@ public class AppRender implements JRender {
      */
     @Override
     public void vertex(double x, double y, double z) {
-        app.vertex((float) x, (float) y, (float) z);
+        graphics.vertex((float) x, (float) y, (float) z);
     }
 
     /**
@@ -57,7 +57,7 @@ public class AppRender implements JRender {
      */
     @Override
     public void normal(double x, double y, double z) {
-        app.normal((float) x, (float) y, (float) z);
+        graphics.normal((float) x, (float) y, (float) z);
     }
 
     /**
@@ -70,7 +70,7 @@ public class AppRender implements JRender {
      */
     @Override
     public void vertex(double x, double y, double z, double u, double v) {
-        app.vertex((float) x, (float) y, (float) z, (float) u, (float) v);
+        graphics.vertex((float) x, (float) y, (float) z, (float) u, (float) v);
     }
 
     /**
@@ -81,6 +81,6 @@ public class AppRender implements JRender {
      */
     @Override
     public void curveVertex(double x, double y, double z) {
-        app.curveVertex((float) x, (float) y, (float) z);
+        graphics.curveVertex((float) x, (float) y, (float) z);
     }
 }