tracksperanto 1.6.9 → 1.7.0

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.7.0 / 2010-01-24
+
+* Fix edge cases of specific comp sizes outputting incorrect exports for Equalizer 3 and MatchMover
+
 === 1.6.9 / 2010-01-20
 
 * Make the commandline progress reports shorter

data/Manifest.txt

@@ -49,7 +49,6 @@ lib/tracksperanto/simple_export.rb
 lib/tracksperanto/tracker.rb
 lib/tracksperanto/uv_coordinates.rb
 lib/tracksperanto/zip_tuples.rb
-test/export/.DS_Store
 test/export/README_EXPORT_TESTS.txt
 test/export/samples/ref_Mayalive.txt
 test/export/samples/ref_Mayalive_CustomAspect.txt
@@ -72,11 +71,9 @@ 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/3de_v3/3de_export_v3.txt
 test/import/samples/3de_v4/3de_export_cube.txt
 test/import/samples/boujou_features_text/boujou_txt_export.txt
-test/import/samples/flame_stabilizer/.DS_Store
 test/import/samples/flame_stabilizer/fromCombustion_fromMidClip_wSnap.stabilizer
 test/import/samples/flame_stabilizer/hugeFlameSetup.stabilizer
 test/import/samples/flame_stabilizer/megaTrack.action.3dtrack.stabilizer
@@ -88,9 +85,7 @@ test/import/samples/nuke/one_tracker_with_break_in_grp.nk
 test/import/samples/nuke/tracker_with_differing_gaps.nk
 test/import/samples/nuke/tracker_with_repeating_gaps.nk
 test/import/samples/pftrack4/sourcefile_pftrack.2dt
-test/import/samples/pftrack5/.DS_Store
 test/import/samples/pftrack5/garage.2dt
-test/import/samples/shake_script/.DS_Store
 test/import/samples/shake_script/four_tracks_in_one_matchmove.shk
 test/import/samples/shake_script/four_tracks_in_one_stabilizer.shk
 test/import/samples/shake_script/shake_script_from_boujou.shk
@@ -103,7 +98,6 @@ test/import/samples/shake_script/two_tracks_in_one_tracker.shk
 test/import/samples/shake_text/one_shake_tracker.txt
 test/import/samples/shake_text/one_shake_tracker_from_first.txt
 test/import/samples/shake_text/two_shake_trackers.txt
-test/import/samples/syntheyes_2d_paths/.DS_Store
 test/import/samples/syntheyes_2d_paths/cola_plate.txt
 test/import/samples/syntheyes_2d_paths/flyover2DP_syntheyes.txt
 test/import/samples/syntheyes_2d_paths/shake_tracker_nodes_to_syntheyes.txt

data/lib/export/base.rb

@@ -26,16 +26,16 @@ class Tracksperanto::Export::Base
   
   # The constructor for an exporter should accept a handle to the IO object that you can write to.
   # This gets assigned to @io ivar by default, but you can do whatever you wish
-  # By convention, the caller will close the IO when you are done so don't do it here
+  # By convention, the caller owns the IO handle and will close it when you are done, so don't close t yourself
   def initialize(write_to_io)
     @io = write_to_io
   end
   
-  # Called on export start. Will receive the width and height of the comp being exported
+  # Called on export start. Will receive the width and height of the comp being exported as Fixnums
   def start_export( img_width, img_height)
   end
   
-  # Called on export end. By convention, the caller will close the IO when you are done so don't do it here.
+  # Called on export end. By convention, the caller will close the main IO when you are done so don't do it here.
   # However if you've allocated anything during export (like some Tempfiles) here will be the place to get rid
   # of them
   def end_export

data/lib/export/equalizer3.rb

@@ -1,7 +1,7 @@
 # Export for 3DE v3 point files
 class Tracksperanto::Export::Equalizer3 < Tracksperanto::Export::Base
   
-  HEADER = '// 3DE Multiple Tracking Curves Export 2048 x 778 * 275 frames'
+  HEADER = '// 3DE Multiple Tracking Curves Export %d x %d * %d frames'
   
   def self.desc_and_extension
     "3de_v3.txt"
@@ -30,8 +30,7 @@ class Tracksperanto::Export::Equalizer3 < Tracksperanto::Export::Base
   
   def end_export
     @buffer.rewind
-    preamble = HEADER.gsub(/2048/, @w.to_s).gsub(/778/, @h.to_s).gsub(/275/, @highest_keyframe.to_s)
-    @io.puts(preamble)
+    @io.puts(HEADER % [@w, @h, @highest_keyframe])
     @io.puts(@buffer.read) until @buffer.eof?
     @buffer.close!
     @io.puts("") # Newline at end

data/lib/export/equalizer4.rb

@@ -38,11 +38,7 @@ class Tracksperanto::Export::Equalizer4 < Tracksperanto::Export::Base
     @internal_io.rewind
     @io.puts(@num_of_trackers)
     @io.puts(@internal_io.read)
-    discard_io
+    @internal_io.close!
   end
   
-  private
-    def discard_io
-      @internal_io.close!
-    end
 end

data/lib/export/match_mover.rb

@@ -9,7 +9,7 @@ class Tracksperanto::Export::MatchMover < Tracksperanto::Export::Base
     "Matchmover 2D export .rz2 file"
   end
   
-  PREAMBLE = %[imageSequence	"Sequence 01"\n{\n\t2560\t1080\tf( "D:/temp/sequence.%04d.dpx" )\tb( 1 211 1 )\t\n}\n]
+  PREAMBLE = %[imageSequence	"Sequence 01"\n{\n\t%d\t%d\tf( "D:/temp/sequence.%%04d.dpx" )\tb( 1 211 1 )\t\n}\n]
   TRACKER_PREAMBLE = "pointTrack  %s  rgb( 255 0 0 )	\n{\n"
   TRACKER_POSTAMBLE = "}\n"
   FIRST_KEYFRAME_TEMPLATE = "\t%d\t   %.3f     %.3f    ki( 0.8 )\t    s( 66 66 64 64 )  p( 24 24 25 25 )"
@@ -17,7 +17,7 @@ class Tracksperanto::Export::MatchMover < Tracksperanto::Export::Base
   
   def start_export( img_width, img_height)
     @height = img_height
-    @io.puts(PREAMBLE.gsub(/2560/, img_width.to_s).gsub(/1080/, img_height.to_s))
+    @io.puts(PREAMBLE % [img_width, img_height])
   end
   
   def start_tracker_segment(tracker_name)

data/lib/tracksperanto.rb

@@ -4,7 +4,7 @@ require 'tempfile'
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '1.6.9'
+  VERSION = '1.7.0'
   
   module Import; end
   module Export; end
@@ -14,10 +14,10 @@ module Tracksperanto
   class << self
     # Returns the array of all exporter classes defined
     attr_accessor :exporters
-
+    
     # Returns the array of all importer classes defined
     attr_accessor :importers
-
+    
     # Returns the array of all available middlewares
     attr_accessor :middlewares
     
@@ -35,14 +35,13 @@ module Tracksperanto
     def middleware_names
       middlewares.map{|e| e.const_name }
     end
-    
   end
   
   self.exporters, self.importers, self.middlewares = [], [], []
   
 end
 
-%w( 
+%w(
   const_name
   casts
   block_init

data/test/export/test_equalizer3_export.rb

@@ -12,4 +12,13 @@ class Equalizer3ExportTestTest < Test::Unit::TestCase
     assert_equal "3de_v3.txt", Tracksperanto::Export::Equalizer3.desc_and_extension
     assert_equal "3DE v3 point export .txt file", Tracksperanto::Export::Equalizer3.human_name
   end
+  
+  def test_export_for_format_does_not_override_preamble
+    out = StringIO.new
+    expt = Tracksperanto::Export::Equalizer3.new(out)
+    expt.start_export(2048, 275)
+    expt.end_export
+    assert_equal "// 3DE Multiple Tracking Curves Export 2048 x 275 * 0 frames\n\n", out.string,
+      "Frame count should not bleed into width"
+  end
 end

data/test/export/test_match_mover_export.rb

@@ -13,4 +13,13 @@ class MatchmoverExportTest < Test::Unit::TestCase
     assert_equal "Matchmover 2D export .rz2 file", Tracksperanto::Export::MatchMover.human_name
   end
   
+  def test_width_and_height_not_stepping_on_each_other_in_preamble
+    o = StringIO.new
+    expt = Tracksperanto::Export::MatchMover.new(o)
+    expt.start_export(1080, 720)
+    expt.end_export
+    assert_equal "imageSequence\t\"Sequence 01\"\n{\n\t1080\t720\tf( \"D:/temp/sequence.%04d.dpx\" )\tb( 1 211 1 )\t\n}\n",
+      o.string,
+      "The output width and height should be properly substituted"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  version: 1.6.9
+  version: 1.7.0
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 +01:00
+date: 2010-01-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,7 +96,6 @@ files:
 - lib/tracksperanto/tracker.rb
 - lib/tracksperanto/uv_coordinates.rb
 - lib/tracksperanto/zip_tuples.rb
-- test/export/.DS_Store
 - test/export/README_EXPORT_TESTS.txt
 - test/export/samples/ref_Mayalive.txt
 - test/export/samples/ref_Mayalive_CustomAspect.txt
@@ -119,11 +118,9 @@ files:
 - test/export/test_shake_export.rb
 - test/export/test_syntheyes_export.rb
 - test/helper.rb
-- test/import/.DS_Store
 - test/import/samples/3de_v3/3de_export_v3.txt
 - test/import/samples/3de_v4/3de_export_cube.txt
 - test/import/samples/boujou_features_text/boujou_txt_export.txt
-- test/import/samples/flame_stabilizer/.DS_Store
 - test/import/samples/flame_stabilizer/fromCombustion_fromMidClip_wSnap.stabilizer
 - test/import/samples/flame_stabilizer/hugeFlameSetup.stabilizer
 - test/import/samples/flame_stabilizer/megaTrack.action.3dtrack.stabilizer
@@ -135,9 +132,7 @@ files:
 - test/import/samples/nuke/tracker_with_differing_gaps.nk
 - test/import/samples/nuke/tracker_with_repeating_gaps.nk
 - test/import/samples/pftrack4/sourcefile_pftrack.2dt
-- test/import/samples/pftrack5/.DS_Store
 - test/import/samples/pftrack5/garage.2dt
-- test/import/samples/shake_script/.DS_Store
 - test/import/samples/shake_script/four_tracks_in_one_matchmove.shk
 - test/import/samples/shake_script/four_tracks_in_one_stabilizer.shk
 - test/import/samples/shake_script/shake_script_from_boujou.shk
@@ -150,7 +145,6 @@ files:
 - test/import/samples/shake_text/one_shake_tracker.txt
 - test/import/samples/shake_text/one_shake_tracker_from_first.txt
 - test/import/samples/shake_text/two_shake_trackers.txt
-- test/import/samples/syntheyes_2d_paths/.DS_Store
 - test/import/samples/syntheyes_2d_paths/cola_plate.txt
 - test/import/samples/syntheyes_2d_paths/flyover2DP_syntheyes.txt
 - test/import/samples/syntheyes_2d_paths/shake_tracker_nodes_to_syntheyes.txt