tracksperanto 1.1.0 → 1.1.1

data/lib/import/base.rb

@@ -4,6 +4,8 @@ class Tracksperanto::Import::Base
   include Tracksperanto::Safety
   include Tracksperanto::Casts
   
+  attr_accessor :progress_block
+  
   # The original width of the tracked image
   # Some importers need it
   cast_to_int :width
@@ -20,6 +22,11 @@ class Tracksperanto::Import::Base
     super
   end
   
+  # Call this method to tell what you are doing. This gets propagated to the caller
+  def report_progress(message)
+    @progress_block.call(message) if @progress_block
+  end
+  
   # Should return an array of Tracksperanto::Tracker objects
   def parse(track_file_content)
     []

data/lib/import/flame_stabilizer.rb

@@ -149,10 +149,7 @@ Channel tracker1/ref/x
       ChannelBlock.new(io, channel_name)
     end
     
-    def report_progress(msg)
-    end
-    
-    REF_CHANNEL = "ref"
+    REF_CHANNEL = "ref" # or "track" - sometimes works sometimes don't
     
     def scavenge_trackers_from_channels(channels)
       trackers = []
@@ -166,6 +163,8 @@ Channel tracker1/ref/x
     def grab_tracker(channels, track_x)
       t = T.new(:name => track_x.name.split('/').shift)
       
+      report_progress("Extracting tracker #{t.name}")
+      
       track_y = channels.find{|e| e.name == "#{t.name}/#{REF_CHANNEL}/y" }
       shift_x = channels.find{|e| e.name == "#{t.name}/shift/x" }
       shift_y = channels.find{|e| e.name == "#{t.name}/shift/y" }
@@ -179,19 +178,19 @@ Channel tracker1/ref/x
         [track_x.base_value, track_y.base_value]
       end
       
+      total_kf = 1
       t.keyframes = shift_tuples.map do | (at, x, y) |
         # Flame keyframes are sort of minus-one based, so to start at frame 0
         # we need to decrement one frame, always. Also, the shift value is inverted!
-        K.new(:frame => (at - 1), :abs_x => (base_x - x.to_f), :abs_y => (base_y - y.to_f))
+        kf_x, kf_y = base_x - x.to_f, base_y - y.to_f
+        
+        report_progress("Extracting keyframe #{total_kf += 1} of #{t.name}")
+        K.new(:frame => (at - 1), :abs_x => kf_x, :abs_y => kf_y)
       end
       
       return t
     end
     
-    def cornerize(from_dimension, value_from_center)
-      (from_dimension / 2.0) + (value_from_center * -1)
-    end
-    
     UseBase = RuntimeError
     
     def find_base_x_and_y(track_tuples, shift_tuples)

data/lib/import/pftrack.rb

@@ -8,6 +8,7 @@ class Tracksperanto::Import::PFTrack < Tracksperanto::Import::Base
       
       if line =~ /[AZaz]/ # Tracker with a name
         t = Tracksperanto::Tracker.new{|t| t.name = line.strip.gsub(/"/, '') }
+        report_progress("Reading tracker #{t.name}")
         parse_tracker(t, io)
         trackers << t
       end
@@ -20,6 +21,7 @@ class Tracksperanto::Import::PFTrack < Tracksperanto::Import::Base
     def parse_tracker(t, io)
       num_of_keyframes = io.gets.chomp.to_i
       t.keyframes = (1..num_of_keyframes).map do
+        report_progress("Reading keyframe")
         Tracksperanto::Keyframe.new do |k| 
           k.frame, k.abs_x, k.abs_y, k.residual = io.gets.chomp.split
         end

data/lib/import/shake_script.rb

@@ -57,7 +57,7 @@ class Tracksperanto::Import::ShakeScript < Tracksperanto::Import::Base
 
       # Name me!
       @name = scan_until(/(\w+) /).strip
-
+      
       # All the tracker arguments
       17.times { skip_until ',' } # input data
       
@@ -96,6 +96,8 @@ class Tracksperanto::Import::ShakeScript < Tracksperanto::Import::Base
       
       tracker = Tracksperanto::Tracker.new{|t| t.name = parser.name }
       
+      report_progress("Reading tracker #{tracker.name}")
+      
       x_keyframes, y_keyframes, residual_keyframes = TrackerParser.new(tracker_text_block.to_s).curves
       x_keyframes.each_with_index do | value_at, kf_index |
         

data/lib/pipeline/base.rb

@@ -37,6 +37,10 @@ class Base
     points, keyframes, percent_complete = 0, 0, 0.0
     
     yield(percent_complete, "Starting the parse routine") if block_given?
+    parser.progress_block = lambda do | message |
+      yield(percent_complete, message) if block_given?
+    end
+    
     trackers = parser.parse(tracker_data_blob)
     
     yield(percent_complete = 20.0, "Starting export for #{trackers.length} trackers") if block_given?

data/lib/tracksperanto.rb

@@ -1,5 +1,5 @@
 module Tracksperanto
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
   
   module Import; end
   module Export; end
@@ -122,21 +122,21 @@ module Tracksperanto
 end
 
 # Load importers
-Dir.glob(File.dirname(__FILE__) + '/import/*.rb').each do | i |
+Dir.glob(File.dirname(__FILE__) + '/import/*.rb').sort.each do | i |
   require i
 end
 
 # Load exporters
-Dir.glob(File.dirname(__FILE__) + '/export/*.rb').each do | i |
+Dir.glob(File.dirname(__FILE__) + '/export/*.rb').sort.each do | i |
   require i
 end
 
 # Load middleware
-Dir.glob(File.dirname(__FILE__) + '/middleware/*.rb').each do | i |
+Dir.glob(File.dirname(__FILE__) + '/middleware/*.rb').sort.each do | i |
   require i
 end
 
 # Load pipelines
-Dir.glob(File.dirname(__FILE__) + '/pipeline/*.rb').each do | i |
+Dir.glob(File.dirname(__FILE__) + '/pipeline/*.rb').sort.each do | i |
   require i
 end

data/tracksperanto.gemspec

@@ -3,11 +3,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tracksperanto}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = %q{2009-09-07}
+  s.date = %q{2009-09-08}
   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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-07 00:00:00 +02:00
+date: 2009-09-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency