tracksperanto 3.2.2 → 3.3.0.pre

data/Gemfile

@@ -1,9 +1,9 @@
 # -*- ruby -*-
 source :rubygems
 
-# gem "bychar", "~> 1.1" - controlled by Tickly
 gem "obuf", "~> 1.1"
-gem "tickly", "~> 0.0.8"
+gem "tickly", "~> 2.0"
+gem "bychar"
 gem "progressive_io", "~> 1.0"
 gem "flame_channel_parser", "~> 4.0"
 gem "progressbar", "0.10.0"

data/lib/export/flame_stabilizer_cornerpin.rb

@@ -12,17 +12,19 @@ class Tracksperanto::Export::FlameStabilizerCornerpin < Tracksperanto::Export::F
   end
   
   # The trackers for cornerpins should go in Z order, like this
-  #    TL   ->   TR
-  #             /
-  #     _______/
-  #    |
-  #    BL   ->   BR
+  #
+  #     TL(0)---->TR(1)
+  #               /
+  #            /
+  #         /
+  #      /
+  #     BL(2)----->BR(3)
+  #
   # This "kinda tool" ensures that this is indeed taking place
-  class Sorter < DelegateClass(Tracksperanto::Export::Base)
+  class Sorter
     include Tracksperanto::SimpleExport # so that it calls OUR methods
     
     def initialize(exporter)
-      __setobj__(exporter)
       @exp = exporter
     end
     

data/lib/import/nuke_script.rb

@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
 require 'tickly'
-require File.expand_path(File.dirname(__FILE__)) + "/nuke_grammar/utils"
 
 class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
   
@@ -17,21 +16,16 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
   end
   
   def each
-    parser = Tickly::NodeExtractor.new("Tracker3", "Tracker4", "PlanarTracker1_0", "Reconcile3D")
-    script_tree = Tickly::Parser.new.parse(@io)
+    parser = Tickly::NodeProcessor.new
+    parser.add_node_handler_class(Tracker3)
+    parser.add_node_handler_class(Reconcile3D)
+    parser.add_node_handler_class(PlanarTracker1_0)
+    parser.add_node_handler_class(Tracker4)
     
-    evaluator = Tickly::Evaluator.new
-    evaluator.add_node_handler_class(Tracker3)
-    evaluator.add_node_handler_class(Reconcile3D)
-    evaluator.add_node_handler_class(PlanarTracker1_0)
-    evaluator.add_node_handler_class(Tracker4)
-    
-    script_tree.each do | node |
-      evaluator.evaluate(node) do | node_object |
-        node_object.trackers.each do | t |
-          report_progress("Scavenging tracker #{t.name}")
-          yield t
-        end
+    parser.parse(@io) do | node |
+      node.trackers.each do | t |
+        report_progress("Scavenging tracker #{t.name}")
+        yield t
       end
     end
   end
@@ -70,11 +64,10 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
     end
     
     def extract_curves_from_channel(point_channel)
-      u = Tracksperanto::NukeGrammarUtils.new
       # First element is the :c curly identifier
       point_channel[1..-1].map do | curve_argument | 
         if curve_argument[1] == "curve"
-          u.parse_curve(curve_argument.to_a)
+          Tickly::Curve.new(curve_argument)
         else
           nil
         end
@@ -117,14 +110,14 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
       # "key_search_t", "key_track_x", "key_track_y", "key_track_r", "key_track_t", "key_centre_offset_x", "key_centre_offset_y")
       tracker_rows = values[0]
       
-      u = Tracksperanto::NukeGrammarUtils.new
-      
       # The 0 element is the :c symbol
       tracker_rows[1..-1].each do | row |
         row_content = row[0]
         
         # For offsets see above
-        point_name, x_curve, y_curve = row_content[2], u.parse_curve(row_content[3].to_a), u.parse_curve(row_content[4].to_a)
+        point_name = row_content[2]
+        x_curve = Tickly::Curve.new(row_content[3])
+        y_curve = Tickly::Curve.new(row_content[4])
         
         full_name = [options["name"], point_name].join('_')
         tracker = package_tracker(full_name, x_curve, y_curve)

data/test/import/test_nuke_import.rb

@@ -157,19 +157,6 @@ class NukeImportTest < Test::Unit::TestCase
     assert_in_delta 510.107, sec_tracker.keyframes[-1].abs_y, DELTA
   end
   
-  def test_parsing_nuke_curve
-    curve = [:c] + %w( curve x742 888 890.2463989 891.6602783 
-893.5056763 895.6155396 s95 897.2791748 899.1762695 
-x754 912.0731812 x755 913.7190552 916.0959473 918.1025391 920.0751953 922.1898804 )
-    p = Tracksperanto::NukeGrammarUtils.new
-    result = p.parse_curve(curve)
-    assert_kind_of Array, result
-    assert_equal 13, result.length
-    assert_equal 742, result[0][0]
-    assert_equal 754, result[7][0]
-  end
-  
-  
   def test_zip_channels
     tuples_x = [[1, 125], [3, 234], [5, 456], [9,876]]
     tuples_y = [[2, 437], [3, 123], [6, 432], [9, 430]]

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tracksperanto"
-  s.version = "3.2.2"
+  s.version = "3.3.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2013-03-16"
+  s.date = "2013-03-22"
   s.description = "Converts 2D track exports between different apps like Flame, MatchMover, PFTrack..."
   s.email = "me@julik.nl"
   s.executables = ["tracksperanto"]
@@ -54,7 +54,6 @@ Gem::Specification.new do |s|
     "lib/import/match_mover.rb",
     "lib/import/match_mover_rzml.rb",
     "lib/import/maya_live.rb",
-    "lib/import/nuke_grammar/utils.rb",
     "lib/import/nuke_script.rb",
     "lib/import/pftrack.rb",
     "lib/import/shake_grammar/catcher.rb",
@@ -211,11 +210,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<obuf>, ["~> 1.1"])
-      s.add_runtime_dependency(%q<tickly>, ["~> 0.0.8"])
+      s.add_runtime_dependency(%q<tickly>, ["~> 2.0"])
+      s.add_runtime_dependency(%q<bychar>, [">= 0"])
       s.add_runtime_dependency(%q<progressive_io>, ["~> 1.0"])
       s.add_runtime_dependency(%q<flame_channel_parser>, ["~> 4.0"])
       s.add_runtime_dependency(%q<progressbar>, ["= 0.10.0"])
       s.add_runtime_dependency(%q<update_hints>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<approximately>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
@@ -225,11 +226,13 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ruby-prof>, [">= 0"])
     else
       s.add_dependency(%q<obuf>, ["~> 1.1"])
-      s.add_dependency(%q<tickly>, ["~> 0.0.8"])
+      s.add_dependency(%q<tickly>, ["~> 2.0"])
+      s.add_dependency(%q<bychar>, [">= 0"])
       s.add_dependency(%q<progressive_io>, ["~> 1.0"])
       s.add_dependency(%q<flame_channel_parser>, ["~> 4.0"])
       s.add_dependency(%q<progressbar>, ["= 0.10.0"])
       s.add_dependency(%q<update_hints>, ["~> 1.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<approximately>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
@@ -240,11 +243,13 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<obuf>, ["~> 1.1"])
-    s.add_dependency(%q<tickly>, ["~> 0.0.8"])
+    s.add_dependency(%q<tickly>, ["~> 2.0"])
+    s.add_dependency(%q<bychar>, [">= 0"])
     s.add_dependency(%q<progressive_io>, ["~> 1.0"])
     s.add_dependency(%q<flame_channel_parser>, ["~> 4.0"])
     s.add_dependency(%q<progressbar>, ["= 0.10.0"])
     s.add_dependency(%q<update_hints>, ["~> 1.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<approximately>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tracksperanto
 version: !ruby/object:Gem::Version
-  version: 3.2.2
-  prerelease: 
+  version: 3.3.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: obuf
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: bychar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: progressive_io
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +123,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: approximately
   requirement: !ruby/object:Gem::Requirement
@@ -265,7 +297,6 @@ files:
 - lib/import/match_mover.rb
 - lib/import/match_mover_rzml.rb
 - lib/import/maya_live.rb
-- lib/import/nuke_grammar/utils.rb
 - lib/import/nuke_script.rb
 - lib/import/pftrack.rb
 - lib/import/shake_grammar/catcher.rb
@@ -425,13 +456,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 419869014882253399
+      hash: 506904342212099543
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/import/nuke_grammar/utils.rb

@@ -1,33 +0,0 @@
-# -*- encoding : utf-8 -*-
-class Tracksperanto::NukeGrammarUtils
-  SECTION_START = /^x(\d+)$/
-  KEYFRAME = /^([-\d\.]+)$/
-  
-  # Scan a TCL curve expression into a number of tuples of [frame, value]
-  def parse_curve(atoms)
-    # Replace the closing curly brace with a curly brace with space so that it gets caught by split
-    atoms.shift # remove the :c curly designator
-    atoms.shift # remove the "curve" keyword
-    tuples = []
-    # Nuke saves curves very efficiently. x(keyframe_number) means that an uninterrupted sequence of values will start,
-    # after which values follow. When the curve is interrupted in some way a new x(keyframe_number) will signifu that we
-    # skip to that specified keyframe and the curve continues from there, in gap size defined by the last fragment.
-    # That is, x1 1 x3 2 3 4 will place 2, 3 and 4 at 2-frame increments
-    
-    last_processed_keyframe = 1
-    intraframe_gap_size = 1
-    while atom = atoms.shift
-      if atom =~ SECTION_START
-        last_processed_keyframe = $1.to_i
-        if tuples.any?
-          last_captured_frame = tuples[-1][0]
-          intraframe_gap_size = last_processed_keyframe - last_captured_frame
-        end
-      elsif  atom =~ KEYFRAME
-        tuples << [last_processed_keyframe, $1.to_f]
-        last_processed_keyframe += intraframe_gap_size
-      end
-    end
-    tuples
-  end
-end