AppRender => GfxRender

monkstone · monkstone · commit 536f1e9d4436 · 2019-03-13T07:01:09.000Z
diff --git a/contributed/elegant_ball.rb b/contributed/elegant_ball.rb
@@ -32,7 +32,7 @@ def draw
 end
 
 def renderer
-  @renderer ||= AppRender.new(self)
+  @renderer ||= GfxRender.new(self.g)
 end
 
 def setup_lights
diff --git a/contributed/library/branch/branch.rb b/contributed/library/branch/branch.rb
@@ -1,7 +1,7 @@
 require 'forwardable'
 
 # 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.
+# ToxicLibsSupport, by using our own GfxRender 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
diff --git a/contributed/mycelium.rb b/contributed/mycelium.rb
@@ -8,7 +8,7 @@
 attr_reader :renderer, :root
 
 def setup
-  @renderer = AppRender.new(self)
+  @renderer = GfxRender.new(self.g)
   @root = Branch.new(
     self,
     Vec2D.new(0, height / 2),
diff --git a/contributed/mycelium_box.rb b/contributed/mycelium_box.rb
@@ -5,12 +5,12 @@
 
 load_library :branch3D
 
-attr_reader :renderer, :root
+attr_reader :root, :renderer
 
 def setup
   sketch_title 'Mycelium Box'
   ArcBall.init self
-  @renderer = AppRender.new(self)
+  @renderer = GfxRender.new(self.g)
   @root = Branch.new(
     self,
     Vec3D.new(0, 10, 10),
diff --git a/contributed/recursive_pentagon.rb b/contributed/recursive_pentagon.rb
@@ -6,8 +6,8 @@
 def setup
   sketch_title 'Recursive Pentagons'
   @strut_factor = 0.2
-  @renderer = AppRender.new self # so we can send Vec2D :to_vertex
-  group = ColorGroup.from_web_array(PALETTE.to_java(:string))
+  @renderer = GfxRender.new self.g # so we can send Vec2D :to_vertex
+  group = ColorGroup.from_web_array(PALETTE)
   @cols = group.colors
   background(cols.last)
   no_loop
diff --git a/contributed/ribbon_doodle.rb b/contributed/ribbon_doodle.rb
@@ -81,5 +81,5 @@ def mouse_moved
 end
 
 def renderer
-  @renderer ||= AppRender.new(self)
+  @renderer ||= GfxRender.new(self.g)
 end
diff --git a/examples/grid_method/generative_arrow_rotate.rb b/examples/grid_method/generative_arrow_rotate.rb
@@ -2,10 +2,17 @@
 #  Example of using noise to rotate a grid of arrows
 #
 load_library :pdf
-attr_reader :version, :time_seed, :save_one_frame, :arrow
+attr_reader :version, :time_seed, :save_one_frame, :arrow, :renderer
 STEP = 40
 POINTS = [
-  [0, -55], [6, 0], [16, 10], [2, 10], [0, -10], [-2, 10], [-16, 10], [-6, 0]
+  Vec2D.new(0, -55),
+  Vec2D.new(6, 0),
+  Vec2D.new(16, 10),
+  Vec2D.new(2, 10),
+  Vec2D.new(0, -10),
+  Vec2D.new(-2, 10),
+  Vec2D.new(-16, 10),
+  Vec2D.new(-6, 0)
 ].freeze
 
 def setup
@@ -45,11 +52,12 @@ def mouse_pressed
 
 def create_arrow # custom shape for our arrow
   @arrow = create_shape
+  @renderer ||= ShapeRender.new(arrow)
   arrow.begin_shape
   arrow.fill(200, 0, 0)
   arrow.no_stroke
   arrow.stroke_weight(2)
-  POINTS.each { |pt| arrow.vertex(*pt) }
+  POINTS.each { |pt| pt.to_vertex(renderer) }
   arrow.end_shape(CLOSE)
 end
 
diff --git a/external_library/gem/mdarray/frame_of_reference.rb b/external_library/gem/mdarray/frame_of_reference.rb
@@ -109,5 +109,5 @@ def draw
 end
 
 def renderer
-  @renderer ||= AppRender.new(self)
+  @renderer ||= GfxRender.new(self.g)
 end
diff --git a/processing_app/basics/form/shape_transform.rb b/processing_app/basics/form/shape_transform.rb
@@ -13,7 +13,7 @@
 
 def setup
   sketch_title 'Shape Transform'
-  @renderer = AppRender.new(self)
+  @renderer = GfxRender.new(self.g)
   no_stroke
   @angle_inc = PI / 300
   @pts = 4
diff --git a/processing_app/basics/form/toroid.rb b/processing_app/basics/form/toroid.rb
@@ -106,5 +106,5 @@ def settings
 end
 
 def renderer
-  @renderer ||= AppRender.new(self)
+  @renderer ||= GfxRender.new(self.g)
 end
diff --git a/processing_app/basics/input/bounding_box.rb b/processing_app/basics/input/bounding_box.rb
@@ -14,7 +14,7 @@ def setup
   @bounds = AaBb.new(
     center: Vec2D.new(width / 2, height / 2),
     extent: Vec2D.new(width - BLOCK_WIDTH, height - BLOCK_WIDTH))
-  @renderer = AppRender.new(self)
+  @renderer = GfxRender.new(self.g)
 end
 
 def draw
diff --git a/processing_app/basics/modules/module_two.rb b/processing_app/basics/modules/module_two.rb
@@ -26,7 +26,7 @@ def one_of_each(&block)
 
 def setup 
   sketch_title 'Module Two'
-  @renderer = AppRender.new(self)
+  @renderer = GfxRender.new(self.g)
   frame_rate 30 
   reset_scene
 end
diff --git a/processing_app/library/vecmath/vec2d/aabb_test.rb b/processing_app/library/vecmath/vec2d/aabb_test.rb
@@ -35,7 +35,7 @@ def draw
 end
 
 def renderer
-  @renderer ||= AppRender.new(self)
+  @renderer ||= GfxRender.new(self.g)
 end
 
 def block_locked?
diff --git a/processing_app/library/vecmath/vec2d/basic_circumcircle_sketch.rb b/processing_app/library/vecmath/vec2d/basic_circumcircle_sketch.rb
@@ -30,7 +30,7 @@ def setup
   @pnt = Vec2D.new
   @points = SimplePoints.new
   ellipse_mode RADIUS
-  @renderer = AppRender.new(self)
+  @renderer = GfxRender.new(self.g)
 end
 
 def draw
diff --git a/processing_app/library/vecmath/vec2d/circumcircle_sketch.rb b/processing_app/library/vecmath/vec2d/circumcircle_sketch.rb
@@ -34,7 +34,7 @@ def setup
   @font = create_font('Arial', 16, true)
   @points = TPoints.new
   ellipse_mode RADIUS
-  @renderer = AppRender.new(self)
+  @renderer = GfxRender.new(self.g)
 end
 
 def draw
diff --git a/processing_app/library/vecmath/vec2d/circumcircle_sketch2.rb b/processing_app/library/vecmath/vec2d/circumcircle_sketch2.rb
@@ -35,7 +35,7 @@ def setup
   @font = create_font('Arial', 16, true)
   @points = TPoints.new
   ellipse_mode RADIUS
-  @renderer = AppRender.new(self)
+  @renderer = GfxRender.new(self.g)
 end
 
 def draw
diff --git a/processing_app/library/vecmath/vec2d/morph.rb b/processing_app/library/vecmath/vec2d/morph.rb
@@ -73,7 +73,7 @@ def draw
 end
 
 def renderer
-  @renderer = AppRender.new(self)
+  @renderer = GfxRender.new(self.g)
 end
 
 def settings
diff --git a/processing_app/library/vecmath/vec2d/soft_body.rb b/processing_app/library/vecmath/vec2d/soft_body.rb
@@ -36,7 +36,7 @@ def draw
 end
 
 def renderer
-  @renderer ||= AppRender.new(self)
+  @renderer ||= GfxRender.new(self.g)
 end
 
 def draw_shape
diff --git a/processing_app/library/vecmath/vec3d/drawolver.rb b/processing_app/library/vecmath/vec3d/drawolver.rb
@@ -43,7 +43,7 @@ def draw
 end
 
 def renderer
-  @renderer ||= AppRender.new(self)
+  @renderer ||= GfxRender.new(self.g)
 end
 
 def reset_scene
diff --git a/processing_app/library/vecmath/vec3d/frame_of_reference.rb b/processing_app/library/vecmath/vec3d/frame_of_reference.rb
@@ -108,5 +108,5 @@ def draw
 end
 
 def renderer
-  @renderer ||= AppRender.new(self)
+  @renderer ||= GfxRender.new(self.g)
 end
diff --git a/processing_app/library/vecmath/vec3d/terrain.rb b/processing_app/library/vecmath/vec3d/terrain.rb
@@ -51,5 +51,5 @@ def hash_key(x, y)
 end
 
 def renderer
-  @renderer ||= AppRender.new(self)
+  @renderer ||= GfxRender.new(self.g)
 end
diff --git a/processing_app/topics/lsystems/doily.rb b/processing_app/topics/lsystems/doily.rb
@@ -76,7 +76,7 @@ def render(points)
 end
 
 def renderer
-  @renderer ||= AppRender.new(self)
+  @renderer ||= GfxRender.new(self.g)
 end
 
 def settings
diff --git a/processing_app/topics/lsystems/moore_curve.rb b/processing_app/topics/lsystems/moore_curve.rb
@@ -74,7 +74,7 @@ def render(points)
 end
 
 def renderer
-  @renderer ||= AppRender.new(self)
+  @renderer ||= GfxRender.new(self.g)
 end
 
 def settings
diff --git a/processing_app/topics/lsystems/peano.rb b/processing_app/topics/lsystems/peano.rb
@@ -80,7 +80,7 @@ def render(points)
 end
 
 def renderer
-  @renderer ||= AppRender.new(self)
+  @renderer ||= GfxRender.new(self.g)
 end
 
 def settings
