tracksperanto 1.5.3 → 1.5.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.5.4 / 2009-10-25
+
+* Fix a bug in the Shake importer for tracks that have no animation
+
 === 1.5.3 / 2009-10-17
 
 * Fix a bug in the Nuke importer for tracks that have no animation

data/Manifest.txt

@@ -4,6 +4,7 @@ Manifest.txt
 README.txt
 Rakefile
 bin/tracksperanto
+foo.rb
 lib/.DS_Store
 lib/export/base.rb
 lib/export/equalizer3.rb
@@ -47,6 +48,7 @@ lib/tracksperanto/safety.rb
 lib/tracksperanto/simple_export.rb
 lib/tracksperanto/tracker.rb
 lib/tracksperanto/zip_tuples.rb
+serveur.julik.nl
 test/.DS_Store
 test/export/.DS_Store
 test/export/README_EXPORT_TESTS.txt
@@ -74,6 +76,7 @@ test/export/test_syntheyes_export.rb
 test/helper.rb
 test/import/.DS_Store
 test/import/samples/.DS_Store
+test/import/samples/018.nk
 test/import/samples/3de_export_cube.txt
 test/import/samples/3de_export_v3.txt
 test/import/samples/flyover2DP_syntheyes.txt
@@ -86,12 +89,12 @@ test/import/samples/kipPointsMatchmover.rz2
 test/import/samples/mayalive_kipShot.txt
 test/import/samples/megaTrack.action.3dtrack.stabilizer
 test/import/samples/one_shake_tracker.txt
-test/import/samples/018.nk
 test/import/samples/one_shake_tracker_from_first.txt
 test/import/samples/one_tracker_with_break.nk
 test/import/samples/one_tracker_with_break_in_grp.nk
 test/import/samples/shake_tracker_nodes.shk
 test/import/samples/shake_tracker_nodes_to_syntheyes.txt
+test/import/samples/shake_tracker_with_no_anim.shk
 test/import/samples/sourcefile_pftrack.2dt
 test/import/samples/three_tracks_in_one_stabilizer.shk
 test/import/samples/two_shake_trackers.txt

data/foo.rb

@@ -0,0 +1 @@
+class Foo < Tracksperanto::Import::Base; end

data/lib/export/syntheyes.rb

@@ -6,7 +6,7 @@ class Tracksperanto::Export::SynthEyes < Tracksperanto::Export::Base
   end
   
   def self.human_name
-    "Syntheyes 2D tracker .txt file"
+    "Syntheyes 2D tracker paths file"
   end
   
   def start_export( img_width, img_height)

data/lib/import/shake_script.rb

@@ -193,7 +193,13 @@ class Tracksperanto::Import::ShakeScript < Tracksperanto::Import::Base
     end
     
     def collect_tracker(name, x_curve, y_curve, corr_curve, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12)
+      unless x_curve.is_a?(Array) && y_curve.is_a?(Array)
+        report_progress("Tracker #{name} had no anim or unsupported interpolation and can't be recovered")
+        return
+      end
+      
       report_progress("Scavenging tracker #{name}")
+      
       keyframes = zip_curve_tuples(x_curve, y_curve, corr_curve).map do | (frame, x, y, corr) |
         Tracksperanto::Keyframe.new(:frame => frame - 1, :abs_x => x, :abs_y => y, :residual => (1 - corr))
       end

data/lib/import/syntheyes.rb

@@ -1,7 +1,7 @@
 class Tracksperanto::Import::Syntheyes < Tracksperanto::Import::Base
   
   def self.human_name
-    "Syntheyes tracker export (UV) file"
+    "Syntheyes 2D tracker paths file"
   end
   
   def parse(io)

data/lib/tracksperanto.rb

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

data/test/export/test_syntheyes_export.rb

@@ -10,6 +10,6 @@ class SynthEyesExportTest < Test::Unit::TestCase
   
   def test_exporter_meta
     assert_equal "syntheyes_2dt.txt", Tracksperanto::Export::SynthEyes.desc_and_extension
-    assert_equal "Syntheyes 2D tracker .txt file", Tracksperanto::Export::SynthEyes.human_name
+    assert_equal "Syntheyes 2D tracker paths file", Tracksperanto::Export::SynthEyes.human_name
   end
 end

data/test/import/samples/shake_tracker_with_no_anim.shk

@@ -0,0 +1,6 @@
+Tracker36 = Tracker(Expand1, "1-1580", "1/64", "luminance", 0.75, 
+    "use start frame", 0.5, "stop", 1, 1, "v2.0", 0.3, 0.59, 
+    0.11, 0, 10, "track1", width/2, height/2, 1, width/2-height/30, 
+    width/2+height/30, height/2-height/30, height/2+height/30, 
+    width/2-height/15, width/2+height/15, height/2-height/15, 
+    height/2+height/15, width/2, height/2, 1, 1);

data/test/import/test_shake_script_import.rb

@@ -21,7 +21,15 @@ class ShakeScriptImportTest < Test::Unit::TestCase
     second_kf = t.keyframes[1]
     assert_in_delta 0.00129, second_kf.residual, DELTA
   end
-
+  
+  def test_parse_tracker_node_with_no_animation
+    fixture = File.open(File.dirname(__FILE__) + '/samples/shake_tracker_with_no_anim.shk')
+    assert_nothing_raised do
+      trackers = Tracksperanto::Import::ShakeScript.new.parse(fixture)
+      assert_equal 0, trackers.length
+    end
+  end
+  
   def test_parsing_two_tracks_in_one_tracker_node
     fixture = File.open(File.dirname(__FILE__) + '/samples/two_tracks_in_one_tracker.shk')
     

data/test/import/test_syntheyes_import.rb

@@ -4,7 +4,7 @@ class SyntheyesImportTest < Test::Unit::TestCase
   DELTA = 0.9 # our SynthEyes sample is somewhat inaccurate :-P
   def test_introspects_properly
     i = Tracksperanto::Import::Syntheyes
-    assert_equal "Syntheyes tracker export (UV) file", i.human_name
+    assert_equal "Syntheyes 2D tracker paths file", i.human_name
     assert !i.autodetects_size?
   end
   

data/tracksperanto.gemspec

@@ -1,18 +1,18 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{tracksperanto}
-  s.version = "1.5.2"
+  s.version = "1.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = %q{2009-10-10}
+  s.date = %q{2009-10-25}
   s.default_executable = %q{tracksperanto}
   s.description = %q{Tracksperanto is a universal 2D-track translator between many apps.}
   s.email = ["me@julik.nl"]
   s.executables = ["tracksperanto"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = [".DS_Store", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/tracksperanto", "lib/.DS_Store", "lib/export/base.rb", "lib/export/equalizer3.rb", "lib/export/equalizer4.rb", "lib/export/match_mover.rb", "lib/export/maya_live.rb", "lib/export/mux.rb", "lib/export/nuke_script.rb", "lib/export/pftrack.rb", "lib/export/pftrack_5.rb", "lib/export/shake_text.rb", "lib/export/syntheyes.rb", "lib/import/base.rb", "lib/import/equalizer3.rb", "lib/import/equalizer4.rb", "lib/import/flame_stabilizer.rb", "lib/import/match_mover.rb", "lib/import/maya_live.rb", "lib/import/nuke_script.rb", "lib/import/pftrack.rb", "lib/import/shake_grammar/catcher.rb", "lib/import/shake_grammar/lexer.rb", "lib/import/shake_script.rb", "lib/import/shake_text.rb", "lib/import/syntheyes.rb", "lib/middleware/base.rb", "lib/middleware/golden.rb", "lib/middleware/reformat.rb", "lib/middleware/scaler.rb", "lib/middleware/shift.rb", "lib/middleware/slipper.rb", "lib/pipeline/base.rb", "lib/tracksperanto.rb", "lib/tracksperanto/block_init.rb", "lib/tracksperanto/casts.rb", "lib/tracksperanto/const_name.rb", "lib/tracksperanto/ext_io.rb", "lib/tracksperanto/format_detector.rb", "lib/tracksperanto/keyframe.rb", "lib/tracksperanto/safety.rb", "lib/tracksperanto/simple_export.rb", "lib/tracksperanto/tracker.rb", "lib/tracksperanto/zip_tuples.rb", "test/.DS_Store", "test/export/.DS_Store", "test/export/README_EXPORT_TESTS.txt", "test/export/samples/ref_Mayalive.txt", "test/export/samples/ref_Mayalive_CustomAspect.txt", "test/export/samples/ref_NukeScript.nk", "test/export/samples/ref_NukeScript.nk.autosave", "test/export/samples/ref_PFTrack.2dt", "test/export/samples/ref_PFTrack5.2dt", "test/export/samples/ref_ShakeText.txt", "test/export/samples/ref_Syntheyes.txt", "test/export/samples/ref_equalizer.txt", "test/export/samples/ref_equalizer3.txt", "test/export/samples/ref_matchmover.rz2", "test/export/test_equalizer3_export.rb", "test/export/test_equalizer_export.rb", "test/export/test_match_mover_export.rb", "test/export/test_maya_live_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", "test/helper.rb", "test/import/.DS_Store", "test/import/samples/.DS_Store", "test/import/samples/3de_export_cube.txt", "test/import/samples/3de_export_v3.txt", "test/import/samples/flyover2DP_syntheyes.txt", "test/import/samples/four_tracks_in_one_matchmove.shk", "test/import/samples/four_tracks_in_one_stabilizer.shk", "test/import/samples/fromCombustion_fromMidClip_wSnap.stabilizer", "test/import/samples/garage.2dt", "test/import/samples/hugeFlameSetup.stabilizer", "test/import/samples/kipPointsMatchmover.rz2", "test/import/samples/mayalive_kipShot.txt", "test/import/samples/megaTrack.action.3dtrack.stabilizer", "test/import/samples/one_shake_tracker.txt", "test/import/samples/one_shake_tracker_from_first.txt", "test/import/samples/one_tracker_with_break.nk", "test/import/samples/018.nk", "test/import/samples/one_tracker_with_break_in_grp.nk", "test/import/samples/shake_tracker_nodes.shk", "test/import/samples/shake_tracker_nodes_to_syntheyes.txt", "test/import/samples/sourcefile_pftrack.2dt", "test/import/samples/three_tracks_in_one_stabilizer.shk", "test/import/samples/two_shake_trackers.txt", "test/import/samples/two_tracks_in_one_tracker.shk", "test/import/test_3de_import.rb", "test/import/test_3de_import3.rb", "test/import/test_flame_import.rb", "test/import/test_match_mover_import.rb", "test/import/test_maya_live_import.rb", "test/import/test_nuke_import.rb", "test/import/test_pftrack_import.rb", "test/import/test_shake_catcher.rb", "test/import/test_shake_lexer.rb", "test/import/test_shake_script_import.rb", "test/import/test_shake_text_import.rb", "test/import/test_syntheyes_import.rb", "test/middleware/test_golden_middleware.rb", "test/middleware/test_reformat_middleware.rb", "test/middleware/test_scaler_middleware.rb", "test/middleware/test_shift_middleware.rb", "test/middleware/test_slip_middleware.rb", "test/test_const_name.rb", "test/test_extio.rb", "test/test_format_detector.rb", "test/test_keyframe.rb", "test/test_simple_export.rb", "test/test_tracker.rb", "tracksperanto.gemspec"]
+  s.files = [".DS_Store", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/tracksperanto", "foo.rb", "lib/.DS_Store", "lib/export/base.rb", "lib/export/equalizer3.rb", "lib/export/equalizer4.rb", "lib/export/match_mover.rb", "lib/export/maya_live.rb", "lib/export/mux.rb", "lib/export/nuke_script.rb", "lib/export/pftrack.rb", "lib/export/pftrack_5.rb", "lib/export/shake_text.rb", "lib/export/syntheyes.rb", "lib/import/base.rb", "lib/import/equalizer3.rb", "lib/import/equalizer4.rb", "lib/import/flame_stabilizer.rb", "lib/import/match_mover.rb", "lib/import/maya_live.rb", "lib/import/nuke_script.rb", "lib/import/pftrack.rb", "lib/import/shake_grammar/catcher.rb", "lib/import/shake_grammar/lexer.rb", "lib/import/shake_script.rb", "lib/import/shake_text.rb", "lib/import/syntheyes.rb", "lib/middleware/base.rb", "lib/middleware/golden.rb", "lib/middleware/reformat.rb", "lib/middleware/scaler.rb", "lib/middleware/shift.rb", "lib/middleware/slipper.rb", "lib/pipeline/base.rb", "lib/tracksperanto.rb", "lib/tracksperanto/block_init.rb", "lib/tracksperanto/casts.rb", "lib/tracksperanto/const_name.rb", "lib/tracksperanto/ext_io.rb", "lib/tracksperanto/format_detector.rb", "lib/tracksperanto/keyframe.rb", "lib/tracksperanto/safety.rb", "lib/tracksperanto/simple_export.rb", "lib/tracksperanto/tracker.rb", "lib/tracksperanto/zip_tuples.rb", "serveur.julik.nl", "test/.DS_Store", "test/export/.DS_Store", "test/export/README_EXPORT_TESTS.txt", "test/export/samples/ref_Mayalive.txt", "test/export/samples/ref_Mayalive_CustomAspect.txt", "test/export/samples/ref_NukeScript.nk", "test/export/samples/ref_NukeScript.nk.autosave", "test/export/samples/ref_PFTrack.2dt", "test/export/samples/ref_PFTrack5.2dt", "test/export/samples/ref_ShakeText.txt", "test/export/samples/ref_Syntheyes.txt", "test/export/samples/ref_equalizer.txt", "test/export/samples/ref_equalizer3.txt", "test/export/samples/ref_matchmover.rz2", "test/export/test_equalizer3_export.rb", "test/export/test_equalizer_export.rb", "test/export/test_match_mover_export.rb", "test/export/test_maya_live_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", "test/helper.rb", "test/import/.DS_Store", "test/import/samples/.DS_Store", "test/import/samples/018.nk", "test/import/samples/3de_export_cube.txt", "test/import/samples/3de_export_v3.txt", "test/import/samples/flyover2DP_syntheyes.txt", "test/import/samples/four_tracks_in_one_matchmove.shk", "test/import/samples/four_tracks_in_one_stabilizer.shk", "test/import/samples/fromCombustion_fromMidClip_wSnap.stabilizer", "test/import/samples/garage.2dt", "test/import/samples/hugeFlameSetup.stabilizer", "test/import/samples/kipPointsMatchmover.rz2", "test/import/samples/mayalive_kipShot.txt", "test/import/samples/megaTrack.action.3dtrack.stabilizer", "test/import/samples/one_shake_tracker.txt", "test/import/samples/one_shake_tracker_from_first.txt", "test/import/samples/one_tracker_with_break.nk", "test/import/samples/one_tracker_with_break_in_grp.nk", "test/import/samples/shake_tracker_nodes.shk", "test/import/samples/shake_tracker_nodes_to_syntheyes.txt", "test/import/samples/shake_tracker_with_no_anim.shk", "test/import/samples/sourcefile_pftrack.2dt", "test/import/samples/three_tracks_in_one_stabilizer.shk", "test/import/samples/two_shake_trackers.txt", "test/import/samples/two_tracks_in_one_tracker.shk", "test/import/test_3de_import.rb", "test/import/test_3de_import3.rb", "test/import/test_flame_import.rb", "test/import/test_match_mover_import.rb", "test/import/test_maya_live_import.rb", "test/import/test_nuke_import.rb", "test/import/test_pftrack_import.rb", "test/import/test_shake_catcher.rb", "test/import/test_shake_lexer.rb", "test/import/test_shake_script_import.rb", "test/import/test_shake_text_import.rb", "test/import/test_syntheyes_import.rb", "test/middleware/test_golden_middleware.rb", "test/middleware/test_reformat_middleware.rb", "test/middleware/test_scaler_middleware.rb", "test/middleware/test_shift_middleware.rb", "test/middleware/test_slip_middleware.rb", "test/test_const_name.rb", "test/test_extio.rb", "test/test_format_detector.rb", "test/test_keyframe.rb", "test/test_simple_export.rb", "test/test_tracker.rb", "tracksperanto.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://guerilla-di.org/tracksperanto}
   s.rdoc_options = ["--main", "README.txt"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-18 00:00:00 +02:00
+date: 2009-10-25 01:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,7 @@ files:
 - README.txt
 - Rakefile
 - bin/tracksperanto
+- foo.rb
 - lib/.DS_Store
 - lib/export/base.rb
 - lib/export/equalizer3.rb
@@ -93,6 +94,7 @@ files:
 - lib/tracksperanto/simple_export.rb
 - lib/tracksperanto/tracker.rb
 - lib/tracksperanto/zip_tuples.rb
+- serveur.julik.nl
 - test/.DS_Store
 - test/export/.DS_Store
 - test/export/README_EXPORT_TESTS.txt
@@ -120,6 +122,7 @@ files:
 - test/helper.rb
 - test/import/.DS_Store
 - test/import/samples/.DS_Store
+- test/import/samples/018.nk
 - test/import/samples/3de_export_cube.txt
 - test/import/samples/3de_export_v3.txt
 - test/import/samples/flyover2DP_syntheyes.txt
@@ -132,12 +135,12 @@ files:
 - test/import/samples/mayalive_kipShot.txt
 - test/import/samples/megaTrack.action.3dtrack.stabilizer
 - test/import/samples/one_shake_tracker.txt
-- test/import/samples/018.nk
 - test/import/samples/one_shake_tracker_from_first.txt
 - test/import/samples/one_tracker_with_break.nk
 - test/import/samples/one_tracker_with_break_in_grp.nk
 - test/import/samples/shake_tracker_nodes.shk
 - test/import/samples/shake_tracker_nodes_to_syntheyes.txt
+- test/import/samples/shake_tracker_with_no_anim.shk
 - test/import/samples/sourcefile_pftrack.2dt
 - test/import/samples/three_tracks_in_one_stabilizer.shk
 - test/import/samples/two_shake_trackers.txt