even more data_path stuff

Author: monkstone

external_library/java/hype/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      

external_library/java/hype/h_canvas.rb

@@ -27,7 +27,7 @@ def setup
   sketch_title 'Scanlines GLSL sketch'
   H.init(self)
   H.background(color('#000000'))
-  @my_shader = load_shader('scanlines.glsl')
+  @my_shader = load_shader(data_path('scanlines.glsl'))
   my_shader.set('resolution', 1.0, 1.0)
   my_shader.set('screenres', width.to_f, height.to_f)
   my_shader.set('time', millis / 1000.0)

external_library/java/hype/magnetic_field.rb

@@ -32,7 +32,7 @@ def setup
 
   @pool = HDrawablePool.new(2_500)
   pool.auto_add_to_stage
-      .add(HShape.new('arrow.svg').enable_style(false).anchor_at(H::CENTER))
+      .add(HShape.new(data_path('arrow.svg')).enable_style(false).anchor_at(H::CENTER))
       .layout(Hype::HGridLayout.new.start_x(-60).start_y(-60).spacing(16, 16).cols(50))
       .on_create do |obj|
         obj.no_stroke.anchor(-20, -20)

processing_app/basics/color/reading/reading.rb

@@ -6,7 +6,7 @@ def setup
   sketch_title 'Read Color'
   no_stroke
   background 0
-  c = load_image 'cait.jpg'
+  c = load_image(data_path('cait.jpg'))
   xoff, yoff = 0, 0
   p = 2
   pix = p * 3

processing_app/basics/web/embedded_links.rb

@@ -39,7 +39,7 @@ def check_buttons
   @over_right_button = inside? mouse_x, mouse_y, (105..180), (60..135)
 end
 
-def inside? ( x, y, x_bound, y_bound )
+def inside?(x, y, x_bound, y_bound)
   x_bound.cover?(x) && y_bound.cover?(y)
 end
 

processing_app/library/video/capture/ascii_capture.rb

@@ -20,7 +20,7 @@ def setup
   sketch_title 'Ascii Capture'
   init_video
   @font_size = 1.5
-  @font = load_font('UniversLTStd-Light-48.vlw')
+  @font = load_font(data_path('UniversLTStd-Light-48.vlw'))
   # for the 256 levels of brightness, distribute the letters across
   # the an array of 256 elements to use for the lookup
   @letters = (0...256).map do |i|
@@ -111,4 +111,3 @@ def key_pressed
 def settings
   size(960, 544, P2D)
 end
-

processing_app/library/video/capture/background_subtraction.rb

@@ -76,4 +76,3 @@ def key_pressed
 def settings
   size(960, 544, P2D)
 end
-

processing_app/library/video/capture/black_white_capture.rb

@@ -1,21 +1,16 @@
 # hold down mouse to see unfiltered output
-require_relative 'video_event'
-
-load_libraries :video
-include_package 'processing.video'
-
-include Java::MonkstoneVideoevent::VideoInterface
+load_libraries :video, :video_event
 
 attr_reader :cam, :my_shader
 
 def setup
   sketch_title 'Black & White Capture'
-  @my_shader = load_shader('bwfrag.glsl')
+  @my_shader = load_shader(data_path('bwfrag.glsl'))
   start_capture(width, height)
 end
 
 def start_capture(w, h)
-  @cam = Capture.new(self, w, h)
+  @cam = Java::ProcessingVideo::Capture.new(self, w, h)
   cam.start
 end