joonsrenderer 1.1-java → 1.3.1-java

data/src/main/java/joons/JRFiller.java

@@ -1,24 +1,24 @@
 package joons;
 
-import java.util.ArrayList;
-import java.util.List;
+import org.sunflow.util.FloatArray;
+import org.sunflow.util.IntArray;
 
 public class JRFiller {
 
-    private final List<Float> vertices;
-    private final List<Integer> triangleIndices;
-    private final List<Float> spheres;
-    private final List<Float> points;
+    private final FloatArray vertices;
+    private final IntArray triangleIndices;
+    private final FloatArray spheres;
+    private final FloatArray points;
 
     private final String fillType;
     public float[] p; //array of parameters
     public int np = 0; //number of parameters
 
     public JRFiller(String fillType, float... params) {
-        vertices = new ArrayList<>();
-        triangleIndices = new ArrayList<>();
-        spheres = new ArrayList<>();
-        points = new ArrayList<>();
+        vertices = new FloatArray();
+        triangleIndices = new IntArray();
+        spheres = new FloatArray();
+        points = new FloatArray();
 
         this.fillType = fillType;
         p = params;
@@ -29,12 +29,12 @@ public class JRFiller {
         return fillType;
     }
 
-    public List<Float> getVertices() {
+    public FloatArray getVertices() {
         return vertices;
     }
 
     private void writeTriangleIndices() {
-        for (int i = 0; i < (vertices.size() / 9); i++) {
+        for (int i = 0; i < (vertices.getSize() / 9); i++) {
             //vertices/3 = number of 3d points
             //vertices/9 = number of triangles
             triangleIndices.add(i * 3);
@@ -44,20 +44,12 @@ public class JRFiller {
     }
 
     public float[] verticesToArray() {
-        float[] v = new float[vertices.size()];
-        for (int i = 0; i < vertices.size(); i++) {
-            v[i] = vertices.get(i);
-        }
-        return v;
+        return vertices.trim();
     }
 
     public int[] triangleIndicesToArray() {
         writeTriangleIndices();
-        int[] t = new int[triangleIndices.size()];
-        for (int i = 0; i < triangleIndices.size(); i++) {
-            t[i] = triangleIndices.get(i);
-        }
-        return t;
+        return triangleIndices.trim();
     }
 
     public void addSphere(float x, float y, float z, float r) {
@@ -67,7 +59,7 @@ public class JRFiller {
         spheres.add(r);
     }
 
-    public List<Float> getSpheres() {
+    public FloatArray getSpheres() {
         return spheres;
     }
 

data/src/main/java/joons/JoonsRenderer.java

@@ -1,6 +1,6 @@
 package joons;
 
-import java.util.List;
+import org.sunflow.util.FloatArray;
 
 import org.sunflow.SunflowAPI;
 import org.sunflow.math.Matrix4;
@@ -210,6 +210,7 @@ public class JoonsRenderer {
         case(AMBIENT_OCCLUSION):
         case(LIGHT):
         case(MIRROR):
+        case(GLASS):
             fillers.add(new JRFiller(type, params));
             break;
         default:
@@ -661,8 +662,8 @@ public class JoonsRenderer {
         }
 
         //light spheres
-        List<Float> spheres = temp.getSpheres();
-        int noOfSpheres = (int) spheres.size() / 4;
+        FloatArray spheres = temp.getSpheres();
+        int noOfSpheres = (int) spheres.getSize() / 4;
 
         for (int j = 0; j < noOfSpheres; j++) {
             float x = spheres.get(j * 4);
@@ -801,8 +802,8 @@ public class JoonsRenderer {
         api.instance("Object_" + i + ".instance", "Object_" + i);
 
         //render the respective spheres
-        List<Float> spheres = temp.getSpheres();
-        int noOfSpheres = spheres.size() / 4;
+        FloatArray spheres = temp.getSpheres();
+        int noOfSpheres = spheres.getSize() / 4;
 
         for (int j = 0; j < noOfSpheres; j++) {
             float x = spheres.get(j * 4);

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

@@ -68,9 +68,9 @@ public class SunflowAPI implements SunflowAPIInterface {
             UI.printError(Module.API, "JVM available memory is below %d MB (found %d MB only).\nPlease make sure you launched the program with the -Xmx command line options.", RECOMMENDED_MAX_SIZE, maxMb);
         }
         String compiler = System.getProperty("java.vm.name");
-        if (compiler == null || !(compiler.contains("HotSpot") && compiler.contains("Server"))) {
-            UI.printError(Module.API, "You do not appear to be running Sun's server JVM\nPerformance may suffer");
-        }
+//        if (compiler == null || !(compiler.contains("HotSpot") && compiler.contains("Server"))) {
+//            UI.printError(Module.API, "You do not appear to be running Sun's server JVM\nPerformance may suffer");
+//        }
         UI.printDetailed(Module.API, "Java environment settings:");
         UI.printDetailed(Module.API, "  * Max memory available : %d MB", maxMb);
         UI.printDetailed(Module.API, "  * Virtual machine name : %s", compiler == null ? "<unknown" : compiler);
@@ -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/Geometry.java

@@ -15,7 +15,7 @@ import org.sunflow.system.UI.Module;
  */
 public class Geometry implements RenderObject {
 
-    private Tesselatable tesselatable;
+    private final Tesselatable tesselatable;
     private PrimitiveList primitives;
     private AccelerationStructure accel;
     private int builtAccel;

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/accel/KDTree.java

@@ -471,7 +471,7 @@ public class KDTree implements AccelerationStructure {
                 // current plane
                 int pClosed = 0, pPlanar = 0, pOpened = 0;
                 long ptrMasked = ptr & (~TYPE_MASK & 0xFFFFFFFFF0000000L);
-                long ptrClosed = ptrMasked | CLOSED;
+                long ptrClosed = ptrMasked;
                 long ptrPlanar = ptrMasked | PLANAR;
                 long ptrOpened = ptrMasked | OPENED;
                 while (i < nSplits && (splits[i] & 0xFFFFFFFFF0000000L) == ptrClosed) {

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

@@ -41,7 +41,7 @@ public final class CausticPhotonMap implements CausticPhotonMapInterface {
         bounds = new BoundingBox();
         maxPower = 0;
         maxRadius = 0;
-        photonList = new ArrayList<Photon>();
+        photonList = new ArrayList<>();
         photonList.add(null);
         photons = null;
         storedPhotons = halfStoredPhotons = 0;
@@ -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/photonmap/GlobalPhotonMap.java

@@ -22,7 +22,7 @@ public final class GlobalPhotonMap implements GlobalPhotonMapInterface {
     private int log2n;
     private int numGather;
     private float gatherRadius;
-    private BoundingBox bounds;
+    private final BoundingBox bounds;
     private boolean hasRadiance;
     private float maxPower;
     private float maxRadius;
@@ -425,7 +425,7 @@ public final class GlobalPhotonMap implements GlobalPhotonMapInterface {
 
         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));
     }