no need for toxiclibs library

Author: monkstone

…y/gem/toxiclibs/library/branch/branch.rb contributed/library/branch/branch.rbexternal_library/gem/toxiclibs/library/branch/branch.rb renamed to contributed/library/branch/branch.rb external_library/gem/toxiclibs/library/branch/branch.rb renamed to contributed/library/branch/branch.rb

@@ -1,9 +1,9 @@
 require 'forwardable'
 
-# Here we use our own Vec2D class, until we create a path as an array of TVec2D
-# toxis Vec2D. Required to use the ToxicLibsSupport lineStrip2D method.
-# further we can and should use power of ruby to make Branch enumerable and
-# Forwardable to define which enumerable methods we want to use
+# Here we use the JRubyArt Vec2D class, and not toxis Vec2D. We avoid using
+# ToxicLibsSupport, by using our own AppRender to translate Vec2D to vertices.
+# Further we use the power of ruby (metaprogramming) to make Branch enumerable
+# and use Forwardable to define which enumerable methods we want to use.
 class Branch
   include Enumerable
   extend Forwardable
@@ -29,7 +29,7 @@ def initialize(app, pos, dir, speed)
     @children = []
     @xbound = Boundary.new(0, app.width)
     @ybound = Boundary.new(0, app.height)
-    path << TVec2D.new(pos.x, pos.y)
+    path << pos
   end
 
   def run
@@ -39,12 +39,12 @@ def run
 
   private
 
-  # Note use of both rotate! (changes original) rotate (returns a copy) of Vec2D
+  # NB: use of both rotate! (changes original) rotate (returns a copy) of Vec2D
   def grow
     check_bounds(position + (dir * speed)) if path.length < MAX_LEN
     @position += (dir * speed)
     dir.rotate!(rand(-0.5..0.5) * THETA)
-    path << TVec2D.new(position.x, position.y)
+    path << position
     if (length < MAX_GEN) && (rand < BRANCH_CHANCE)
       branch_dir = dir.rotate(rand(-0.5..0.5) * BRANCH_THETA)
       self << Branch.new(app, position.copy, branch_dir, speed * 0.99)
@@ -53,7 +53,11 @@ def grow
   end
 
   def display
-    app.gfx.lineStrip2D(path)
+    app.begin_shape
+    app.stroke(255)
+    app.no_fill
+    path.each { |vec| vec.to_vertex(app.renderer) }
+    app.end_shape
     each(&:display)
   end
 
@@ -66,6 +70,6 @@ def check_bounds(pos)
 # we are looking for excluded values
 Boundary = Struct.new(:lower, :upper) do
   def exclude?(val)
-    true unless (lower...upper).cover? val
+    !(lower...upper).cover? val
   end
 end

…ternal_library/gem/toxiclibs/mycelium.rb contributed/mycelium.rbexternal_library/gem/toxiclibs/mycelium.rb renamed to contributed/mycelium.rb external_library/gem/toxiclibs/mycelium.rb renamed to contributed/mycelium.rb

@@ -1,18 +1,14 @@
-require 'toxiclibs'
-
 # Simple recursive branching system inspired by mycelium growth
-#
-# The vanilla processing sketch was part of the SAC 2013 workshop project
-# (c) 2013 Karsten Schmidt
-# LGPLv3 licensed
+# After an original sketch by Karsten Schmidt
+# https://github.com/learn-postspectacular/sac-workshop-2013/blob/master/Mycelium/Mycelium.pde
 # translated to JRubyArt by Martin Prout 2018
 
 load_library :branch
 
-attr_reader :gfx, :root
+attr_reader :renderer, :root
 
 def setup
-  @gfx = Gfx::ToxiclibsSupport.new(self)
+  @renderer = AppRender.new(self)
   @root = Branch.new(
     self,
     Vec2D.new(0, height / 2),
@@ -23,8 +19,6 @@ def setup
 
 def draw
   background(0)
-  stroke(255)
-  no_fill
   root.run
 end