joonsrenderer 1.1-java → 1.3.1-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

@@ -2,11 +2,11 @@ require 'fileutils'
 project 'joonsrenderer' do
 
   model_version '4.0.0'
-  id 'joons:joonsrenderer:1.1-SNAPSHOT'
+  id 'joons:joonsrenderer:1.3.0'
   packaging 'jar'
   description 'joonsrenderer for propane and JRubyArt'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
-  { 'fpsunflower' => 'Christopher Kulla', 'geneome' => 'Not Known', 'joonhyublee' => 'Joon Hyub Lee', 'monkstone' => 'Martin Prout' }.each do |key, value|
+  { 'fpsunflower' => 'Christopher Kulla', 'geneome' => 'Eugene Reilly', 'joonhyublee' => 'Joon Hyub Lee', 'monkstone' => 'Martin Prout' }.each do |key, value|
     developer key do
       name value
       roles 'developer'
@@ -18,12 +18,10 @@ project 'joonsrenderer' do
   properties( 'source.directory' => 'src',
   'joonsrenderer.basedir' => '${project.basedir}',
   'polyglot.dump.pom' => 'pom.xml',
-  'maven.compiler.source' => '1.8',
   'project.build.sourceEncoding' => 'utf-8',
-  'maven.compiler.target' => '1.8',
-  'janino.version' => '3.0.6',
+  'janino.version' => '3.1.3',
   'jogl.version' => '2.3.2',
-  'processing.version' => '3.2.3'
+  'processing.version' => '3.3.7'
   )
 
   jar 'org.processing:core:${processing.version}'
@@ -33,8 +31,8 @@ project 'joonsrenderer' do
   jar('org.codehaus.janino:janino:${janino.version}')
 
   overrides do
-    plugin :resources, '2.6'
-    plugin :dependency, '2.10' do
+    plugin :resources, '3.1.0'
+    plugin :dependency, '3.1.2' do
       execute_goals( id: 'default-cli',
         artifactItems:[
         { groupId: 'org.codehaus.janino',
@@ -52,24 +50,26 @@ project 'joonsrenderer' do
       ]
       )
     end
-
-    plugin( :compiler, '3.6.0',
-    source: '${maven.compiler.source}',
-    target: '${maven.compiler.target}'
-    )
-    plugin( :javadoc, '2.10.4',
-    detect_offline_links:  'false',
-    )
-    plugin( :jar, '3.0.2',
-    'archive' => {
-      'manifestFile' =>  'MANIFEST.MF'
-    }
-    )
+    plugin(:compiler, '3.8.1',
+           'release' => '11')
+    plugin(:javadoc, '2.10.4',
+           'detectOfflineLinks' => 'false',
+           'links' => ['${processing.api}',
+                       '${jruby.api}'])
+                       plugin(:jar, '3.2.0',
+                         'archive' => {
+                           'manifestEntries' => {
+                             'Automatic-Module-Name' => 'joonsrenderer'
+                           }
+                           })
+    plugin :jdeps, '3.1.2' do
+      execute_goals 'jdkinternals', 'test-jdkinternals'
+    end
   end
 
   build do
     default_goal 'package'
-    source_directory 'src'
+    source_directory '${source.directory}/main/java'
     final_name 'joonsrenderer'
   end
 end

data/pom.xml

@@ -6,12 +6,12 @@ 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"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://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">
   <modelVersion>4.0.0</modelVersion>
   <groupId>joons</groupId>
   <artifactId>joonsrenderer</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.3.0</version>
   <name>joonsrenderer</name>
   <description>joonsrenderer for propane and JRubyArt</description>
   <organization>
@@ -34,7 +34,7 @@ DO NOT MODIFIY - GENERATED CODE
     </developer>
     <developer>
       <id>geneome</id>
-      <name>Not Known</name>
+      <name>Eugene Reilly</name>
       <roles>
         <role>developer</role>
       </roles>
@@ -59,15 +59,13 @@ DO NOT MODIFIY - GENERATED CODE
     <url>https://github.com/monkstone/joonsrenderer/issues</url>
   </issueManagement>
   <properties>
+    <janino.version>3.1.3</janino.version>
     <jogl.version>2.3.2</jogl.version>
-    <source.directory>src</source.directory>
     <joonsrenderer.basedir>${project.basedir}</joonsrenderer.basedir>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <processing.version>3.2.3</processing.version>
-    <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <janino.version>3.0.6</janino.version>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
-    <maven.compiler.source>1.8</maven.compiler.source>
+    <processing.version>3.3.7</processing.version>
+    <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+    <source.directory>src</source.directory>
   </properties>
   <dependencies>
     <dependency>
@@ -97,18 +95,18 @@ DO NOT MODIFIY - GENERATED CODE
     </dependency>
   </dependencies>
   <build>
-    <sourceDirectory>src</sourceDirectory>
+    <sourceDirectory>${source.directory}/main/java</sourceDirectory>
     <defaultGoal>package</defaultGoal>
     <finalName>joonsrenderer</finalName>
     <pluginManagement>
       <plugins>
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.1.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.10</version>
+          <version>3.1.2</version>
           <executions>
             <execution>
               <id>default-cli</id>
@@ -135,10 +133,9 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.6.0</version>
+          <version>3.8.1</version>
           <configuration>
-            <source>${maven.compiler.source}</source>
-            <target>${maven.compiler.target}</target>
+            <release>11</release>
           </configuration>
         </plugin>
         <plugin>
@@ -146,17 +143,35 @@ DO NOT MODIFIY - GENERATED CODE
           <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.0.2</version>
+          <version>3.2.0</version>
           <configuration>
             <archive>
-              <manifestFile>MANIFEST.MF</manifestFile>
+              <manifestEntries>
+                <Automatic-Module-Name>joonsrenderer</Automatic-Module-Name>
+              </manifestEntries>
             </archive>
           </configuration>
         </plugin>
+        <plugin>
+          <artifactId>maven-jdeps-plugin</artifactId>
+          <version>3.1.2</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>jdkinternals</goal>
+                <goal>test-jdkinternals</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>

data/src/{test/java/a_maintest.java → a_maintest.java}

@@ -1,7 +1,7 @@
 import processing.core.PApplet;
 import joons.JoonsRenderer;
 
-@SuppressWarnings("serial")
+
 public class a_maintest extends PApplet {
 
     JoonsRenderer jr;

data/src/main/java/SunflowGUI.java

@@ -1,3 +1,4 @@
+package main.java;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -5,8 +6,8 @@ import java.awt.FlowLayout;
 import java.awt.Toolkit;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.beans.PropertyVetoException;
 import java.io.BufferedReader;
 import java.io.File;
@@ -40,6 +41,7 @@ import javax.swing.SwingUtilities;
 import javax.swing.TransferHandler;
 import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
+import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.filechooser.FileFilter;
 import javax.swing.plaf.metal.DefaultMetalTheme;
 import javax.swing.plaf.metal.MetalLookAndFeel;
@@ -198,196 +200,216 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
             String translateFilename = null;
             int frameStart = 1, frameStop = 1;
             while (i < args.length) {
-                if (args[i].equals("-o")) {
-                    if (i > args.length - 2) {
-                        usage(false);
-                    }
-                    filename = args[i + 1];
-                    i += 2;
-                } else if (args[i].equals("-nogui")) {
-                    showFrame = false;
-                    i++;
-                } else if (args[i].equals("-ipr")) {
-                    sampler = "ipr";
-                    i++;
-                } else if (args[i].equals("-threads")) {
-                    if (i > args.length - 2) {
-                        usage(false);
-                    }
-                    threads = Integer.parseInt(args[i + 1]);
-                    i += 2;
-                } else if (args[i].equals("-lopri")) {
-                    lowPriority = true;
-                    i++;
-                } else if (args[i].equals("-hipri")) {
-                    lowPriority = false;
-                    i++;
-                } else if (args[i].equals("-sampler")) {
-                    if (i > args.length - 2) {
-                        usage(false);
-                    }
-                    sampler = args[i + 1];
-                    i += 2;
-                } else if (args[i].equals("-smallmesh")) {
-                    TriangleMesh.setSmallTriangles(true);
-                    i++;
-                } else if (args[i].equals("-dumpkd")) {
-                    KDTree.setDumpMode(true, "kdtree");
-                    i++;
-                } else if (args[i].equals("-buildonly")) {
-                    noRender = true;
-                    i++;
-                } else if (args[i].equals("-showaa")) {
-                    showAA = true;
-                    i++;
-                } else if (args[i].equals("-nogi")) {
-                    noGI = true;
-                    i++;
-                } else if (args[i].equals("-nocaustics")) {
-                    noCaustics = true;
-                    i++;
-                } else if (args[i].equals("-pathgi")) {
-                    if (i > args.length - 2) {
-                        usage(false);
-                    }
-                    pathGI = Integer.parseInt(args[i + 1]);
-                    i += 2;
-                } else if (args[i].equals("-quick_ambocc")) {
-                    if (i > args.length - 2) {
-                        usage(false);
-                    }
-                    maxDist = Float.parseFloat(args[i + 1]);
-                    shaderOverride = "ambient_occlusion"; // new
-                    // AmbientOcclusionShader(Color.WHITE,
-                    // d);
-                    i += 2;
-                } else if (args[i].equals("-quick_uvs")) {
-                    if (i > args.length - 1) {
-                        usage(false);
-                    }
-                    shaderOverride = "show_uvs";
-                    i++;
-                } else if (args[i].equals("-quick_normals")) {
-                    if (i > args.length - 1) {
-                        usage(false);
-                    }
-                    shaderOverride = "show_normals";
-                    i++;
-                } else if (args[i].equals("-quick_id")) {
-                    if (i > args.length - 1) {
-                        usage(false);
-                    }
-                    shaderOverride = "show_instance_id";
-                    i++;
-                } else if (args[i].equals("-quick_prims")) {
-                    if (i > args.length - 1) {
-                        usage(false);
-                    }
-                    shaderOverride = "show_primitive_id";
-                    i++;
-                } else if (args[i].equals("-quick_gray")) {
-                    if (i > args.length - 1) {
-                        usage(false);
-                    }
-                    shaderOverride = "quick_gray";
-                    i++;
-                } else if (args[i].equals("-quick_wire")) {
-                    if (i > args.length - 1) {
-                        usage(false);
-                    }
-                    shaderOverride = "wireframe";
-                    i++;
-                } else if (args[i].equals("-resolution")) {
-                    if (i > args.length - 3) {
-                        usage(false);
-                    }
-                    resolutionW = Integer.parseInt(args[i + 1]);
-                    resolutionH = Integer.parseInt(args[i + 2]);
-                    i += 3;
-                } else if (args[i].equals("-aa")) {
-                    if (i > args.length - 3) {
-                        usage(false);
-                    }
-                    aaMin = Integer.parseInt(args[i + 1]);
-                    aaMax = Integer.parseInt(args[i + 2]);
-                    i += 3;
-                } else if (args[i].equals("-samples")) {
-                    if (i > args.length - 2) {
-                        usage(false);
-                    }
-                    samples = Integer.parseInt(args[i + 1]);
-                    i += 2;
-                } else if (args[i].equals("-bucket")) {
-                    if (i > args.length - 3) {
-                        usage(false);
-                    }
-                    bucketSize = Integer.parseInt(args[i + 1]);
-                    bucketOrder = args[i + 2];
-                    i += 3;
-                } else if (args[i].equals("-bake")) {
-                    if (i > args.length - 2) {
-                        usage(false);
-                    }
-                    bakingName = args[i + 1];
-                    i += 2;
-                } else if (args[i].equals("-bakedir")) {
-                    if (i > args.length - 2) {
-                        usage(false);
-                    }
-                    String baketype = args[i + 1];
-                    if (baketype.equals("view")) {
-                        bakeViewdep = true;
-                    } else if (baketype.equals("ortho")) {
-                        bakeViewdep = false;
-                    } else {
-                        usage(false);
-                    }
-                    i += 2;
-                } else if (args[i].equals("-filter")) {
-                    if (i > args.length - 2) {
-                        usage(false);
-                    }
-                    filterType = args[i + 1];
-                    i += 2;
-                } else if (args[i].equals("-bench")) {
-                    runBenchmark = true;
-                    i++;
-                } else if (args[i].equals("-rtbench")) {
-                    runRTBenchmark = true;
-                    i++;
-                } else if (args[i].equals("-frame")) {
-                    if (i > args.length - 2) {
-                        usage(false);
-                    }
-                    frameStart = frameStop = Integer.parseInt(args[i + 1]);
-                    i += 2;
-                } else if (args[i].equals("-anim")) {
-                    if (i > args.length - 3) {
-                        usage(false);
-                    }
-                    frameStart = Integer.parseInt(args[i + 1]);
-                    frameStop = Integer.parseInt(args[i + 2]);
-                    i += 3;
-                } else if (args[i].equals("-v")) {
-                    if (i > args.length - 2) {
-                        usage(false);
-                    }
-                    UI.verbosity(Integer.parseInt(args[i + 1]));
-                    i += 2;
-                } else if (args[i].equals("-translate")) {
-                    if (i > args.length - 2) {
-                        usage(false);
-                    }
-                    translateFilename = args[i + 1];
-                    i += 2;
-                } else if (args[i].equals("-h") || args[i].equals("-help")) {
-                    usage(true);
-                } else {
-                    if (input != null) {
-                        usage(false);
+                switch (args[i]) {
+                    case "-o":
+                        if (i > args.length - 2) {
+                            usage(false);
+                        }   filename = args[i + 1];
+                        i += 2;
+                        break;
+                    case "-nogui":
+                        showFrame = false;
+                        i++;
+                        break;
+                    case "-ipr":
+                        sampler = "ipr";
+                        i++;
+                        break;
+                    case "-threads":
+                        if (i > args.length - 2) {
+                            usage(false);
+                        }   threads = Integer.parseInt(args[i + 1]);
+                        i += 2;
+                        break;
+                    case "-lopri":
+                        lowPriority = true;
+                        i++;
+                        break;
+                    case "-hipri":
+                        lowPriority = false;
+                        i++;
+                        break;
+                    case "-sampler":
+                        if (i > args.length - 2) {
+                            usage(false);
+                        }   sampler = args[i + 1];
+                        i += 2;
+                        break;
+                    case "-smallmesh":
+                        TriangleMesh.setSmallTriangles(true);
+                        i++;
+                        break;
+                    case "-dumpkd":
+                        KDTree.setDumpMode(true, "kdtree");
+                        i++;
+                        break;
+                    case "-buildonly":
+                        noRender = true;
+                        i++;
+                        break;
+                    case "-showaa":
+                        showAA = true;
+                        i++;
+                        break;
+                    case "-nogi":
+                        noGI = true;
+                        i++;
+                        break;
+                    case "-nocaustics":
+                        noCaustics = true;
+                        i++;
+                        break;
+                    case "-pathgi":
+                        if (i > args.length - 2) {
+                            usage(false);
+                        }   pathGI = Integer.parseInt(args[i + 1]);
+                        i += 2;
+                        break;
+                    case "-quick_ambocc":
+                        if (i > args.length - 2) {
+                            usage(false);
+                        }   maxDist = Float.parseFloat(args[i + 1]);
+                        shaderOverride = "ambient_occlusion"; // new
+                        // AmbientOcclusionShader(Color.WHITE,
+                        // d);
+                        i += 2;
+                        break;
+                    case "-quick_uvs":
+                        if (i > args.length - 1) {
+                            usage(false);
+                        }   shaderOverride = "show_uvs";
+                        i++;
+                        break;
+                    case "-quick_normals":
+                        if (i > args.length - 1) {
+                            usage(false);
+                        }   shaderOverride = "show_normals";
+                        i++;
+                        break;
+                    case "-quick_id":
+                        if (i > args.length - 1) {
+                            usage(false);
+                        }   shaderOverride = "show_instance_id";
+                        i++;
+                        break;
+                    case "-quick_prims":
+                        if (i > args.length - 1) {
+                            usage(false);
+                        }   shaderOverride = "show_primitive_id";
+                        i++;
+                        break;
+                    case "-quick_gray":
+                        if (i > args.length - 1) {
+                            usage(false);
+                        }   shaderOverride = "quick_gray";
+                        i++;
+                        break;
+                    case "-quick_wire":
+                        if (i > args.length - 1) {
+                            usage(false);
+                        }   shaderOverride = "wireframe";
+                        i++;
+                        break;
+                    case "-resolution":
+                        if (i > args.length - 3) {
+                            usage(false);
+                        }   resolutionW = Integer.parseInt(args[i + 1]);
+                        resolutionH = Integer.parseInt(args[i + 2]);
+                        i += 3;
+                        break;
+                    case "-aa":
+                        if (i > args.length - 3) {
+                            usage(false);
+                        }   aaMin = Integer.parseInt(args[i + 1]);
+                        aaMax = Integer.parseInt(args[i + 2]);
+                        i += 3;
+                        break;
+                    case "-samples":
+                        if (i > args.length - 2) {
+                            usage(false);
+                        }   samples = Integer.parseInt(args[i + 1]);
+                        i += 2;
+                        break;
+                    case "-bucket":
+                        if (i > args.length - 3) {
+                            usage(false);
+                        }   bucketSize = Integer.parseInt(args[i + 1]);
+                        bucketOrder = args[i + 2];
+                        i += 3;
+                        break;
+                    case "-bake":
+                        if (i > args.length - 2) {
+                            usage(false);
+                        }   bakingName = args[i + 1];
+                        i += 2;
+                        break;
+                    case "-bakedir":
+                        if (i > args.length - 2) {
+                            usage(false);
+                        }   String baketype = args[i + 1];
+                    switch (baketype) {
+                        case "view":
+                            bakeViewdep = true;
+                            break;
+                        case "ortho":
+                            bakeViewdep = false;
+                            break;
+                        default:
+                            usage(false);
+                            break;
                     }
-                    input = args[i];
-                    i++;
+i += 2;
+                        break;
+
+                    case "-filter":
+                        if (i > args.length - 2) {
+                            usage(false);
+                        }   filterType = args[i + 1];
+                        i += 2;
+                        break;
+                    case "-bench":
+                        runBenchmark = true;
+                        i++;
+                        break;
+                    case "-rtbench":
+                        runRTBenchmark = true;
+                        i++;
+                        break;
+                    case "-frame":
+                        if (i > args.length - 2) {
+                            usage(false);
+                        }   frameStart = frameStop = Integer.parseInt(args[i + 1]);
+                        i += 2;
+                        break;
+                    case "-anim":
+                        if (i > args.length - 3) {
+                            usage(false);
+                        }   frameStart = Integer.parseInt(args[i + 1]);
+                        frameStop = Integer.parseInt(args[i + 2]);
+                        i += 3;
+                        break;
+                    case "-v":
+                        if (i > args.length - 2) {
+                            usage(false);
+                        }   UI.verbosity(Integer.parseInt(args[i + 1]));
+                        i += 2;
+                        break;
+                    case "-translate":
+                        if (i > args.length - 2) {
+                            usage(false);
+                        }   translateFilename = args[i + 1];
+                        i += 2;
+                        break;
+                    case "-h":
+                    case "-help":
+                        usage(true);
+                        break;
+                    default:
+                        if (input != null) {
+                            usage(false);
+                        }   input = args[i];
+                        i++;
+                        break;
                 }
             }
             if (runBenchmark) {
@@ -495,7 +517,7 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                         break;
                     }
                 }
-            } catch (Exception e) {
+            } catch (ClassNotFoundException | IllegalAccessException | InstantiationException | UnsupportedLookAndFeelException e) {
                 // If Nimbus is not available, you can set the GUI to another look and feel.
                 MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
             }
@@ -548,22 +570,16 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                         renderButton = new JButton();
                         jPanel1.add(renderButton);
                         renderButton.setText("Render");
-                        renderButton.addActionListener(new ActionListener() {
-                            @Override
-                            public void actionPerformed(ActionEvent evt) {
-                                renderMenuItemActionPerformed(evt);
-                            }
+                        renderButton.addActionListener((ActionEvent evt) -> {
+                            renderMenuItemActionPerformed(evt);
                         });
                     }
                     {
                         iprButton = new JButton();
                         jPanel1.add(iprButton);
                         iprButton.setText("IPR");
-                        iprButton.addActionListener(new ActionListener() {
-                            @Override
-                            public void actionPerformed(ActionEvent evt) {
-                                iprMenuItemActionPerformed(evt);
-                            }
+                        iprButton.addActionListener((ActionEvent evt) -> {
+                            iprMenuItemActionPerformed(evt);
                         });
                     }
                 }
@@ -608,11 +624,8 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                         buildButton = new JButton();
                         jPanel3.add(buildButton);
                         buildButton.setText("Build Scene");
-                        buildButton.addActionListener(new ActionListener() {
-                            @Override
-                            public void actionPerformed(ActionEvent evt) {
-                                buildMenuItemActionPerformed(evt);
-                            }
+                        buildButton.addActionListener((ActionEvent evt) -> {
+                            buildMenuItemActionPerformed(evt);
                         });
                     }
                 }
@@ -669,22 +682,16 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                             jPanel5.add(taskCancelButton);
                             taskCancelButton.setText("Cancel");
                             taskCancelButton.setEnabled(false);
-                            taskCancelButton.addActionListener(new ActionListener() {
-                                @Override
-                                public void actionPerformed(ActionEvent evt) {
-                                    UI.taskCancel();
-                                }
+                            taskCancelButton.addActionListener((ActionEvent evt) -> {
+                                UI.taskCancel();
                             });
                         }
                         {
                             clearConsoleButton = new JButton();
                             jPanel5.add(clearConsoleButton);
                             clearConsoleButton.setText("Clear");
-                            clearConsoleButton.addActionListener(new ActionListener() {
-                                @Override
-                                public void actionPerformed(ActionEvent evt) {
-                                    clearConsole();
-                                }
+                            clearConsoleButton.addActionListener((ActionEvent evt) -> {
+                                clearConsole();
                             });
                         }
                     }
@@ -705,11 +712,8 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                     fileMenu.add(newFileMenuItem);
                     newFileMenuItem.setText("New");
                     newFileMenuItem.setAccelerator(KeyStroke.getKeyStroke("ctrl N"));
-                    newFileMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent evt) {
-                            newFileMenuItemActionPerformed(evt);
-                        }
+                    newFileMenuItem.addActionListener((ActionEvent evt) -> {
+                        newFileMenuItemActionPerformed(evt);
                     });
                 }
                 {
@@ -717,11 +721,8 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                     fileMenu.add(openFileMenuItem);
                     openFileMenuItem.setText("Open ...");
                     openFileMenuItem.setAccelerator(KeyStroke.getKeyStroke("ctrl O"));
-                    openFileMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent evt) {
-                            openFileMenuItemActionPerformed(evt);
-                        }
+                    openFileMenuItem.addActionListener((ActionEvent evt) -> {
+                        openFileMenuItemActionPerformed(evt);
                     });
                 }
                 {
@@ -729,22 +730,16 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                     fileMenu.add(saveMenuItem);
                     saveMenuItem.setText("Save");
                     saveMenuItem.setAccelerator(KeyStroke.getKeyStroke("ctrl S"));
-                    saveMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent evt) {
-                            saveCurrentFile(currentFile);
-                        }
+                    saveMenuItem.addActionListener((ActionEvent evt) -> {
+                        saveCurrentFile(currentFile);
                     });
                 }
                 {
                     saveAsMenuItem = new JMenuItem();
                     fileMenu.add(saveAsMenuItem);
                     saveAsMenuItem.setText("Save As ...");
-                    saveAsMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent evt) {
-                            saveAsMenuItemActionPerformed(evt);
-                        }
+                    saveAsMenuItem.addActionListener((ActionEvent evt) -> {
+                        saveAsMenuItemActionPerformed(evt);
                     });
                 }
                 {
@@ -755,11 +750,8 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                     exitMenuItem = new JMenuItem();
                     fileMenu.add(exitMenuItem);
                     exitMenuItem.setText("Exit");
-                    exitMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent evt) {
-                            System.exit(0);
-                        }
+                    exitMenuItem.addActionListener((ActionEvent evt) -> {
+                        System.exit(0);
                     });
                 }
             }
@@ -772,12 +764,9 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                     sceneMenu.add(buildMenuItem);
                     buildMenuItem.setText("Build");
                     buildMenuItem.setAccelerator(KeyStroke.getKeyStroke("ctrl B"));
-                    buildMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent evt) {
-                            if (sceneMenu.isEnabled()) {
-                                buildMenuItemActionPerformed(evt);
-                            }
+                    buildMenuItem.addActionListener((ActionEvent evt) -> {
+                        if (sceneMenu.isEnabled()) {
+                            buildMenuItemActionPerformed(evt);
                         }
                     });
                 }
@@ -795,22 +784,16 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                     renderMenuItem = new JMenuItem();
                     sceneMenu.add(renderMenuItem);
                     renderMenuItem.setText("Render");
-                    renderMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent evt) {
-                            renderMenuItemActionPerformed(evt);
-                        }
+                    renderMenuItem.addActionListener((ActionEvent evt) -> {
+                        renderMenuItemActionPerformed(evt);
                     });
                 }
                 {
                     iprMenuItem = new JMenuItem();
                     sceneMenu.add(iprMenuItem);
                     iprMenuItem.setText("IPR");
-                    iprMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent evt) {
-                            iprMenuItemActionPerformed(evt);
-                        }
+                    iprMenuItem.addActionListener((ActionEvent evt) -> {
+                        iprMenuItemActionPerformed(evt);
                     });
                 }
                 {
@@ -828,11 +811,8 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                     textureCacheClearMenuItem = new JMenuItem();
                     sceneMenu.add(textureCacheClearMenuItem);
                     textureCacheClearMenuItem.setText("Clear Texture Cache");
-                    textureCacheClearMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent evt) {
-                            textureCacheClearMenuItemActionPerformed(evt);
-                        }
+                    textureCacheClearMenuItem.addActionListener((ActionEvent evt) -> {
+                        textureCacheClearMenuItemActionPerformed(evt);
                     });
                 }
                 {
@@ -840,11 +820,8 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                     sceneMenu.add(smallTrianglesMenuItem);
                     smallTrianglesMenuItem.setText("Low Mem Triangles");
                     smallTrianglesMenuItem.setToolTipText("Load future meshes using a low memory footprint triangle representation");
-                    smallTrianglesMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent evt) {
-                            smallTrianglesMenuItemActionPerformed(evt);
-                        }
+                    smallTrianglesMenuItem.addActionListener((ActionEvent evt) -> {
+                        smallTrianglesMenuItemActionPerformed(evt);
                     });
                 }
             }
@@ -856,22 +833,16 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                     resetZoomMenuItem = new JMenuItem();
                     imageMenu.add(resetZoomMenuItem);
                     resetZoomMenuItem.setText("Reset Zoom");
-                    resetZoomMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent evt) {
-                            imagePanel.reset();
-                        }
+                    resetZoomMenuItem.addActionListener((ActionEvent evt) -> {
+                        imagePanel.reset();
                     });
                 }
                 {
                     fitWindowMenuItem = new JMenuItem();
                     imageMenu.add(fitWindowMenuItem);
                     fitWindowMenuItem.setText("Fit to Window");
-                    fitWindowMenuItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent evt) {
-                            imagePanel.fit();
-                        }
+                    fitWindowMenuItem.addActionListener((ActionEvent evt) -> {
+                        imagePanel.fit();
                     });
                 }
                 {
@@ -882,26 +853,23 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                     jMenuItem4 = new JMenuItem();
                     imageMenu.add(jMenuItem4);
                     jMenuItem4.setText("Save Image ...");
-                    jMenuItem4.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent evt) {
-                            // imagePanel.image;
-                            JFileChooser fc = new JFileChooser(".");
-                            fc.setFileFilter(new FileFilter() {
-                                @Override
-                                public String getDescription() {
-                                    return "Image File";
-                                }
-
-                                @Override
-                                public boolean accept(File f) {
-                                    return (f.isDirectory() || f.getName().endsWith(".png") || f.getName().endsWith(".tga"));
-                                }
-                            });
-                            if (fc.showSaveDialog(SunflowGUI.this) == JFileChooser.APPROVE_OPTION) {
-                                String filename = fc.getSelectedFile().getAbsolutePath();
-                                imagePanel.save(filename);
+                    jMenuItem4.addActionListener((ActionEvent evt) -> {
+                        // imagePanel.image;
+                        JFileChooser fc = new JFileChooser(".");
+                        fc.setFileFilter(new FileFilter() {
+                            @Override
+                            public String getDescription() {
+                                return "Image File";
                             }
+                            
+                            @Override
+                            public boolean accept(File f) {
+                                return (f.isDirectory() || f.getName().endsWith(".png") || f.getName().endsWith(".tga"));
+                            }
+                        });
+                        if (fc.showSaveDialog(SunflowGUI.this) == JFileChooser.APPROVE_OPTION) {
+                            String filename = fc.getSelectedFile().getAbsolutePath();
+                            imagePanel.save(filename);
                         }
                     });
                 }
@@ -916,11 +884,8 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                 windowMenu.add(imageWindowMenuItem);
                 imageWindowMenuItem.setText("Image");
                 imageWindowMenuItem.setAccelerator(KeyStroke.getKeyStroke("ctrl 1"));
-                imageWindowMenuItem.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent evt) {
-                        selectFrame(imagePanelFrame);
-                    }
+                imageWindowMenuItem.addActionListener((ActionEvent evt) -> {
+                    selectFrame(imagePanelFrame);
                 });
             }
             {
@@ -928,11 +893,8 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                 windowMenu.add(editorWindowMenuItem);
                 editorWindowMenuItem.setText("Script Editor");
                 editorWindowMenuItem.setAccelerator(KeyStroke.getKeyStroke("ctrl 2"));
-                editorWindowMenuItem.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent evt) {
-                        selectFrame(editorFrame);
-                    }
+                editorWindowMenuItem.addActionListener((ActionEvent evt) -> {
+                    selectFrame(editorFrame);
                 });
             }
             {
@@ -940,11 +902,8 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                 windowMenu.add(consoleWindowMenuItem);
                 consoleWindowMenuItem.setText("Console");
                 consoleWindowMenuItem.setAccelerator(KeyStroke.getKeyStroke("ctrl 3"));
-                consoleWindowMenuItem.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent evt) {
-                        selectFrame(consoleFrame);
-                    }
+                consoleWindowMenuItem.addActionListener((ActionEvent evt) -> {
+                    selectFrame(consoleFrame);
                 });
             }
             {
@@ -956,11 +915,8 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                 windowMenu.add(tileWindowMenuItem);
                 tileWindowMenuItem.setText("Tile");
                 tileWindowMenuItem.setAccelerator(KeyStroke.getKeyStroke("ctrl T"));
-                tileWindowMenuItem.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent evt) {
-                        tileWindowMenuItemActionPerformed(evt);
-                    }
+                tileWindowMenuItem.addActionListener((ActionEvent evt) -> {
+                    tileWindowMenuItemActionPerformed(evt);
                 });
             }
         }
@@ -1045,11 +1001,8 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
     }
 
     private void println(final String s) {
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                consoleTextArea.append(s + "\n");
-            }
+        SwingUtilities.invokeLater(() -> {
+            consoleTextArea.append(s + "\n");
         });
     }
 
@@ -1079,16 +1032,13 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
         currentTaskLastP = -1;
         final int taskMin = min;
         final int taskMax = max;
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                taskProgressBar.setEnabled(true);
-                taskCancelButton.setEnabled(true);
-                taskProgressBar.setMinimum(taskMin);
-                taskProgressBar.setMaximum(taskMax);
-                taskProgressBar.setValue(taskMin);
-                taskProgressBar.setString(currentTask);
-            }
+        SwingUtilities.invokeLater(() -> {
+            taskProgressBar.setEnabled(true);
+            taskCancelButton.setEnabled(true);
+            taskProgressBar.setMinimum(taskMin);
+            taskProgressBar.setMaximum(taskMax);
+            taskProgressBar.setValue(taskMin);
+            taskProgressBar.setString(currentTask);
         });
     }
 
@@ -1096,29 +1046,23 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
     public void taskUpdate(int current) {
         final int taskCurrent = current;
         final String taskString = currentTask;
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                taskProgressBar.setValue(taskCurrent);
-                int p = (int) (100.0 * taskProgressBar.getPercentComplete());
-                if (p > currentTaskLastP) {
-                    taskProgressBar.setString(taskString + " [" + p + "%]");
-                    currentTaskLastP = p;
-                }
+        SwingUtilities.invokeLater(() -> {
+            taskProgressBar.setValue(taskCurrent);
+            int p = (int) (100.0 * taskProgressBar.getPercentComplete());
+            if (p > currentTaskLastP) {
+                taskProgressBar.setString(taskString + " [" + p + "%]");
+                currentTaskLastP = p;
             }
         });
     }
 
     @Override
     public void taskStop() {
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                taskProgressBar.setValue(taskProgressBar.getMinimum());
-                taskProgressBar.setString("");
-                taskProgressBar.setEnabled(false);
-                taskCancelButton.setEnabled(false);
-            }
+        SwingUtilities.invokeLater(() -> {
+            taskProgressBar.setValue(taskProgressBar.getMinimum());
+            taskProgressBar.setString("");
+            taskProgressBar.setEnabled(false);
+            taskCancelButton.setEnabled(false);
         });
     }
 
@@ -1330,7 +1274,7 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
                         break;
                     }
                 }
-            } catch (Exception exp) {
+            } catch (UnsupportedFlavorException | IOException exp) {
                 Logger.getLogger(SunflowGUI.class.getName()).log(Level.SEVERE, null, exp);
             }
 
@@ -1341,8 +1285,8 @@ public class SunflowGUI extends javax.swing.JFrame implements UserInterface {
         public boolean canImport(JComponent c, DataFlavor[] flavors) {
             // Just a quick check to see if a file can be accepted at this time
             // Are there any files around?
-            for (int i = 0; i < flavors.length; i++) {
-                if (flavors[i].isFlavorJavaFileListType()) {
+            for (DataFlavor flavor : flavors) {
+                if (flavor.isFlavorJavaFileListType()) {
                     return true;
                 }
             }