use data_path wrapper, mainly shaders

Author: monkstone

processing_app/topics/shaders/blur_filter.rb

@@ -10,7 +10,8 @@
 
 def setup
   sketch_title 'Blur filter'
-  @blur = load_shader('blur.glsl') 
+  @blur = load_shader(data_path('blur.glsl')) 
+  # @blur = load_shader('blur.glsl') 
   stroke(255, 0, 0)
   rectMode(CENTER)
 end

processing_app/topics/shaders/bw_shader.rb

@@ -5,13 +5,13 @@
 
 def setup
   sketch_title 'Bw shader'
-  @label = load_image('lachoy.jpg') # sketch needs --noruby flag to run
+  # @label = load_image('lachoy.jpg') # sketch needs --noruby flag to run
   # @label = load_image((File.absolute_path('data/lachoy.jpg')) # no flag required
-  # @label = load_image((data_path('lachoy.jpg')) # no flag required
+  @label = load_image((data_path('lachoy.jpg')) # no flag required
   @can = create_can(100, 200, 32, label)
-  @bw_shader = load_shader('bwfrag.glsl') # sketch needs --noruby flag to run
+  # @bw_shader = load_shader('bwfrag.glsl') # sketch needs --noruby flag to run
   # @bw_shader = load_shader(File.absolute_path('data/bwfrag.glsl')) # no flag required
-  # @bw_shader = load_shader(data_path('bwfrag.glsl')) # no flag required since jruby_art-1.1
+  @bw_shader = load_shader(data_path('bwfrag.glsl')) # no flag required since jruby_art-1.1
   @angle = 0
 end
 

processing_app/topics/shaders/conway.rb

@@ -8,9 +8,9 @@ def setup
   sketch_title 'Conway'
   @pg = createGraphics(400, 400, P2D)
   pg.no_smooth
-  @conway = load_shader('conway.glsl') # sketch needs --noruby flag to run
+  # @conway = load_shader('conway.glsl') # sketch needs --noruby flag to run
   # @conway = load_shader(File.absolute_path('data/conway.glsl')) # no flag required
-  # @conway = load_shader(data_path('conway.glsl')) # no flag required
+  @conway = load_shader(data_path('conway.glsl')) # no flag required
   conway.set('resolution', width.to_f, height.to_f)
   @time = Time.now
 end

processing_app/topics/shaders/deform.rb

@@ -14,9 +14,10 @@ def setup
   sketch_title 'Deform'
 
   textureWrap(REPEAT)
-  @tex = loadImage('tex1.jpg')
- 
-  @deform = loadShader('deform.glsl')
+  @tex = load_image(data_path('tex1.jpg'))
+  @deform = load_shader(data_path('deform.glsl'))
+  # @tex = loadImage('tex1.jpg')
+  # @deform = loadShader('deform.glsl')
   deform.set('resolution', width.to_f, height.to_f)
 end
 

processing_app/topics/shaders/edge_detect.rb

@@ -11,19 +11,21 @@
 def setup
   sketch_title 'Edge detect'
   @enabled = true
-  @img = load_image('leaves.jpg');      
-  @edges = load_shader('edges.glsl')
+  @img = load_image(data_path('leaves.jpg'))    
+  @edges = load_shader(data_path('edges.glsl'))
+  # @img = load_image('leaves.jpg') # use --noruby flag      
+  # @edges = load_shader('edges.glsl') # use --nojruby flag
 end
 
 def draw
   shader(edges) if enabled
   image(img, 0, 0)
 end
 
-def mousePressed
+def mouse_pressed
   @enabled = !enabled
   if (!enabled == true)
-    resetShader
+    reset_shader
   end
 end
 

processing_app/topics/shaders/glossy_fish_eye.rb

@@ -1,20 +1,20 @@
-#
 # Glossy Fish Eye
-# 
-# A fish-eye shader is used on the main surface and 
-# a glossy specular reflection shader is used on the
-# offscreen canvas. 
 #
+# A fish-eye shader is used on the main surface and
+# a glossy specular reflection shader is used on the
+# offscreen canvas.
 
 attr_reader :ball, :canvas, :glossy, :fisheye, :img, :use_fish_eye
+SHADERS = %w(FishEye.glsl GlossyFrag.glsl GlossyVert.glsl).freeze
 
 def setup
   sketch_title 'Glossy fish eye'
   @canvas = create_graphics(width, height, P3D)
   @use_fish_eye = true
-  @fisheye = load_shader('FishEye.glsl')
+  shaders = SHADERS.map { |shader| data_path(shader) }
+  @fisheye = load_shader(shaders[0])
   fisheye.set('aperture', 180.0)
-  @glossy = load_shader('GlossyFrag.glsl', 'GlossyVert.glsl')  
+  @glossy = load_shader(shaders[1], shaders[2])
   glossy.set('AmbientColour', 0.0, 0.0, 0.0)
   glossy.set('DiffuseColour', 0.9, 0.2, 0.2)
   glossy.set('SpecularColour', 1.0, 1.0, 1.0)
@@ -34,26 +34,26 @@ def draw
   canvas.background(0)
   canvas.push_matrix
   canvas.rotate_y(frame_count * 0.01)
-  canvas.point_light(204, 204, 204, 1000, 1000, 1000)
-  canvas.pop_matrix  
-  (0 ... canvas.width + 100).step(100) do |x|
-    (0 ... canvas.width + 100).step(100) do |y|
-      (0 ... canvas.width + 100).step(100) do |z|
+  canvas.point_light(204, 204, 204, 1_000, 1_000, 1_000)
+  canvas.pop_matrix
+  (0...canvas.width + 100).step(100) do |x|
+    (0...canvas.width + 100).step(100) do |y|
+      (0...canvas.width + 100).step(100) do |z|
         canvas.push_matrix
         canvas.translate(x, y, -z)
         canvas.shape(ball)
         canvas.pop_matrix
       end
     end
   end
-  canvas.end_draw   
-  shader(fisheye) if use_fish_eye  
+  canvas.end_draw
+  shader(fisheye) if use_fish_eye
   image(canvas, 0, 0, width, height)
 end
 
 def mouse_pressed
   @use_fish_eye = !use_fish_eye
-  reset_shader    
+  reset_shader
 end
 
 def settings

processing_app/topics/shaders/glsl_heightmap_noise.rb

@@ -11,7 +11,6 @@
 # Photographs by Folkert Gorter (@folkertgorter / http://superfamous.com/)
 # made available under a CC Attribution 3.0 license.
 #
-
 DIM = 300 # the grid dimensions of the heightmap
 attr_reader :blur_factor # the blur for the displacement map
 attr_reader :resize_factor # the resize factor for the displacement map
@@ -24,18 +23,19 @@
 attr_reader :images # array to hold 2 input images
 attr_reader :color_map # variable to keep track of the current colorMap
 
-
 def setup
-  sketch_title 'Glsl heightmap noise'
+  sketch_title 'Glsl Heightmap Noise'
   @blur_factor = 3
   @resize_factor = 0.25
-  displace_strength = 0.25 # the displace strength of the GLSL shader displacement effect
+  displace_strength = 0.25 # the displace strength of the GLSL shader
   # load the images
   textures = %w(Texture01.jpg Texture02.jpg)
-  @images = textures.map { |texture| load_image(texture) }
+  @images = textures.map { |texture| load_image(data_path(texture)) }
   @color_map = 0
   # load the PShader with a fragment and a vertex shader
-  @displace = load_shader('displaceFrag.glsl', 'displaceVert.glsl')
+  shader_name = %w(displaceFrag.glsl displaceVert.glsl)
+  shaders = shader_name.map { |s| data_path(s) }
+  @displace = load_shader(shaders[0], shaders[1])
   displace.set('displaceStrength', displace_strength) # set the displace_strength
   displace.set('colorMap', images[color_map]) # set the initial colorMap
   # create the heightmap PShape (see custom creation method) and put it in the

processing_app/topics/shaders/image_filtering/Rakefile

@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 --nojruby run #{sample_name}", "r") do |io|
+  open("|k9 run #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      

processing_app/topics/shaders/image_filtering/bicubic.rb

@@ -14,8 +14,10 @@ def setup
     @panel = c
   end
   @hide = false
-  @my_image  = load_image('texture.jpg')
-  @bicubic = load_shader('bicubic.glsl')
+  @my_image  = load_image(data_path('texture.jpg'))
+  @bicubic = load_shader(data_path('bicubic.glsl'))
+  # @my_image  = load_image('texture.jpg')
+  # @bicubic = load_shader('bicubic.glsl')
   bicubic.set('sketchSize', width.to_f, height.to_f)
   sketch_title 'Bicubic'
 end

processing_app/topics/shaders/image_filtering/bilateral.rb

@@ -7,8 +7,10 @@
 attr_reader :apply, :bilateral, :my_image
 
 def setup  
-  @my_image  = load_image('texture.jpg')
-  @bilateral = load_shader('bilateral.glsl')
+  @my_image  = load_image(data_path('texture.jpg'))
+  @bilateral = load_shader(data_path('bilateral.glsl'))
+  # @my_image  = load_image('texture.jpg')
+  # @bilateral = load_shader('bilateral.glsl')
   bilateral.set('sketchSize', width.to_f, height.to_f)
   sketch_title 'Bilateral'
 end