toxiclibs 0.5.0-java → 0.5.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5091cf92d2855207e7cdcb43bd060cfa6759ac67
-  data.tar.gz: eea0cc723bd449da72205a93af8976dcecd22dfe
+  metadata.gz: d867709518cd92da4ee751ce618404e36aa58d23
+  data.tar.gz: bc13b0124cbcea23088e24f79246f5b955d4b16c
 SHA512:
-  metadata.gz: 12585fbd3a328b644c3dc865e080d2ada3df6a9da9d92d3fd6552786c585fa065fb9167723c4edfe5961f7724ae96125d5dff003de068fc11b8635663344c96e
-  data.tar.gz: 865ba9f6ba7db109675e2b0eaa30c0ca62bd4a7c4201df32e959e36aea04cdbdd760f30bc999081426386a7fc672f6b05db1d2b96fa2b3c6d263a2228325838b
+  metadata.gz: 006718bd1fd184723895bd17b5e2dbb088875c123b32e1365b763569b489224b69b97cf0644d7e62aa51cf2eb99f6c96c3eccad82dfc3d0fa7bd9bc3ad22f9ba
+  data.tar.gz: 23a90d6fa991b7295b971d5a8b07dec6e78bc6fcc3702b3f630a07b1b2dcafc2afe7c87f017efb7ddf4d95304265199d30b91e6323194e8bf93d05830d3e25de

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-**v0.5.0** New version toxiclibs update to use jdk8 syntax, require jdk8 and probably therefore JRubyArt only new MeshToVBO class.
 
+**v0.5.1** Mainly corrections.
+
+**v0.5.0** New version toxiclibs update to use jdk8 syntax, require jdk8 and probably therefore JRubyArt only new MeshToVBO class.
 
 **v0.4.0** Last version compatible with both ruby-processing and JRubyArt.

data/README.md

@@ -7,7 +7,7 @@ gem install toxiclibs
 
 ### NB: Use version 0.4 for ruby-processing
 
-Here I have created create a gem to use Karsten Schmidts (aka toxi, @postspectacular) toxiclibs jars in JRubyArt. To compile the gem follow the instructions for [JRubyArt][]. Most parts of toxiclibs API is exposed in the latest version, (but only a few examples are included) in principle it should be possible to make all available!!! For this demonstration I have used up to date source code for version 21, since [toxis final release][] may never materialise (he's probably got more interesting things to do). There are reported to be number of outstanding bugs with toxiclibs, if they affect you report it [here][] (or better fix them yourself and submit a pull request).
+Here I have created create a gem to use Karsten Schmidts (aka toxi, @postspectacular) toxiclibs jars in JRubyArt. To compile the gem follow the instructions for [JRubyArt][]. Most parts of toxiclibs API is exposed in the latest version, (but only a few examples are included) in principle it should be possible to make all available!!! For this demonstration I have used up to date source code for version 21, since [toxis final release][] may never materialise (he's probably got more interesting things to do). There are reported to be number of outstanding bugs with toxiclibs, if they affect you report it [here][] (or better fix them yourself and submit a pull request). Version 0.5.0 features java code updated to use java lambda (jdk8) and was compiled against processing-3.0.1 core.jar.  Added features are export Mesh to PShape and export Mesh to [povray mesh2](http://www.povray.org/documentation/3.7.0/r3_4.html#r3_4_5_2_4).
 
 ![grayscott image](http://4.bp.blogspot.com/-d4MiL4_0Njk/VFJMv6VUicI/AAAAAAAAEgY/fFAfrXDxNXM/s400/grayscott.png)
 

data/examples/povmesh/ftest.rb

@@ -1,46 +1,59 @@
 require 'toxiclibs'
 
-attr_reader :gfx, :mesh0, :mesh1, :mesh2
+attr_reader :gfx, :mesh0, :mesh1, :mesh2, :fshape
 
 def settings
   size(200, 200, P3D)
-  smooth 4
+  smooth 8
 end
 
 def setup
   sketch_title('FTest')
-  @gfx = Gfx::ToxiclibsSupport.new(self)
+  ArcBall.init(self)
+  @gfx = Gfx::MeshToVBO.new(self)
   # define a rounded cube using the SuperEllipsoid surface function
   vert = AABB.fromMinMax(TVec3D.new(-1.0, -3.5, -1.0), TVec3D.new(1.0, 3.5, 1.0))
   box = AABB.fromMinMax(TVec3D.new(1.0, -1.5, -1.0), TVec3D.new(3.0, -3.5, 1.0))
   box2 = AABB.fromMinMax(TVec3D.new(1.0, 2.0, -1.0), TVec3D.new(3.0, 0.0, 1.0))
   @mesh0 = box.to_mesh
   @mesh1 = vert.to_mesh
-  @mesh2 = box2.to_mesh
+  @mesh2 = box2.to_mesh # build a composite mesh
   mesh0.add_mesh(mesh1)
   mesh0.add_mesh(mesh2)
   mesh0.compute_face_normals
-  mesh0.compute_vertex_normals
-  fileID = 'FTest'
-  pm = Gfx::POVMesh.new(self)
-  file = java.io.File.new(sketchPath(fileID + '.inc'))
-  pm.begin_save(file)
-  pm.set_texture(Gfx::Textures::CHROME)
-  pm.saveAsPOV(mesh0.faceOutwards, false)
-  #        pm.set_texture(Textures::RED)
-  #        pm.saveAsPOV(mesh1, false)
-  #        pm.set_texture(Textures::WHITE)
-  #        pm.saveAsPOV(mesh2, false)
-  pm.end_save
-  #   exit
+  fill(color('#c0c0c0')) # silver
+  specular(20, 20, 20)
+  ambient(100)
+  no_stroke
+  @fshape = gfx.mesh_to_shape(mesh0, false)
 end
 
 def draw
-  background 50, 50, 200
-  lights
-  translate(width / 2, height / 2)
+  background 80, 80, 160
+  setup_lights
   scale(10)
-  rotateY(20.radians)
-  gfx.choose_stroke_fill(false, Toxi::TColor::WHITE, Toxi::TColor::RED)
-  gfx.mesh(mesh0)
+  shape(fshape)
+end
+
+def setup_lights
+  lights
+  ambient_light(150, 150, 150)
+  directional_light(100, 100, 100, -1, 0, 0)
+  directional_light(100, 100, 100, 1, 0, -1)
 end
+
+
+def key_pressed
+  case key
+  when 'p', 'P'
+    fileID = 'FTest'
+    pm = Gfx::POVMesh.new(self)
+    file = java.io.File.new(sketchPath(fileID + '.inc'))
+    pm.begin_save(file)
+    pm.set_texture(Gfx::Textures::CHROME)
+    pm.saveAsPOV(mesh0.faceOutwards, false)
+    pm.end_save 
+  when 's', 'S'
+    save_frame('FTest.png')
+  end
+end

data/examples/povmesh/mesh_align.rb

@@ -0,0 +1,47 @@
+require 'toxiclibs'
+
+attr_reader :gfx, :vbo, :meshes
+SCALE = 200
+BOX_SIZE = TVec3D.new(5, 5, 50)
+
+def settings
+  size(600, 600, P3D)
+end
+
+def setup
+  sketch_title('Mesh Align')
+  ArcBall.init(self)
+  @vbo = Gfx::MeshToVBO.new(self)
+  no_stroke
+  @meshes = create_shape(GROUP)
+  600.times do |i|
+    # create a new direction vector for each box
+    dir = TVec3D.new(cos(i * TWO_PI / 75), sin(i * TWO_PI / 50), sin(i * TWO_PI / 25)).normalize
+    # create a position on a sphere, using the direction vector
+    pos = dir.scale(SCALE)
+    # create a box mesh at the origin
+    b = AABB.new(TVec3D.new, BOX_SIZE).to_mesh
+    # align the Z axis of the box with the direction vector
+    b.point_towards(dir)
+    # move the box to the correct position
+    b.transform(Toxi::Matrix4x4.new.translate_self(pos.x, pos.y, pos.z))
+    b.compute_face_normals
+    temp = vbo.mesh_to_shape(b, false)
+    temp.disable_style
+    temp.set_fill(color(rand(255), rand(255), rand(255)))
+    meshes.add_child(temp)
+  end
+end
+
+def draw
+  background 50, 50, 200
+  define_lights
+  shape(meshes)
+end
+
+def define_lights
+  lights
+  shininess(16)
+  directionalLight(255, 255, 255, 0, -1, 1)
+  specular(255)
+end

data/examples/spherical_harmonics_mesh.rb

@@ -0,0 +1,50 @@
+require 'toxiclibs'
+
+#######
+# After Paul Bourke see http://paulbourke.net/geometry/sphericalh/
+# radius =
+# sin(m0*phi)**m1 + cos(m2*phi)**m3 + sin(m4*theta)**m5 + cos(m6*theta)**m7
+# where phi = (0..PI) and theta = (0..TWO_PI)
+# As implemented by Karsten Schmidt aka toxi/postspectacular
+#######
+
+attr_reader :gfx, :mesh, :spherical, :param
+
+def setup
+  sketch_title 'Spherical Harmonics Mesh Builder'
+  ArcBall.init(self)
+  @param = [8, 4, 1, 5, 1, 4, 0, 0] # default function parameters (m0..m7)
+  @mesh = spherical_mesh(param)
+  @gfx = Gfx::MeshToVBO.new(self) # Mesh to vertex buffer object converter
+  no_stroke
+  @spherical = gfx.mesh_to_shape(mesh, true) # white
+end
+
+def draw
+  background(0)
+  lights
+  shininess(16)
+  directional_light(255, 255, 255, 0, -1, 1)
+  specular(255)
+  shape(spherical)
+end
+
+def key_pressed
+  return unless (key == 'r')
+  @mesh = spherical_mesh(random_parameters)
+  no_stroke
+  @spherical = gfx.mesh_to_colored_shape(mesh, true) # harmonic colors
+end
+
+def random_parameters
+  (0..8).map { rand(0..8) }
+end
+
+def spherical_mesh(param)
+  b = SurfaceMeshBuilder.new(SphericalHarmonics.new(param.to_java(:float)))
+  b.create_mesh(nil, 80, 60)
+end
+
+def settings
+  size(1024, 576, P3D)
+end

data/lib/toxiclibs/version.rb

@@ -1,3 +1,3 @@
 module Toxiclibs
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'.freeze
 end

data/pom.xml

@@ -28,8 +28,8 @@
 
   <licenses>
     <license>
-      <name>'GPLv3'</name>
-      <url>http://www.opensource.org/licenses/gplv3.php</url>
+      <name>LGPL 3</name>
+      <url>http://www.gnu.org/licenses/lgpl-3.0-standalone.html</url>
     </license>
   </licenses>
 

data/src/toxi/processing/MeshToVBO.java

@@ -1,31 +1,14 @@
-/*
- * This library adds translate from toxiclibs Mesh to processing PShape (vbo)
- * Copyright (c) 2015 Martin Prout
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * http://creativecommons.org/licenses/LGPL/2.1/
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
 package toxi.processing;
 
 import java.util.Collection;
 import processing.core.PApplet;
 import processing.core.PConstants;
 import processing.core.PShape;
+import toxi.geom.Matrix4x4;
+import toxi.geom.Vec3D;
 import toxi.geom.mesh.Mesh3D;
 import toxi.geom.mesh.Face;
+import toxi.geom.mesh.TriangleMesh;
 
 /**
  *
@@ -34,6 +17,8 @@ import toxi.geom.mesh.Face;
 public class MeshToVBO {
 
     private final PApplet app;
+    private final Matrix4x4 normalMap =
+    new Matrix4x4().translateSelf(128, 128, 128).scaleSelf(127);
 
     /**
      *
@@ -49,39 +34,24 @@ public class MeshToVBO {
      * @param smooth boolean
      * @return
      */
-    public PShape meshToShape(Mesh3D mesh, boolean smooth) {
+    public PShape meshToShape(TriangleMesh mesh, boolean smooth) {
         PShape retained = app.createShape();
         retained.beginShape(PConstants.TRIANGLE);
         if (smooth) {
-            mesh.computeVertexNormals();
-            Collection<Face> faces = mesh.getFaces();
-            faces.stream().map((f) -> {
+            mesh.faces.stream().map((f) -> {
                 retained.normal(f.a.normal.x, f.a.normal.y, f.a.normal.z);
-                return f;
-            }).map((f) -> {
                 retained.vertex(f.a.x, f.a.y, f.a.z);
-                return f;
-            }).map((f) -> {
                 retained.normal(f.b.normal.x, f.b.normal.y, f.b.normal.z);
-                return f;
-            }).map((f) -> {
                 retained.vertex(f.b.x, f.b.y, f.b.z);
-                return f;
-            }).map((f) -> {
                 retained.normal(f.c.normal.x, f.c.normal.y, f.c.normal.z);
                 return f;
             }).forEach((f) -> {
                 retained.vertex(f.c.x, f.c.y, f.c.z);
             });
         } else {
-            Collection<Face> faces = mesh.getFaces();
-            faces.stream().map((f) -> {
+            mesh.faces.stream().map((f) -> {
                 retained.normal(f.normal.x, f.normal.y, f.normal.z);
-                return f;
-            }).map((f) -> {
                 retained.vertex(f.a.x, f.a.y, f.a.z);
-                return f;
-            }).map((f) -> {
                 retained.vertex(f.b.x, f.b.y, f.b.z);
                 return f;
             }).forEach((f) -> {
@@ -91,4 +61,39 @@ public class MeshToVBO {
         retained.endShape();
         return retained;
     }
+    
+    public PShape meshToColoredShape(TriangleMesh mesh, 
+      boolean vertexNormals) {
+        PShape gfx = app.createShape();
+        gfx.beginShape(PConstants.TRIANGLES);
+        if (vertexNormals) {
+            mesh.faces.stream().map((f) -> {
+                Vec3D n = normalMap.applyTo(f.a.normal);
+                gfx.fill(n.x, n.y, n.z);
+                gfx.normal(f.a.normal.x, f.a.normal.y, f.a.normal.z);
+                gfx.vertex(f.a.x, f.a.y, f.a.z);
+                n = normalMap.applyTo(f.b.normal);
+                gfx.fill(n.x, n.y, n.z);
+                gfx.normal(f.b.normal.x, f.b.normal.y, f.b.normal.z);
+                gfx.vertex(f.b.x, f.b.y, f.b.z);
+                n = normalMap.applyTo(f.c.normal);
+                gfx.fill(n.x, n.y, n.z);
+                gfx.normal(f.c.normal.x, f.c.normal.y, f.c.normal.z);
+                return f;
+            }).forEach((f) -> {
+                gfx.vertex(f.c.x, f.c.y, f.c.z);
+            });
+        } else {
+            mesh.faces.stream().map((f) -> {
+                gfx.normal(f.normal.x, f.normal.y, f.normal.z);
+                gfx.vertex(f.a.x, f.a.y, f.a.z);
+                gfx.vertex(f.b.x, f.b.y, f.b.z);
+                return f;
+            }).forEach((f) -> {
+                gfx.vertex(f.c.x, f.c.y, f.c.z);
+            });
+        }
+        gfx.endShape();        
+        return gfx;
+    }
 }

data/toxiclibs.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   expressions (available since jdk8). Also new since version 0.5.0 are 3D Mesh 
   to PShape and 3D mesh to Povray mesh2 utilities.
   EOS
-  spec.license = 'GPLv3'
-  spec.authors = %w{Karsten/ Schmidt Martin/ Prout}
+  spec.licenses = %w{MIT LGPL-3.0}
+  spec.authors = %w{Karsten\ Schmidt Martin\ Prout}
   spec.email = 'martin_p@lineone.net'
   spec.homepage = 'https://github.com/ruby-processing/toxiclibs'
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

metadata

@@ -1,17 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: toxiclibs
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: java
 authors:
-- Karsten/
-- Schmidt
-- Martin/
-- Prout
+- Karsten Schmidt
+- Martin Prout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby_art
@@ -84,6 +82,7 @@ files:
 - examples/inflate_mesh.rb
 - examples/model_align.rb
 - examples/povmesh/ftest.rb
+- examples/povmesh/mesh_align.rb
 - examples/povmesh/tentacle.rb
 - examples/simple_cluster/cluster.rb
 - examples/simple_cluster/node.rb
@@ -92,6 +91,7 @@ files:
 - examples/soft_body/connection.rb
 - examples/soft_body/particle.rb
 - examples/soft_body/soft_body_square_adapted.rb
+- examples/spherical_harmonics_mesh.rb
 - lib/args4j-2.0.31.jar
 - lib/toxiclibs.jar
 - lib/toxiclibs.rb
@@ -450,7 +450,8 @@ files:
 - toxiclibs.gemspec
 homepage: https://github.com/ruby-processing/toxiclibs
 licenses:
-- GPLv3
+- MIT
+- LGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []