tracksperanto 1.2.1 → 1.2.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.2.2 / 2009-09-21
+
+* Support both PFTrack 4 and 5 
+
 === 1.2.1 / 2009-09-21
 
 * Fixed the binary that was not able to properly pass the importer class to the pipeline

data/lib/export/pftrack.rb

@@ -1,14 +1,14 @@
 # Export for PFTrack .2dt files
-class Tracksperanto::Export::PFTrack < Tracksperanto::Export::Base
+class Tracksperanto::Export::PFTrack4 < Tracksperanto::Export::Base
     
     KEYFRAME_TEMPLATE = "%s %.3f %.3f %.3f"
     
     def self.desc_and_extension
-      "pftrack.2dt"
+      "pftrack_v4.2dt"
     end
     
     def self.human_name
-      "PFTrack .2dt file"
+      "PFTrack v4 .2dt file"
     end
     
     def start_tracker_segment(tracker_name)

data/lib/import/pftrack.rb

@@ -7,13 +7,15 @@ class Tracksperanto::Import::PFTrack < Tracksperanto::Import::Base
     ".2dt"
   end
   
+  CHARACTERS = /[AZaz]/
+  
   def parse(io)
     trackers = []
     until io.eof?
       line = io.gets
-      next unless line
+      next if (!line || line =~ /^#/)
       
-      if line =~ /[AZaz]/ # Tracker with a name
+      if line =~ CHARACTERS # Tracker with a name
         t = Tracksperanto::Tracker.new{|t| t.name = line.strip.gsub(/"/, '') }
         report_progress("Reading tracker #{t.name}")
         parse_tracker(t, io)
@@ -26,7 +28,13 @@ class Tracksperanto::Import::PFTrack < Tracksperanto::Import::Base
   
   private
     def parse_tracker(t, io)
-      num_of_keyframes = io.gets.chomp.to_i
+      first_tracker_line = io.gets.chomp
+      
+      if first_tracker_line =~ CHARACTERS # PFTrack version 5 format
+        first_tracker_line = io.gets.chomp
+      end
+      
+      num_of_keyframes = first_tracker_line.to_i
       t.keyframes = (1..num_of_keyframes).map do
         report_progress("Reading keyframe")
         Tracksperanto::Keyframe.new do |k| 

data/lib/pipeline/base.rb

@@ -64,7 +64,6 @@ class Tracksperanto::Pipeline::Base
   end
   
   def detect_importer_or_use_options(path, opts)
-    puts opts[:parser].inspect
     d = Tracksperanto::FormatDetector.new(path)
     if d.match? && d.auto_size?
       return [1, 1, d.importer_klass]

data/lib/tracksperanto.rb

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

data/test/export/test_pftrack5_export.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../helper'
+
+class PFTrack5ExportTest < Test::Unit::TestCase
+  include ParabolicTracks
+  
+  def test_human_name
+    assert_equal "PFTrack v5 .2dt file", Tracksperanto::Export::PFTrack5.human_name
+  end
+  
+  def test_desc_and_ext
+    assert_equal "pftrack_v5.2dt", Tracksperanto::Export::PFTrack5.desc_and_extension
+  end
+  
+  P = File.dirname(__FILE__) + "/samples/ref_PFTrack5.2dt"
+  
+  def test_export_output_written
+    create_reference_output Tracksperanto::Export::PFTrack5, P
+  end
+end

data/test/export/test_pftrack_export.rb

@@ -4,16 +4,16 @@ class PFTrackExportTest < Test::Unit::TestCase
   include ParabolicTracks
   
   def test_human_name
-    assert_equal "PFTrack .2dt file", Tracksperanto::Export::PFTrack.human_name
+    assert_equal "PFTrack v4 .2dt file", Tracksperanto::Export::PFTrack4.human_name
   end
   
   def test_desc_and_ext
-    assert_equal "pftrack.2dt", Tracksperanto::Export::PFTrack.desc_and_extension
+    assert_equal "pftrack_v4.2dt", Tracksperanto::Export::PFTrack4.desc_and_extension
   end
   
   P = File.dirname(__FILE__) + "/samples/ref_PFTrack.2dt"
   
   def test_export_output_written
-    ensure_same_output Tracksperanto::Export::PFTrack, P
+    ensure_same_output Tracksperanto::Export::PFTrack4, P
   end
 end

data/test/import/test_pftrack_import.rb

@@ -36,4 +36,13 @@ class PFTrackImportTest < Test::Unit::TestCase
     assert_equal "Tracker41", trackers[-1].name
     assert_equal 467, trackers[-1].keyframes.length
   end
+  
+  def test_garage_shot
+    fixture = File.open(File.dirname(__FILE__) + '/samples/garage.2dt')
+    parser = Tracksperanto::Import::PFTrack.new(:width => 1920, :height => 1080)
+    trackers = parser.parse(fixture)
+    assert_equal 250, trackers.length
+    assert_equal "Tracker121", trackers[0].name
+    assert_equal 189, trackers[0].length
+  end
 end

data/test/import/test_syntheyes_import.rb

@@ -27,19 +27,4 @@ class SyntheyesImportTest < Test::Unit::TestCase
     assert_in_delta 886.212, first_kf.abs_y, DELTA
     assert_in_delta 30.0, first_kf.residual, DELTA
   end
-  
-  def test_syntheyes_import_from_victorw
-    fixture = File.open(File.dirname(__FILE__) + "/samples/testalltrackers_VictorW.txt")
-    parser = Tracksperanto::Import::Syntheyes.new
-    parser.width = 1920
-    parser.height = 1080
-    
-    trackers = parser.parse(fixture)
-    for tracker in trackers
-      puts tracker.inspect
-      STDOUT.flush
-    end
-    
-  end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -168,6 +168,7 @@ test_files:
 - test/export/test_match_mover_export.rb
 - test/export/test_mux.rb
 - test/export/test_nuke_export.rb
+- test/export/test_pftrack5_export.rb
 - test/export/test_pftrack_export.rb
 - test/export/test_shake_export.rb
 - test/export/test_syntheyes_export.rb