tracksperanto 1.0.6 → 1.1.0

data/test/test_flame_import.rb

@@ -60,9 +60,8 @@ class FlameImportTest < Test::Unit::TestCase
     name = "foo/bar"
     c = Tracksperanto::Import::FlameStabilizer::ChannelBlock.new(io, name)
     
-    assert_equal 1, c.length
-    assert_in_delta 10.0, c[0].value, DELTA
-    assert_equal 1, c[0].frame
+    assert_equal 0, c.length
+    assert_in_delta 10.0, c.base_value, DELTA
   end
   
   def test_channel_block_for_channel_with_5_keyframes
@@ -102,9 +101,9 @@ class FlameImportTest < Test::Unit::TestCase
     
     first_k = first_t.keyframes[1]
     
-    assert_equal 2, first_k.frame
-    assert_in_delta 1022.82062, first_k.abs_x, DELTA
-    assert_in_delta 586.82, first_k.abs_y, DELTA
+    assert_equal 1, first_k.frame
+    assert_in_delta 771.58, first_k.abs_x, DELTA
+    assert_in_delta 107.98192, first_k.abs_y, DELTA
   end
 
   def test_parsing_another_track
@@ -118,4 +117,29 @@ class FlameImportTest < Test::Unit::TestCase
     
     assert_equal 20, trackers.length
   end
+
+  def test_simple_from_combustion
+    fixture = File.read(File.dirname(__FILE__) + '/samples/fromCombustion_fromMidClip_wSnap.stabilizer')
+    
+    parser = Tracksperanto::Import::FlameStabilizer.new
+    
+    trackers = parser.parse(fixture)
+    assert_equal 1280, parser.width
+    assert_equal 540, parser.height
+    
+    assert_equal 1, trackers.length
+    
+    t = trackers.shift
+    assert_equal 232, t.keyframes.length
+    
+    first_kf = t.keyframes[0]
+    
+    assert_equal 0, first_kf.frame
+    assert_in_delta 387.7752, first_kf.abs_x, DELTA
+    assert_in_delta 514.4738, first_kf.abs_y, DELTA
+    
+    frame_149 = t.keyframes[148]
+    assert_in_delta 390.267, frame_149.abs_x, DELTA
+    assert_in_delta 280.248, frame_149.abs_y, DELTA
+  end
 end

data/test/test_keyframe.rb

@@ -13,6 +13,11 @@ class KeyframeTest < Test::Unit::TestCase
     assert_equal 12.5, keyframe.abs_y
   end
   
+  def test_inspect
+    kf = Tracksperanto::Keyframe.new(:frame => 0, :abs_x => 10, :abs_y => 12.0)
+    assert_equal "[0, 10.0, 12.0]", kf.inspect
+  end
+  
   def test_frame_translated_to_int
     kf = Tracksperanto::Keyframe.new {|k|  k.frame = '0' }
     assert_equal 0, kf.frame

data/tracksperanto.gemspec

@@ -3,17 +3,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tracksperanto}
-  s.version = "1.0.5"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = %q{2009-09-06}
+  s.date = %q{2009-09-07}
   s.default_executable = %q{tracksperanto}
   s.description = %q{Tracksperanto is a universal 2D-track translator between many apps.  Import support: * Shake script (one tracker node per tracker) * Shake tracker node export (textfile with many tracks per file), also exported by Boujou and others * PFTrack 2dt files * Syntheyes 2D tracking data exports (UV coordinates)  Export support:  * Shake text file (many trackers per file), also accepted by Boujou * PFTrack 2dt file (with residuals) * Syntheyes 2D tracking data import (UV coordinates)  The main way to use Tracksperanto is to use the supplied "tracksperanto" binary, like so:  tracksperanto -f ShakeScript -w 1920 -h 1080 /Films/Blockbuster/Shots/001/script.shk  ShakeScript is the name of the translator that will be used to read the file (many apps export tracks as .txt files so there is no way for us to autodetect them all). -w and -h stand for Width and Height and define the size of your comp (different tracking apps use different coordinate systems and we need to know the size of the comp to properly convert these). You also have additional options like -xs, -ys and --slip - consult the usage info for the tracksperanto binary.  The converted files will be saved in the same directory as the source, if resulting converted files already exist ++they will be overwritten without warning++.}
   s.email = ["me@julik.nl"]
   s.executables = ["tracksperanto"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt", "test/samples/].txt", "test/samples/flyover2DP_syntheyes.txt", "test/samples/one_shake_tracker.txt", "test/samples/one_shake_tracker_from_first.txt", "test/samples/shake_tracker_nodes_to_syntheyes.txt", "test/samples/two_shake_trackers.txt"]
-  s.files = [".DS_Store", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/tracksperanto", "lib/.DS_Store", "lib/export/base.rb", "lib/export/flame_stabilizer.rb", "lib/export/mux.rb", "lib/export/pftrack.rb", "lib/export/shake_text.rb", "lib/export/syntheyes.rb", "lib/import/base.rb", "lib/import/flame_stabilizer.rb", "lib/import/pftrack.rb", "lib/import/shake_script.rb", "lib/import/shake_text.rb", "lib/import/syntheyes.rb", "lib/middleware/base.rb", "lib/middleware/close.rb", "lib/middleware/golden.rb", "lib/middleware/scaler.rb", "lib/middleware/slipper.rb", "lib/pipeline/base.rb", "lib/tracksperanto.rb", "test/.DS_Store", "test/helper.rb", "test/samples/.DS_Store", "test/samples/].txt", "test/samples/flyover2DP_syntheyes.txt", "test/samples/hugeFlameSetup.stabilizer", "test/samples/megaTrack.action.3dtrack.stabilizer", "test/samples/one_shake_tracker.txt", "test/samples/one_shake_tracker_from_first.txt", "test/samples/shake_tracker_nodes.shk", "test/samples/shake_tracker_nodes_to_syntheyes.txt", "test/samples/sourcefile_pftrack.2dt", "test/samples/three_tracks_in_one_stabilizer.shk", "test/samples/two_shake_trackers.txt", "test/samples/two_tracks_in_one_tracker.shk", "test/test_flame_block.rb", "test/test_keyframe.rb", "test/test_pftrack_import.rb", "test/test_shake_export.rb", "test/test_shake_script_import.rb", "test/test_shake_text_import.rb", "test/test_syntheyes_import.rb", "tracksperanto.gemspec"]
+  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/mux.rb", "lib/export/pftrack.rb", "lib/export/shake_text.rb", "lib/export/syntheyes.rb", "lib/import/base.rb", "lib/import/flame_stabilizer.rb", "lib/import/pftrack.rb", "lib/import/shake_script.rb", "lib/import/shake_text.rb", "lib/import/syntheyes.rb", "lib/middleware/base.rb", "lib/middleware/close.rb", "lib/middleware/golden.rb", "lib/middleware/reformat.rb", "lib/middleware/scaler.rb", "lib/middleware/slipper.rb", "lib/pipeline/base.rb", "lib/tracksperanto.rb", "test/.DS_Store", "test/helper.rb", "test/samples/.DS_Store", "test/samples/flyover2DP_syntheyes.txt", "test/samples/fromCombustion_fromMidClip_wSnap.stabilizer", "test/samples/hugeFlameSetup.stabilizer", "test/samples/megaTrack.action.3dtrack.stabilizer", "test/samples/one_shake_tracker.txt", "test/samples/one_shake_tracker_from_first.txt", "test/samples/shake_tracker_nodes.shk", "test/samples/shake_tracker_nodes_to_syntheyes.txt", "test/samples/sourcefile_pftrack.2dt", "test/samples/three_tracks_in_one_stabilizer.shk", "test/samples/two_shake_trackers.txt", "test/samples/two_tracks_in_one_tracker.shk", "test/test_flame_import.rb", "test/test_keyframe.rb", "test/test_pftrack_import.rb", "test/test_shake_export.rb", "test/test_shake_script_import.rb", "test/test_shake_text_import.rb", "test/test_syntheyes_import.rb", "tracksperanto.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://guerilla-di.org/tracksperanto}
   s.rdoc_options = ["--main", "README.txt"]
@@ -21,18 +21,18 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{guerilla-di}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{Tracksperanto is a universal 2D-track translator between many apps}
-  s.test_files = ["test/test_flame_block.rb", "test/test_keyframe.rb", "test/test_pftrack_import.rb", "test/test_shake_export.rb", "test/test_shake_script_import.rb", "test/test_shake_text_import.rb", "test/test_syntheyes_import.rb"]
+  s.test_files = ["test/test_flame_import.rb", "test/test_keyframe.rb", "test/test_pftrack_import.rb", "test/test_shake_export.rb", "test/test_shake_script_import.rb", "test/test_shake_text_import.rb", "test/test_syntheyes_import.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<hoe>, [">= 1.8.3"])
+      s.add_development_dependency(%q<hoe>, [">= 2.3.3"])
     else
-      s.add_dependency(%q<hoe>, [">= 1.8.3"])
+      s.add_dependency(%q<hoe>, [">= 2.3.3"])
     end
   else
-    s.add_dependency(%q<hoe>, [">= 1.8.3"])
+    s.add_dependency(%q<hoe>, [">= 2.3.3"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-06 00:00:00 +02:00
+date: 2009-09-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        version: 2.3.3
     version: 
 description: "Tracksperanto is a universal 2D-track translator between many apps.  Import support: * Shake script (one tracker node per tracker) * Shake tracker node export (textfile with many tracks per file), also exported by Boujou and others * PFTrack 2dt files * Syntheyes 2D tracking data exports (UV coordinates)  Export support:  * Shake text file (many trackers per file), also accepted by Boujou * PFTrack 2dt file (with residuals) * Syntheyes 2D tracking data import (UV coordinates)  The main way to use Tracksperanto is to use the supplied \"tracksperanto\" binary, like so:  tracksperanto -f ShakeScript -w 1920 -h 1080 /Films/Blockbuster/Shots/001/script.shk  ShakeScript is the name of the translator that will be used to read the file (many apps export tracks as .txt files so there is no way for us to autodetect them all). -w and -h stand for Width and Height and define the size of your comp (different tracking apps use different coordinate systems and we need to know the size of the comp to properly convert these). You also have additional options like -xs, -ys and --slip - consult the usage info for the tracksperanto binary.  The converted files will be saved in the same directory as the source, if resulting converted files already exist ++they will be overwritten without warning++."
 email: 
@@ -33,11 +33,6 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-- test/samples/flyover2DP_syntheyes.txt
-- test/samples/one_shake_tracker.txt
-- test/samples/one_shake_tracker_from_first.txt
-- test/samples/shake_tracker_nodes_to_syntheyes.txt
-- test/samples/two_shake_trackers.txt
 files: 
 - .DS_Store
 - History.txt
@@ -47,7 +42,6 @@ files:
 - bin/tracksperanto
 - lib/.DS_Store
 - lib/export/base.rb
-- lib/export/flame_stabilizer.rb
 - lib/export/mux.rb
 - lib/export/pftrack.rb
 - lib/export/shake_text.rb
@@ -61,6 +55,7 @@ files:
 - lib/middleware/base.rb
 - lib/middleware/close.rb
 - lib/middleware/golden.rb
+- lib/middleware/reformat.rb
 - lib/middleware/scaler.rb
 - lib/middleware/slipper.rb
 - lib/pipeline/base.rb
@@ -69,6 +64,7 @@ files:
 - test/helper.rb
 - test/samples/.DS_Store
 - test/samples/flyover2DP_syntheyes.txt
+- test/samples/fromCombustion_fromMidClip_wSnap.stabilizer
 - test/samples/hugeFlameSetup.stabilizer
 - test/samples/megaTrack.action.3dtrack.stabilizer
 - test/samples/one_shake_tracker.txt

data/lib/export/flame_stabilizer.rb

@@ -1,50 +0,0 @@
-class Tracksperanto::Export::FlameStabilizer < Tracksperanto::Export::Base
-  PREAMBLE = '' #__DATA__.read
-  
-  # Should return the suffix and extension of this export file (like "_flame.stabilizer")
-  def self.desc_and_extension
-    "flame.stabilizer"
-  end
-  
-  def start_export(w, h)
-    @width = w, @height = h
-  end
-  
-  def start_tracker_segment(tracker_name)
-    @tracker_count ||= 0
-    @tracker_count += 1
-  end
-  
-  def end_export
-    preamble = PREAMBLE % [ @tracker_count, @width, @height]
-  end
-  
-  def export_point(frame, abs_float_x, abs_float_y, float_residual)
-  end
-end
-
-__END__
-StabilizerFileVersion 5.0
-CreationDate Tue Dec  9 21:02:02 2008
-
-
-NbTrackers %d
-Selected 0
-FrameWidth %d
-FrameHeight %d
-AutoKey yes
-MotionPath yes
-Icons yes
-AutoPan no
-EditMode 1
-Format 0
-Padding
-	Red 0
-	Green 0
-	Blue 0
-Oversampling no
-Opacity 50
-Zoom 3
-Field no
-Backward no
-Anim