tracksperanto 1.9.9 → 2.0.0

data/History.txt

@@ -1,3 +1,11 @@
+=== 2.0.0 / 2011-01-27
+* Bugfix for PFTrack exports to contain cross-platform linebreaks (rn instead of n)
+
+=== 1.9.9 / 2010-08-11
+
+* Buffer the parsed trackers on disk or in a stream (all backwards-compatible). Substantially reduces conversion times and memory
+  usage on huge files.
+
 === 1.9.8 / 2010-08-11
 
 * Very minor changes and improvements

data/bin/tracksperanto

@@ -71,8 +71,8 @@ op.on(" -xm", "--xshift X_IN_PIXELS", Float, "Move the points left or right", &m
 op.on(" -ym", "--yshift Y_IN_PIXELS", Float, "Move the points up or down", &mw("Shift", :y_shift)) 
 op.on(" -p", "--prefix PREFIX", String, "A prefix to prepend to tracker names in bulk", &mw("Prefix", :prefix))
 op.on("--lerp", "Linearly interpolate missing keyframes", &mw("Lerp", :enabled, true))
-op.on("--flip", "Flip the comp horizontally", &mw("Flip", :flip, true))
-op.on("--flop", "Flop the comp vertically", &mw("Flip", :flop, true))
+op.on("--flip", "Flip the comp horizontally", &mw("Flip", :enabled, true))
+op.on("--flop", "Flop the comp vertically", &mw("Flop", :enabled, true))
 
 op.on("--version", "Show the version and exit") do |v| 
     puts "Tracksperanto v.#{Tracksperanto::VERSION} running on Ruby #{RUBY_VERSION} on #{RUBY_PLATFORM}"

data/lib/export/pftrack.rb

@@ -31,6 +31,7 @@ class Tracksperanto::Export::PFTrack4 < Tracksperanto::Export::Base
     def export_point(frame, abs_float_x, abs_float_y, float_residual)
       @frame_count += 1
       line = KEYFRAME_TEMPLATE % [frame, abs_float_x, abs_float_y, float_residual / 8]
-      @tracker_io.puts(line)
+      @tracker_io.write(line)
+      @tracker_io.write("\r\n")
     end
 end

data/lib/export/pftrack_5.rb

@@ -10,10 +10,13 @@ class Tracksperanto::Export::PFTrack5 < Tracksperanto::Export::PFTrack4
     end
     
     def end_tracker_segment
-      @io.write("\n\n")
-      @io.puts(@tracker_name.inspect) # autoquotes
-      @io.puts("Primary".inspect) # For primary/secondary cam in stereo pair
-      @io.puts(@frame_count)
+      @io.write("\r\n\r\n")
+      @io.write(@tracker_name.inspect) # autoquotes
+      @io.write("\r\n")
+      @io.write("Primary".inspect) # For primary/secondary cam in stereo pair
+      @io.write("\r\n")
+      @io.write(@frame_count)
+      @io.write("\r\n")
       
       @tracker_io.rewind
       @io.write(@tracker_io.read) until @tracker_io.eof?

data/lib/import/base.rb

@@ -8,7 +8,8 @@ class Tracksperanto::Import::Base
   include Tracksperanto::ZipTuples
   include Tracksperanto::ConstName
   
-  # Every time the importer accumulates a tracker this block will be called
+  # Every time the importer accumulates a tracker this object's #push method will be called.
+  # Can be an array or a more full-featured buffer
   attr_accessor :receiver
   
   # Tracksperanto will assign a proc that reports the status of the import to the caller.
@@ -67,12 +68,6 @@ class Tracksperanto::Import::Base
   # and then send it to the caller. Used in tests.
   def parse(track_file_io)
     @receiver = []
-    class << @receiver
-      def call(with)
-        push(with)
-      end
-    end
-    
     stream_parse(track_file_io)
     @receiver
   end
@@ -87,6 +82,10 @@ class Tracksperanto::Import::Base
   
   # When a tracker has been detected completely (all keyframes) call this method with the tracker object as argument
   def send_tracker(tracker_obj)
-    @receiver.call(tracker_obj) if @receiver
+    if @receiver
+      @receiver.push(tracker_obj)
+    else
+      raise "Tracker received but no @receiver has been set for #{self.inspect}"
+    end
   end
 end

data/lib/import/nuke_script.rb

@@ -26,7 +26,7 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
     TRACK_PATTERN = /^track(\d) \{/
     NODENAME = /^name ([^\n]+)/
     
-    
+    # Scans a tracker node and return all tracks within that node (no more than 4)
     def scan_tracker_node(io)
       tracks_in_tracker = []
       while line = io.gets_and_strip

data/lib/middleware/flip.rb

@@ -1,7 +1,7 @@
-# Flips the comp being exported horizontally or vertically
+# Flips the comp being exported horizontally
 class Tracksperanto::Middleware::Flip < Tracksperanto::Middleware::Base
   
-  attr_accessor :flip, :flop
+  attr_accessor :enabled
   
   def start_export(w, h)
     @w, @h = w, h
@@ -9,8 +9,7 @@ class Tracksperanto::Middleware::Flip < Tracksperanto::Middleware::Base
   end
   
   def export_point(frame, float_x, float_y, float_residual)
-    x = @flip ? (@w - float_x) : float_x
-    y = @flop ? (@h - float_y) : float_y
-    super(frame, x, y, float_residual)
+    x = @enabled ? (@w - float_x) : float_x
+    super(frame, x, float_y, float_residual)
   end
 end

data/lib/pipeline/base.rb

@@ -157,14 +157,13 @@ class Tracksperanto::Pipeline::Base
   # that replays to all of them
   def setup_outputs_for(input_file_path)
     file_name = File.basename(input_file_path).gsub(EXTENSION, '')
-    export_klasses = exporters || Tracksperanto.exporters    
-    Tracksperanto::Export::Mux.new(
-      export_klasses.map do | exporter_class |
-        export_name = [file_name, exporter_class.desc_and_extension].join("_")
-        export_path = File.join(File.dirname(input_file_path), export_name)
-        exporter = exporter_class.new(open_owned_export_file(export_path))
-      end
-    )
+    outputs = (exporters || Tracksperanto.exporters).map do | exporter_class |
+      export_name = [file_name, exporter_class.desc_and_extension].join("_")
+      export_path = File.join(File.dirname(input_file_path), export_name)
+      exporter_class.new(open_owned_export_file(export_path))
+    end
+    
+    Tracksperanto::Export::Mux.new(outputs)
   end
   
   # Open the file for writing and register it to be closed automatically

data/lib/tracksperanto.rb

@@ -4,7 +4,7 @@ require 'tempfile'
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '1.9.9'
+  VERSION = '2.0.0'
   
   module Import; end
   module Export; end

data/lib/tracksperanto/accumulator.rb

@@ -1,16 +1,22 @@
+# An accumulator buffer for Ruby objects. Use it to sequentially store a shitload
+# of objects on disk and then retreive them one by one. Make sure to call #close! when done with it to
+# discard the stored blob. This object is intended to be used as a Tracksperanto::Import::Base#receiver
 class Tracksperanto::Accumulator < DelegateClass(IO)
   
+  # Stores the number of objects stored so far
   attr_reader :numt
+  
   def initialize
     __setobj__(Tracksperanto::BufferIO.new)
     @numt = 0
   end
   
-  def call(with_arrived_tracker)
+  # Store an object
+  def push(object_to_store)
     
     @numt += 1
     
-    d = Marshal.dump(with_arrived_tracker)
+    d = Marshal.dump(object_to_store)
     bytelen = d.size
     write(bytelen)
     write("\t")
@@ -18,16 +24,18 @@ class Tracksperanto::Accumulator < DelegateClass(IO)
     write("\n")
   end
   
+  # Retreive each stored object in succession
   def each_object_with_index
     rewind
-    @numt.times { |i| yield(recover_tracker, i - 1) }
+    @numt.times { |i| yield(recover_object, i - 1) }
   end
   
   private
   
-  def recover_tracker
-    # Read everything upto the tab
+  def recover_object
+    # Up to the tab is the amount of bytes to read
     demarshal_bytes = gets("\t").strip.to_i
+    # Then read the bytes and unmarshal it
     Marshal.load(read(demarshal_bytes))
   end
 end

data/test/export/samples/ref_PFTrack.2dt

@@ -2,50 +2,50 @@
 
 "Parabolic_1_from_top_left"
 19
-0 0.000 1080.000 0.000
-1 96.000 874.800 0.006
-2 192.000 691.200 0.012
-3 288.000 529.200 0.018
-4 384.000 388.800 0.024
-5 480.000 270.000 0.030
-6 576.000 172.800 0.036
-7 672.000 97.200 0.042
-8 768.000 43.200 0.048
-9 864.000 10.800 0.054
-12 1152.000 43.200 0.071
-13 1248.000 97.200 0.077
-14 1344.000 172.800 0.083
-15 1440.000 270.000 0.089
-16 1536.000 388.800 0.095
-17 1632.000 529.200 0.101
-18 1728.000 691.200 0.107
-19 1824.000 874.800 0.113
-20 1920.000 1080.000 0.119
+0 0.000 1080.000 0.000
+1 96.000 874.800 0.006
+2 192.000 691.200 0.012
+3 288.000 529.200 0.018
+4 384.000 388.800 0.024
+5 480.000 270.000 0.030
+6 576.000 172.800 0.036
+7 672.000 97.200 0.042
+8 768.000 43.200 0.048
+9 864.000 10.800 0.054
+12 1152.000 43.200 0.071
+13 1248.000 97.200 0.077
+14 1344.000 172.800 0.083
+15 1440.000 270.000 0.089
+16 1536.000 388.800 0.095
+17 1632.000 529.200 0.101
+18 1728.000 691.200 0.107
+19 1824.000 874.800 0.113
+20 1920.000 1080.000 0.119
 
 
 "Parabolic_2_from_bottom_right"
 19
-0 1920.000 0.000 0.000
-1 1824.000 205.200 0.006
-2 1728.000 388.800 0.012
-3 1632.000 550.800 0.018
-4 1536.000 691.200 0.024
-5 1440.000 810.000 0.030
-6 1344.000 907.200 0.036
-7 1248.000 982.800 0.042
-8 1152.000 1036.800 0.048
-9 1056.000 1069.200 0.054
-12 768.000 1036.800 0.071
-13 672.000 982.800 0.077
-14 576.000 907.200 0.083
-15 480.000 810.000 0.089
-16 384.000 691.200 0.095
-17 288.000 550.800 0.101
-18 192.000 388.800 0.107
-19 96.000 205.200 0.113
-20 0.000 0.000 0.119
+0 1920.000 0.000 0.000
+1 1824.000 205.200 0.006
+2 1728.000 388.800 0.012
+3 1632.000 550.800 0.018
+4 1536.000 691.200 0.024
+5 1440.000 810.000 0.030
+6 1344.000 907.200 0.036
+7 1248.000 982.800 0.042
+8 1152.000 1036.800 0.048
+9 1056.000 1069.200 0.054
+12 768.000 1036.800 0.071
+13 672.000 982.800 0.077
+14 576.000 907.200 0.083
+15 480.000 810.000 0.089
+16 384.000 691.200 0.095
+17 288.000 550.800 0.101
+18 192.000 388.800 0.107
+19 96.000 205.200 0.113
+20 0.000 0.000 0.119
 
 
 "SingleFrame"
 1
-0 970.000 550.000 0.000
+0 970.000 550.000 0.000

data/test/export/samples/ref_PFTrack5.2dt

@@ -1,54 +1,54 @@
-
-
-"Parabolic_1_from_top_left"
-"Primary"
-19
-0 0.000 1080.000 0.000
-1 96.000 874.800 0.006
-2 192.000 691.200 0.012
-3 288.000 529.200 0.018
-4 384.000 388.800 0.024
-5 480.000 270.000 0.030
-6 576.000 172.800 0.036
-7 672.000 97.200 0.042
-8 768.000 43.200 0.048
-9 864.000 10.800 0.054
-12 1152.000 43.200 0.071
-13 1248.000 97.200 0.077
-14 1344.000 172.800 0.083
-15 1440.000 270.000 0.089
-16 1536.000 388.800 0.095
-17 1632.000 529.200 0.101
-18 1728.000 691.200 0.107
-19 1824.000 874.800 0.113
-20 1920.000 1080.000 0.119
-
-
-"Parabolic_2_from_bottom_right"
-"Primary"
-19
-0 1920.000 0.000 0.000
-1 1824.000 205.200 0.006
-2 1728.000 388.800 0.012
-3 1632.000 550.800 0.018
-4 1536.000 691.200 0.024
-5 1440.000 810.000 0.030
-6 1344.000 907.200 0.036
-7 1248.000 982.800 0.042
-8 1152.000 1036.800 0.048
-9 1056.000 1069.200 0.054
-12 768.000 1036.800 0.071
-13 672.000 982.800 0.077
-14 576.000 907.200 0.083
-15 480.000 810.000 0.089
-16 384.000 691.200 0.095
-17 288.000 550.800 0.101
-18 192.000 388.800 0.107
-19 96.000 205.200 0.113
-20 0.000 0.000 0.119
-
-
-"SingleFrame"
-"Primary"
-1
-0 970.000 550.000 0.000
+
+
+"Parabolic_1_from_top_left"
+"Primary"
+19
+0 0.000 1080.000 0.000
+1 96.000 874.800 0.006
+2 192.000 691.200 0.012
+3 288.000 529.200 0.018
+4 384.000 388.800 0.024
+5 480.000 270.000 0.030
+6 576.000 172.800 0.036
+7 672.000 97.200 0.042
+8 768.000 43.200 0.048
+9 864.000 10.800 0.054
+12 1152.000 43.200 0.071
+13 1248.000 97.200 0.077
+14 1344.000 172.800 0.083
+15 1440.000 270.000 0.089
+16 1536.000 388.800 0.095
+17 1632.000 529.200 0.101
+18 1728.000 691.200 0.107
+19 1824.000 874.800 0.113
+20 1920.000 1080.000 0.119
+
+
+"Parabolic_2_from_bottom_right"
+"Primary"
+19
+0 1920.000 0.000 0.000
+1 1824.000 205.200 0.006
+2 1728.000 388.800 0.012
+3 1632.000 550.800 0.018
+4 1536.000 691.200 0.024
+5 1440.000 810.000 0.030
+6 1344.000 907.200 0.036
+7 1248.000 982.800 0.042
+8 1152.000 1036.800 0.048
+9 1056.000 1069.200 0.054
+12 768.000 1036.800 0.071
+13 672.000 982.800 0.077
+14 576.000 907.200 0.083
+15 480.000 810.000 0.089
+16 384.000 691.200 0.095
+17 288.000 550.800 0.101
+18 192.000 388.800 0.107
+19 96.000 205.200 0.113
+20 0.000 0.000 0.119
+
+
+"SingleFrame"
+"Primary"
+1
+0 970.000 550.000 0.000

data/test/import/test_syntheyes_import.rb

@@ -10,10 +10,7 @@ class SyntheyesImportTest < Test::Unit::TestCase
   
   def test_parsing_from_importable
     fixture = File.open(File.dirname(__FILE__) + '/samples/syntheyes_2d_paths/shake_tracker_nodes_to_syntheyes.txt')
-    
-    parser = Tracksperanto::Import::Syntheyes.new
-    parser.width = 2560
-    parser.height = 1080
+    parser = Tracksperanto::Import::Syntheyes.new(:width => 2560, :height => 1080)
     
     trackers = parser.parse(fixture)
     assert_equal 50, trackers.length
@@ -30,9 +27,7 @@ class SyntheyesImportTest < Test::Unit::TestCase
   
   def test_parsing_cola_plate
     fixture = File.open(File.dirname(__FILE__) + '/samples/syntheyes_2d_paths/cola_plate.txt')
-    parser = Tracksperanto::Import::Syntheyes.new
-    parser.width = 1920
-    parser.height = 1080
+    parser = Tracksperanto::Import::Syntheyes.new(:width => 1920, :height => 1080)
     
     trackers = parser.parse(fixture)
     assert_equal 6, trackers.length
@@ -40,12 +35,16 @@ class SyntheyesImportTest < Test::Unit::TestCase
   
   def test_parsing_with_one_tracker
     fixture = File.open(File.dirname(__FILE__) + '/samples/syntheyes_2d_paths/one_tracker.txt')
-    parser = Tracksperanto::Import::Syntheyes.new
-    parser.width = 1920
-    parser.height = 1080
+    parser = Tracksperanto::Import::Syntheyes.new(:width => 1920, :height => 1080)
     trackers = parser.parse(fixture)
     assert_equal 1, trackers.length
     assert_equal 49, trackers[0].length
   end
   
+  def test_parsing_from_sy_2010
+    fixture = File.open(File.dirname(__FILE__) + '/samples/syntheyes_2d_paths/morePoints_sy2010.txt')
+    parser = Tracksperanto::Import::Syntheyes.new(:width => 1920, :height => 1080)
+    trackers = parser.parse(fixture)
+    assert_equal 26, trackers.length
+  end
 end

data/test/middleware/test_flip_middleware.rb

@@ -1,18 +1,14 @@
 require File.dirname(__FILE__) + '/../helper'
 
-class ShiftMiddlewareTest < Test::Unit::TestCase
+class FlipMiddlewareTest < Test::Unit::TestCase
   def test_shift_supports_hash_init
     receiver = flexmock
     
     m = Tracksperanto::Middleware::Flip.new(receiver)
-    assert !m.flip
-    assert !m.flop
+    assert !m.enabled
     
-    m = Tracksperanto::Middleware::Flip.new(receiver, :flip => true)
-    assert m.flip
-    
-    m = Tracksperanto::Middleware::Flip.new(receiver, :flop => true)
-    assert m.flop
+    m = Tracksperanto::Middleware::Flip.new(receiver, :enabled => true)
+    assert m.enabled
   end
   
   def test_export_flip_and_flop
@@ -21,10 +17,10 @@ class ShiftMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:export_point).once.with(1, 100, 95, 0)
     receiver.should_receive(:export_point).once.with(1, 10, 95, 0)
     
-    m = Tracksperanto::Middleware::Flip.new(receiver, :flip => true)
+    m = Tracksperanto::Middleware::Flip.new(receiver, :enabled => true)
     m.start_export(110, 120)
     m.export_point(1, 10, 95, 0)
-    m.flip = false
+    m.enabled = false
     m.export_point(1, 10, 95, 0)
   end
 end

data/test/middleware/test_flop_middleware.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../helper'
+
+class FlopMiddlewareTest < Test::Unit::TestCase
+  def test_shift_supports_hash_init
+    receiver = flexmock
+    
+    m = Tracksperanto::Middleware::Flop.new(receiver)
+    assert !m.enabled
+    
+    m = Tracksperanto::Middleware::Flop.new(receiver, :enabled => true)
+    assert m.enabled
+  end
+  
+  def test_export_flip_and_flop
+    receiver = flexmock(:exporter)
+    receiver.should_receive(:start_export).once.with(110, 120)
+    receiver.should_receive(:export_point).once.with(1, 10, 25, 0)
+    
+    m = Tracksperanto::Middleware::Flop.new(receiver, :enabled => true)
+    m.start_export(110, 120)
+    m.export_point(1, 10, 95, 0)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 15
   prerelease: false
   segments: 
-  - 1
-  - 9
-  - 9
-  version: 1.9.9
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 +01:00
+date: 2011-01-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -232,6 +232,7 @@ files:
 - test/test_simple_export.rb
 - test/test_tracker.rb
 - test/test_tracksperanto.rb
+- test/middleware/test_flop_middleware.rb
 - test/middleware/test_lens_distort_middleware.rb
 has_rdoc: true
 homepage: http://guerilla-di.org/tracksperanto
@@ -295,6 +296,7 @@ test_files:
 - test/import/test_shake_text_import.rb
 - test/import/test_syntheyes_import.rb
 - test/middleware/test_flip_middleware.rb
+- test/middleware/test_flop_middleware.rb
 - test/middleware/test_golden_middleware.rb
 - test/middleware/test_length_cutoff_middleware.rb
 - test/middleware/test_lens_distort_middleware.rb