joonsrenderer 1.1.3-java → 1.2.0-java

data/src/main/java/org/sunflow/AsciiFileSunflowAPI.java

@@ -12,7 +12,7 @@ import org.sunflow.math.Matrix4;
 
 class AsciiFileSunflowAPI extends FileSunflowAPI {
 
-    private OutputStream stream;
+    private final OutputStream stream;
 
     AsciiFileSunflowAPI(String filename) throws IOException {
         stream = new BufferedOutputStream(new FileOutputStream(filename));

data/src/main/java/org/sunflow/BinaryFileSunflowAPI.java

@@ -12,7 +12,7 @@ import org.sunflow.math.Matrix4;
 
 class BinaryFileSunflowAPI extends FileSunflowAPI {
 
-    private DataOutputStream stream;
+    private final DataOutputStream stream;
 
     BinaryFileSunflowAPI(String filename) throws FileNotFoundException {
         stream = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(filename)));

data/src/main/java/org/sunflow/SunflowAPI.java

@@ -639,7 +639,7 @@ public class SunflowAPI implements SunflowAPIInterface {
         if (filename == null) {
             return new SunflowAPI();
         }
-        SunflowAPI api = null;
+        SunflowAPI api;
         if (filename.endsWith(".java")) {
             Timer t = new Timer();
             UI.printInfo(Module.API, "Compiling \"" + filename + "\" ...");
@@ -684,7 +684,7 @@ public class SunflowAPI implements SunflowAPIInterface {
      * @return <code>true</code> upon success, <code>false</code> otherwise
      */
     public static boolean translate(String filename, String outputFilename) {
-        FileSunflowAPI api = null;
+        FileSunflowAPI api;
         try {
             if (outputFilename.endsWith(".sca")) {
                 api = new AsciiFileSunflowAPI(outputFilename);

data/src/main/java/org/sunflow/core/GIEngine.java

@@ -21,8 +21,10 @@ public interface GIEngine {
     public Color getGlobalRadiance(ShadingState state);
 
     /**
-     * Initialize the engine. This is called before rendering begins.
+     * Initialize the engine.This is called before rendering begins.
      *
+     * @param options
+     * @param scene
      * @return <code>true</code> if the init phase succeeded, <code>false</code>
      * otherwise
      */

data/src/main/java/org/sunflow/core/ImageSampler.java

@@ -10,8 +10,11 @@ public interface ImageSampler {
     /**
      * Prepare the sampler for rendering an image of w x h pixels
      *
+     * @param options
+     * @param scene
      * @param w width of the image
      * @param h height of the image
+     * @return 
      */
     public boolean prepare(Options options, Scene scene, int w, int h);
 

data/src/main/java/org/sunflow/core/InstanceList.java

@@ -6,7 +6,7 @@ import org.sunflow.math.Matrix4;
 
 final class InstanceList implements PrimitiveList {
 
-    private Instance[] instances;
+    private final Instance[] instances;
     private Instance[] lights;
 
     InstanceList() {

data/src/main/java/org/sunflow/core/IntersectionState.java

@@ -36,9 +36,9 @@ public final class IntersectionState {
      * Initializes all traversal stacks.
      */
     public IntersectionState() {
-        for (int i = 0; i < stacks.length; i++) {
-            for (int j = 0; j < stacks[i].length; j++) {
-                stacks[i][j] = new StackNode();
+        for (StackNode[] stack : stacks) {
+            for (int j = 0; j < stack.length; j++) {
+                stack[j] = new StackNode();
             }
         }
     }
@@ -102,13 +102,14 @@ public final class IntersectionState {
     }
 
     /**
-     * Record an intersection with the specified primitive id. The parent object
-     * is assumed to be the current instance. The u and v parameters are used to
-     * pinpoint the location on the surface if needed.
+     * Record an intersection with the specified primitive id.The parent object
+ is assumed to be the current instance. The u and v parameters are used to
+ pinpoint the location on the surface if needed.
      *
      * @param id primitive id of the intersected object
      * @param u u surface paramater of the intersection point
      * @param v v surface parameter of the intersection point
+     * @param w
      */
     public final void setIntersection(int id, float u, float v, float w) {
         instance = current;

data/src/main/java/org/sunflow/core/ParameterList.java

@@ -36,13 +36,14 @@ public class ParameterList {
      * Creates an empty ParameterList.
      */
     public ParameterList() {
-        list = new FastHashMap<String, Parameter>();
+        list = new FastHashMap<>();
         numVerts = numFaces = numFaceVerts = 0;
     }
 
     /**
-     * Clears the list of all its members. If some members were never used, a
+     * Clears the list of all its members.If some members were never used, a
      * warning will be printed to remind the user something may be wrong.
+     * @param showUnused
      */
     public void clear(boolean showUnused) {
         if (showUnused) {

data/src/main/java/org/sunflow/core/PhotonStore.java

@@ -19,6 +19,7 @@ public interface PhotonStore {
     /**
      * Initialize this object for the specified scene size.
      *
+     * @param options
      * @param sceneBounds scene bounding box
      */
     void prepare(Options options, BoundingBox sceneBounds);

data/src/main/java/org/sunflow/core/Ray.java

@@ -95,11 +95,12 @@ public final class Ray {
     }
 
     /**
-     * Create a new ray by transforming the supplied one by the given matrix. If
-     * the matrix is
-     * <code>null</code>, the original ray is returned.
+     * Create a new ray by transforming the supplied one by the given matrix.If
+ the matrix is
+    <code>null</code>, the original ray is returned.
      *
      * @param m matrix to transform the ray by
+     * @return 
      */
     public Ray transform(Matrix4 m) {
         if (m == null) {

data/src/main/java/org/sunflow/core/TextureCache.java

@@ -11,7 +11,7 @@ import org.sunflow.system.UI.Module;
  */
 public final class TextureCache {
 
-    private static HashMap<String, Texture> textures = new HashMap<String, Texture>();
+    private static final HashMap<String, Texture> textures = new HashMap<>();
 
     private TextureCache() {
     }

data/src/main/java/org/sunflow/core/accel/BoundingIntervalHierarchy.java

@@ -17,7 +17,7 @@ public class BoundingIntervalHierarchy implements AccelerationStructure {
     private int[] objects;
     private PrimitiveList primitives;
     private BoundingBox bounds;
-    private int maxPrims;
+    private final int maxPrims;
 
     public BoundingIntervalHierarchy() {
         maxPrims = 2;

data/src/main/java/org/sunflow/core/photonmap/CausticPhotonMap.java

@@ -267,7 +267,7 @@ public final class CausticPhotonMap implements CausticPhotonMapInterface {
 
         int found;
         float px, py, pz;
-        private int max;
+        private final int max;
         private boolean gotHeap;
         protected float[] dist2;
         protected Photon[] index;

data/src/main/java/org/sunflow/core/renderer/BucketRenderer.java

@@ -34,7 +34,7 @@ public class BucketRenderer implements ImageSampler {
     private int bucketSize;
     private int bucketCounter;
     private int[] bucketCoords;
-    private boolean dumpBuckets;
+    private final boolean dumpBuckets;
     // anti-aliasing
     private int minAADepth;
     private int maxAADepth;
@@ -67,6 +67,7 @@ public class BucketRenderer implements ImageSampler {
         dumpBuckets = false; // for debugging only - not user settable
     }
 
+    @Override
     public boolean prepare(Options options, Scene scene, int w, int h) {
         this.scene = scene;
         imageWidth = w;
@@ -142,6 +143,7 @@ public class BucketRenderer implements ImageSampler {
         return String.format("%s%d sample%s", depth < 0 ? "1/" : "", pixelAA * pixelAA, depth == 0 ? "" : "s");
     }
 
+    @Override
     public void render(Display display) {
         this.display = display;
         display.imageBegin(imageWidth, imageHeight, bucketSize);

data/src/main/java/org/sunflow/image/writers/EXRBitmapWriter.java

@@ -48,27 +48,36 @@ public class EXRBitmapWriter implements BitmapWriter {
     @Override
     public final void configure(final String option, String value) {
         if (option.equals(COMPRESSION)) {
-            if (value.equals("none")) {
-                compression = NO_COMPRESSION;
-            } else if (value.equals("rle")) {
-                compression = RLE_COMPRESSION;
-            } else if (value.equals("zip")) {
-                compression = ZIP_COMPRESSION;
-            } else {
-                UI.printWarning(Module.IMG, "EXR - Compression type was not recognized - defaulting to zip");
-                compression = ZIP_COMPRESSION;
+            switch (value) {
+                case "none":
+                    compression = NO_COMPRESSION;
+                    break;
+                case "rle":
+                    compression = RLE_COMPRESSION;
+                    break;
+                case "zip":
+                    compression = ZIP_COMPRESSION;
+                    break;
+                default:
+                    UI.printWarning(Module.IMG, "EXR - Compression type was not recognized - defaulting to zip");
+                    compression = ZIP_COMPRESSION;
+                    break;
             }
         } else if (option.equals("channeltype")) {
-            if (value.equals("float")) {
-                channelType = FLOAT;
-                channelSize = FLOAT_SIZE;
-            } else if (value.equals("half")) {
-                channelType = HALF;
-                channelSize = HALF_SIZE;
-            } else {
-                UI.printWarning(Module.DISP, "EXR - Channel type was not recognized - defaulting to float");
-                channelType = FLOAT;
-                channelSize = FLOAT_SIZE;
+            switch (value) {
+                case "float":
+                    channelType = FLOAT;
+                    channelSize = FLOAT_SIZE;
+                    break;
+                case "half":
+                    channelType = HALF;
+                    channelSize = HALF_SIZE;
+                    break;
+                default:
+                    UI.printWarning(Module.DISP, "EXR - Channel type was not recognized - defaulting to float");
+                    channelType = FLOAT;
+                    channelSize = FLOAT_SIZE;
+                    break;
             }
         }
     }

data/src/main/java/org/sunflow/image/writers/PNGBitmapWriter.java

@@ -14,17 +14,21 @@ public class PNGBitmapWriter implements BitmapWriter {
     private String filename;
     private BufferedImage image;
 
+    @Override
     public void configure(String option, String value) {
     }
 
+    @Override
     public void openFile(String filename) throws IOException {
         this.filename = filename;
     }
 
+    @Override
     public void writeHeader(int width, int height, int tileSize) throws IOException, UnsupportedOperationException {
         image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
     }
 
+    @Override
     public void writeTile(int x, int y, int w, int h, Color[] color, float[] alpha) throws IOException {
         for (int j = 0, index = 0; j < h; j++) {
             for (int i = 0; i < w; i++, index++) {
@@ -33,6 +37,7 @@ public class PNGBitmapWriter implements BitmapWriter {
         }
     }
 
+    @Override
     public void closeFile() throws IOException {
         ImageIO.write(image, "png", new File(filename));
     }

data/src/main/java/org/sunflow/image/writers/TGABitmapWriter.java

@@ -15,19 +15,23 @@ public class TGABitmapWriter implements BitmapWriter {
     private int width, height;
     private byte[] data;
 
+    @Override
     public void configure(String option, String value) {
     }
 
+    @Override
     public void openFile(String filename) throws IOException {
         this.filename = filename;
     }
 
+    @Override
     public void writeHeader(int width, int height, int tileSize) throws IOException, UnsupportedOperationException {
         this.width = width;
         this.height = height;
         data = new byte[width * height * 4]; // RGBA8
     }
 
+    @Override
     public void writeTile(int x, int y, int w, int h, Color[] color, float[] alpha) throws IOException {
         color = ColorEncoder.unlinearize(color); // gamma correction
         byte[] tileData = ColorEncoder.quantizeRGBA8(color, alpha);
@@ -43,21 +47,23 @@ public class TGABitmapWriter implements BitmapWriter {
         }
     }
 
+    @Override
     public void closeFile() throws IOException {
-        // actually write the file from here
-        OutputStream f = new BufferedOutputStream(new FileOutputStream(filename));
         // no id, no colormap, uncompressed 32bpp RGBA
-        byte[] tgaHeader = {0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-        f.write(tgaHeader);
-        // then the size info
-        f.write(width & 0xFF);
-        f.write((width >> 8) & 0xFF);
-        f.write(height & 0xFF);
-        f.write((height >> 8) & 0xFF);
-        // bitsperpixel and filler
-        f.write(32);
-        f.write(0);
-        f.write(data); // write image data bytes (already in BGRA order)
-        f.close();
+        try ( // actually write the file from here
+                OutputStream f = new BufferedOutputStream(new FileOutputStream(filename))) {
+            // no id, no colormap, uncompressed 32bpp RGBA
+            byte[] tgaHeader = {0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+            f.write(tgaHeader);
+            // then the size info
+            f.write(width & 0xFF);
+            f.write((width >> 8) & 0xFF);
+            f.write(height & 0xFF);
+            f.write((height >> 8) & 0xFF);
+            // bitsperpixel and filler
+            f.write(32);
+            f.write(0);
+            f.write(data); // write image data bytes (already in BGRA order)
+        }
     }
 }

data/src/main/java/org/sunflow/system/BenchmarkFramework.java

@@ -8,8 +8,8 @@ import org.sunflow.system.UI.Module;
  */
 public class BenchmarkFramework {
 
-    private Timer[] timers;
-    private int timeLimit; // time limit in seconds
+    private final Timer[] timers;
+    private final int timeLimit; // time limit in seconds
 
     public BenchmarkFramework(int iterations, int timeLimit) {
         this.timeLimit = timeLimit;

data/src/main/java/org/sunflow/system/RenderGlobalsPanel.java

@@ -64,6 +64,7 @@ public class RenderGlobalsPanel extends JTabbedPane {
 
     /**
      * Auto-generated main method to display this JPanel inside a new JFrame.
+     * @param args
      */
     public static void main(String[] args) {
         JFrame frame = new JFrame();
@@ -181,9 +182,9 @@ public class RenderGlobalsPanel extends JTabbedPane {
                             jLabel5.setText("Min:");
                         }
                         {
-                            ComboBoxModel<String> minSamplingComboBoxModel = new DefaultComboBoxModel<String>(new String[]{
+                            ComboBoxModel<String> minSamplingComboBoxModel = new DefaultComboBoxModel<>(new String[]{
                                 "Item One", "Item Two"});
-                            minSamplingComboBox = new JComboBox<String>();
+                            minSamplingComboBox = new JComboBox<>();
                             samplingPanel.add(minSamplingComboBox);
                             minSamplingComboBox.setModel(minSamplingComboBoxModel);
                         }
@@ -193,9 +194,9 @@ public class RenderGlobalsPanel extends JTabbedPane {
                             jLabel6.setText("Max:");
                         }
                         {
-                            ComboBoxModel<String> maxSamplingComboxBoxModel = new DefaultComboBoxModel<String>(new String[]{
+                            ComboBoxModel<String> maxSamplingComboxBoxModel = new DefaultComboBoxModel<>(new String[]{
                                 "Item One", "Item Two"});
-                            maxSamplingComboxBox = new JComboBox<String>();
+                            maxSamplingComboxBox = new JComboBox<>();
                             samplingPanel.add(maxSamplingComboxBox);
                             maxSamplingComboxBox.setModel(maxSamplingComboxBoxModel);
                         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joonsrenderer
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2019-04-29 00:00:00.000000000 Z
 dependencies: []
 description: A realistic ray tracer for propane and JRubyArt
 email:
@@ -19,20 +19,22 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".mvn/extensions.xml"
+- ".mvn/wrapper/maven-wrapper.properties"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - docs/.gitignore
+- docs/Gemfile
 - docs/_config.yml
 - docs/_includes/footer.html
-- docs/_includes/head.html
 - docs/_includes/header.html
 - docs/_includes/icon-github.html
 - docs/_includes/icon-github.svg
 - docs/_includes/icon-twitter.html
 - docs/_includes/icon-twitter.svg
+- docs/_includes/top.html
 - docs/_layouts/default.html
 - docs/_layouts/page.html
 - docs/_layouts/post.html
@@ -55,13 +57,14 @@ files:
 - docs/feed.xml
 - docs/index.html
 - joonsrenderer.gemspec
-- lib/commons-compiler-3.0.6.jar
-- lib/janino-3.0.6.jar
+- lib/commons-compiler-3.0.12.jar
+- lib/janino-3.0.12.jar
 - lib/joonsrenderer.jar
 - lib/joonsrenderer.rb
 - lib/joonsrenderer/version.rb
 - pom.rb
 - pom.xml
+- src/a_maintest.java
 - src/main/java/SunflowGUI.java
 - src/main/java/joons/JRFiller.java
 - src/main/java/joons/JRImagePanel.java
@@ -276,7 +279,6 @@ files:
 - src/main/java/org/sunflow/util/FastHashMap.java
 - src/main/java/org/sunflow/util/FloatArray.java
 - src/main/java/org/sunflow/util/IntArray.java
-- src/test/java/a_maintest.java
 homepage: https://ruby-processing.github.io/joonsrenderer/
 licenses:
 - GPL-3.0
@@ -296,8 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: From Sketch to Ray Traced Image