toxiclibs 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb631f45b5fb8df9acc6abbb1c03ddd8427c71d541601955b098934b6c9bff72
-  data.tar.gz: 23a64c5c0038efed7f914485f36277feedcbbc3871d6ea965afcee046228fedc
+  metadata.gz: 946268fb6e50b2556be590d1cf0b733f3915e31c98b19e436ec50bd872006a41
+  data.tar.gz: '09522b131b7f1b8047dce50b62e39f8b7795383c028155e0d7236ef4baeb419c'
 SHA512:
-  metadata.gz: 21c40b1481a4f4265f63d3d06a04c62230f1cb78d909f8a296d5c8b21cc47cbc82b4db3b8c73789eb861b63854ccacb83704fada053702ae7b83c9f17f278ab6
-  data.tar.gz: 8eb685db0276ca3b84b76c05e887ca65e50011057e35de55b2a65ae7061146535586ebfdebd185a4cfc51767fa93ee6a1a6afb5fc01645840b186f8f64717298
+  metadata.gz: c86c4b5dd436f79bed4d9ba21ca7c2f14e822e13a7eeeabdab677b0b93f67ce8d4b3da915632a9cafa29fddb0720be53f5c19ff253bbcbce55b6ca9b4b0bc94f
+  data.tar.gz: 13a197bc603117f7a863b2d32d658aae44d23080f5b4cd1fddd490706ec66739c91ad57efa87020f00546ff55431423482376b658fff905eac713913b9533152

data/.mvn/extensions.xml

@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.2.1</version>
+    <version>0.4.0</version>
   </extension>
 </extensions>

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 sudo: false
 
-rvm: 
-  - jruby-9.1.6.0
+rvm:
+  - jruby-9.2.8.0
 jdk:
-  - oraclejdk8
+  - openjdk11
 os:
   - linux
-

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+**v2.0.0** Bump to target minimum of jdk11 thus removing JAXB annotations (possibly esoteric and underused anyway).
+
+**v1.0.1** Bump processing to 3.4, support toxiclibs Voronoi etc
 
 **v1.0.0** About time we got to 1.0.0 bump processing to 3.3.4
 

data/README.md

@@ -8,7 +8,7 @@
 gem install toxiclibs
 ```
 
-### NB: Use version 0.4 for ruby-processing, and 1.0.0 for propane and JRubyArt
+### NB: Use version 0.4 for ruby-processing, and 1.0.0+ for propane and JRubyArt
 
 NB: Build is only failing because current version of processing is not available at maven central.
 This gem provides Karsten Schmidts (aka toxi, @postspectacular) toxiclibs jars for 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][] has not yet been released (although [Dan Shiffman][] has released a version for processing-3.0+). 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).
@@ -27,7 +27,7 @@ This gem provides Karsten Schmidts (aka toxi, @postspectacular) toxiclibs jars f
 
 ### Licensing
 
-I should be clear that the original toxiclibs is the work of Karsten Schmidt see [Copyright][]
+It should be clear that the original toxiclibs is the work of Karsten Schmidt see [Copyright][]
 
 This demo & library is free software you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

data/Rakefile

@@ -24,7 +24,6 @@ end
 desc 'Compile'
 task :compile do
   sh "mvn package"
-  sh "mvn dependency:copy"
   sh "mv target/toxiclibs.jar lib"
 end
 

data/examples/attract_repel/attractor.rb

@@ -10,7 +10,7 @@ class Attractor < Physics::VerletParticle2D
 
   def initialize(loc)
     super(loc)
-    @app = $app
+    @app = Processing.app
     @r = 24
     physics.add_particle(self)
     physics.add_behavior(Physics::AttractionBehavior2D.new(self, width, 0.1))

data/examples/attract_repel/particle.rb

@@ -12,7 +12,7 @@ class Particle < Physics::VerletParticle2D
 
   def initialize(loc)
     super(loc)
-    @app = $app
+    @app = Processing.app
     @r = 8
     physics.add_particle(self)
     physics.add_behavior(Physics::AttractionBehavior2D.new(self, r * 4, -1))

data/examples/boolean_shapes.rb

@@ -1,17 +1,22 @@
 require 'toxiclibs'
+# Original toxi example had ellipse and circle but there were flaws in union and
+# and XOR rendering caused by ellipse shapes
 load_library :control_panel
 attr_reader :gfx, :bool, :panel, :type, :hide, :polies
 include Toxi
 
-TYPE = [BooleanShapeBuilder::Type::UNION, BooleanShapeBuilder::Type::XOR]
+TYPE = [
+  BooleanShapeBuilder::Type::UNION,
+  BooleanShapeBuilder::Type::XOR
+]
 KEY = %w(union xor).freeze
 
 def setup
   sketch_title 'Boolean Shapes'
-  @gfx = Gfx::ToxiclibsSupport.new(self)
+  @gfx = Gfx::ToxiclibsSupport.new(self, self.g)
   @bool = KEY.zip(TYPE).to_h
   control_panel do |c|
-    c.title = 'Control Panel'
+    c.title = 'Union or XOR'
     c.menu :type, KEY, 'union'
     @panel = c
   end
@@ -26,8 +31,7 @@ def draw
   background(160)
   builder = BooleanShapeBuilder.new(bool[type])
   phi = frame_count * 0.01
-  builder.add_shape(Circle.new(mouse_x, mouse_y, 50))
-  builder.add_shape(Ellipse.new(150, 130 + sin(phi) * 50, 120, 60))
+  builder.add_shape(Circle.new(mouse_x, mouse_y, 70).toPolygon2D(30))
   builder.add_shape(Rect.new(200 + sin(phi * 13 / 8) * 50, 180, 100, 100))
   builder.add_shape(Triangle2D.create_equilateral_from(
     TVec2D.new(50 + sin(phi * 15 / 13) * 50, 200), TVec2D.new(300, 200))

data/examples/force_directed/node.rb

@@ -13,7 +13,7 @@ class Node < Physics::VerletParticle2D
   def_delegators(:@app, :fill, :stroke, :stroke_weight, :ellipse)
   def initialize(pos)
     super(pos)
-    @app = $app
+    @app = Processing.app
   end
 
   # All we're doing really is adding a display function to a VerletParticle

data/examples/inflate_mesh.rb

@@ -28,7 +28,7 @@ end
 
 def setup
   sketch_title 'Inflate Mesh'
-  Processing::ArcBall.init(self)
+  ArcBall.init(self)
   @gfx = Gfx::ToxiclibsSupport.new(self)
   init_physics
 end

data/examples/model_align.rb

@@ -16,7 +16,7 @@ end
 
 def setup
   sketch_title 'Model Align'
-  Processing::ArcBall.init(self)
+  ArcBall.init(self)
   @gfx = Gfx::ToxiclibsSupport.new(self)
   # compute mesh positions on circle in XZ plane
   @positions = (Toxi::Circle.new(200).toPolygon2D(8)).map(&:to3DXZ)

data/examples/physics_type.rb

@@ -1,4 +1,4 @@
-load_library :geomerative
+require 'geomerative'
 require 'toxiclibs'
 include_package 'geomerative'
 attr_reader :font, :input, :physics

data/examples/povmesh/ftest.rb

@@ -48,12 +48,12 @@ def key_pressed
   when 'p', 'P'
     fileID = 'FTest'
     pm = Gfx::POVMesh.new(self)
-    file = java.io.File.new(sketch_path(fileID + '.inc'))
+    file = java.io.File.new(data_path(fileID + '.inc'))
     pm.begin_save(file)
     pm.set_texture(Gfx::Textures::CHROME)
     pm.saveAsPOV(mesh0.faceOutwards, false)
-    pm.end_save 
+    pm.end_save
   when 's', 'S'
     save_frame(data_path('FTest.png'))
   end
-end
+end

data/examples/toxiclibs_color_theme.rb

@@ -0,0 +1,91 @@
+
+require 'toxiclibs'
+
+SWATCH_HEIGHT = 40.0
+SWATCH_WIDTH = 5.0
+SWATCH_GAP = 1
+
+MAX_SIZE = 150.0
+NUM_DISCS = 300
+attr_reader :show_discs
+
+def settings
+  size(1024, 768)
+  # smooth
+end
+
+def setup
+  sketch_title 'Color Theme'
+  @show_discs = true
+  noise_detail(2)
+  no_loop
+end
+
+def draw
+  # first define our new theme
+  t = Toxi::ColorTheme.new('test')
+  # add different color options, each with their own weight
+  t.add_range('soft ivory', 0.5)
+  t.add_range('intense goldenrod', 0.25)
+  t.add_range('warm saddlebrown', 0.15)
+  t.add_range('fresh teal', 0.05)
+  t.add_range('bright yellowgreen', 0.05)
+  # now add another rand hue which is using only bright shades
+  t.add_range(Toxi::ColorRange::BRIGHT, TColor.new_random, rand(0.02..0.05))
+  # use the TColor theme to create a list of 160 Colors
+  list = t.get_colors(160)
+  if show_discs
+    background(list.get_lightest.toARGB)
+    discs(list)
+  else
+    background(0)
+    yoff = 32
+    list.sort_by_distance(false)
+    swatches(list, 32, yoff)
+    yoff += SWATCH_HEIGHT + 10
+    list.sort_by_criteria(Toxi::AccessCriteria::LUMINANCE, false)
+    swatches(list, 32, yoff)
+    yoff += SWATCH_HEIGHT + 10
+    list.sort_by_criteria(Toxi::AccessCriteria::BRIGHTNESS, false)
+    swatches(list, 32, yoff)
+    yoff += SWATCH_HEIGHT + 10
+    list.sort_by_criteria(Toxi::AccessCriteria::SATURATION, false)
+    swatches(list, 32, yoff)
+    yoff += SWATCH_HEIGHT + 10
+    list.sort_by_criteria(Toxi::AccessCriteria::HUE, false)
+    swatches(list, 32, yoff)
+    yoff += SWATCH_HEIGHT + 10
+    list.sort_by_proximity_to(Toxi::NamedColor::WHITE, RGBDistanceProxy.new, false)
+    swatches(list, 32, yoff)
+  end
+  # save_frame(format('theme-%s%s', timestamp, '_##.png'))
+end
+
+def timestamp
+  Time.now.strftime('%Y%d%m_%H%M%S')
+end
+
+def key_pressed
+  @show_discs = !show_discs if key == ' '
+  redraw
+end
+
+def swatches(sorted, x, y)
+  no_stroke
+  colors = sorted.toARGBArray.to_a
+  colors.each do |c|
+    fill(c)
+    rect(x, y, SWATCH_WIDTH, SWATCH_HEIGHT)
+    x += SWATCH_WIDTH + SWATCH_GAP
+  end
+end
+
+def discs(list)
+  no_stroke
+  colors = list.toARGBArray.to_a
+  colors.shuffle.each do |c|
+    fill(c, rand(125.0..255)) # random transparency
+    r = rand(MAX_SIZE)
+    ellipse(rand(width), rand(height), r, r)
+  end
+end

data/lib/toxiclibs.rb

@@ -8,22 +8,22 @@ if RUBY_PLATFORM == 'java'
   module Simulation
     include_package 'toxi.sim.automata'
     include_package 'toxi.sim.dla'
-    erosion = %w(ErosionFunction TalusAngleErosion ThermalErosion)
+    erosion = %w[ErosionFunction TalusAngleErosion ThermalErosion]
     erosion_format = 'toxi.sim.erosion.%s'
     import_class_list(erosion, erosion_format)
-    fluids = %w(FluidSolver2D FluidSolver3D)
+    fluids = %w[FluidSolver2D FluidSolver3D]
     fluids_format = 'toxi.sim.fluids.%s'
     import_class_list(fluids, fluids_format)
     java_import 'toxi.sim.grayscott.GrayScott'
   end
 
   module Physics
-    behavior2d = %w(AttractionBehavior2D ConstantForceBehavior2D GravityBehavior2D ParticleBehavior2D)
+    behavior2d = %w[AttractionBehavior2D ConstantForceBehavior2D GravityBehavior2D ParticleBehavior2D]
     behavior2d_format = 'toxi.physics2d.behaviors.%s'
     import_class_list(behavior2d, behavior2d_format)
     include_package 'toxi.physics2d.constraints'
     include_package 'toxi.physics2d'
-    behavior3d = %w(AttractionBehavior3D ConstantForceBehavior3D GravityBehavior3D ParticleBehavior3D)
+    behavior3d = %w[AttractionBehavior3D ConstantForceBehavior3D GravityBehavior3D ParticleBehavior3D]
     behavior3d_format = 'toxi.physics3d.behaviors.%s'
     import_class_list(behavior3d, behavior3d_format)
     include_package 'toxi.physics3d.constraints'
@@ -39,40 +39,51 @@ if RUBY_PLATFORM == 'java'
     include_package 'toxi.color.theory'
     include_package 'toxi.util.datatypes'
     java_import 'toxi.util.events.EventDispatcher'
-    utils = %w{DateUtils FileSequenceDescriptor FileUtils}
+    utils = %w[DateUtils FileSequenceDescriptor FileUtils]
     utils_format = 'toxi.util.%s'
     import_class_list(utils, utils_format)
-    subdiv = %w(CentroidSubdiv DisplacementSubdivision DualDisplacementSubdivision
-                DualSubdivision EdgeLengthComparator FaceCountComparator
-                MidpointDisplacementSubdivision MidpointSubdiv MidpointSubdivision
-                NewSubdivStrategy NormalDisplacementSubdivision SubdivisionStrategy
-                TriSubdivision)
+    subdiv = %w[
+      CentroidSubdiv DisplacementSubdivision DualDisplacementSubdivision
+      DualSubdivision EdgeLengthComparator FaceCountComparator
+      MidpointDisplacementSubdivision MidpointSubdiv MidpointSubdivision
+      NewSubdivStrategy NormalDisplacementSubdivision SubdivisionStrategy
+      TriSubdivision
+    ]
     subdiv_format = 'toxi.geom.mesh.subdiv.%s'
     import_class_list(subdiv, subdiv_format)
-    nurbs = %w(BasicNurbsCurve BasicNurbsSurface ControlNet CurveCreator CurveUtils
-               InterpolationException KnotVector NurbsCreator NurbsCurve NurbsMeshCreator
-               NurbsSurface)
+    nurbs = %w[
+      BasicNurbsCurve BasicNurbsSurface ControlNet CurveCreator CurveUtils
+      InterpolationException KnotVector NurbsCreator NurbsCurve NurbsMeshCreator
+      NurbsSurface
+    ]
     nurbs_format = 'toxi.geom.nurbs.%s'
     import_class_list(nurbs, nurbs_format)
     include_package 'toxi.math'
-    noise = %w(SimplexNoise PerlinNoise)
+    noise = %w[SimplexNoise PerlinNoise]
     noise_format = 'toxi.math.noise.%s'
     import_class_list(noise, noise_format)
-    geom = %w(AABB Axis3D AxisAlignedCylinder BernsteinPolynomial BezierCurve2D
-              BezierCurve3D BooleanShapeBuilder BoxIntersector Circle CircleIntersector
-              Cone ConvexPolygonClipper CoordinateExtractor Ellipse GMatrix GVector
-              GlobalGridTesselator GridTesselator Intersector2D Intersector3D IsectData2D
-              IsectData3D Line2D Line3D LineStrip2D LineStrip3D LocalGridTesselator Matrix3d
-              Matrix4f Matrix4x4 MatrixSizeException OctreeVisitor Origin3D Plane
-              PlaneIntersector PointCloud3D PointOctree PointQuadtree Polygon2D
-              PolygonClipper2D PolygonTesselator QuadtreeVisitor Quaternion Ray2D Ray3D
-              Ray3DIntersector ReadonlyVec2D ReadonlyVec3D ReadonlyVec4D Rect Reflector3D
-              Shape2D Shape3D SingularMatrixException SpatialBins SpatialIndex Sphere
-              SphereIntersectorReflector Spline2D Spline3D SutherlandHodgemanClipper
-              Triangle2D Triangle3D TriangleIntersector Vec2D Vec3D Vec4D VecMathUtil
-              XAxisCylinder YAxisCylinder ZAxisCylinder)
+    geom = %w[
+      AABB Axis3D AxisAlignedCylinder BernsteinPolynomial BezierCurve2D
+      BezierCurve3D BooleanShapeBuilder BoxIntersector Circle CircleIntersector
+      Cone ConvexPolygonClipper CoordinateExtractor Ellipse GMatrix GVector
+      GlobalGridTesselator GridTesselator Intersector2D Intersector3D IsectData2D
+      IsectData3D Line2D Line3D LineStrip2D LineStrip3D LocalGridTesselator Matrix3d
+      Matrix4f Matrix4x4 MatrixSizeException OctreeVisitor Origin3D Plane
+      PlaneIntersector PointCloud3D PointOctree PointQuadtree Polygon2D
+      PolygonClipper2D PolygonTesselator QuadtreeVisitor Quaternion Ray2D Ray3D
+      Ray3DIntersector ReadonlyVec2D ReadonlyVec3D ReadonlyVec4D Rect Reflector3D
+      Shape2D Shape3D SingularMatrixException SpatialBins SpatialIndex Sphere
+      SphereIntersectorReflector Spline2D Spline3D SutherlandHodgemanClipper
+      Triangle2D Triangle3D TriangleIntersector Vec2D Vec3D Vec4D VecMathUtil
+      XAxisCylinder YAxisCylinder ZAxisCylinder
+    ]
     geom_format = 'toxi.geom.%s'
     import_class_list(geom, geom_format)
+    geom_mesh2d = %w[
+      DelaunayTriangle DelaunayVertex DelaunayTriangulation Voronoi
+    ]
+    geom_mesh2d_format = 'toxi.geom.mesh2d.%s'
+    import_class_list(geom_mesh2d, geom_mesh2d_format)
   end
 
   module Gfx
@@ -85,18 +96,22 @@ if RUBY_PLATFORM == 'java'
   AABB = Toxi::AABB
   # alias Toxi::TColor
   TColor = Toxi::TColor
-  volume = %w(AdditiveBrush ArrayIsoSurface BoxBrush BrushMode HashIsoSurface
-              IsoSurface MarchingCubesIndex MeshLatticeBuilder MeshVoxelizer
-              MultiplyBrush PeakBrush ReplaceBrush RoundBrush VolumetricBrush
-              VolumetricHashMap VolumetricSpace VolumetricSpaceArray)
+  volume = %w[
+    AdditiveBrush ArrayIsoSurface BoxBrush BrushMode HashIsoSurface
+    IsoSurface MarchingCubesIndex MeshLatticeBuilder MeshVoxelizer
+    MultiplyBrush PeakBrush ReplaceBrush RoundBrush VolumetricBrush
+    VolumetricHashMap VolumetricSpace VolumetricSpaceArray
+  ]
   volume_format = 'toxi.volume.%s'
   import_class_list(volume, volume_format)
-  mesh = %w(BezierPatch BoxSelector DefaultSTLColorModel DefaultSelector Face
-            LaplacianSmooth MaterialiseSTLColorModel Mesh3D MeshIntersector OBJWriter
-            PLYWriter PlaneSelector STLColorModel STLReader STLWriter SphereFunction
-            SphericalHarmonics SuperEllipsoid SurfaceFunction SurfaceMeshBuilder
-            Terrain TriangleMesh Vertex VertexSelector WEFace WEMeshFilterStrategy
-            WETriangleMesh WEVertex WingedEdge)
+  mesh = %w[
+    BezierPatch BoxSelector DefaultSTLColorModel DefaultSelector Face
+    LaplacianSmooth MaterialiseSTLColorModel Mesh3D MeshIntersector OBJWriter
+    PLYWriter PlaneSelector STLColorModel STLReader STLWriter SphereFunction
+    SphericalHarmonics SuperEllipsoid SurfaceFunction SurfaceMeshBuilder
+    Terrain TriangleMesh Vertex VertexSelector WEFace WEMeshFilterStrategy
+    WETriangleMesh WEVertex WingedEdge
+  ]
   mesh_format = 'toxi.geom.mesh.%s'
   import_class_list(mesh, mesh_format)
 end

data/lib/toxiclibs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # wrapper to give version a meaningful name
 module Toxiclibs
-  VERSION = '1.0.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/pom.rb

@@ -1,57 +1,53 @@
 project 'toxiclibs' do
 
   model_version '4.0.0'
-  id 'ruby-processing:toxiclibs:1.0.0'
+  id 'ruby-processing:toxiclibs:2.0.0'
   packaging 'jar'
 
   description 'toxiclibs-library for JRubyArt'
 
-  organization 'ruby-processing', 'https://ruby-processing.github.io'
-
   developer 'monkstone' do
     name 'Martin Prout'
     email 'mamba2928@yahoo.co.uk'
     roles 'developer'
   end
 
-  license 'LGPL 2', 'http://www.gnu.org/licenses/lgpl-2.1-standalone.html'
-
   issue_management 'https://github.com/ruby-processing/toxiclibs/issues', 'Github'
 
   source_control( :url => 'https://github.com/ruby-processing/toxiclibs',
                   :connection => 'scm:git:git://github.com/ruby-processing/toxiclibs.git',
                   :developer_connection => 'scm:git:git@github.com:ruby-processing/toxiclibs.git' )
 
-  properties( 'maven.compiler.source' => '1.8',
+  properties( 'source.directory' => 'src',
+              'polyglot.dump.pom' => 'pom.xml',
               'project.build.sourceEncoding' => 'UTF-8',
-              'maven.compiler.target' => '1.8',
+              'target.release' => '11',
               'polyglot.dump.pom' => 'pom.xml'
             )
 
-  jar 'args4j:args4j:2.0.31'
-  jar 'org.processing:core:3.3.6'
-
-  plugin( :compiler, '3.7.0',
-          'source' =>  '1.8',
-          'target' =>  '1.8' )
-  plugin( :jar, '3.0.2',
-          'archive' => {
-            'manifestFile' =>  'MANIFEST.MF'
-          } )
-  plugin :resources, '3.0.2'
-  plugin :dependency, '3.0.2' do
-    execute_goals( :id => 'default-cli',
-                   'artifactItems' => [ { 'groupId' =>  'args4j',
-                                          'artifactId' =>  'args4j',
-                                          'version' =>  '2.0.31',
-                                          'type' =>  'jar',
-                                          'outputDirectory' =>  'lib' } ] )
+  jar 'org.processing:core:3.3.7'
+
+  overrides do
+    plugin( :compiler, '3.8.1',
+            'release' =>  '11' )
+    plugin :javadoc, '2.10.4'
+    plugin(
+      :jar, '3.2.0',
+      'archive' => {
+        'manifestFile' =>  'MANIFEST.MF'
+      }
+    )
+    plugin :jdeps, '3.1.2' do
+      execute_goals 'jdkinternals', 'test-jdkinternals'
+    end
+
   end
 
 
   build do
     default_goal 'package'
-    source_directory 'src'
+    source_directory '${source.directory}/main/java'
     final_name 'toxiclibs'
   end
+
 end