Change GfxRender and ShapeRender examples

Author: monkstone

contributed/cairo_tiling.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/env jruby
+
+require 'propane'
+
+class CairoTiling < Propane::App
+  ANGLE = PI / 2
+  PTS = [Vec2D.new(-30, 0), Vec2D.new(30, 0), Vec2D.new(45, 45), Vec2D.new(0, 60), Vec2D.new(-45, 45)]
+  S = 15
+  W = 12 * S
+  H = 6 * S
+
+  def settings
+    size(W * 3, H * 6)
+  end
+
+  def setup
+    sketch_title 'Cairo tiling'
+    cols = width + W
+    rows = height + H
+    grid(cols, rows, W, H) do |x, y|
+      (y % W).zero? ? composite_tile(x + W / 2, y, S) : composite_tile(x, y, S)
+    end
+  end
+
+  # An example of GfxRenderer usage for Vec3D => vertex conversion
+  def renderer
+    @renderer ||= Propane::GfxRender.new(self.g)
+  end
+
+  def composite_tile(x, y, s)
+    stroke_weight 2
+    fill(255, 220, 0)
+    pentagon(x, y, s)
+    fill(255, 220, 155)
+    pentagon(x + 6 * s, y, s, r = 1)
+    fill(0, 100, 200)
+    pentagon(x - 6 * s, y, s, r = 3)
+    fill(140, 180, 255)
+    pentagon(x, y, s, r = 2)
+  end
+
+  def pentagon(xo, yo, _s, r = 0)
+    push_matrix
+    translate(xo, yo)
+    rotate(ANGLE * r)
+    begin_shape
+    PTS.map { |vec| vec.to_vertex(renderer) }
+    end_shape
+    pop_matrix
+  end
+end
+
+CairoTiling.new

contributed/ribbon_doodle.rb

@@ -86,7 +86,7 @@ def mouse_moved
 
   # An example of GfxRenderer usage for Vec3D => vertex conversion
   def renderer
-    @renderer ||= Propane::GfxRender.new(self.g)
+    @renderer ||= Propane::GfxRender.new(g)
   end
 end
 

processing_app/basics/input/key_demo.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/env jruby -v -W2
+# frozen_string_literal: true
+require 'propane'
+# Demo of Mouse Button
+class MouseButtonDemo < Propane::App
+  # Click within the image and press
+  # the left and right mouse buttons to
+  # change the value of the rectangle
+
+  def settings
+    size 300, 200
+  end
+
+  def setup
+    sketch_title 'Mouse Button Demo'
+  end
+
+  def draw
+    rect(25, 25, 150, 80)
+  end
+
+  def key_pressed
+    case key
+    when 'c', 'C'
+      fill 0
+    when 'b', 'B'
+      fill 255
+    when 'c', 'C'
+      fill 125
+    else
+      fill 200, 0, 0
+    end
+  end
+end
+
+MouseButtonDemo.new

processing_app/topics/lsystems/david_tour.rb

@@ -58,7 +58,7 @@ def create_grammar(gen)
   def translate_rules(prod)
     swap = false
     [].tap do |points| # An array to store lines as a flat array of points
-      prod.scan(/./) do |ch||
+      prod.scan(/./) do |ch|
         case ch
         when 'F'
           points << xpos << ypos << (@xpos += draw_length * Math.cos(theta)) << (@ypos -= draw_length * Math.sin(theta))

processing_app/topics/lsystems/mpeano.rb

@@ -64,7 +64,7 @@ def generate(gen)
 
   def translate_rules(prod)
     [].tap do |points| # An empty array to store line vertices
-      prod.scan(/./) do |ch||
+      prod.scan(/./) do |ch|
         case ch
         when 'F'
           points << xpos << ypos << (@xpos -= draw_length * cos(theta)) << (@ypos -= draw_length * sin(theta))

processing_app/topics/lsystems/peano.rb

@@ -70,7 +70,7 @@ def translate_rules(prod)
     coss = ->(orig, alpha, len) { orig + len * DegLut.cos(alpha) }
     sinn = ->(orig, alpha, len) { orig - len * DegLut.sin(alpha) }
     [].tap do |pts| # An array to store line vertices as Vec2D
-      prod.scan(/./) do |ch||
+      prod.scan(/./) do |ch|
         case ch
         when 'F'
           pts << vec.copy

processing_app/topics/shaders/glsl_heightmap_noise.rb

@@ -14,12 +14,7 @@
 
 require 'propane'
 
-module Renderer
-  java_import 'monkstone.vecmath.Propane::ShapeRender'
-end
-
 class HeightMap < Propane::App
-  include Renderer
   SHADERS = %w(displaceFrag.glsl displaceVert.glsl).freeze
   SHADER_NAME = %i(frag vert).freeze
   DIM = 300 # the grid dimensions of the heightmap
@@ -106,13 +101,12 @@ def create_plane(xsegs, ysegs)
     tex = images[0]
 
     mesh = create_shape # create the initial PShape
-    renderer = Propane::ShapeRender.new(mesh) # initialize the shape renderer
     mesh.begin_shape(QUADS) # define the PShape type: QUADS
     mesh.no_stroke
     mesh.texture(tex) # set a texture to make a textured PShape
     # put all the vertices, uv texture coordinates and normals into the PShape
     positions.each_with_index do |p, i|
-      p.to_vertex_uv(renderer, tex_coords[i]) # NB: tex_coords as Vec2D
+      p.to_vertex_uv(renderer(mesh), tex_coords[i]) # NB: tex_coords as Vec2D
       # p.to_vertex_uv(renderer, u, v) # u, v as floats is the alternate form
     end
     mesh.end_shape
@@ -128,6 +122,11 @@ def key_released
       puts format('key pressed: %s', key)
     end # cycle through colorMaps (set variable and set colorMap in PShader)
   end
+
+    # An example of GfxRenderer usage for Vec3D => vertex conversion
+  def renderer(shape)
+    @renderer ||= Propane::ShapeRender.new(shape)
+  end
 end
 
-HeightMap.new
+HeightMap.new