tracksperanto 2.9.9 → 2.10.0

data/Gemfile

@@ -8,6 +8,7 @@ gem "progressbar", "0.10.0"
 gem "update_hints", "~> 1.0"
 
 group :development do
+  gem "approximately"
   gem "jeweler"
   gem "rake"
   gem "flexmock", "~>0.8"

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.10.0
+
+* Nuke importer now supports PlanarTracker nodes and their corner-pin output
+
 === 2.9.9
 
 * Add lens distortion middleware. Adds the possibility to remove or add Syntheyes lens distortion to your plates.

data/README.rdoc

@@ -55,7 +55,7 @@ converted files already exist <b>they will be overwritten without warning</b>.
 == Format support
 
 Import and export support:
-* Nuke v5 script (Tracker3 nodes, also known as Tracker in the UI - this is the node that you track with)
+* Nuke v5 script (Tracker3 nodes, also known as Tracker in the UI - this is the node that you track with, and Reconcile3D)
 * Shake tracker node export (textfile with many tracks per file)
 * PFTrack 2dt (version 4 and 5) anf PFMatchit/PFTrack 2011 point track exports
 * Syntheyes 2D tracking data exports
@@ -74,10 +74,10 @@ Export only:
 * Ruby (will make calls to Tracksperanto to create trackers/keyframes) - useful if you want to play with trackers as data
 * Maya locators (animated locators on an image plane)
 
-== Modularity
+== Editing your tracks while converting
 
-Tracksperanto is very modular and can process data passing through it (like
-scaling a proxy track up). Consult the --help option to see what is available.
+Tracksperanto has a number of features to scale, move, slip, distort and rename trackers.
+Consult the --help option to see what is available.
 
 == Development
 

data/bin/tracksperanto

@@ -68,11 +68,14 @@ op.on("--code PATH_TO_SCRIPT", String, "Load custom Ruby code into tracksperanto
   end
 end
 
+def f(module_list)
+  "\n" + module_list.map{|e| "\t\t\t\t\t%s\n" % e }.join
+end
 
-op.on(" -f", "--from TRANSLATOR", String, "Use the specific import translator - #{readers.join(", ")}") { |f| options[:importer] = f }
+op.on(" -f", "--from TRANSLATOR", String, "Use the specific import translator, must be one of: #{f(readers)}") { |f| options[:importer] = f }
 op.on(" -w", "--width WIDTH_IN_PIXELS", Integer, "Absolute input comp width in pixels (will try to autodetect)") { |w| options[:width] = w }
 op.on(" -h", "--height HEIGHT_IN_PIXELS", Integer, "Absolute input comp height in pixels (will try to autodetect)") {|w| options[:height] = w }
-op.on(" -o", "--only EXPORTER_NAME", String, "Only export the selected format, format must be one of #{writers.join(", ")}") { |f| writer_class_name = f }
+op.on(" -o", "--only EXPORTER_NAME", String, "Only export the selected format, format must be one of: #{f(writers)}") { |f| writer_class_name = f }
 
 op.on(" -xs", "--xscale X_SCALING_FACTOR", Float, mwd("Scaler"), &mw("Scaler", :x_factor))
 
@@ -81,12 +84,12 @@ op.on(" -pad", "--pad PAD_FRACTION_VALUES_COMMA_SEPARATED", String, mwd("Pad"))
   $middlewares.push(["Pad", {"left_pad" => left, "right_pad"=> right, "top_pad" => top, "bottom_pad" => bottom}])
 end
 
-op.on(" -u", "--undistort K_AND_KCUBE_COMMA_SEPARATED", String, mwd("LensDisto")) do | coefficients |
+op.on(" -u", "--undistort K_AND_KCUBE_COMMA_SEPARATED", String, "Remove lens distortion using the Syntheyes algorithm") do | coefficients |
   k, kcube = coefficients.split(",").map{|e| e.to_f }
   $middlewares.push(["LensDisto", {"k" => k, "kcube"=> kcube, "remove" => true}])
 end
 
-op.on(" -d", "--distort K_AND_KCUBE_COMMA_SEPARATED", String, mwd("LensDisto")) do | coefficients |
+op.on(" -d", "--distort K_AND_KCUBE_COMMA_SEPARATED", String, "Add lens distortion using the Syntheyes algorithm") do | coefficients |
   k, kcube = coefficients.split(",").map{|e| e.to_f }
   $middlewares.push(["LensDisto", {"k" => k, "kcube"=> kcube, "remove" => false}])
 end

data/lib/import/nuke_script.rb

@@ -19,6 +19,8 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
         scan_tracker_node(io).each(&Proc.new)
       elsif line =~ RECONCILE_PATTERN
         scan_reconcile_node(io).each(&Proc.new)
+      elsif line =~ PLANAR_PATTERN
+        scan_planar_tracker_node(io).each(&Proc.new)
       end
     end
   end
@@ -27,10 +29,11 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
     
     TRACKER_3_PATTERN = /^Tracker3 \{/
     RECONCILE_PATTERN = /^Reconcile3D \{/
+    PLANAR_PATTERN = /^PlanarTracker1_0 \{/
     OUTPUT_PATTERN = /^output \{/
     TRACK_PATTERN = /^track(\d) \{/
     NODENAME = /^name ([^\n]+)/
-    
+    PLANAR_CORNERS = %w( outputBottomLeft outputBottomRight outputTopLeft outputTopRight)
     
     # Scans a Reconcile3D node and returs it's output
     def scan_reconcile_node(io)
@@ -46,6 +49,31 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
       end
     end
     
+    # Scans a PlanarTracker node and recovers corner pin
+    def scan_planar_tracker_node(io)
+      trackers, node_name = [], nil
+      while line = io.gets_and_strip
+        PLANAR_CORNERS.each do | corner_name |
+          if line =~ /#{corner_name}/
+            t = Tracksperanto::Tracker.new
+            t = extract_tracker(line)
+            t.name = corner_name
+            trackers.push(t.dup)
+          elsif line =~ NODENAME
+            node_name = $1
+          end
+        end
+        
+        if node_name && trackers.length == 4
+          trackers.each{|t| t.name = "%s_%s" % [node_name, t.name] }
+          return trackers
+        end
+      end
+      
+      # Fail
+      return []
+    end
+    
     # Scans a tracker node and return all tracks within that node (no more than 4)
     def scan_tracker_node(io)
       tracks_in_tracker = []

data/lib/middleware/lens_disto.rb

@@ -1,19 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Tracksperanto::Middleware::LensDisto < Tracksperanto::Middleware::Base
   include Tracksperanto::UVCoordinates
-  
-  class Vector2 < Struct.new(:x, :y)
-  end
-  
-  class RF < Struct.new(:r, :f)
-    def inspect
-      '(%0.3f %0.3f)' % [r, f]
-    end
-    
-    def m
-      r * f
-    end
-  end
+
   
   parameter :k,  :cast => :float, :desc => "Quartic distortion coefficient", :default => 0
   parameter :kcube,  :cast => :float, :desc => "Cubic distortion coefficient", :default => 0
@@ -29,6 +17,32 @@ class Tracksperanto::Middleware::LensDisto < Tracksperanto::Middleware::Base
     @width, @height = w, h
     @aspect = @width.to_f / @height
     
+    generate_lut
+    super
+  end
+  
+  def export_point(frame, float_x, float_y, float_residual)
+    x, y =  remove ? undisto(float_x, float_y) : disto(float_x, float_y)
+    super(frame, x, y, float_residual)
+  end
+  
+  private
+  
+  class Vector2 < Struct.new(:x, :y)
+  end
+  
+  class RF < Struct.new(:r, :f)
+    def inspect
+      '(%0.3f %0.3f)' % [r, f]
+    end
+    
+    def m
+      r * f
+    end
+  end
+  
+  # We apply disto using a lookup table of y = f(r)
+  def generate_lut
     # Generate the lookup table
     @lut = [RF.new(0.0, 1.0)]
     max_r = @aspect + 1
@@ -37,20 +51,10 @@ class Tracksperanto::Middleware::LensDisto < Tracksperanto::Middleware::Base
     r = 0
     STEPS.times do | mult |
       r += increment
-      @lut.push(RF.new(r, disto_radius(r)))
+      @lut.push(RF.new(r, distort_radius(r)))
     end
-    
-    @lut.inspect
-    super
   end
   
-  def export_point(frame, float_x, float_y, float_residual)
-    x, y =  remove ? undisto(float_x, float_y) : disto(float_x, float_y)
-    super(frame, x, y, float_residual)
-  end
-  
-  private
-  
   def with_uv(x, y)
     vec = Vector2.new(convert_to_uv(x, @width), convert_to_uv(y, @height))
     yield(vec)
@@ -58,40 +62,29 @@ class Tracksperanto::Middleware::LensDisto < Tracksperanto::Middleware::Base
   end
   
   # Radius is equal to aspect at the rightmost extremity
-  def disto_radius(r)
-    r2 = r ** 2
-    # Skipping the square root speeds things up if we don't need it
-    f = if kcube.abs > 0.00001
-      1 + (r2 * (k + kcube * Math.sqrt(r2)));
-    else
-      1 + (r2 * k);
-    end
+  def distort_radius(r)
+    1 + (r*r*(k + kcube * r))
   end
   
   def disto(x, y)
     with_uv(x, y) do | pt |
-      # Get the radius of the point
-      x = pt.x * @aspect
-      r = Math.sqrt(x.abs**2 + pt.y.abs**2)
-      
       # Find the good tuples to interpolate on
-      f = disto_interpolated(r)
-      
+      f = disto_interpolated(get_radius(pt))
       pt.x = pt.x * f
       pt.y = pt.y * f
     end
   end
   
+  def get_radius(pt)
+    # Get the radius of the point
+    x = pt.x * @aspect
+    r = Math.sqrt(x.abs**2 + pt.y.abs**2)
+  end
   
   def undisto(x, y)
     with_uv(x, y) do | pt |
-      # Get the radius of the point
-      x = pt.x * @aspect
-      r = Math.sqrt(x.abs**2 + pt.y.abs**2)
-      
       # Find the good tuples to interpolate on
-      f = undisto_interpolated(r)
-      
+      f = undisto_interpolated(get_radius(pt))
       pt.x = pt.x / f
       pt.y = pt.y / f
     end

data/lib/pipeline/base.rb

@@ -26,7 +26,7 @@ module Tracksperanto::Pipeline
   # applies the middlewares. Here's how a calling sequence for a pipeline looks like:
   #
   #   pipe = Tracksperanto::Pipeline::Base.new
-  #   pipe.middleware_tuples = ["Golden", {:enabled => true}]
+  #   pipe.middleware_tuples = ["Shift", {:x => 10}]
   #   pipe.progress_block = lambda{|percent, msg| puts("#{msg}..#{percent.to_i}%") }
   #   pipe.run("/tmp/shakescript.shk", :width => 720, :height => 576)
   #

data/lib/tracksperanto.rb

@@ -3,7 +3,7 @@
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '2.9.9'
+  VERSION = '2.10.0'
   
   module Import; end
   module Export; end

data/test/helper.rb

@@ -4,6 +4,7 @@ require File.dirname(__FILE__) + '/../lib/tracksperanto' unless defined?(Tracksp
 require 'test/unit'
 require 'flexmock'
 require 'flexmock/test_unit'
+require 'approximately'
 require 'fileutils'
 
 unless File.exist?(File.dirname(__FILE__) + "/import/samples")

data/test/import/test_nuke_import.rb

@@ -34,6 +34,20 @@ class NukeImportTest < Test::Unit::TestCase
     assert_equal 128, trackers[0].length
   end
   
+  def test_parsing_planar_tracker
+    fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/planar.nk')
+    
+    parser = Tracksperanto::Import::NukeScript.new(:io => fixture)
+    parser.width = 4096
+    parser.height = 2304
+    
+    trackers = parser.to_a
+    assert_equal 4, trackers.length
+    
+    ref_names = %w( PlanarTracker2_outputBottomLeft PlanarTracker2_outputBottomRight 
+      PlanarTracker2_outputTopRight PlanarTracker2_outputTopLeft )
+    assert_equal ref_names, trackers.map{|e| e.name }
+  end
   
   def test_parsing_from_nuke
     fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/one_tracker_with_break.nk')
@@ -121,6 +135,7 @@ x754 912.0731812 x755 913.7190552 916.0959473 918.1025391 920.0751953 922.189880
     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/test/middleware/test_lens_middleware.rb

@@ -3,6 +3,8 @@ require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class LensMiddlewareTest < Test::Unit::TestCase
   
+  include Approximately
+  
   def test_action_description
     assert_equal "Apply or remove lens distortion with the Syntheyes algorithm", Tracksperanto::Middleware::LensDisto.action_description
   end
@@ -27,7 +29,8 @@ class LensMiddlewareTest < Test::Unit::TestCase
     receiver = flexmock
     receiver.should_receive(:start_export).once.with(1920, 1080)
     receiver.should_receive(:start_tracker_segment).once.with("Tracker")
-    receiver.should_receive(:export_point).once.with(1, 66.03001446825158, 43.978678913818925, 0)
+    receiver.should_receive(:export_point).once.with(1, approx(66.03), approx(43.978), approx(0))
+    
     receiver.should_receive(:end_tracker_segment).once
     receiver.should_receive(:end_export).once
     
@@ -43,7 +46,7 @@ class LensMiddlewareTest < Test::Unit::TestCase
     receiver = flexmock
     receiver.should_receive(:start_export).once.with(1920, 1080)
     receiver.should_receive(:start_tracker_segment).once.with("Tracker")
-    receiver.should_receive(:export_point).once.with(1, 11.999914830236555, 13.99995274335909, 0)
+    receiver.should_receive(:export_point).once.with(1, approx(11.999914830236555), approx(13.99995274335909), 0)
     receiver.should_receive(:end_tracker_segment).once
     receiver.should_receive(:end_export).once
     
@@ -59,7 +62,7 @@ class LensMiddlewareTest < Test::Unit::TestCase
     receiver = flexmock
     receiver.should_receive(:start_export).once.with(1920, 1080)
     receiver.should_receive(:start_tracker_segment).once.with("Tracker")
-    receiver.should_receive(:export_point).once.with(1, 1.0, 1.0, 0)
+    receiver.should_receive(:export_point).once.with(1, approx(0.984), approx(0.991), 0)
     receiver.should_receive(:end_tracker_segment).once
     receiver.should_receive(:end_export).once
     

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tracksperanto"
-  s.version = "2.9.9"
+  s.version = "2.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2012-04-10"
+  s.date = "2012-05-30"
   s.description = "Converts 2D track exports between different apps like Flame, MatchMover, PFTrack..."
   s.email = "me@julik.nl"
   s.executables = ["tracksperanto"]
@@ -198,6 +198,7 @@ Gem::Specification.new do |s|
       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_development_dependency(%q<approximately>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<flexmock>, ["~> 0.8"])
@@ -208,6 +209,7 @@ Gem::Specification.new do |s|
       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<approximately>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<flexmock>, ["~> 0.8"])
@@ -219,6 +221,7 @@ Gem::Specification.new do |s|
     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<approximately>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<flexmock>, ["~> 0.8"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracksperanto
 version: !ruby/object:Gem::Version
-  version: 2.9.9
+  version: 2.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: obuf
-  requirement: &12549320 !ruby/object:Gem::Requirement
+  requirement: &81500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *12549320
+  version_requirements: *81500
 - !ruby/object:Gem::Dependency
   name: progressive_io
-  requirement: &12549080 !ruby/object:Gem::Requirement
+  requirement: &80900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *12549080
+  version_requirements: *80900
 - !ruby/object:Gem::Dependency
   name: flame_channel_parser
-  requirement: &12548840 !ruby/object:Gem::Requirement
+  requirement: &80430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *12548840
+  version_requirements: *80430
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &12548600 !ruby/object:Gem::Requirement
+  requirement: &79900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *12548600
+  version_requirements: *79900
 - !ruby/object:Gem::Dependency
   name: update_hints
-  requirement: &12548360 !ruby/object:Gem::Requirement
+  requirement: &79370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,21 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *12548360
+  version_requirements: *79370
+- !ruby/object:Gem::Dependency
+  name: approximately
+  requirement: &79050 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *79050
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &12548120 !ruby/object:Gem::Requirement
+  requirement: &78640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12548120
+  version_requirements: *78640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12547880 !ruby/object:Gem::Requirement
+  requirement: &78050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12547880
+  version_requirements: *78050
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &12547640 !ruby/object:Gem::Requirement
+  requirement: &524110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +109,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *12547640
+  version_requirements: *524110
 - !ruby/object:Gem::Dependency
   name: cli_test
-  requirement: &12547400 !ruby/object:Gem::Requirement
+  requirement: &522630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +120,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *12547400
+  version_requirements: *522630
 description: Converts 2D track exports between different apps like Flame, MatchMover,
   PFTrack...
 email: me@julik.nl
@@ -299,7 +310,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 179279919
+      hash: -819741475
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: