joonsrenderer 1.1.1-java → 1.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70b8fd0626fcf3607da397f21b01f129a7770ac0
-  data.tar.gz: 44a2a7edebc5e35e3763a5b9034dbfecfe29e668
+  metadata.gz: c7619bcb28e30d6facafc84f6a4237dfe1b51bbc
+  data.tar.gz: 0c4c0910518f2e693e4fb43a46f82f97b64fef1c
 SHA512:
-  metadata.gz: b22df8ccdd0ec469da9f1ca63951beef95de15fe27f0adc25908c1fd997a586f4a5ff347e3ddf1ff3eee91e80315736ad791cb8e52700030c10c5d225302993f
-  data.tar.gz: 6dc590a2ef2dede0d84db67d5f148ed88ca8800326123b00334cd96529f59bc5a560ce300bfef4194e3a0a1abe940c0adac711c7789c93adeac8d14a2452dc1d
+  metadata.gz: f63b2a97ada796e0ccb967b8a616ff98d98dbff79dd3726999c26c0e44954cd9dffca0575f41ed8afa49a38cd0d04d820d50db1c0bf69eec0459f887f78428f7
+  data.tar.gz: ee8762e7ff242c4920f91917c326a4394748b070c17ee8d6af87b54f3e0a23158f4afbfdf8f57f601244c22f41f537cfb269793853a8673206db5ce553e5d4f1

data/CHANGELOG.md

@@ -1,3 +1,4 @@
+**v1.1.2** Use sunflow.util.FloatList and IntList, netbeans profiling suggest it is worth doing (there is a vanilla processing alternative, with a different interface)
 
 **v1.1.1** Left out GLASS from fill type switch easily fixed thought
 

data/README.md

@@ -1,2 +1,2 @@
 # joonsrenderer
-gem to use sunflow (raytacer) with JRubyArt and propane
+A gem to use the sunflow (raytacer) with JRubyArt and propane. Pretty quick and dirty stuff, if you are really serious you might choose to export processing sketch to some 3D format, parse that through [MeshLab](http://www.meshlab.net/) to clean it up before rendering with [blender](https://www.blender.org/) but for everyone else this is pretty easy.

data/docs/_posts/2017-01-06-media.md

@@ -0,0 +1,101 @@
+---
+layout: post
+title:  "Media Demo"
+date:   2017-01-08 04:31:13
+categories: joonsrenderer update
+---
+Sunflow is an open source global illumination rendering system written in Java written by [Christopher Kulla][fpsunflower]. I have recently updated to [build with maven][maven] using jdk-8 and to use the latest [janino jars][janino]. This is gem makes sunflow rendering easily available to `JRubyArt` and `propane` users using Joon Hylub Lees [joons-renderer][joons]:-
+
+### media_demo.rb (JRubyArt Sketch)
+```ruby
+require 'joonsrenderer'
+include_package 'joons'
+
+attr_reader :jr, :eye, :center, :up
+
+def setup
+  sketch_title 'Media Demo'
+  @jr = JoonsRenderer.new(self)
+  jr.set_sampler('ipr') # Rendering mode, either 'ipr' or 'bucket'.
+  jr.set_size_multiplier(2) # Set size of PNG file as a multiple of Processing sketch size.
+  jr.setAA(-2, 0) # Set anti aliasing, (aaMin, aaMax, aaSamples). aaMin & aaMax = .. -2, -1, .. , 1, 2 .. aaMin < aaMax.
+  jr.set_caustics(10) # Set caustics. 1, 5, 10 .., affects quality of light reflected & refracted through glass.
+  # Camera Setting.
+  @eye = Vec3D.new(0, 0, 120)
+  @center = Vec3D.new(0, 0, -1)
+  @up = Vec3D.new(0, 1, 0)
+end
+
+def draw
+  jr.begin_record # Make sure to include things you want rendered.
+  kamera(eye: eye, center: center, up: up)
+  perspektiv(fov: PI / 4.0, aspect_ratio: 4 / 3.0, near_z: 5, far_z: 10_000)
+  jr.background('gi_instant') # Global illumination.
+  jr.background('cornell_box', 100, 100, 100) # Cornell box, width, height, depth.
+  push_matrix
+  translate(-40, 20, -20)
+  push_matrix
+  rotateY(-PI / 8)
+  # jr.fill('light', r, g, b)
+  jr.fill('light', 5, 5, 5)
+  sphere(13)
+  translate(27, 0, 0)
+  # jr.fill('mirror', r, g, b)
+  jr.fill('mirror', 255, 255, 255)
+  sphere(13)
+  translate(27, 0, 0)
+  # jr.fill('diffuse', r, g, b)
+  jr.fill('diffuse', 150, 255, 255)
+  sphere(13)
+  translate(27, 0, 0)
+  # jr.fill('shiny', r, g, b, shininess)
+  jr.fill('shiny', 150, 255, 255, 0.1)
+  sphere(13)
+  translate(27, 0, 0)
+  pop_matrix
+  rotateY(PI / 8)
+  translate(-10, -27, 30)
+  # jr.fill('ambient occlusion', bright r, g, b, dark r, g, b, maximum distance, int samples)
+  jr.fill('ambient_occlusion', 150, 255, 255, 0, 0, 255, 50, 16)
+  sphere(13)
+  translate(27, 0, 0)
+  # jr.fill('phong', r, g, b)
+  jr.fill('phong', 150, 255, 255)
+  sphere(13)
+  translate(27, 0, 0)
+  # jr.fill('glass', r, g, b)
+  jr.fill('glass', 255, 255, 255)
+  sphere(13)
+  translate(27, 0, 0)
+  # jr.fill('constant', r, g, b)
+  jr.fill('constant', 150, 255, 255)
+  sphere(13)
+  pop_matrix
+  jr.end_record # Make sure to end record.
+  # Display rendered image if render is completed, and the argument is true.
+  jr.display_rendered(true)
+end
+
+def key_pressed
+  jr.render if (key == 'r' || key == 'R')  # Press 'r' key to start rendering.
+end
+
+def settings
+  size(800, 600, P3D)
+end
+
+```
+
+### The Processing Sketch
+
+<img src="{{site.github.url}}/assets/media_captured.png" />
+
+### The RayTraced Image
+
+<img src="{{site.github.url}}/assets/media_rendered.png" />
+
+[fpsunflower]:http://sunflow.sourceforge.net/
+[maven]:https://github.com/monkstone/sunflow
+[joons]:https://github.com/joonhyublee/joons-renderer
+[janino]:http://janino-compiler.github.io/janino/
+[github]:https://github.com/monkstone/joonsrenderer

data/docs/_posts/2017-01-08-resources.md

@@ -4,9 +4,11 @@ title:  "Resource References"
 date:   2017-01-08 05:00:13
 categories: joonsrenderer update
 ---
-Get some inspiration on [flickr][flickr] and [vimeo][vimeo] (and by [Joon Hyub Lee][joonsvimeo]). See also this [tutorial][wiki]
+Get some inspiration on [flickr][flickr] and [vimeo][vimeo] (and by [Joon Hyub Lee][joonsvimeo]). See also this [tutorial][tutorial] by Joon Hyub Lee
+and this link to a [pdf][wiki] of a defunct wiki from a sunflow developer.
 
 [flickr]:https://www.flickr.com/search/?text=sunflow
 [joonsvimeo]:https://vimeo.com/user4562261
 [vimeo]:https://vimeo.com/search?q=sunflow
-[wiki]:https://github.com/joonhyublee/joons-renderer/wiki
+[tutorial]:https://github.com/joonhyublee/joons-renderer/wiki
+[wiki]:https://geneome.com/sunflow-wiki/

data/lib/joonsrenderer/version.rb

@@ -1,3 +1,3 @@
 module JoonsRenderer
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/pom.rb

@@ -2,11 +2,11 @@ require 'fileutils'
 project 'joonsrenderer' do
 
   model_version '4.0.0'
-  id 'joons:joonsrenderer:1.1.1'
+  id 'joons:joonsrenderer:1.1.2'
   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'

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>joons</groupId>
   <artifactId>joonsrenderer</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</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>

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;
@@ -662,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);
@@ -802,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);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joonsrenderer
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-08 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies: []
 description: A realistic ray tracer for propane and JRubyArt
 email:
@@ -36,6 +36,7 @@ files:
 - docs/_layouts/default.html
 - docs/_layouts/page.html
 - docs/_layouts/post.html
+- docs/_posts/2017-01-06-media.md
 - docs/_posts/2017-01-08-animated_ray_tracing.md
 - docs/_posts/2017-01-08-resources.md
 - docs/_posts/2017-01-08-welcome.md
@@ -47,6 +48,8 @@ files:
 - docs/assets/Animation.png
 - docs/assets/basic.png
 - docs/assets/basic_traced.png
+- docs/assets/media_captured.png
+- docs/assets/media_rendered.png
 - docs/css/main.scss
 - docs/favicon.ico
 - docs/feed.xml
@@ -294,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: From Sketch to Ray Traced Image