toxiclibs 0.5.1-java → 0.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d867709518cd92da4ee751ce618404e36aa58d23
-  data.tar.gz: bc13b0124cbcea23088e24f79246f5b955d4b16c
+  metadata.gz: 0621bb2a556be4f39f85ae0c7ce5bf2798ac2f05
+  data.tar.gz: 3f70efd64fa650f57ab654b94b288ec6f30f4936
 SHA512:
-  metadata.gz: 006718bd1fd184723895bd17b5e2dbb088875c123b32e1365b763569b489224b69b97cf0644d7e62aa51cf2eb99f6c96c3eccad82dfc3d0fa7bd9bc3ad22f9ba
-  data.tar.gz: 23a90d6fa991b7295b971d5a8b07dec6e78bc6fcc3702b3f630a07b1b2dcafc2afe7c87f017efb7ddf4d95304265199d30b91e6323194e8bf93d05830d3e25de
+  metadata.gz: e686d52c7e42a54da8de8454d306ca6487129a3cde5a5d42a4cd582c4ff61a8a603d8e5126ed86afb698b138a918d40e001b3d671f6a63b91446431949b56e06
+  data.tar.gz: 97a6d9711d2d33fcac33dd934ed77e1131830895a6a15b8e67a1e5306311493830a1b616d9e1a118c72cf87fa82169e6013a91f583bd341e84b88ff2612da3f3

data/CHANGELOG.md

@@ -1,5 +1,5 @@
 
-**v0.5.1** Mainly corrections.
+**v0.6.0** Some corrections to the Rect and Vec3D contains logic (mea culpa, caued by injudicious refactoring)
 
 **v0.5.0** New version toxiclibs update to use jdk8 syntax, require jdk8 and probably therefore JRubyArt only new MeshToVBO class.
 

data/README.md

@@ -1,5 +1,5 @@
 ## Toxiclibs for JRubyArt
-[![Gem Version](https://badge.fury.io/rb/toxiclibs.svg)](http://badge.fury.io/rb/toxiclibs)
+
 ### Installing
 ```bash
 gem install toxiclibs
@@ -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). 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).
+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/README.md

@@ -0,0 +1,5 @@
+Certain sketches in this folder need to be run with the `--nojruby` flag:-
+
+`physics_type.rb`
+
+`gray_scott_image.rb`

data/examples/model_align.rb

@@ -12,7 +12,7 @@ require 'toxiclibs'
 attr_reader :gfx, :positions
 
 def settings
-  size(640, 480, P3D)  
+  size(640, 480, P3D)
 end
 
 def setup
@@ -28,7 +28,7 @@ def draw
   lights
   no_stroke
   # create manual focal point in XY plane
-  focus = TVec3D.new((mouse_x - width/2), (mouse_y - height/2), 0)
+  focus = TVec3D.new((mouse_x - width / 2), (mouse_y - height / 2), 0)
   # create mesh prototype to draw at all generated positions
   # the mesh is a simple box placed at the world origin
   m = AABB.new(25).to_mesh
@@ -37,8 +37,8 @@ def draw
   # align the positive z-axis of mesh to point at focus
   # mesh needs to be located at world origin for it to work correctly
   # only once rotated, move it to actual position
-  positions.map { |p| gfx.mesh(m.copy.pointTowards(focus.sub(p), TVec3D::Z_AXIS).translate(p)) }  
+  positions.map { |p| gfx.mesh(m.copy.pointTowards(focus.sub(p), TVec3D::Z_AXIS).translate(p)) }
   # draw connections from mesh centers to focal point
-  stroke(0,255,255)
+  stroke(0, 255, 255)
   positions.map { |p| gfx.line(p, focus) }
 end

data/examples/physics_type.rb

@@ -0,0 +1,78 @@
+load_library :geomerative
+require 'toxiclibs'
+include_package 'geomerative'
+
+attr_reader :font, :input, :physics
+
+def settings
+  size(1280, 720, P3D)
+  smooth
+end
+
+def setup
+  sketch_title 'Physics Type'
+  @input = 'Hello!'
+  RG.init(self)
+  fnt = RG.load_font('ReplicaBold.ttf') # file name
+  RG.text_font(fnt, 330) # RFont object, size
+  @font = RG.get_text(input) # String to RShape
+  RG.set_polygonizer(RCommand::UNIFORMLENGTH)
+  RG.set_polygonizer_length(10) # length of segment
+  init_physics
+  fill(255)
+end
+
+def draw
+  physics.update
+  background(0)
+  stroke(255)
+  physics.springs.each do |s|
+    line(s.a.x, s.a.y, s.b.x, s.b.y)
+  end
+  physics.particles.each do |p|
+    ellipse(p.x, p.y, 3, 3)
+  end
+end
+
+def init_physics
+  @physics = Physics::VerletPhysics2D.new
+  # set screen bounds as bounds for physics sim
+  physics.set_world_bounds(Toxi::Rect.new(0, 0, width, height))
+  # add gravity along positive Y axis
+  physics.add_behavior(Physics::GravityBehavior2D.new(TVec2D.new(0, 0.1)))
+  # multidimensional array of x and y coordinates
+  paths = font.get_points_in_paths
+  offset = TVec2D.new(200, 250)
+  return if paths.nil?
+  paths.length.times do |ii|
+    points = paths[ii]
+    path_particles = []
+    points.length.times do |i|
+      p = Physics::VerletParticle2D.new(
+        points[i].x + offset.x,
+        points[i].y + offset.y
+      )
+      physics.add_particle(p)
+      path_particles << p
+      physics.add_spring(
+        Physics::VerletSpring2D.new(
+          path_particles[i - 1],
+          p,
+          path_particles[i - 1].distanceTo(p),
+          1
+        )
+      ) if i > 0
+    end
+    first = path_particles.first
+    last = path_particles.last
+    physics.add_spring(
+      Physics::VerletSpring2D.new(
+        first,
+        last,
+        first.distance_to(last),
+        1
+      )
+    )
+    first.lock
+  end
+end

data/examples/povmesh/tentacle.rb

@@ -3,7 +3,7 @@ require 'toxiclibs'
 # A 3D Tentacle by Nikolaus Gradwohl http://www.local-guru.net
 # Adapted for JRubyArt and mesh to PShape, and mesh2 export by Martin Prout
 
-attr_reader :mesh, :gfx, :tentacle
+attr_reader :mesh, :gfx, :tentacle, :tex
 
 def settings
   size(500, 500, P3D)
@@ -11,6 +11,7 @@ end
 
 def setup
   sketch_title 'Tentacle'
+  @tex = load_image('mask.jpg')
   ArcBall.init(self)
   @gfx = Gfx::MeshToVBO.new(self)
   volume = VolumetricSpaceArray.new(TVec3D.new(100, 200, 100), 100, 100, 100)
@@ -37,26 +38,23 @@ def setup
   surface.reset
   surface.compute_surface_mesh(mesh, 0.5)
   no_stroke
-  @tentacle = gfx.mesh_to_shape(mesh, true)
-  tentacle.set_fill(color(200, 10, 10))
-  tentacle.set_ambient(80)
-  tentacle.set_specular(80)
+  @tentacle = gfx.mesh_to_textured_shape(mesh, tex)
 end
 
 def draw
   background(150)
-  lights
-  setup_lights
+  define_lights
   shape(tentacle)
 end
 
-def setup_lights
+def define_lights 
   lights
-  ambient_light(100, 100, 100)
-  directional_light(100, 100, 100, -1, -1, 1)
-  light_specular(50, 50, 50)
+  ambient_light(40, 40, 40)
+  directional_light(10, 30, 40, 1, 1, 0)
+  directional_light(10, 30, 40, 1, 1, -1)
 end
 
+
 def key_pressed
   case key
   when 'p', 'P'

data/examples/spherical_harmonics_mesh.rb

@@ -33,7 +33,7 @@ def key_pressed
   return unless (key == 'r')
   @mesh = spherical_mesh(random_parameters)
   no_stroke
-  @spherical = gfx.mesh_to_colored_shape(mesh, true) # harmonic colors
+  @spherical = gfx.mesh_to_colored_shape(mesh) # harmonic colors
 end
 
 def random_parameters

data/examples/test_rect.rb

@@ -0,0 +1,30 @@
+require 'toxiclibs'
+
+attr_reader :points, :bounds, :gfx
+
+def settings
+  size(400,400)
+end
+
+def setup
+  sketch_title 'Test Rect'
+  @points = []
+  @bounds = Toxi::Rect.new(200, 200, 0, 0)
+  @gfx = Gfx::ToxiclibsSupport.new(self)
+end
+
+def draw
+  background(255)
+  no_fill
+  stroke(0)
+  gfx.rect(bounds)
+  fill(255, 0, 0)
+  no_stroke
+  points.each { |p| gfx.circle(p, 5) }
+end
+
+def mouse_pressed
+  p = TVec2D.new(mouse_x, mouse_y)
+  points << p
+  bounds.grow_to_contain_point(p)
+end

data/lib/toxiclibs/version.rb

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

data/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.ruby-processing</groupId>
   <artifactId>toxiclibs</artifactId>
-  <version>0.5.0</version>
+  <version>0.6.0</version>
   <packaging>jar</packaging>
   <description>
     toxiclibs-library for JRubyArt

data/src/toxi/geom/Rect.java

@@ -146,7 +146,7 @@ public class Rect implements Shape2D {
         if (px < x || px > x + width) {
             return false;
         }
-        return (py >= y || py <= y + height);
+        return (py >= y && py <= y + height);
     }
 
     /**

data/src/toxi/geom/Vec2D.java

@@ -743,7 +743,7 @@ public class Vec2D implements Comparable<ReadonlyVec2D>, ReadonlyVec2D {
         if (x < r.x || x > r.x + r.width) {
             return false;
         }
-        return (y >= r.y || y <= r.y + r.height); 
+        return (y >= r.y && y <= r.y + r.height); 
     }
 
     @Override

data/src/toxi/geom/Vec3D.java

@@ -994,7 +994,7 @@ public class Vec3D implements Comparable<ReadonlyVec3D>, ReadonlyVec3D {
             return false;
         }
         w = boxExtent.z;
-        return (z > boxOrigin.z - w || z < boxOrigin.z + w);
+        return (z >= boxOrigin.z - w && z <= boxOrigin.z + w);
     }
 
     @Override

data/src/toxi/processing/MeshToVBO.java

@@ -1,13 +1,11 @@
 package toxi.processing;
 
-import java.util.Collection;
 import processing.core.PApplet;
 import processing.core.PConstants;
+import processing.core.PImage;
 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;
 
 /**
@@ -15,10 +13,12 @@ import toxi.geom.mesh.TriangleMesh;
  * @author Martin Prout
  */
 public class MeshToVBO {
-
+    final int DEFAULT_COLOR = -1; // white
+    private int fillColor;
+    private boolean wire = false;
     private final PApplet app;
-    private final Matrix4x4 normalMap =
-    new Matrix4x4().translateSelf(128, 128, 128).scaleSelf(127);
+    private final Matrix4x4 normalMap
+        = new Matrix4x4().translateSelf(128, 128, 128).scaleSelf(127);
 
     /**
      *
@@ -26,17 +26,35 @@ public class MeshToVBO {
      */
     public MeshToVBO(PApplet app) {
         this.app = app;
+        this.fillColor = DEFAULT_COLOR;
+    }
+
+    public void wire(boolean show) {
+        this.wire = show;
+    }
+
+    /**
+     *
+     * @param col
+     */
+    public void fillColor(int col) {
+        this.fillColor = col;
     }
 
     /**
      * Use default smooth (smooth = false) for cubes etc
+     *
      * @param mesh Toxiclibs mesh
      * @param smooth boolean
      * @return
      */
     public PShape meshToShape(TriangleMesh mesh, boolean smooth) {
+        if (!wire) {
+            app.noStroke();
+        }
         PShape retained = app.createShape();
         retained.beginShape(PConstants.TRIANGLE);
+        retained.fill(fillColor);
         if (smooth) {
             mesh.faces.stream().map((f) -> {
                 retained.normal(f.a.normal.x, f.a.normal.y, f.a.normal.z);
@@ -49,6 +67,9 @@ public class MeshToVBO {
                 retained.vertex(f.c.x, f.c.y, f.c.z);
             });
         } else {
+            if (wire) {
+                app.noFill();
+            }
             mesh.faces.stream().map((f) -> {
                 retained.normal(f.normal.x, f.normal.y, f.normal.z);
                 retained.vertex(f.a.x, f.a.y, f.a.z);
@@ -61,39 +82,46 @@ public class MeshToVBO {
         retained.endShape();
         return retained;
     }
-    
-    public PShape meshToColoredShape(TriangleMesh mesh, 
-      boolean vertexNormals) {
+
+    public PShape meshToColoredShape(TriangleMesh mesh) {
+        app.noStroke();
         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();        
+        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);
+        });
+        gfx.endShape();
+        return gfx;
+    }
+    
+    public PShape meshToTexturedShape(TriangleMesh mesh, PImage tex) {
+        PShape gfx = app.createShape();
+        gfx.beginShape(PConstants.TRIANGLE);
+        gfx.texture(tex);
+        mesh.faces.stream().map((f) -> {
+            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, 0, 0);
+            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, tex.width, 0);
+            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, tex.width, tex.height);
+        });
+        gfx.endShape();
         return gfx;
     }
-}
+}

data/toxiclibs.gemspec

@@ -17,18 +17,16 @@ Gem::Specification.new do |spec|
   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.homepage = 'http://ruby-processing.github.io/toxicgem/'
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.files << 'lib/toxiclibs.jar'
   spec.files << 'lib/args4j-2.0.31.jar' 
   spec.require_paths = ['lib']
-  spec.add_dependency 'jruby_art', '~> 1.0' 
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.8"
+  spec.add_dependency 'jruby_art', '~> 1.0', '>= 1.0.1' 
+  spec.add_development_dependency 'rake', '~> 10.4', '>= 10.4.2'
   spec.platform = 'java'
   spec.requirements << 'A decent graphics card'
   spec.requirements << 'java runtime >= 1.8+'
   spec.requirements << 'processing = 3.0.1+'
   spec.requirements << 'maven = 3.3.3'
-  spec.requirements << 'jruby_art = 1.0+'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toxiclibs
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: java
 authors:
 - Karsten Schmidt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby_art
@@ -18,6 +18,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,34 +28,29 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '10.4'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '10.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.4.2
 description: "  Toxiclibs java libraries wrapped in a rubygem. Updated to use java
   lambda \n  expressions (available since jdk8). Also new since version 0.5.0 are
   3D Mesh \n  to PShape and 3D mesh to Povray mesh2 utilities.\n"
@@ -69,9 +67,11 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- examples/README.md
 - examples/attract_repel/attract_repel.rb
 - examples/attract_repel/attractor.rb
 - examples/attract_repel/particle.rb
+- examples/data/ReplicaBold.ttf
 - examples/data/ti_yong.png
 - examples/force_directed/cluster.rb
 - examples/force_directed/force_directed_graph.rb
@@ -81,6 +81,8 @@ files:
 - examples/implicit.rb
 - examples/inflate_mesh.rb
 - examples/model_align.rb
+- examples/physics_type.rb
+- examples/povmesh/data/mask.jpg
 - examples/povmesh/ftest.rb
 - examples/povmesh/mesh_align.rb
 - examples/povmesh/tentacle.rb
@@ -92,6 +94,7 @@ files:
 - examples/soft_body/particle.rb
 - examples/soft_body/soft_body_square_adapted.rb
 - examples/spherical_harmonics_mesh.rb
+- examples/test_rect.rb
 - lib/args4j-2.0.31.jar
 - lib/toxiclibs.jar
 - lib/toxiclibs.rb
@@ -448,7 +451,7 @@ files:
 - src/toxi/volume/VolumetricSpace.java
 - src/toxi/volume/VolumetricSpaceArray.java
 - toxiclibs.gemspec
-homepage: https://github.com/ruby-processing/toxiclibs
+homepage: http://ruby-processing.github.io/toxicgem/
 licenses:
 - MIT
 - LGPL-3.0
@@ -472,7 +475,6 @@ requirements:
 - java runtime >= 1.8+
 - processing = 3.0.1+
 - maven = 3.3.3
-- jruby_art = 1.0+
 rubyforge_project: 
 rubygems_version: 2.5.0
 signing_key: