propane 3.1.0.pre-java → 3.2.0-java

data/mvnw.cmd

@@ -0,0 +1,145 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+set MAVEN_CMD_LINE_ARGS=%MAVEN_CONFIG% %*
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+
+set WRAPPER_JAR=""%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar""
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

data/pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.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>
@@ -64,19 +64,20 @@
   <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>
     <propane.basedir>${project.basedir}</propane.basedir>
     <source.directory>src</source.directory>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.5.0</version>
+      <version>9.2.6.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -130,30 +131,30 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.8.0</version>
           <configuration>
-                <release>11</release>
-            </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>
+            <release>11</release>
           </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.4 on MacOS, linux and windows (64bit only)}
+  gem.summary       = %q{ruby wrapper for processing-3.5 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.1.0.jar'
+  gem.files << 'lib/propane-3.2.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,71 +16,65 @@
   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();
 
-	    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();
+    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();
 
-	      } 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);
-	}
+            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);
+    }
 
-	
 //	static public void show() {
 //	  instance.setVisible(true);
 //	}
+    static public void hide() {
+        instance.setVisible(false, false);
+    }
 
-	
-	static public void hide() {
-	  instance.setVisible(false, false);
-	}
-
-	
-	public native void setVisible(boolean visibility, boolean kioskMode); 
+    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/ColorUtil.java

@@ -3,7 +3,7 @@
  * in their sketches. Includes a method to efficiently convert an array of web
  * strings to an array of color int, and another to convert an array of color
  * int to a string that can be used in ruby code (to generate web color array).
- * Copyright (c) 2015-18 Martin Prout.
+ * Copyright (c) 2015-19 Martin Prout.
  * This utility 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; either version 2.1 of the License, or (at

data/src/main/java/monkstone/MathToolModule.java

@@ -1,7 +1,7 @@
 /**
  * The purpose of this tool is to allow propane users to use an alternative
  * to processing.org map, lerp and norm methods in their sketches
- * Copyright (c) 2015-18 Martin Prout. This tool is free software; you can
+ * Copyright (c) 2015-19 Martin Prout. This tool 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; either version
  * 2.1 of the License, or (at your option) any later version.
@@ -175,7 +175,8 @@ public class MathToolModule {
         }
         return mapMt(context, value, start, stop, 0, 1.0);
     }
-     // start2 + (stop2 - start2) * ((value - start1) / (stop1 - start1));
+    // start2 + (stop2 - start2) * ((value - start1) / (stop1 - start1));
+
     static final RubyFloat mapMt(ThreadContext context, double value, double first1, double last1, double first2, double last2) {
         double result = first2 + (last2 - first2) * ((value - first1) / (last1 - first1));
         return context.runtime.newFloat(result);
@@ -218,17 +219,17 @@ public class MathToolModule {
         int column = (int) args[1].toJava(Integer.class);
         int rowStep = 1;
         int colStep = 1;
-        if (args.length == 4){
-        rowStep = (int) args[2].toJava(Integer.class);
-        colStep = (int) args[3].toJava(Integer.class);
+        if (args.length == 4) {
+            rowStep = (int) args[2].toJava(Integer.class);
+            colStep = (int) args[3].toJava(Integer.class);
         }
         if (block.isGiven()) {
-              int tempRow = row / rowStep;
-              for (int z = 0; z < (tempRow * (column / colStep)); z++){
-                  int x = z % tempRow;
-                  int y = z / tempRow;
-                  block.yieldSpecific(context, context.runtime.newFixnum(x * rowStep), context.runtime.newFixnum(y * colStep));
-              }
+            int tempRow = row / rowStep;
+            for (int z = 0; z < (tempRow * (column / colStep)); z++) {
+                int x = z % tempRow;
+                int y = z / tempRow;
+                block.yieldSpecific(context, context.runtime.newFixnum(x * rowStep), context.runtime.newFixnum(y * colStep));
+            }
         }
         return context.nil;
 

data/src/main/java/monkstone/PropaneLibrary.java

@@ -1,13 +1,12 @@
 /**
- * The purpose of this class is to load the MathTool into ruby-processing runtime 
- * Copyright (C) 2015-18 Martin Prout. This code is free software; you can 
+ * The purpose of this class is to load the MathTool into ruby-processing runtime
+ * Copyright (C) 2015-19 Martin Prout. This code 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; either version 
+ * Public License as published by the Free Software Foundation; either version
  * 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * Obtain a copy of the license at http://www.gnu.org/licenses/lgpl-2.1.html
  */
-
 package monkstone;
 
 import java.io.IOException;
@@ -21,8 +20,8 @@ import org.jruby.runtime.load.Library;
  *
  * @author Martin Prout
  */
-public class PropaneLibrary implements Library{
-  
+public class PropaneLibrary implements Library {
+
     /**
      *
      * @param runtime
@@ -32,8 +31,8 @@ public class PropaneLibrary implements Library{
         Deglut.createDeglut(runtime);
         Vec2.createVec2(runtime);
         Vec3.createVec3(runtime);
-    } 
-    
+    }
+
     /**
      *
      * @param runtime
@@ -43,5 +42,5 @@ public class PropaneLibrary implements Library{
     @Override
     public void load(final Ruby runtime, boolean wrap) throws IOException {
         load(runtime);
-    }  
+    }
 }