tracksperanto 2.2.2 → 2.2.4

data/DEVELOPER_DOCS.rdoc

@@ -4,8 +4,8 @@
 
 You can easily write a Tracksperanto import module - refer to Tracksperanto::Import::Base
 docs. Your importer will be configured with width and height of the comp that it is importing, and will get an IO 
-object with the file that you are processing. The parse method should then return an array of Tracksperanto::Tracker objects which
-are themselves arrays of Tracksperanto::Keyframe objects.
+object with the file that you are processing. You should then yield parsed trackers within the each method (tracker objects should
+be Tracksperanto::Tracker objects or compatibles)
 
 === Exporting your own formats
 

data/History.txt

@@ -1,3 +1,15 @@
+=== 2.2.4 / 2011-04-04
+
+* Properly deal with negative frames happening in Shake scripts sometimes. We will now recognize a script starting at negative
+frames and "bump" it's frames in curves so that everything neatly starts at frame 0. Granted this does not give us the same frame range
+but most apps wil go bonkers anyway if we send them negative frame numbers.
+
+=== 2.2.3 / 2011-04-03
+
+* Prevent zero-length trackers (trackers having no position information) from being accumulated during import.
+This had adverse effects on export modules that could not export trackers containing no information. As a sidenote we
+will write down in the doco that an export module should not expect empty trackers with no keyframes to be sent
+
 === 2.2.2 / 2011-04-03
 
 * The last change to PFMatchit exporter had adverse effects on pftrack files, now fixed.
@@ -13,8 +25,8 @@
 
 * Improve documentation substantially
 * Changed the Import::Base interface yo use enumeration instead of @receiver.
-  Upside: This allows us to convert importers to an array of trackers and other niceties.
-  Downside: stream_parse will be deprecated. It is however still available for backwards compatibility
+Upside: This allows us to convert importers to an array of trackers and other niceties.
+Downside: stream_parse will be deprecated. It is however still available for backwards compatibility
   
 === 2.1.1 / 2011-02-14
 

data/Manifest.txt

@@ -109,7 +109,9 @@ test/import/samples/nuke/tracker_with_repeating_gaps.nk
 test/import/samples/pfmatchit/pfmatchit_example.2dt
 test/import/samples/pftrack4/sourcefile_pftrack.2dt
 test/import/samples/pftrack5/apft.2dt
+test/import/samples/pftrack5/empty_trackers.2dt
 test/import/samples/pftrack5/garage.2dt
+test/import/samples/shake_script/designated_global_range_starting_at_negative_frame.shk
 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/from_matchmover.shk

data/Rakefile

@@ -16,7 +16,7 @@ begin
     p.extra_dev_deps = {"flexmock" => ">=0"}
     p.rubyforge_name = 'guerilla-di'
     p.developer('Julik Tarkhanov', 'me@julik.nl')
-    p.clean_globs = %w( **/.DS_Store  coverage.info **/*.rbc .idea)
+    p.clean_globs = %w( **/.DS_Store  coverage.info **/*.rbc .idea .yardoc)
   end
 rescue LoadError
   $stderr.puts "Meta-operations on this package require Hoe"

data/lib/export/base.rb

@@ -21,6 +21,7 @@
 #       exporter.end_export
 #     end
 #
+# By contract export_point will be called at least once for each tracker being exported (no empty trackers will be sent)
 class Tracksperanto::Export::Base
   include Tracksperanto::ConstName
   include Tracksperanto::SimpleExport

data/lib/import/flame_stabilizer.rb

@@ -14,10 +14,6 @@ class Tracksperanto::Import::FlameStabilizer < Tracksperanto::Import::Base
     "Flame .stabilizer file"
   end
   
-  class Key
-    attr_accessor :at, :value, :extrap, :interp, :left_tangent, :right_tangent
-  end
-  
   class ChannelBlock < Array
     include ::Tracksperanto::Casts
     cast_to_string :name

data/lib/import/shake_grammar/lexer.rb

@@ -78,10 +78,10 @@ module Tracksperanto::ShakeGrammar
       end
     end
     
-    INT_ATOM = /^(\d+)$/
+    INT_ATOM = /^(-?\d+)$/
     FLOAT_ATOM = /^([\-\d\.]+)$/
     STR_ATOM = /^\"/
-    AT_FRAME = /^@(\d+)/
+    AT_FRAME = /^@(-?\d+)/
     
     # Grab the minimum atomic value
     def consume_atom!

data/lib/import/shake_script.rb

@@ -12,16 +12,33 @@ class Tracksperanto::Import::ShakeScript < Tracksperanto::Import::Base
   end
   
   def each
-    progress_proc = lambda{|msg| report_progress(msg) }
-    TrackExtractor.new(@io, [Proc.new, progress_proc])
+    s = Sentinel.new
+    s.progress_proc = method(:report_progress)
+    s.tracker_proc = Proc.new
+    TrackExtractor.new(@io, s)
   end
   
   private
   
+  #:nodoc:
+  
+  class Sentinel
+    attr_accessor :start_frame, :tracker_proc, :progress_proc
+    def start_frame
+      @start_frame.to_i
+    end
+  end
+  
   # Extractor. Here we define copies of Shake's standard node creation functions.
   class TrackExtractor < Tracksperanto::ShakeGrammar::Catcher
     include Tracksperanto::ZipTuples
     
+    # SetTimeRange("-5-15") // sets time range of comp
+    # We use it to avoid producing keyframes which start at negative frames
+    def settimerange(str)
+      sentinel.start_frame = str.to_i if str.to_i < 0
+    end
+    
     # Normally, we wouldn't need to look for the variable name from inside of the funcall. However,
     # in this case we DO want to take this shortcut so we know how the tracker node is called
     def push(atom)
@@ -31,7 +48,8 @@ class Tracksperanto::Import::ShakeScript < Tracksperanto::Import::Base
       trackers = atom[2][1][1..-1]
       trackers.map do | tracker |
         tracker.name = [node_name, tracker.name].join("_")
-        sentinel[0].call(tracker)
+        # THIS IS THE MOST IMPORTANT THINGO
+        sentinel.tracker_proc.call(tracker)
       end
     end
     
@@ -43,7 +61,8 @@ class Tracksperanto::Import::ShakeScript < Tracksperanto::Import::Base
     # We put the frame number at the beginning since it works witih oru tuple zipper
     def linear(extrapolation_type, *keyframes)
       report_progress("Translating Linear animation")
-      keyframes.map { |kf| [kf.at, kf.value] }
+      remap_keyframes_against_negative_at!(keyframes)
+      keyframes.map { |kf| [kf.at , kf.value] }
     end
     alias_method :nspline, :linear
     alias_method :jspline, :linear
@@ -54,9 +73,16 @@ class Tracksperanto::Import::ShakeScript < Tracksperanto::Import::Base
     # tangent positions (which we discard)
     def hermite(extrapolation_type, *keyframes)
       report_progress("Translating Hermite curve, removing tangents")
+      remap_keyframes_against_negative_at!(keyframes)
       keyframes.map{ |kf| [kf.at, kf.value[0]] }
     end
     
+    def remap_keyframes_against_negative_at!(kfs)
+      frame_start_of_script = sentinel.start_frame
+      kfs.each{|k| k.at = (k.at - frame_start_of_script) }
+    end
+    private :remap_keyframes_against_negative_at!
+    
     # image Tracker( 
     #   image In,
     #   const char * trackRange,
@@ -199,7 +225,7 @@ class Tracksperanto::Import::ShakeScript < Tracksperanto::Import::Base
     private
     
     def report_progress(with_message)
-      sentinel[1].call(with_message) if sentinel[1]
+      sentinel.progress_proc.call(with_message)
     end
     
     def collect_trackers_from(array)

data/lib/middleware/shift.rb

@@ -4,7 +4,7 @@ class Tracksperanto::Middleware::Shift < Tracksperanto::Middleware::Base
   cast_to_float :x_shift, :y_shift
   
   def export_point(frame, float_x, float_y, float_residual)
-    super(frame, float_x + (@x_shift || 0), float_y + (@y_shift || 0), float_residual)
+    super(frame, float_x + @x_shift.to_f, float_y + @y_shift.to_f, float_residual)
   end
   
 end

data/lib/pipeline/base.rb

@@ -16,7 +16,6 @@ module Tracksperanto::Pipeline
     def message; "Could not recover any non-empty trackers from this file. Wrong import format maybe?"; end
   end
   
-  
   # The base pipeline is the whole process of track conversion from start to finish. The pipeline object organizes the import formats, scans them,
   # applies the middlewares. Here's how a calling sequence for a pipeline looks like:
   #
@@ -149,7 +148,7 @@ module Tracksperanto::Pipeline
       importer.stream_parse(io_with_progress)
     else
       importer.io = io_with_progress
-      importer.each {|t| @accumulator.push(t) }
+      importer.each {|t| @accumulator.push(t) unless t.empty? }
     end
     
     report_progress(percent_complete = 50.0, "Validating #{@accumulator.size} imported trackers")

data/lib/tracksperanto.rb

@@ -1,11 +1,10 @@
 require 'stringio'
 require 'delegate'
-require 'forwardable'
 require 'tempfile'
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '2.2.2'
+  VERSION = '2.2.4'
   
   module Import; end
   module Export; end

data/test/import/samples/pftrack5/empty_trackers.2dt

@@ -0,0 +1,30 @@
+# 2D feature tracks generated by PFTrack 5.0r4-90106
+#
+# format:
+# "name"
+# "camera"
+# <number of frames>
+# <frame number> <x pixel> <y pixel> <residual>
+#
+
+"Feature2"
+"Primary"
+0
+
+"Feature3"
+"Primary"
+10
+9095 615.471 403.957 0.000
+9105 643.794 405.318 0.000
+9107 644.339 405.863 0.000
+9115 632.084 424.110 0.000
+9121 627.684 438.722 0.000
+9125 709.070 452.946 0.000
+9128 726.041 472.858 0.000
+9131 668.577 480.211 0.000
+9135 595.863 470.952 0.000
+9138 527.778 467.956 0.000
+
+"Feature4"
+"Primary"
+0