update to toxiclibs gem

Author: monkstone

samples/external_library/java_processing/toxiclibs/gray_scott_tone_map.rb

@@ -0,0 +1,30 @@
+### Using Toxiclibs jars in JRubyArt
+
+Here we demonstrate how to use Karsten Schmidts (aka toxi, @postspectacular) toxiclibs jars in ruby-processing. Using the [toxiclibs gem][]...  
+NB: need to use the --nojruby flag when running gray_scott_image.rb (ie use jruby-complete see wiki for why?)
+
+### Web Links
+
+[Post Spectacular Home][]
+
+[Toxiclibs Clone][]
+
+[Toxiclibs Documentation][]
+
+### Licensing
+
+I should be clear that the original toxiclibs is the work of Karsten Schmidt:-
+
+Copyright (c) 2010 Karsten Schmidt
+ 
+This demo & 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.
+
+
+[Post Spectacular Home]:http://postspectacular.com/
+[Toxiclibs Clone]:https://github.com/ruby-processing/toxiclibs
+[Toxiclibs Documentation]:http://toxiclibs.org/
+[toxiclibs gem]:https://github.com/ruby-processing/toxicgem
+

samples/external_library/ruby_gem/toxiclibs/README.md

@@ -1,4 +1,5 @@
-#
+require 'toxiclibs'
+
 # <p>GrayScottImage uses the seedImage() method to use a bitmap as simulation seed.
 # In this demo the image is re-applied every frame and the user can adjust the 
 # F coefficient of the reaction diffusion to produce different patterns emerging
@@ -33,20 +34,12 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-load_libraries 'simutils','toxiclibscore','colorutils'
-
-module Toxi
-  include_package "toxi.sim.grayscott"
-  include_package "toxi.math"
-  include_package "toxi.color"
-end
-
 attr_reader :gs, :tone_map, :img
 
 def setup
-  size 256, 256
-  @gs = Toxi::GrayScott.new width, height, true
-  @img = load_image "ti_yong.png"
+  size(256, 256, P2D)
+  @gs = Simulation::GrayScott.new width, height, true
+  @img = load_image 'ti_yong.png'
   # create a duo-tone gradient map with 256 steps
   # NB: use '::' in place of '.' here for these java constants
   @tone_map = Toxi::ToneMap.new(0,  0.33, Toxi::NamedColor::CRIMSON, Toxi::NamedColor::WHITE, 256)
@@ -59,21 +52,21 @@ def draw
   10.times { @gs.update(1) }
   # read out the V result array
   # and use tone map to render colours
-  gs.v.length.times do |i|
-    pixels[i]=tone_map.getARGBToneFor(gs.v[i])  # NB: don't camel case convert here
+  @gs.v.each_with_index do |v, i|
+    pixels[i] = tone_map.getARGBToneFor(v)  # NB: don't camel case convert here
   end
   update_pixels
 end
 
 def key_pressed
+  control_key = %w(1 2 3 4 5 6 7 8 9)
   case key
-  when '1', '9', '3', '2', '4', '6', '5', '7', '8'
+  when *control_key
     @gs.setF(0.02 + (key.ord - 48) * 0.001)
   when 's'
-    save_frame "toxi.png"
+    save_frame 'toxi.png'
   else
     @gs.reset()
   end
 end
 
-

samples/external_library/java_processing/toxiclibs/data/ti_yong.png renamed to samples/external_library/ruby_gem/toxiclibs/data/ti_yong.png

@@ -0,0 +1,71 @@
+require 'toxiclibs'
+
+#
+# <p>GrayScottToneMap shows how to use the ColorGradient & ToneMap classes of the
+# colorutils package to create a tone map for rendering the results of
+# the Gray-Scott reaction-diffusion.</p>
+#
+# <p><strong>Usage:</strong><ul>
+# <li>click + drag mouse to draw dots used as simulation seed</li>
+# <li>press any key to reset</li>
+# </ul></p>
+#
+# Copyright (c) 2010 Karsten Schmidt, ruby-processing Version (c) 2015 Martin Prout
+
+# This demo & 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
+#
+
+NUM_ITERATIONS = 10  
+attr_reader :gs, :tone_map
+
+def setup 
+  size(256,256, P2D)
+  @gs = Simulation::GrayScott.new width, height, false
+  @gs.set_coefficients 0.021, 0.076, 0.12, 0.06
+  # create a color gradient for 256 values
+  grad = Toxi::ColorGradient.new
+  # NamedColors are preset colors, but any TColor can be added
+  # see javadocs for list of names:
+  # http://toxiclibs.org/docs/colorutils/toxi/color/NamedColor::html
+  # NB: use '::' in place of '.' here for these java constants
+  grad.add_color_at(0, Toxi::NamedColor::BLACK)
+  grad.add_color_at(128, Toxi::NamedColor::RED)
+  grad.add_color_at(192, Toxi::NamedColor::YELLOW)
+  grad.add_color_at(255, Toxi::NamedColor::WHITE)
+  # this gradient is used to map simulation values to colors
+  # the first 2 parameters define the min/max values of the
+  # input range (Gray-Scott produces values in the interval of 0.0 - 0.5)
+  # setting the max = 0.33 increases the contrast
+  @tone_map = Toxi::ToneMap.new 0, 0.33, grad
+end
+
+def draw     
+  @gs.set_rect(mouse_x, mouse_y, 20, 20) if mouse_pressed?
+  load_pixels
+  # update the simulation a few time steps
+  NUM_ITERATIONS.times { @gs.update(1) }
+  # read out the V result array
+  # and use tone map to render colours
+  gs.v.each_with_index do |v, i|
+    pixels[i] = tone_map.getARGBToneFor(v)  # NB: don't camel case convert here
+  end
+  update_pixels
+end
+
+def key_pressed
+  @gs.reset
+end

samples/external_library/java_processing/toxiclibs/gray_scott_image.rb renamed to samples/external_library/ruby_gem/toxiclibs/gray_scott_image.rb

@@ -1,6 +1,6 @@
 
 #
-# This example implements a custom VolumetricSpace using an implicit function
+# This example implements a custom VolumetricSpace uMath.sing an implicit function
 # to calculate each voxel. This is slower than the default array or HashMap
 # based implementations, but also has much less memory requirements and so might
 # be an interesting and more viable approach for very highres voxel spaces
@@ -9,15 +9,15 @@
 # acting as lower threshold when computing the iso surface)
 #
 # Usage:
-# move mouse to rotate camera
-# -/=: zoom in/out
+# drag mouse to rotate camera
+# mouse wheel zoom in/out
 # l: apply laplacian mesh smooth
 # 
 #
 
 # 
-# Copyright (c) 2010 Karsten Schmidt & ruby-processing version Martin Prout 2013
-# This sketch relies on a custom ruby-processing mesh_to_vbo library
+# Copyright (c) 2010 Karsten Schmidt & ruby-procesMath.sing version Martin Prout 2013
+# This sketch relies on a custom ruby-procesMath.sing mesh_to_vbo library
 # 
 # This library is free software you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -36,14 +36,9 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-load_libraries 'toxiclibscore', 'vbo', 'volumeutils'
+require 'toxiclibs'
 
-module Toxi
-  include_package 'toxi.geom'
-  include_package 'toxi.geom.mesh'
-  include_package 'toxi.volume'
-  include_package 'toxi.processing'
-end
+load_library :mesh_to_vbo
 
 RES = 64
 ISO = 0.2
@@ -53,10 +48,11 @@ module Toxi
 
 def setup
   size(720,720, P3D)
+  Processing::ArcBall.init(self)
   @vbo = MeshToVBO.new(self)
   @curr_zoom = 1
-  vol = EvaluatingVolume.new(Toxi::Vec3D.new(400,400,400), RES, RES, RES, MAX_ISO)
-  surface = Toxi::HashIsoSurface.new(vol)
+  vol = EvaluatingVolume.new(TVec3D.new(400,400,400), RES, RES, RES, MAX_ISO)
+  surface = Volume::HashIsoSurface.new(vol)
   @mesh = Toxi::WETriangleMesh.new
   surface.compute_surface_mesh(mesh, ISO)
   @is_wire_frame = false
@@ -72,19 +68,11 @@ def draw
   background(0)
   lights
   define_lights
-  translate(width / 2.0, height / 2.0, 0)
-  rotate_x(mouse_y * -0.01)
-  rotate_y(mouse_x * -0.01)
-  scale(curr_zoom)
   shape(implicit)
 end
 
 def key_pressed
   case key
-  when '-'
-    @curr_zoom -= 0.1
-  when '='
-    @curr_zoom += 0.1
   when 'l', 'L'
     Toxi::LaplacianSmooth.new.filter(mesh, 1)
     @implicit = vbo.meshToVBO(mesh, true)
@@ -105,17 +93,14 @@ def define_lights
   spot_light(30, 30, 30, 0, 40, 200, 0, -0.5, -0.5, PI / 2, 2)
 end
 
-class EvaluatingVolume < Toxi::VolumetricSpace
-  include Processing::Proxy
-  java_import 'toxi.math.SinCosLUT'
+class EvaluatingVolume < Volume::VolumetricSpace
 
   attr_reader :upper_bound, :lut
-  FREQ = PI * 3.8
+  FREQ = Math::PI * 3.8
 
   def initialize(scal_vec, resX, resY, resZ, upper_limit)
     super(scal_vec, resX, resY, resZ)
     @upper_bound = upper_limit
-    @lut=SinCosLUT.new
   end
 
   def clear
@@ -132,8 +117,8 @@ def getVoxel(x, y, z)  # can't overload so we renamed
       xx = x * 1.0 / resX - 0.5  # NB: careful about integer division !!!
       yy = y * 1.0 / resY - 0.5
       zz = z * 1.0 / resZ - 0.5
-      #val = lut.sin(xx * FREQ) + lut.cos(yy * FREQ) + lut.sin(zz * FREQ)
-      val = lut.cos(xx * FREQ) * lut.sin(yy* FREQ) + lut.cos(yy* FREQ) * lut.sin(zz* FREQ) + lut.cos(zz* FREQ)* lut.sin(xx* FREQ)
+      #val = Math.sin(xx * FREQ) + Math.cos(yy * FREQ) + Math.sin(zz * FREQ)
+      val = Math.cos(xx * FREQ) * Math.sin(yy* FREQ) + Math.cos(yy* FREQ) * Math.sin(zz* FREQ) + Math.cos(zz* FREQ)* Math.sin(xx* FREQ)
       if (val > upper_bound)
         val = 0
       end