soby 0.1.1.1 → 0.1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e7385d5735df3f2e46baf9ff541a3d9a4680dd
-  data.tar.gz: 0be5f95f21b0380aeb6beb56267bcd1c15982dd0
+  metadata.gz: 848e3ae068e46b6a989ffe10d023ccafe730dc07
+  data.tar.gz: efe6a770edc21dee8dab8572359c0a0e06c5bff5
 SHA512:
-  metadata.gz: b895c8bd25a2f4392b126af7dead26d434963665f50765698d0399edbcd054dd2dc5fe2d51f11a852c2cc44fec95ed175f3d1b71df2997088071b3834091b4c0
-  data.tar.gz: faa7999280e3da2eafaadc0abafad8920384c5101808b62454f1d8d9f6694d1bcfce8cf04d951505c0aca5846b27e35fa5310f50248fff359eb26c7b3f89e8fe
+  metadata.gz: 036473e69e86bbf51ff788c4b58a5434c3126f2c613a9c7b733a9d7d95844e3bc87051a6f4672633be5b7ba9f98ffdf7ef91dedaf5b84b1b29252ef8ffeec661
+  data.tar.gz: abf72c89abcd52e3e74c4a530777a933d5529afa8fcc25509c5934cac97ace0891f427dcacab546fe84a6aae777ff1250940ea0b73ff0185cca6ab5315cde38d

data/bin/soby

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/soby'
-# require 'soby'
+# require_relative '../lib/soby'
+require 'soby'
 
 Processing::App::SKETCH_PATH = __FILE__
 $:.unshift File.dirname(__FILE__)
@@ -16,15 +16,17 @@ end
 
 require 'java'
 
-
 Java::TechLityReaSvgextended::PShapeSVGExtended.TEXT_QUALITY = 2.0
 
 $app =  SobyPlayer.new screen_id
 
 sleep 0.2 while not $app.ready?
 
-if filename != nil
+if filename != nil and filename != ""
   presentation = Soby::load_presentation ARGV[0]
   Soby::start_presentation presentation
 end
 # Soby::auto_update presentation, __FILE__
+
+# require_relative '../lib/extensions/backgrounds/circles-bg.rb'
+# load '../lib/extensions/backgrounds/circles-bg.rb'

data/lib/extensions/backgrounds/circles-bg.rb

@@ -0,0 +1,26 @@
+# coding: utf-8
+## re-open the class
+
+require_relative 'circles'
+
+class SobyPlayer
+
+  ## To be overriden by the Presentation Code.
+  def custom_setup
+    @circles = CirclesBackground.new(self, width, height)
+    @setup_done = true
+  end
+
+  def custom_pre_draw
+    # puts "pre draw " + @setup_done.to_s
+    return unless @setup_done
+
+
+    background 0
+    image(@circles.draw, 0, 0, width, height)
+  end
+
+  def custom_post_draw
+  end
+
+end

data/lib/extensions/backgrounds/circles.rb

@@ -0,0 +1,156 @@
+#!/usr/bin/env jruby
+# coding: utf-8
+# require 'propane'
+
+## Circles by Bárbara Almeida
+##  A fork of Circle through 3 points by Bárbara Almeida.
+## Draw circles from 3 points moving on smooth random trajectories.
+## https://www.openprocessing.org/sketch/211167
+
+## Propane version by Jérémy Laviole - @poqudrof
+
+## Propane & JRubyARt compatibility.
+Propane = Processing if not defined? Propane
+
+class CirclesBackground
+  include Math
+  include Propane::PConstants
+  
+  def initialize(app,w,h)
+    @app,@width,@height = app,w,h
+    @offscreen = @app.createGraphics @width, @height
+    setup
+  end
+  
+  def setup
+    @c = @app.random(360)
+#    @points = (0..2).map { Points.new(@app.random(@width), @app.random(@height)) }
+
+    @points = []
+    3.times { @points << Points.new(@app.random(@width),@app.random(@height)) }
+
+    @offscreen.beginDraw
+    @offscreen.background 0
+    # @offscreen.noStroke
+    # @offscreen.rect(0, 0, @width, @height) 
+    @offscreen.endDraw
+  end
+
+  def draw
+
+    ## Clear once in a while
+    setup if (@app.frame_count % 3_000).zero?
+
+    @points.each do |point|
+      ##change direction sometimes
+      point.setDir @app.random(-Propane::PConstants::PI, Propane::PConstants::PI) if (@app.random(1) > 0.96)
+      point.update
+      point.checkEdges
+    end
+
+    @offscreen.beginDraw
+    @offscreen.color_mode(HSB, 360, 100, 100, 100)
+    
+    ## set the style of the circle
+    ## slowly changes hue
+    @dc = Propane::PApplet::map(@app.millis, 0, 150000, 0, 360) 
+    @offscreen.stroke((@c + @dc) % 360, 50, 100, 5)
+    @offscreen.no_fill
+
+  ## verifies if there is a circle and draw it
+det = (@points[0].p.x * @points[1].p.y)  + (@points[1].p.x * @points[2].p.y) + (@points[2].p.x * @points[0].p.y);
+det -= (@points[0].p.y * @points[1].p.x)  + (@points[1].p.y * @points[2].p.x) + (@points[2].p.y * @points[0].p.x);
+ 
+    #  det = (@points[0].p.x * @points[1].p.y) +
+    #       (@points[1].p.x * @points[2].p.y) +
+    #       (@points[2].p.x * @points[0].p.y)
+
+    # det -= (@points[0].p.y * @points[1].p.x) +
+    #        (@points[1].p.y * @points[2].p.x) +
+    #        (@points[2].p.y * @points[0].p.x)
+
+    if Propane::PApplet::abs(det) > 50
+      draw_circle @points
+    end
+#    draw_circle @points if det.abs > 50
+
+    @offscreen.endDraw
+    return @offscreen
+  end
+
+
+  def draw_circle(pts)
+    ## find the midpoints of 2 sides
+    mp = []
+    mp[0] = midpoint(pts[0].p, pts[1].p)
+    mp[1] = midpoint(pts[1].p, pts[2].p)
+
+    center_point = center(mp)   ## find the center of the circle
+    r = $app.dist(center_point.x, center_point.y, pts[2].p.x, pts[2].p.y)  ##calculate the radius
+
+    @offscreen.ellipse(center_point.x, center_point.y, 2*r, 2*r) ## if not collinear display circle
+  end
+
+  def midpoint(a, b)
+    d = $app.dist(a.x, a.y, b.x, b.y) ## distance AB
+    theta = atan2(b.y - a.y, b.x - a.x) ## inclination of AB
+    p = Propane::PVector.new(a.x + d/2*  cos(theta),
+                    a.y + d/2* sin(theta), # midpoint
+                    theta - HALF_PI)  #inclination of the bissecteur
+    return p
+  end
+
+  def center(mid_point)
+    eq = []
+
+    ## equation of the first bissector (ax - y =  -b)
+    mid_point.each do |mp|
+      a = tan mp.z
+      eq << Propane::PVector.new(a,
+                                   -1,
+                                   -1*(mp.y - mp.x*a))
+    end
+
+    ## calculate x and y coordinates of the center of the circle
+    ox = (eq[1].y * eq[0].z - eq[0].y * eq[1].z) /
+         (eq[0].x * eq[1].y - eq[1].x * eq[0].y)
+    oy =  (eq[0].x * eq[1].z - eq[1].x * eq[0].z) /
+          (eq[0].x * eq[1].y - eq[1].x * eq[0].y)
+    return Propane::PVector.new(ox,oy)
+  end
+end
+
+class Points
+
+  include Propane::Proxy
+  attr_accessor :p, :velocity, :acceleration
+  
+  def initialize(x, y)
+    @p = Propane::PVector.new(x, y, 1)
+    @velocity = Propane::PVector.new(0, 0, 0);
+    @acceleration = Propane::PVector.new($app.random(0.2), $app.random(0.2), 0)
+  end
+
+  # change direction
+  def setDir(angle) 
+    ## direction of the acceleration is defined by the new angle
+    acceleration.set(Propane::PApplet::cos(angle), Propane::PApplet::sin(angle), 0); 
+    ## magnitude of the acceleration is proportional to the angle between acceleration and velocity
+    acceleration.normalize
+    dif = Propane::PVector::angleBetween(acceleration, velocity)
+    dif = Propane::PApplet::map(dif, 0, Propane::PConstants::PI, 0.1, 0.001)
+    acceleration.mult(dif);
+  end
+
+  def update
+    velocity.add(acceleration);
+#    velocity.limit(1.5);
+    velocity.limit 0.5
+    p.add(velocity);
+  end
+  
+  def checkEdges
+    p.x = constrain(p.x, 0, $app.width)
+    p.y = constrain(p.y, 0, $app.height)
+  end
+end

data/lib/soby.rb

@@ -17,13 +17,10 @@ require_relative 'soby/slide'
 require_relative 'soby/cam'
 require_relative 'soby/launcher'
 
-
 class SobyPlayer < Processing::App
 
-  
   load_library 'video','video_event', 'SVGExtended'
 
-  
   include_package 'processing.core'
 
   attr_accessor :prez, :prev_cam, :next_cam, :slides
@@ -61,19 +58,57 @@ class SobyPlayer < Processing::App
   def setup
     @ready = false
 
-    @width = self.width
-    @height = self.height
     init_player
 
     @custom_setup_done = true
     @ready = true
     @has_thread = false
+    init_key_commands
   end
 
-  def ready?
-    @ready
+  def init_key_commands
+    @key_actions = {}
+
+    @key_actions['a'] = ["start autoload",
+    Proc.new {
+      # break or return ?
+      next if @has_thread
+      puts "Thread starting"
+      Soby::auto_update self
+      @has_thread = true
+    }]
+
+    @key_actions['h'] = ["show/hide help",
+                         Proc.new do
+                           @is_displaying_help = false if @is_displaying_help == nil
+                           @is_displaying_help = ! @is_displaying_help
+                         end]
+
+    @key_actions['c'] = ["save frame",
+                         Proc.new do
+                           @frame_number = 1 if @frame_number == nil
+                           saveFrame "frame-" + @frame_number.to_s + ".png"
+                           @frame_number = @frame_number + 1
+                         end ]
+
+    @key_actions['s'] = ["stop autoload",
+                         Proc.new { Thread::kill @thread if @has_thread }]
+
+    @key_actions['r'] = ["custom setup restart",
+                         Proc.new { @custom_setup_done = false }]
+
+    @key_actions['g'] = ["clean memory", Proc.new { Java::JavaLang::System.gc }]
+
+    @key_actions['l'] = ["load another presentation",
+                         Proc.new { load_presentation }
+                        ]
+
   end
 
+
+
+  def ready? ; @ready ; end
+
   def init_player
     @prez = nil
     @current_slide_no = 0
@@ -99,7 +134,7 @@ class SobyPlayer < Processing::App
   end
 
   def custom_pre_draw
-    background(255)
+    background(150)
   end
 
   def custom_post_draw
@@ -107,7 +142,6 @@ class SobyPlayer < Processing::App
   end
 
   def draw
-    rect 0, 0, 100, millis / 1000
     if not @custom_setup_done
       custom_setup
       @custom_setup_done = true
@@ -115,6 +149,8 @@ class SobyPlayer < Processing::App
 
     custom_pre_draw
 
+
+
     shapeMode(CORNER)
     imageMode(CORNER)
 
@@ -131,25 +167,58 @@ class SobyPlayer < Processing::App
       display_slide_number
     end
 
+
+    display_help if @is_displaying_help or @prez == nil
+
     custom_post_draw
   end
 
+  def display_help
+    text_size = 12
+    textSize(text_size)
+
+    # fill 200
+    # stroke 180
+    # rect(width/2, height/2, 50, 20);
+
+    fill 200
+    stroke 255
+
+    text "Soby Player", width/2, height/2 if @prez == nil
+
+    translate(50, height - 200)
+    texts = []
+
+    @key_actions.each_pair do |key_name, action|
+      description = action[0]
+      t = "#{key_name} - #{description}"
+      text(t, 0, 0)
+      translate(0, text_size + text_size/2);
+    end
+
+    # texts.each do |t|
+    #   text(t, 0, 0)
+    #   translate(0, text_size + text_size /2);
+    # end
+
+  end
+
   def run_slide_code
     translate 0, 0, 1
+#    puts "run slide code"
     if not @is_moving and @current_slide_no != 0
       desc = @prez.slides[@current_slide_no].description
       if(desc != nil)
-        #          puts "EVAL #{desc}"
-        eval desc
+#        puts "EVAL #{desc}"
+        instance_eval desc
       end
     end
   end
 
-
   def display_slide_number
     # Slide number
     push_matrix
-    translate(@width - 40, @height - 45)
+    translate(self.width - 40, self.height - 45)
     fill(30)
     strokeWeight(3)
     stroke(190)
@@ -162,7 +231,7 @@ class SobyPlayer < Processing::App
       translate 2, 0
     else
       translate -3.5, 0
-    end 
+    end
     text(@current_slide_no.to_s, 10, 30)
     pop_matrix
   end
@@ -174,11 +243,10 @@ class SobyPlayer < Processing::App
   alias :default_display_slide_number :display_slide_number
 
 
-  def key_pressed
+  def key_pressed(*args)
 
-    if key == 'g'
-      puts "Garbage"
-      Java::JavaLang::System.gc
+    @key_actions.each_pair do |key_name, command|
+      command[1][] if key == key_name
     end
 
     return if @prez == nil
@@ -191,43 +259,7 @@ class SobyPlayer < Processing::App
       next_slide
     end
 
-    if key == 'l'
-      # selectInput("Select a file to process:",
-      #             "fileSelected",
-      #             Java::JavaIo::File.new(SKETCH_ROOT))
-
-      folder = Java::JavaIo::File.new(SKETCH_ROOT)
-      fc = Java::javax::swing::JFileChooser.new("Soby Loader")
-      fc.set_dialog_title "Select your presentation"
-      fc.setFileFilter AppFilter.new
-      fc.setCurrentDirectory folder
-      success = fc.show_open_dialog(nil)
-      if success == Java::javax::swing::JFileChooser::APPROVE_OPTION
-        path = fc.get_selected_file.get_absolute_path
-        puts "User selected " + path
-        presentation = Soby::load_presentation path
-        Soby::start_presentation presentation
-      else
-        puts "No file"
-      end
-    end
 
-    if key == 'a'
-      return if @has_thread
-      puts "Thread starting"
-      Soby::auto_update self
-      @has_thread = true
-    end
-    
-    if key == 'c'
-      @frame_number = 1 if @frame_number == nil
-      saveFrame "frame-" + @frame_number.to_s + ".png"
-      @frame_number = @frame_number + 1
-    end
-    
-    if key == 's'
-      Thread::kill @thread if @has_thread
-    end
     #    puts "slide #{@current_slide_no} "
   end
 
@@ -237,7 +269,7 @@ class SobyPlayer < Processing::App
 
 
 
-  def mouse_dragged
+  def mouse_dragged (*args)
     if not @is_moving
       tr = PMatrix3D.new
       tr.translate(mouse_x - pmouse_x, mouse_y - pmouse_y)
@@ -258,15 +290,33 @@ class SobyPlayer < Processing::App
     end
   end
 
+  def load_presentation
+    folder = Java::JavaIo::File.new(SKETCH_ROOT)
+    fc = Java::javax::swing::JFileChooser.new("Soby Loader")
+    fc.set_dialog_title "Select your presentation"
+    fc.setFileFilter AppFilter.new
+    fc.setCurrentDirectory folder
+    success = fc.show_open_dialog(nil)
+    if success == Java::javax::swing::JFileChooser::APPROVE_OPTION
+      path = fc.get_selected_file.get_absolute_path
+      puts "User selected " + path
+      presentation = Soby::load_presentation path
+      Soby::start_presentation presentation
+    else
+      puts "No file"
+    end
+  end
+
 
   def set_prez (prez)
-    current_slide = @current_slide_no
+#    current_slide = @current_slide_no
 
     #    PShape.loadedImages.clear
     @prez = prez
     @slides = prez.slides
 
-    goto_slide current_slide
+    # TODO: check slide number, if different go to 0
+    goto_slide 0
 
     @is_running = true
     @prez_middle = PVector.new(@prez.width / 2.0, @prez.height / 2.0)
@@ -279,8 +329,8 @@ class SobyPlayer < Processing::App
   end
 
   def compute_view(view, slide_number)
-    #    view = createGraphics(@width, @height, P3D)
-    #    @next_view = createGraphics(@width, @height)
+    #    view = createGraphics(@width, self.height, P3D)
+    #    @next_view = createGraphics(@width, self.height)
     view.beginDraw
 
     cam = slide_view slide_number
@@ -314,7 +364,7 @@ class SobyPlayer < Processing::App
     if @slides[@current_slide_no].has_next_animation?
       puts "Animation Next "
       anim = @slides[@current_slide_no].next_animation
-      anim.pshape_elem.setVisible(true)
+      anim.pshape_elem.setVisible(true) unless anim.pshape_elem == nil
       return
     end
 
@@ -416,16 +466,16 @@ class SobyPlayer < Processing::App
     x = @prez.slides[slide_no].x
     y = @prez.slides[slide_no].y
 
-    sc1 = @width.to_f / w.to_f
-    sc2 = @height.to_f / h.to_f
+    sc1 = self.width.to_f / w.to_f
+    sc2 = self.height.to_f / h.to_f
 
     # scale
     sc = [sc1, sc2].min
 
 
     # translate
-    dx = ((@width / sc) - w) * 0.5
-    dy = ((@height / sc) - h) * 0.5
+    dx = ((self.width / sc) - w) * 0.5
+    dy = ((self.height / sc) - h) * 0.5
 
     cam = Cam.new
 
@@ -453,8 +503,8 @@ class SobyPlayer < Processing::App
     my_scale = find_scale
 
     # centering
-    dx = ((@width / my_scale) - @prez.width) * 0.5
-    dy = ((@height / my_scale) - @prez.height) * 0.5
+    dx = ((self.width / my_scale) - @prez.width) * 0.5
+    dy = ((self.height / my_scale) - @prez.height) * 0.5
 
     cam = Cam.new
     cam.scale = my_scale
@@ -465,8 +515,8 @@ class SobyPlayer < Processing::App
   end
 
   def find_scale
-    sc1 = @width / @prez.width
-    sc2 = @height / @prez.height
+    sc1 = self.width / @prez.width
+    sc2 = self.height / @prez.height
     return [sc1, sc2].min
   end
   private :find_scale
@@ -479,10 +529,12 @@ end
 ## TODO: move this somewhere
 class AppFilter < Java::javax::swing::filechooser::FileFilter
   def accept fobj
-    return true if fobj.canExecute
-    return fobj.isDirectory
+    return true if fobj.getName().end_with?(".svg")
+#    return true if fobj.canExecute
+#    return fobj.isDirectory
+    false
   end
   def getDescription
-    "Applications"
+    "Soby Presentations"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soby
 version: !ruby/object:Gem::Version
-  version: 0.1.1.1
+  version: 0.1.1.3
 platform: ruby
 authors:
 - Jeremy Laviole
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/soby
+- lib/extensions/backgrounds/circles-bg.rb
+- lib/extensions/backgrounds/circles.rb
 - lib/soby.rb
 - lib/soby/cam.rb
 - lib/soby/launcher.rb
@@ -86,8 +88,7 @@ files:
 - lib/soby/slide.rb
 - lib/soby/transforms.rb
 homepage: https://github.com/poqudrof/Soby
-licenses:
-- LGPL
+licenses: []
 metadata: {}
 post_install_message: 'Use ''soby presentation.svg 1'' to run a presentation file
   presentation.svg on screen #1 '