various fixes

Author: monkstone

processing_app/topics/advanced_data/data/data.csv

@@ -1,5 +1,5 @@
 x,y,diameter,name
-160,103,43.19838,Happy
-372,137,52.42526,Sad
-273,235,61.14072,Joyous
-121,179,44.758068,Melancholy
+160.0,103.0,43.19838,Happy
+372.0,137.0,52.42526,Sad
+273.0,235.0,61.14072,Joyous
+121.0,179.0,44.758068,Melancholy

processing_app/topics/advanced_data/load_save_table.rb

@@ -42,7 +42,7 @@ def load_data
   # Load CSV file into an Array of Hash objects
   # headers: option indicates the file has a header row
   @bubbles = BubbleData.new
-  CSV.foreach('data/data.csv', headers: true) do |row|
+  CSV.foreach(data_path('data.csv'), headers: true) do |row|
     x = row['x'].to_f
     y = row['y'].to_f
     d = row['diameter'].to_f
@@ -59,7 +59,7 @@ def mouse_pressed
   # Writing the csv data back to the same file, (also specify UTF-8 format)
   headers = %w(x y diameter name) # create csv headers
   CSV.open(
-    'data/data.csv',
+    data_path('data.csv'),
     'w:UTF-8',
     write_headers: true,
     headers: headers

processing_app/topics/advanced_data/word_frequency.rb

@@ -17,8 +17,8 @@
 #
 load_library 'word'
 
-DRACULA = 'data/dracula.txt'
-FRANKENSTEIN = 'data/frankenstein.txt'
+DRACULA = 'dracula.txt'
+FRANKENSTEIN = 'frankenstein.txt'
 DRAC = Regexp.new(DRACULA)
 FRANK = Regexp.new(FRANKENSTEIN)
 
@@ -29,8 +29,8 @@ def setup
   # Create the HashMap
   @words = {}
   # Load two files
-  load_file(DRACULA)
-  load_file(FRANKENSTEIN)
+  load_file(data_path(DRACULA))
+  load_file(data_path(FRANKENSTEIN))
   # Create the font
   text_font(create_font('Georgia', 24))
 end
@@ -80,4 +80,3 @@ def load_file(filename)
 def settings
   size(640, 360)
 end
-

processing_app/topics/shaders/reaction_diffusion.rb

@@ -6,31 +6,38 @@ def settings
 
 def setup
   @pass = 0
-  @shader_grayscott = load_shader(sketch_path('grayscott2.frag'))
-  @shader_render = load_shader(sketch_path('render2.frag'))
-  @pg_src = create_texture(width, height)
+  @shader_render = load_shader(data_path('render2.frag'))
   @pg_dst = create_texture(width, height)
-  # init
-  pg_src.begin_draw
-  pg_src.background(color(0xFFFF0000))
-  pg_src.fill(color(0x0000FFFF))
-  pg_src.no_stroke
-  pg_src.rect_mode(CENTER)
-  pg_src.rect(width / 2, height / 2, 20, 20)
-  pg_src.end_draw
-  frame_rate(1000)
+  @pg_src = create_texture(width, height).tap do |src|
+    src.begin_draw
+    src.background(color(0xFFFF0000))
+    src.fill(color(0x0000FFFF))
+    src.no_stroke
+    src.rect_mode(CENTER)
+    src.rect(width / 2, height / 2, 20, 20)
+    src.end_draw
+  end
+  @shader_grayscott = load_shader(data_path('grayscott2.frag'))
+  shader_grayscott.set('dA', 1.0)
+  shader_grayscott.set('dB', 0.5)
+  shader_grayscott.set('feed', 0.055)
+  shader_grayscott.set('kill', 0.062)
+  shader_grayscott.set('dt', 1.0)
+  shader_grayscott.set('wh_rcp', 1.0 / width, 1.0 / height)
+  shader_grayscott.set('tex', pg_src)
+  frame_rate(1_000)
 end
 
 def create_texture(w, h)
-  pg = create_graphics(w, h, P2D)
-  pg.smooth(0)
-  pg.begin_draw
-  pg.texture_sampling(2)
-  pg.blend_mode(REPLACE)
-  pg.clear
-  pg.no_stroke
-  pg.end_draw
-  pg
+  create_graphics(w, h, P2D).tap do |pg|
+    pg.smooth(0)
+    pg.begin_draw
+    pg.texture_sampling(2)
+    pg.blend_mode(REPLACE)
+    pg.clear
+    pg.no_stroke
+    pg.end_draw
+  end
 end
 
 def swap
@@ -39,13 +46,6 @@ def swap
 
 def reaction_diffusion_pass
   pg_dst.begin_draw
-  shader_grayscott.set('dA' , 1.0)
-  shader_grayscott.set('dB' , 0.5)
-  shader_grayscott.set('feed' , 0.055)
-  shader_grayscott.set('kill' , 0.062)
-  shader_grayscott.set('dt', 1.0    )
-  shader_grayscott.set('wh_rcp', 1.0 / width, 1.0 / height)
-  shader_grayscott.set('tex', pg_src)
   pg_dst.shader(shader_grayscott)
   pg_dst.rect_mode(CORNER)
   pg_dst.rect(0, 0, width, height)
@@ -56,7 +56,7 @@ def reaction_diffusion_pass
 
 def draw
   # multipass rendering, ping-pong
-  100.times { reaction_diffusion_pass }
+  20.times { reaction_diffusion_pass }
   # display result
   shader_render.set('wh_rcp', 1.0 / width, 1.0 / height)
   shader_render.set('tex', pg_src)

processing_app/topics/shaders/video_filtering/black_white_capture.rb

@@ -4,9 +4,7 @@
 
 def setup
   sketch_title 'Black White Capture'
-  @my_shader = load_shader(data_path('bwfrag.glsl')) # since jruby_art-1.1
-  # @my_shader = load_shader('bwfrag.glsl') # requires --nojruby flag
-  # @my_shader = load_shader(File.absolute_path('data/bwfrag.glsl')) # full path
+  @my_shader = load_shader(data_path('bwfrag.glsl'))
   start_capture(width, height)
 end
 

processing_app/topics/shaders/video_filtering/steinberg.rb

@@ -7,9 +7,7 @@
 
 def setup
   sketch_title 'Steinberg'
-  @my_shader = load_shader(data_path('steinberg.glsl')) # data_path wrapper since jruby_art-1.1
-  # @my_shader = load_shader(File.absolute_path('data/steinberg.glsl')) # provide absolute data path
-  # @my_shader = load_shader('steinberg.glsl') # requires --nojruby flag
+  @my_shader = load_shader(data_path('steinberg.glsl'))
   my_shader.set('sketchSize', width.to_java(Java::float), height.to_java(Java::float))
   start_capture(width, height)
 end