picrate 0.7.0-java → 0.8.0-java

data/mvnw.cmd

@@ -0,0 +1,182 @@
+@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 set title of command window
+title %0
+@REM enable echoing by 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
+
+@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
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+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.rb

@@ -1,7 +1,7 @@
 project 'picrate', 'http://maven.apache.org' do
 
   model_version '4.0.0'
-  id 'ruby-processing:picrate:0.7.0'
+  id 'ruby-processing:picrate:0.8.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -24,36 +24,45 @@ project 'picrate', 'http://maven.apache.org' do
 
   properties( 'jogl.version' => '2.3.2',
     'jruby.api' => 'http://jruby.org/apidocs/',
-    'source.directory' => 'src/main',
-    'maven.compiler.target' => '1.8',
+    'source.directory' => 'src',
     'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
     'picrate.basedir' => '${project.basedir}',
     'project.build.sourceEncoding' => 'utf-8',
-    'polyglot.dump.pom' => 'pom.xml',
-    'maven.compiler.source' => '1.8' )
-    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}'
-  end
+    'polyglot.dump.pom' => 'pom.xml'
+  )
+
+  pom 'org.jruby:jruby:9.2.7.0'
+  jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
+  jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
+  jar 'org.processing:video:3.0.2'
+end
+
+overrides do
+  plugin :resources, '2.7'
+  plugin :dependency, '2.8'
+  plugin( :compiler, '3.8.0', 'release' => '8' )
+  plugin(
+    :javadoc,
+    '2.10.4',
+    'detectOfflineLinks' =>  'false',
+    'links' => [ '${processing.api}', '${jruby.api}' ]
+  )
+  plugin(
+    :jar, '3.1.0',
+    'archive' => {
+      'manifestEntries' => { 'Class-Path' => 'gluegen-rt.jar jog-all.jar' }
+    }
+  )
+end
 
-  plugin( :resources, '2.7',
-    'encoding' =>  'UTF-8' )
-    plugin( :compiler, '3.8.0',
-      'source' =>  '1.8',
-      'target' =>  '1.8' )
-      plugin( :pmd, '3.3',
-        'sourceEncoding' =>  'utf-8',
-        'minimumTokens' =>  '100',
-        'targetJdk' =>  '${compileSource}' )
-        build do
-          resource do
-            directory '${source.directory}/java'
-            includes ['**/**/*.glsl', '**/*.jnilib']
-            excludes '**/**/*.java'
-          end
-          resource do
-            directory '${source.directory}/resources'
-            includes ['**/*.png', '*.txt']
-          end
-        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'
+  end
+end

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>0.7.0</version>
+  <version>0.8.0</version>
   <name>picrate</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>http://maven.apache.org</url>
@@ -66,13 +66,11 @@ DO NOT MODIFIY - GENERATED CODE
   <properties>
     <jogl.version>2.3.2</jogl.version>
     <jruby.api>http://jruby.org/apidocs/</jruby.api>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
     <picrate.basedir>${project.basedir}</picrate.basedir>
     <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>
-    <source.directory>src/main</source.directory>
+    <source.directory>src</source.directory>
   </properties>
   <dependencies>
     <dependency>
@@ -81,11 +79,6 @@ DO NOT MODIFIY - GENERATED CODE
       <version>9.2.7.0</version>
       <type>pom</type>
     </dependency>
-    <dependency>
-      <groupId>org.processing</groupId>
-      <artifactId>video</artifactId>
-      <version>3.2.3</version>
-    </dependency>
     <dependency>
       <groupId>org.jogamp.jogl</groupId>
       <artifactId>jogl-all</artifactId>
@@ -96,11 +89,16 @@ DO NOT MODIFIY - GENERATED CODE
       <artifactId>gluegen-rt-main</artifactId>
       <version>${jogl.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.processing</groupId>
+      <artifactId>video</artifactId>
+      <version>3.0.2</version>
+    </dependency>
   </dependencies>
   <build>
     <resources>
       <resource>
-        <directory>${source.directory}/java</directory>
+        <directory>${source.directory}/main/java</directory>
         <includes>
           <include>**/**/*.glsl</include>
           <include>**/*.jnilib</include>
@@ -110,38 +108,53 @@ DO NOT MODIFIY - GENERATED CODE
         </excludes>
       </resource>
       <resource>
-        <directory>${source.directory}/resources</directory>
+        <directory>${source.directory}/main/resources</directory>
         <includes>
           <include>**/*.png</include>
           <include>*.txt</include>
         </includes>
       </resource>
     </resources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.7</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.3</version>
-        <configuration>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <minimumTokens>100</minimumTokens>
-          <targetJdk>${compileSource}</targetJdk>
-        </configuration>
-      </plugin>
-    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.8</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
+          <configuration>
+            <release>8</release>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.10.4</version>
+          <configuration>
+            <detectOfflineLinks>false</detectOfflineLinks>
+            <links>
+              <link>${processing.api}</link>
+              <link>${jruby.api}</link>
+            </links>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.1.0</version>
+          <configuration>
+            <archive>
+              <manifestEntries>
+                <Class-Path>gluegen-rt.jar jog-all.jar</Class-Path>
+              </manifestEntries>
+            </archive>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 </project>

data/src/main/java/monkstone/ColorUtil.java

@@ -1,5 +1,5 @@
 /**
- * This utility allows JRubyArt users to use the processing.org color method
+ * This utility allows PiCrate users to use the processing.org color method
  * in their sketches. Includes a method to efficiently convert an cols of web
  * strings to an cols of color int, and another to convert an cols of p5 color
  * (int) to a string that can be used in ruby code (to generate web color cols).

data/src/main/java/monkstone/core/LibraryProxy.java

@@ -1,7 +1,6 @@
 package monkstone.core;
 
 import processing.core.PApplet;
-import static processing.core.PConstants.*;
 import processing.event.MouseEvent;
 import processing.event.KeyEvent;
 

data/src/main/java/monkstone/noise/SimplexNoise.java

@@ -50,7 +50,7 @@ public class SimplexNoise {  // Simplex noise in 2D, 3D and 4D
         49, 192, 214, 31, 181, 199, 106, 157, 184, 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254,
         138, 236, 205, 93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215, 61, 156, 180};
     // To remove the need for index wrapping, double the permutation table length
-    static short[] PERM = new short[512];
+    static final short[] PERM = new short[512];
     static short[] PERM_MOD_12 = new short[512];
 
     static {

data/src/main/java/monkstone/vecmath/GfxRender.java

@@ -0,0 +1,87 @@
+package monkstone.vecmath;
+
+import processing.core.PGraphics;
+
+/**
+ *
+ *
+ * @author Martin Prout
+ */
+public class GfxRender implements JRender {
+
+    final PGraphics g;
+
+    /**
+     *
+     * @param gfx PGraphics
+     */
+    public GfxRender(final PGraphics gfx) {
+        this.g = gfx;
+    }
+
+    /**
+     *
+     * @param x double
+     * @param y double
+     */
+    @Override
+    public void vertex(double x, double y) {
+        g.vertex((float) x, (float) y);
+    }
+
+    /**
+     *
+     * @param x double
+     * @param y double
+     */
+    @Override
+    public void curveVertex(double x, double y) {
+        g.curveVertex((float) x, (float) y);
+    }
+
+    /**
+     *
+     * @param x double
+     * @param y double
+     * @param z double
+     */
+    @Override
+    public void vertex(double x, double y, double z) {
+        g.vertex((float) x, (float) y, (float) z);
+    }
+
+    /**
+     *
+     * @param x double
+     * @param y double
+     * @param z double
+     */
+    @Override
+    public void normal(double x, double y, double z) {
+        g.normal((float) x, (float) y, (float) z);
+    }
+
+    /**
+     *
+     * @param x double
+     * @param y double
+     * @param z double
+     * @param u double
+     * @param v double
+     */
+    @Override
+    public void vertex(double x, double y, double z, double u, double v) {
+        g.vertex((float) x, (float) y, (float) z, (float) u, (float) v);
+    }
+
+    /**
+     *
+     * @param x double
+     * @param y double
+     * @param z double
+     */
+    @Override
+    public void curveVertex(double x, double y, double z) {
+        g.curveVertex((float) x, (float) y, (float) z);
+    }
+}