soby 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9c5baaea85cf085e890d5a6187cf5f9280338a1
-  data.tar.gz: f1202b568891873ad7739297d8eab9af98dc42e0
+  metadata.gz: 5d65c06b2a1b4f7fb9baa781273823ee83a98dbf
+  data.tar.gz: 4be8a4d47977a8c4e635010bf8929b73118b2f8c
 SHA512:
-  metadata.gz: cf86d2c228bd79243d1e427324a82dee3fe660be9e0d298d6d4aebcb7db4e43c318746635e6da1dffeae300be1eecfbb41b8dc667376be385750db30c12cdbd2
-  data.tar.gz: 0c0d6e75ca8c2ae4c2c696589aefa3b3586135f529ae9a5e987c18f5bc4c5700ab395f07ebbccec0d01a2584dc14988e1b06a544002d5d18cd3bd40e6ba8bce6
+  metadata.gz: 7021ff045f8a62b4c998d65494578987bbdae8e9bda04a5f3d9f9f51f91864e6c93a4331d9b34610453d7206059695a23ee150a1675763c75574809ed353d919
+  data.tar.gz: e79848a3b0e5fea1a683c59d1688f98b1624a8701730fd8e57878eda451921c73a36a65ab86111f6e17137af48a9f159ed75616fed856e81d69c714eb00fb9db

data/lib/soby.rb

@@ -1,20 +1,22 @@
 # -*- coding: utf-8 -*-
 
 require 'nokogiri'  # for XML.
-require 'ruby-processing' 
-require 'java' 
+require 'jruby_art'
+require 'jruby_art/app'
 
-Processing::Runner
-Dir["#{Processing::RP_CONFIG['PROCESSING_ROOT']}/core/library/\*.jar"].each{ |jar| require jar }
 
-# For the other files, we need to load the libraries 
+require 'java'
+
+# Processing::App::SKETCH_PATH = Dir.pwd
+
+# For the other files, we need to load the libraries
 Processing::App::load_library 'video', 'toxiclibscore'
 
 require_relative 'soby/transforms'
 require_relative 'soby/presentation'
 require_relative 'soby/slide'
 require_relative 'soby/cam'
-require_relative 'soby/launcher' 
+require_relative 'soby/launcher'
 
 class SobyPlayer < Processing::App
 
@@ -28,7 +30,7 @@ class SobyPlayer < Processing::App
 
 #  attr_accessor :background_max_color, :background_min_color, :background_constrain
   attr_accessor :cam
-  
+
   def running? () @is_running  end
 
   TRANSITION_DURATION = 1000
@@ -38,38 +40,37 @@ class SobyPlayer < Processing::App
     @h = h
     super()
   end
-  
-  # no Border  
-  def init 
+
+  # no Border
+  def init
     super
     removeFrameBorder
   end
-  
+
   def removeFrameBorder
     frame.removeNotify
     frame.setUndecorated true
     frame.addNotify
-  end 
+  end
 
+  def settings
+    size @w, @h, P3D
+  end
 
-  def setup 
+  def setup
     @ready = false
-    size @w, @h, OPENGL
-
-    ## Some bugs with this. 
-    frame.setResizable true  if frame != nil 
 
     init_player
 
     @custom_setup_done = true
     @ready = true
-  end 
+  end
 
   def ready?
     @ready
   end
 
-  def init_player 
+  def init_player
     @prez = nil
     @current_slide_no = 0
     @is_running = false
@@ -77,10 +78,10 @@ class SobyPlayer < Processing::App
   end
 
   def init_cameras
-    # current camera matrix 
+    # current camera matrix
     @cam = PMatrix3D.new
 
-    # Cameras for movement. 
+    # Cameras for movement.
     @prev_cam = Cam.new
     @next_cam = Cam.new
     @is_moving = false
@@ -88,7 +89,7 @@ class SobyPlayer < Processing::App
   end
 
 
-  ## To be overriden by the Presentation Code. 
+  ## To be overriden by the Presentation Code.
   def custom_setup
 
   end
@@ -102,9 +103,9 @@ class SobyPlayer < Processing::App
   end
 
 
-  def draw 
+  def draw
 
-    if not @custom_setup_done 
+    if not @custom_setup_done
       custom_setup
       @custom_setup_done = true
     end
@@ -117,7 +118,7 @@ class SobyPlayer < Processing::App
     imageMode(CORNER)
 
     if(running?)
-      
+
       push_matrix
 
       update_cam
@@ -126,26 +127,26 @@ class SobyPlayer < Processing::App
       @prez.display_videos
       pop_matrix
 
-      run_slide_code 
-      display_slide_number 
+      run_slide_code
+      display_slide_number
     end
 
     custom_post_draw
   end
 
-  def run_slide_code 
+  def run_slide_code
     translate 0, 0, 1
     if not @is_moving and @current_slide_no != 0
       desc = @prez.slides[@current_slide_no].description
       if(desc != nil)
-        #          puts "EVAL #{desc}" 
+        #          puts "EVAL #{desc}"
         eval desc
-      end 
+      end
     end
   end
 
 
-  def display_slide_number 
+  def display_slide_number
     # Slide number
     push_matrix
     translate(@width - 40, @height - 45)
@@ -155,52 +156,52 @@ class SobyPlayer < Processing::App
     ellipseMode(CENTER)
     ellipse(18, 22, 35, 35)
     fill(255)
-    noStroke 
+    noStroke
     textSize(20)
     text(@current_slide_no.to_s, 10, 30)
     pop_matrix
   end
 
-  alias :default_display_slide_number :display_slide_number 
+  alias :default_display_slide_number :display_slide_number
 
 
   def key_pressed
 
-    if key == 'g' 
+    if key == 'g'
       puts "Garbage"
-      Java::JavaLang::System.gc 
-    end 
+      Java::JavaLang::System.gc
+    end
 
     return if @prez == nil
 
-    if keyCode == LEFT 
+    if keyCode == LEFT
       prev_slide
     end
 
     if keyCode == RIGHT
       next_slide
     end
-    
+
     #    puts "slide #{@current_slide_no} "
   end
 
   def mouse_dragged
-    if not @is_moving 
-      tr = PMatrix3D.new 
+    if not @is_moving
+      tr = PMatrix3D.new
       tr.translate(mouse_x - pmouse_x, mouse_y - pmouse_y)
-      
+
       @cam.preApply(tr)
       @next_cam.mat.preApply(tr)
     end
   end
 
-  def mouseWheel(event) 
+  def mouseWheel(event)
     e = event.getAmount()
-    if not @is_moving 
-      tr = PMatrix3D.new 
-      tr.translate(mouse_x, mouse_y) 
+    if not @is_moving
+      tr = PMatrix3D.new
+      tr.translate(mouse_x, mouse_y)
       tr.scale(e < 0 ?  1.05 :  1 / 1.05)
-      tr.translate(-mouse_x, -mouse_y) 
+      tr.translate(-mouse_x, -mouse_y)
       @cam.preApply(tr)
     end
   end
@@ -209,8 +210,8 @@ class SobyPlayer < Processing::App
   def set_prez (prez)
 
     current_slide = @current_slide_no
-    
-    #    PShape.loadedImages.clear 
+
+    #    PShape.loadedImages.clear
     @prez = prez
     @slides = prez.slides
 
@@ -219,7 +220,7 @@ class SobyPlayer < Processing::App
     @is_running = true
     @prez_middle = PVector.new(@prez.width / 2.0, @prez.height / 2.0)
 
-    puts "Presentation size " 
+    puts "Presentation size "
     puts @prez.width
     puts @prez.height
 
@@ -237,23 +238,23 @@ class SobyPlayer < Processing::App
     view.shape(@prez.pshape, 0, 0)
     view.endDraw
 
-    view 
+    view
   end
 
 
   def next_slide
-    is_last_slide = @current_slide_no >= @prez.nb_slides 
+    is_last_slide = @current_slide_no >= @prez.nb_slides
     is_slide_zero = current_slide_no == 0
 
     # Gloal view
     if is_slide_zero
       goto_slide(@current_slide_no + 1)
-      return 
+      return
     end
 
     # animation
     if @slides[@current_slide_no].has_next_animation?
-      puts "Animation Next " 
+      puts "Animation Next "
       anim = @slides[@current_slide_no].next_animation
       anim.pshape_elem.setVisible(true)
     else
@@ -265,31 +266,31 @@ class SobyPlayer < Processing::App
   def prev_slide
     return if @current_slide_no <= 0
 
-    if current_slide_no == 0 
-      goto_slide(@current_slide_no - 1) 
-      return 
+    if current_slide_no == 0
+      goto_slide(@current_slide_no - 1)
+      return
     end
 
     if @slides[@current_slide_no].has_previous_animation?
-      puts "Animation Previous " 
+      puts "Animation Previous "
       anim = @slides[@current_slide_no].previous_animation
       anim.pshape_elem.setVisible(false)
     else
-      goto_slide(@current_slide_no - 1)   
+      goto_slide(@current_slide_no - 1)
     end
 
   end
 
   def goto_slide (next_slide)
 
-    current_slide = @current_slide_no 
+    current_slide = @current_slide_no
 
-    use_global_view =  next_slide == 0 || next_slide > @prez.slides.size 
+    use_global_view =  next_slide == 0 || next_slide > @prez.slides.size
 
     cam = global_view if use_global_view
-    cam = slide_view(next_slide)  if next_slide > 0   
+    cam = slide_view(next_slide)  if next_slide > 0
 
-    # previous next is now old. 
+    # previous next is now old.
     @prev_cam = @next_cam
     @prev_cam.mat.set(@cam)
     @next_cam = cam
@@ -303,7 +304,7 @@ class SobyPlayer < Processing::App
     end
 
     @transition_start_time = millis
-    @is_moving = true  
+    @is_moving = true
     @current_ratio = 0
 
     ## trigger the slide_change function (user defined)
@@ -315,7 +316,7 @@ class SobyPlayer < Processing::App
   end
 
 
-  def update_cam 
+  def update_cam
 
     return unless @is_moving
     return if @slides.size == 0
@@ -329,7 +330,7 @@ class SobyPlayer < Processing::App
       @is_moving = false
       @cam = @prev_cam.lerp(@next_cam, 1)
 
-      # save a copy 
+      # save a copy
       @prev_cam.mat = @cam.get
       return
     end
@@ -337,16 +338,16 @@ class SobyPlayer < Processing::App
     #    puts @current_ratio
     @cam = @prev_cam.lerp(@next_cam, @current_ratio)
 
-  end  
+  end
 
   def slide_view (slide_no)
 
-    if slide_no > @prez.slides.size 
-      puts "No more slides" 
+    if slide_no > @prez.slides.size
+      puts "No more slides"
       return
     end
 
-    return if @prez.slides[slide_no] == nil 
+    return if @prez.slides[slide_no] == nil
 
     puts "slide view..." << slide_no.to_s
 
@@ -359,22 +360,22 @@ class SobyPlayer < Processing::App
     sc1 = @width.to_f / w.to_f
     sc2 = @height.to_f / h.to_f
 
-    # scale 
+    # scale
     sc = [sc1, sc2].min
 
 
-    # translate 
+    # translate
     dx = ((@width / sc) - w) * 0.5
     dy = ((@height / sc) - h) * 0.5
 
     cam = Cam.new
 
-    m = PMatrix3D.new 
+    m = PMatrix3D.new
     m.apply @prez.slides[slide_no].matrix
     m.invert
 
     # Scale
-    tr = PMatrix3D.new 
+    tr = PMatrix3D.new
     tr.scale(sc)
     m.preApply(tr)
     m.translate(dx, dy)
@@ -386,17 +387,17 @@ class SobyPlayer < Processing::App
   end
 
 
-  def global_view 
+  def global_view
     # ortho(left, right, bottom, top)
     # frustum(left, right, bottom, top, near, far)
-    
+
     my_scale = find_scale
 
     # centering
     dx = ((@width / my_scale) - @prez.width) * 0.5
     dy = ((@height / my_scale) - @prez.height) * 0.5
 
-    cam = Cam.new 
+    cam = Cam.new
     cam.scale = my_scale
     # Not necessary : display from the center...
     cam.post_translation.set(dx, dy)
@@ -413,5 +414,3 @@ class SobyPlayer < Processing::App
 
 
 end
-
-

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: soby
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Jeremy Laviole
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.3
   name: nokogiri
@@ -21,24 +21,24 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.3
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.7
-  name: ruby-processing
+        version: 0.8.0
+  name: jruby_art
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.7
-description: Based on Sozi, it works plays presentation using Ruby-processing.
+        version: 0.8.0
+description: Based on Sozi, it plays presentation using JRubyArt.
 email: poqudrof@gmail.com
 executables: []
 extensions: []
@@ -60,17 +60,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Sozi player !