tracksperanto 2.12.0 → 3.0.0

data/DEVELOPER_DOCS.rdoc

@@ -18,6 +18,13 @@ in the Gemfile plus Bundler. Please develop against the git repo checkout since
 * Carry your development, in your own branch or feature branch
 * File a pull request or send a patch to info at guerilla-di.org
 
+=== Internal tracker representation
+
+The trackers are represented by Tracker objects, which work like addressable hashes per frame number. The Tracker objects
+contain Keyframe objects, and those in turn contain coordinates. The coordinates are stored in absolute pixels, relative to
+the zero coordinate in the lower left corner. The absolute left/bottom of the image has coordinates 0,0 (at the lower left corner of the
+first pixel) and 0.5x0.5 in the middle of the leftmost lower pixel.
+
 === Importing your own formats
 
 You can easily write a Tracksperanto import module - refer to Tracksperanto::Import::Base
@@ -33,14 +40,14 @@ the exporter should work with streams (smaller parts of the file being exported
 
 === Ading your own processing steps
 
-You probably want to write a Middleware (consult the Tracksperanto::Middleware::Base docs) if you need some processing applied to the tracks
-or their data. A Middleware is just like an export module, except that instead it sits between the exporter and the exporting routine. Middlewares wrap export
-modules or each other, so you can stack different middleware modules together (like "scale first, then move").
+You probably want to write a Tool (consult the Tracksperanto::Tool::Base docs) if you need some processing applied to the tracks
+or their data. A Tool is just like an export module, except that instead it sits between the exporter and the exporting routine. Tools wrap export
+modules or each other, so you can stack different tool modules together (like "scale first, then move").
 
 === Writing your own processing routines
 
 You probably want to write a descendant of Tracksperanto::Pipeline::Base. This is a class that manages a conversion from start to finish, including detecting the
-input format, allocating output files and building a chain of Middlewares to process the export. If you want to make a GUI for Tracksperanto you will likely need
+input format, allocating output files and building a chain of Tools to process the export. If you want to make a GUI for Tracksperanto you will likely need
 to write your own Pipeline class or reimplement parts of it.
 
 === Reporting status from long-running operations
@@ -74,11 +81,11 @@ the software user-friendly. A well-behaved Tracksperanto module should manage it
   destination_file = File.open("exported_file.other", "wb")
   some_exporter = Tracksperanto.get_exporter("flamestabilizer").new(destination_file)
   
-  # Now add some middlewares, for example a Scale
-  scaler = Middleware::Scaler.new(some_exporter, :x_factor => 2)
-  # ... and a slip. Middlewares wrap exporters and other middlewares, so you can chain them
+  # Now add some tools, for example a Scale
+  scaler = Tool::Scaler.new(some_exporter, :x_factor => 2)
+  # ... and a slip. Tools wrap exporters and other tools, so you can chain them
   # ad nauseam
-  slipper = Middleware::Slipper.new(scaler, :offset => 2)
+  slipper = Tool::Slipper.new(scaler, :offset => 2)
   
   # Now when we send export commands to the Slipper it will play them through
   # to the Scaler and the Scaler in turn will send commands to the exporter.

data/History.txt

@@ -1,3 +1,10 @@
+=== 3.0.0
+
+* Middleware renamed to Tools
+* Multiple subpixel accuracy tests added
+* Subpixel accuracy fixed for Syntheyes modules
+* Subpixel accuracy fixed for PFTrack modules
+
 === 2.12.0
 
 * Add an export module for Nuke's CameraTracker node. This is just like the Shake format, except that tracker names have to be special.
@@ -21,7 +28,7 @@
 
 === 2.9.9
 
-* Add lens distortion middleware. Adds the possibility to remove or add Syntheyes lens distortion to your plates.
+* Add lens distortion tool. Adds the possibility to remove or add Syntheyes lens distortion to your plates.
 
 === 2.9.8
 
@@ -34,7 +41,7 @@
 === 2.9.6
 
 * Add Nuke Reconcile3D support
-* Add Middleware::Base.parameters for automatic GUI building
+* Add Tool::Base.parameters for automatic GUI building
 
 === 2.9.5
 
@@ -71,7 +78,7 @@
 
 === 2.8.5
 
-* Add Pad and Crop middlewares for fixing botched telecine and anamorphic Alexa
+* Add Pad and Crop tools for fixing botched telecine and anamorphic Alexa
 
 === 2.8.2
 
@@ -85,7 +92,7 @@
 === 2.8.1
 
 * Fix the bug that MatchMover importer would always assume the sequence starting on frame 1
-* Fix the bug that Lint middleware would raise when the export was started from negative frame offsets
+* Fix the bug that Lint tool would raise when the export was started from negative frame offsets
 
 === 2.8.0
 
@@ -193,7 +200,7 @@ Downside: stream_parse will be deprecated. It is however still available for bac
 
 === 2.0.2
 * Compatible with Ruby 1.9.2
-* Scaler middleware now supports negative scaling factors
+* Scaler tool now supports negative scaling factors
 
 === 2.0.0
 * Bugfix for PFTrack exports to contain cross-platform linebreaks (rn instead of n)
@@ -208,7 +215,7 @@ Downside: stream_parse will be deprecated. It is however still available for bac
 * Very minor changes and improvements
 * The app will now tell you when you try to feed it an empty file
 * Change Synetheyes exports to start with a standard frame and not a keyframe to make 1-frame trackers work
-* Adds a flip middleware to mirror a tracked comp
+* Adds a flip tool to mirror a tracked comp
 
 === 1.9.6
 
@@ -241,7 +248,7 @@ Downside: stream_parse will be deprecated. It is however still available for bac
 === 1.9.0
 
 * Use proper progress bars
-* Allow proper chaining of middlewares in the commandline app - you can now apply many middlewares of the same nature in chain, and they will be ordered correctly
+* Allow proper chaining of tools in the commandline app - you can now apply many tools of the same nature in chain, and they will be ordered correctly
 * Small rewrites to Pipeline::Base (changes API slightly - please consult the docs)
 
 === 1.8.4
@@ -270,7 +277,7 @@ Downside: stream_parse will be deprecated. It is however still available for bac
 * Introduce an intentional gap in the reference exports to test trackers with gaps
 * Export Syntheyes paths as normal frames, not as keyframes. This produces better solves by not overconstraining the solver
 	(Without this TransitionFrms, a crucial parameter in SY, seizes to work)
-* Add a LengthCutoff middleware that allows you to remove trackers that have less than X keyframes in them from the export
+* Add a LengthCutoff tool that allows you to remove trackers that have less than X keyframes in them from the export
 
 === 1.7.3
 
@@ -278,7 +285,7 @@ Downside: stream_parse will be deprecated. It is however still available for bac
 
 === 1.7.2
 
-* Add a Lerp middleware that linearly interpolates missing keyframes (USE CAREFULLY!)
+* Add a Lerp tool that linearly interpolates missing keyframes (USE CAREFULLY!)
 * Prevent the Shake lexer from walking into the woods on files that are certainly wrong
 * Export proper project length with Nuke scripts
 * Ensure preamble for Nuke exports does not get overriden in width/height
@@ -322,7 +329,7 @@ Downside: stream_parse will be deprecated. It is however still available for bac
 
 === 1.6.2
 
-* Fixes the Reformat middleware to not suppress the end_export call. Crucial for exporters that
+* Fixes the Reformat tool to not suppress the end_export call. Crucial for exporters that
   use end_export to finalize output
   
 === 1.6.0
@@ -332,7 +339,7 @@ Downside: stream_parse will be deprecated. It is however still available for bac
 
 === 1.5.7
 
-* Add a Prefix middleware that prefixes tracker names
+* Add a Prefix tool that prefixes tracker names
 
 === 1.5.6
 
@@ -350,7 +357,7 @@ Downside: stream_parse will be deprecated. It is however still available for bac
 === 1.5.2
 
 * Fix Windows-specific issue (Tempfile-related) in the Equalizer4 exporter
-* Add Export::Base#just_export and Middleware::Base#just_export
+* Add Export::Base#just_export and Tool::Base#just_export
 
 === 1.5.0
 
@@ -392,8 +399,8 @@ Downside: stream_parse will be deprecated. It is however still available for bac
 
 * Add experimental MatchMoverPro import and export support
 * Rewrite the Shake parser, support MatchMove and Stabilize nodes and many tracks per node
-* Officially add and test the Reformat middleware
-* Remove the Close middleware and close IOs automatically at pipeline end
+* Officially add and test the Reformat tool
+* Remove the Close tool and close IOs automatically at pipeline end
 * Much improved documentation
 * Use IO as base for all the parsers (if a parser needs a string it will have to read by himself)
 * Much improved test coverage

data/Rakefile

@@ -15,6 +15,7 @@ Jeweler::Tasks.new do |gem|
   # Do not package up test fixtures
   gem.files.exclude "test/import/samples"
   gem.files.exclude "test/import/samples/*/*.*"
+  gem.files.exclude "test/subpixel"
   
   # Do not package invisibles
   gem.files.exclude ".*"

data/bin/tracksperanto

@@ -22,26 +22,26 @@ def disclaimer
 end
 
 options = {}
-$middlewares = []
+$tools = []
 writer_class_name = nil
 readers = Tracksperanto.importer_names
 writers = Tracksperanto.exporter_names
 
 op = OptionParser.new
 
-def mw(*name_option_and_default_value)
+def tool(*name_option_and_default_value)
   Proc.new do |value| 
     name, option, default_value = name_option_and_default_value
     v = value.nil? ? default_value : value
-    mw_tuple = [name]
-    mw_tuple.push({option => v}) if option
+    tool_tuple = [name]
+    tool_tuple.push({option => v}) if option
     
-    $middlewares.push(mw_tuple)
+    $tools.push(tool_tuple)
   end
 end
 
-def mwd(name)
-  Tracksperanto.get_middleware(name).action_description
+def toold(name)
+  Tracksperanto.get_tool(name).action_description
 end
 
 def list_exporters(dest = $stderr)
@@ -77,43 +77,44 @@ op.on(" -w", "--width WIDTH_IN_PIXELS", Integer, "Absolute input comp width in p
 op.on(" -h", "--height HEIGHT_IN_PIXELS", Integer, "Absolute input comp height in pixels (will try to autodetect)") {|w| options[:height] = w }
 op.on(" -o", "--only EXPORTER_NAME", String, "Only export the selected format, format must be one of: #{f(writers)}") { |f| writer_class_name = f }
 
-op.on(" -xs", "--xscale X_SCALING_FACTOR", Float, mwd("Scaler"), &mw("Scaler", :x_factor))
+op.on(" -xs", "--xscale X_SCALING_FACTOR", Float, toold("Scaler"), &tool("Scaler", :x_factor))
 
-op.on(" -pad", "--pad PAD_FRACTION_VALUES_COMMA_SEPARATED", String, mwd("Pad")) do | pads|
+op.on(" -pad", "--pad PAD_FRACTION_VALUES_COMMA_SEPARATED", String, toold("Pad")) do | pads|
   left, right, top, bottom = pads.split(",").map{|e| e.to_f }
-  $middlewares.push(["Pad", {"left_pad" => left, "right_pad"=> right, "top_pad" => top, "bottom_pad" => bottom}])
+  $tools.push(["Pad", {"left_pad" => left, "right_pad"=> right, "top_pad" => top, "bottom_pad" => bottom}])
 end
 
 op.on(" -u", "--undistort K_AND_KCUBE_COMMA_SEPARATED", String, "Remove lens distortion using the Syntheyes algorithm") do | coefficients |
   k, kcube = coefficients.split(",").map{|e| e.to_f }
-  $middlewares.push(["LensDisto", {"k" => k, "kcube"=> kcube, "remove" => true}])
+  $tools.push(["LensDisto", {"k" => k, "kcube"=> kcube, "remove" => true}])
 end
 
 op.on(" -d", "--distort K_AND_KCUBE_COMMA_SEPARATED", String, "Add lens distortion using the Syntheyes algorithm") do | coefficients |
   k, kcube = coefficients.split(",").map{|e| e.to_f }
-  $middlewares.push(["LensDisto", {"k" => k, "kcube"=> kcube, "remove" => false}])
+  $tools.push(["LensDisto", {"k" => k, "kcube"=> kcube, "remove" => false}])
 end
 
-op.on(" -crop", "--crop CROP_VALUES_COMMA_SEPARATED", String, mwd("Crop")) do | pads|
+op.on(" -crop", "--crop CROP_VALUES_COMMA_SEPARATED", String, toold("Crop")) do | pads|
   left, right, top, bottom = pads.split(",").map{|e| e.to_i }
-  $middlewares.push(["Crop", {"left" => left, "right"=> right, "top" => top, "bottom" => bottom}])
+  $tools.push(["Crop", {"left" => left, "right"=> right, "top" => top, "bottom" => bottom}])
 end
 
-op.on(" -ys", "--yscale Y_SCALING_FACTOR", Float, mwd("Scaler"), &mw("Scaler", :y_factor))
-op.on(" -t", "--trim", Float, mwd("StartTrim"),  &mw("StartTrim")) # Before slip!
-op.on(" -s", "--slip FRAMES", Integer, mwd("Slipper"), &mw("Slipper", :slip))
-op.on(" -g", "--golden", mwd("Golden"), &mw("Golden"))
-op.on(" -m", "--min-length LENGTH_IN_FRAMES", Integer, mwd("LengthCutoff"), &mw("LengthCutoff", :min_length))
-op.on(" -p", "--prefix PREFIX", String, mwd("Prefix"), &mw("Prefix", :prefix))
-op.on("--lerp", mwd("Lerp"), &mw("Lerp"))
-op.on("--flip", mwd("Flip"), &mw("Flip"))
-op.on("--flop", mwd("Flop"), &mw("Flop"))
+op.on(" -ys", "--yscale Y_SCALING_FACTOR", Float, toold("Scaler"), &tool("Scaler", :y_factor))
+op.on(" -t", "--trim", Float, toold("StartTrim"),  &tool("StartTrim")) # Before slip!
+op.on(" -s", "--slip FRAMES", Integer, toold("Slipper"), &tool("Slipper", :slip))
+op.on(" -g", "--golden", toold("Golden"), &tool("Golden"))
+op.on(" -m", "--min-length LENGTH_IN_FRAMES", Integer, toold("LengthCutoff"), &tool("LengthCutoff", :min_length))
+op.on(" -p", "--prefix PREFIX", String, toold("Prefix"), &tool("Prefix", :prefix))
+op.on(" -as", "--autoslip", toold("MoveToFirst"), &tool("MoveToFirst"))
+op.on("--lerp", toold("Lerp"), &tool("Lerp"))
+op.on("--flip", toold("Flip"), &tool("Flip"))
+op.on("--flop", toold("Flop"), &tool("Flop"))
 
 # TODO - multiparameters
-op.on(" -rx", "--reformat-x NEW_PIX_WIDTH", Integer, "Reformat the comp to this width and scale all tracks to it", &mw("Reformat", :width))
-op.on(" -ry", "--reformat-y NEW_PIX_HEIGHT", Integer, "Reformat the comp to this height and scale all tracks to it", &mw("Reformat", :height))
-op.on(" -xm", "--xshift X_IN_PIXELS", Float, "Move the points left or right", &mw("Shift", :x_shift))
-op.on(" -ym", "--yshift Y_IN_PIXELS", Float, "Move the points up or down", &mw("Shift", :y_shift)) 
+op.on(" -rx", "--reformat-x NEW_PIX_WIDTH", Integer, "Reformat the comp to this width and scale all tracks to it", &tool("Reformat", :width))
+op.on(" -ry", "--reformat-y NEW_PIX_HEIGHT", Integer, "Reformat the comp to this height and scale all tracks to it", &tool("Reformat", :height))
+op.on(" -xm", "--xshift X_IN_PIXELS", Float, "Move the points left or right", &tool("Shift", :x_shift))
+op.on(" -ym", "--yshift Y_IN_PIXELS", Float, "Move the points up or down", &tool("Shift", :y_shift)) 
 
 
 op.on("--list-exporters", "Show available export modules") do
@@ -152,7 +153,7 @@ progress = lambda do |percent,message|
 end
 
 begin
-  pipe = Tracksperanto::Pipeline::Base.new(:progress_block => progress, :middleware_tuples => $middlewares)
+  pipe = Tracksperanto::Pipeline::Base.new(:progress_block => progress, :tool_tuples => $tools)
   pipe.exporters = [Tracksperanto.get_exporter(writer_class_name)] if writer_class_name
   pipe.run(input_file, options)
   pbar.finish
@@ -165,7 +166,7 @@ rescue Tracksperanto::UnknownImporterError => damn
   $stderr.puts damn.message
   list_importers($stderr)
   fail "Unknown importer"
-rescue Tracksperanto::UnknownMiddlewareError => damn
+rescue Tracksperanto::UnknownToolError => damn
   $stderr.puts damn.message
   fail "This is a bug, please report it"
 rescue Exception => damn

data/lib/export/flame_stabilizer_cornerpin.rb

@@ -17,7 +17,7 @@ class Tracksperanto::Export::FlameStabilizerCornerpin < Tracksperanto::Export::F
   #     _______/
   #    |
   #    BL   ->   BR
-  # This "kinda middleware" ensures that this is indeed taking place
+  # This "kinda tool" ensures that this is indeed taking place
   class Sorter < DelegateClass(Tracksperanto::Export::Base)
     include Tracksperanto::SimpleExport # so that it calls OUR methods
     
@@ -68,7 +68,9 @@ class Tracksperanto::Export::FlameStabilizerCornerpin < Tracksperanto::Export::F
     end
   end
   
-  # Initialize the exporter with a preconfigured sorter around it
+  # Initialize the exporter with a preconfigured sorter around it.
+  # When this object receives the commands they will come from the Sorter instead,
+  # and the trackers will already be in their Z-order
   def self.new(*arguments)
     object = super
     Sorter.new(object)

data/lib/export/pfmatchit.rb

@@ -2,6 +2,8 @@
 # Export for PFMatchit
 class Tracksperanto::Export::PFMatchit < Tracksperanto::Export::Base
   
+  include Tracksperanto::PFCoords
+  
   KEYFRAME_TEMPLATE = "%s %.3f %.3f %.3f"
   
   def self.desc_and_extension
@@ -12,6 +14,11 @@ class Tracksperanto::Export::PFMatchit < Tracksperanto::Export::Base
     "PFTrack2011/PFMatchit .txt file (single camera)"
   end
   
+  def start_export(w, h)
+    @width = w
+    @height = h
+  end
+  
   def start_tracker_segment(tracker_name)
     # Setup for the next tracker
     @frame_count = 0
@@ -36,7 +43,7 @@ class Tracksperanto::Export::PFMatchit < Tracksperanto::Export::Base
   
   def export_point(frame, abs_float_x, abs_float_y, float_residual)
     @frame_count += 1
-    line = KEYFRAME_TEMPLATE % [frame_number(frame), abs_float_x, abs_float_y, float_residual / 8]
+    line = KEYFRAME_TEMPLATE % [frame_number(frame), to_pfcoord(abs_float_x), to_pfcoord(abs_float_y), float_residual / 8]
     @tracker_io.write(line)
     @tracker_io.write(linebreak)
   end

data/lib/export/pftrack.rb

@@ -2,6 +2,8 @@
 # Export for PFTrack .2dt files
 class Tracksperanto::Export::PFTrack4 < Tracksperanto::Export::Base
     
+    include Tracksperanto::PFCoords
+    
     KEYFRAME_TEMPLATE = "%s %.3f %.3f %.3f"
     
     # PFtrack wants cross-platform linebreaks
@@ -15,6 +17,11 @@ class Tracksperanto::Export::PFTrack4 < Tracksperanto::Export::Base
       "PFTrack v4 .2dt file"
     end
     
+    def start_export(w, h)
+      @width = w
+      @height = h
+    end
+    
     def start_tracker_segment(tracker_name)
       # Setup for the next tracker
       @frame_count = 0
@@ -36,7 +43,7 @@ class Tracksperanto::Export::PFTrack4 < Tracksperanto::Export::Base
     
     def export_point(frame, abs_float_x, abs_float_y, float_residual)
       @frame_count += 1
-      line = KEYFRAME_TEMPLATE % [frame, abs_float_x, abs_float_y, float_residual / 8]
+      line = KEYFRAME_TEMPLATE % [frame, to_pfcoord(abs_float_x), to_pfcoord(abs_float_y), float_residual / 8]
       @tracker_io.write(line)
       @tracker_io.write(LINEBREAK)
     end

data/lib/import/pftrack.rb

@@ -1,6 +1,9 @@
 # -*- encoding : utf-8 -*-
 # TODO: this should be rewritten as a proper state-machine parser
 class Tracksperanto::Import::PFTrack < Tracksperanto::Import::Base
+  
+  include Tracksperanto::PFCoords
+  
   def self.human_name
     "PFTrack/PFMatchit .2dt file"
   end
@@ -73,7 +76,7 @@ class Tracksperanto::Import::PFTrack < Tracksperanto::Import::Base
       (1..num_of_keyframes).map do | keyframe_idx |
         report_progress("Reading keyframe #{keyframe_idx} of #{num_of_keyframes} in #{t.name}")
         f, x, y, residual = io.gets.chomp.split
-        t.keyframe!(:frame => f, :abs_x => x, :abs_y => y, :residual => residual.to_f * 8)
+        t.keyframe!(:frame => f, :abs_x => from_pfcoord(x), :abs_y => from_pfcoord(y), :residual => residual.to_f * 8)
       end
     end
     

data/lib/import/syntheyes.rb

@@ -20,8 +20,8 @@ class Tracksperanto::Import::Syntheyes < Tracksperanto::Import::Base
       # Add the keyframe
       k = Tracksperanto::Keyframe.new do |e| 
         e.frame = frame
-        e.abs_x = convert_from_uv(width, x)
-        e.abs_y = height - convert_from_uv(height, y) # Convert TL to BL
+        e.abs_x = convert_from_uv(x, width)
+        e.abs_y = height - convert_from_uv(y, height) # Convert TL to BL
       end
       
       @last_tracker.push(k)

data/lib/pipeline/base.rb

@@ -31,10 +31,10 @@ module Tracksperanto::Pipeline
   
   # 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:
+  # applies the tools. Here's how a calling sequence for a pipeline looks like:
   #
   #   pipe = Tracksperanto::Pipeline::Base.new
-  #   pipe.middleware_tuples = ["Shift", {:x => 10}]
+  #   pipe.tool_tuples = ["Shift", {:x => 10}]
   #   pipe.progress_block = lambda{|percent, msg| puts("#{msg}..#{percent.to_i}%") }
   #   pipe.run("/tmp/shakescript.shk", :width => 720, :height => 576)
   #
@@ -64,7 +64,7 @@ module Tracksperanto::Pipeline
   attr_accessor :exporters
   
   # Contains arrays of the form ["MiddewareName", {:param => value}]
-  attr_accessor :middleware_tuples
+  attr_accessor :tool_tuples
   
   
   def initialize(*any)
@@ -72,13 +72,13 @@ module Tracksperanto::Pipeline
     @ios = []
   end
   
-  # Will scan the middleware_tuples attribute and create a processing chain.
-  # Middlewares will be instantiated and wrap each other, starting with the first one
-  def wrap_output_with_middlewares(output)
-    return output unless (middleware_tuples && middleware_tuples.any?)
+  # Will scan the tool_tuples attribute and create a processing chain.
+  # Tools will be instantiated and wrap each other, starting with the first one
+  def wrap_output_with_tools(output)
+    return output unless (tool_tuples && tool_tuples.any?)
     
-    middleware_tuples.reverse.inject(output) do | wrapped, (middleware_name, options) |
-      Tracksperanto.get_middleware(middleware_name).new(wrapped, options || {})
+    tool_tuples.reverse.inject(output) do | wrapped, (tool_name, options) |
+      Tracksperanto.get_tool(tool_name).new(wrapped, options || {})
     end
   end
   
@@ -105,10 +105,10 @@ module Tracksperanto::Pipeline
     mux = setup_outputs_for(from_input_file_path)
     
     # Wrap it into a module that will prevent us from exporting invalid trackers
-    lint = Tracksperanto::Middleware::Lint.new(mux)
+    lint = Tracksperanto::Tool::Lint.new(mux)
     
-    # Setup middlewares
-    endpoint = wrap_output_with_middlewares(lint)
+    # Setup tools
+    endpoint = wrap_output_with_tools(lint)
     @converted_points, @converted_keyframes = run_export(read_data, importer, endpoint)
   end
   
@@ -182,7 +182,7 @@ module Tracksperanto::Pipeline
     # Use the width and height provided by the parser itself
     exporter.start_export(importer.width, importer.height)
   
-    # Now send each tracker through the middleware chain
+    # Now send each tracker through the tool chain
     obuf.each_with_index do | t, tracker_idx |
     
       kf_weight = percent_per_tracker / t.keyframes.length

data/lib/{middleware → tools}/base.rb

@@ -1,10 +1,10 @@
 # -*- encoding : utf-8 -*-
 require "forwardable"
 
-# The base middleware class works just like a Tracksperanto::Export::Base, but it only wraps another exporting object and does not get registered on it's own
-# as an export format. Middleware can be used to massage the tracks being exported in various interesting ways - like moving the coordinates, clipping the keyframes,
+# The base tool class works just like a Tracksperanto::Export::Base, but it only wraps another exporting object and does not get registered on it's own
+# as an export format. Tool can be used to massage the tracks being exported in various interesting ways - like moving the coordinates, clipping the keyframes,
 # scaling the whole export or even reversing the trackers to go backwards
-class Tracksperanto::Middleware::Base
+class Tracksperanto::Tool::Base
   include Tracksperanto::Casts
   include Tracksperanto::BlockInit
   include Tracksperanto::ConstName
@@ -14,17 +14,17 @@ class Tracksperanto::Middleware::Base
   extend Forwardable
   def_delegators :@exporter, :start_export, :start_tracker_segment, :end_tracker_segment, :export_point, :end_export
   
-  # Used to automatically register your middleware in Tracksperanto.middlewares
+  # Used to automatically register your tool in Tracksperanto.tools
   # Normally you wouldn't need to override this
   def self.inherited(by)
-    Tracksperanto.middlewares.push(by)
+    Tracksperanto.tools.push(by)
     super
   end
   
-  # Returns the human name of the action that the middleware will perform. The action is
+  # Returns the human name of the action that the tool will perform. The action is
   # the in infinitive form, like "Remove all the invalid keyframes", "Crop the image" and so on
   def self.action_description
-    "Base middleware class"
+    "Base tool class"
   end
   
   # Constructor accepts the exporter that will be wrapped, followed by the optional options hash

data/lib/{middleware → tools}/crop.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
-# Does the same as the Pad middleware but with absolute pixel values instead of fractionals
-class Tracksperanto::Middleware::Crop < Tracksperanto::Middleware::Base
+# Does the same as the Pad tool but with absolute pixel values instead of fractionals
+class Tracksperanto::Tool::Crop < Tracksperanto::Tool::Base
   
   parameter :top, :cast => :int, :desc => "Top crop amount in px"
   parameter :left, :cast => :int, :desc => "Left crop amount in px"
@@ -13,7 +13,7 @@ class Tracksperanto::Middleware::Crop < Tracksperanto::Middleware::Base
   
   def start_export(w, h)
     left_pad, right_pad, top_pad, bottom_pad = (left / w.to_f), (right / w.to_f), (top / h.to_f), (bottom / h.to_f)
-    @pad = Tracksperanto::Middleware::Pad.new(@exporter, :left_pad => left_pad, :right_pad => right_pad, :top_pad => top_pad, :bottom_pad => bottom_pad)
+    @pad = Tracksperanto::Tool::Pad.new(@exporter, :left_pad => left_pad, :right_pad => right_pad, :top_pad => top_pad, :bottom_pad => bottom_pad)
     @pad.start_export(w, h)
   end
   

data/lib/{middleware → tools}/flip.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 # Flips the comp being exported horizontally
-class Tracksperanto::Middleware::Flip < Tracksperanto::Middleware::Base
+class Tracksperanto::Tool::Flip < Tracksperanto::Tool::Base
   
   def self.action_description
     "Mirrors all the tracker paths horizontally"
@@ -8,7 +8,7 @@ class Tracksperanto::Middleware::Flip < Tracksperanto::Middleware::Base
   
   def start_export(w, h)
     factor = -1
-    @exporter = Tracksperanto::Middleware::Scaler.new(@exporter, :x_factor => factor)
+    @exporter = Tracksperanto::Tool::Scaler.new(@exporter, :x_factor => factor)
     super
   end
 end

data/lib/{middleware → tools}/flop.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 # Flips the comp being exported vertically
-class Tracksperanto::Middleware::Flop < Tracksperanto::Middleware::Base
+class Tracksperanto::Tool::Flop < Tracksperanto::Tool::Base
   
   def self.action_description
     "Mirror all the tracker paths vertically"
@@ -8,7 +8,7 @@ class Tracksperanto::Middleware::Flop < Tracksperanto::Middleware::Base
   
   def start_export(w, h)
     factor = -1
-    @exporter = Tracksperanto::Middleware::Scaler.new(@exporter, :y_factor => factor)
+    @exporter = Tracksperanto::Tool::Scaler.new(@exporter, :y_factor => factor)
     super
   end
 end

data/lib/{middleware → tools}/golden.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
-# This middleware marks all trackers as being 100% accurate
-class Tracksperanto::Middleware::Golden < Tracksperanto::Middleware::Base
+# This tool marks all trackers as being 100% accurate
+class Tracksperanto::Tool::Golden < Tracksperanto::Tool::Base
   
   def self.action_description
     "Reset residual of all the trackers to zero"

data/lib/{middleware → tools}/length_cutoff.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
-# This middleware removes trackers that contain less than min_length keyframes
+# This tool removes trackers that contain less than min_length keyframes
 # from the exported batch
-class Tracksperanto::Middleware::LengthCutoff < Tracksperanto::Middleware::Base
+class Tracksperanto::Tool::LengthCutoff < Tracksperanto::Tool::Base
   
   parameter :min_length, :cast => :int, :desc => "The minimum number of keyframes for the item to contain", :default => 100
   

data/lib/{middleware → tools}/lens_disto.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-class Tracksperanto::Middleware::LensDisto < Tracksperanto::Middleware::Base
+class Tracksperanto::Tool::LensDisto < Tracksperanto::Tool::Base
   include Tracksperanto::UVCoordinates
 
   
@@ -58,7 +58,7 @@ class Tracksperanto::Middleware::LensDisto < Tracksperanto::Middleware::Base
   def with_uv(x, y)
     vec = Vector2.new(convert_to_uv(x, @width), convert_to_uv(y, @height))
     yield(vec)
-    [convert_from_uv(@width, vec.x), convert_from_uv(@height, vec.y)]
+    [convert_from_uv(vec.x, @width), convert_from_uv(vec.y, @height)]
   end
   
   # Radius is equal to aspect at the rightmost extremity

data/lib/{middleware → tools}/lerp.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
-# This middleware adds linearly interpolated keyframes BETWEEN the keyframes passing through the exporter
-class Tracksperanto::Middleware::Lerp < Tracksperanto::Middleware::Base
+# This tool adds linearly interpolated keyframes BETWEEN the keyframes passing through the exporter
+class Tracksperanto::Tool::Lerp < Tracksperanto::Tool::Base
   
   def self.action_description
     "Interpolate missing keyframes of all the trackers"

data/lib/{middleware → tools}/lint.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 # Prevents you from exporting invalid trackers
-class Tracksperanto::Middleware::Lint < Tracksperanto::Middleware::Base
+class Tracksperanto::Tool::Lint < Tracksperanto::Tool::Base
   
   def self.action_description
     "Verify all the exported trackers and check for errors"

data/lib/{middleware → tools}/move_to_first.rb

@@ -1,10 +1,10 @@
 # -*- encoding : utf-8 -*-
 # Sometimes your tracked sequence has been loaded from say frame 73282381, but you want to import into an application
-# that expects the trackers to start at frame 1. This middleware autoslips everything so that your trackers start at frame 1.
-class Tracksperanto::Middleware::MoveToFirst < Tracksperanto::Middleware::Base
+# that expects the trackers to start at frame 1. This tool autoslips everything so that your trackers start at frame 1.
+class Tracksperanto::Tool::MoveToFirst < Tracksperanto::Tool::Base
   
   def self.action_description
-    "Move all the keyframes in time so that the first frame is the first animated keyframe"
+    "Move all the keyframes in time so that the track starts at frame 1"
   end
   
   def start_export(width, height)