tracksperanto 2.12.0 → 3.0.0

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

@@ -1,8 +1,8 @@
 # -*- encoding : utf-8 -*-
-# This middleware pads the comp or crops it if given negative values. Use it to say unpad
+# This tool pads the comp or crops it if given negative values. Use it to say unpad
 # some fucked-up telecine transfers. The padding is in fractional units of the total width
 # and height
-class Tracksperanto::Middleware::Pad < Tracksperanto::Middleware::Base
+class Tracksperanto::Tool::Pad < Tracksperanto::Tool::Base
   
   parameter :top_pad,     :cast => :float, :desc => "Top padding (fraction of original size)"
   parameter :left_pad,    :cast => :float, :desc => "Left padding (fraction of original size)"

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

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
-# This middleware prepends the names of the trackers passing through it with a prefix
+# This tool prepends the names of the trackers passing through it with a prefix
 # and an underscore
-class Tracksperanto::Middleware::Prefix < Tracksperanto::Middleware::Base
+class Tracksperanto::Tool::Prefix < Tracksperanto::Tool::Base
   
   parameter :prefix,  :cast => :string, :desc => "The prefix to apply", :default => "trk_"
   

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

@@ -1,9 +1,9 @@
 # -*- encoding : utf-8 -*-
 require File.dirname(__FILE__) + '/scaler'
 
-# This middleware reformats (scales) the track setup to a specific pixel resolution. Very useful for
+# This tool reformats (scales) the track setup to a specific pixel resolution. Very useful for
 # applying proxy tracks to full-res images
-class Tracksperanto::Middleware::Reformat < Tracksperanto::Middleware::Base
+class Tracksperanto::Tool::Reformat < Tracksperanto::Tool::Base
   
   parameter :width,  :cast => :int, :desc => "New comp width in px", :default => 1080
   parameter :height,  :cast => :int, :desc => "New comp height in px", :default => 1080
@@ -20,7 +20,7 @@ class Tracksperanto::Middleware::Reformat < Tracksperanto::Middleware::Base
     x_factor, y_factor = (@width / img_width.to_f), (@height / img_height.to_f)  
     
     @stash = @exporter
-    @exporter = Tracksperanto::Middleware::Scaler.new(@exporter, :x_factor => x_factor, :y_factor => y_factor)
+    @exporter = Tracksperanto::Tool::Scaler.new(@exporter, :x_factor => x_factor, :y_factor => y_factor)
     super
   end
 end

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

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 # Scales the comp being exported by a specific factor, together with the tracker keyframes
-class Tracksperanto::Middleware::Scaler < Tracksperanto::Middleware::Base
+class Tracksperanto::Tool::Scaler < Tracksperanto::Tool::Base
   DEFAULT_FACTOR = 1
   
   parameter :x_factor,  :cast => :float, :desc => "Factor to scale by", :default => DEFAULT_FACTOR

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

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
-# This middleware moves the keyframs by a preset number of pixels
-class Tracksperanto::Middleware::Shift < Tracksperanto::Middleware::Base
+# This tool moves the keyframs by a preset number of pixels
+class Tracksperanto::Tool::Shift < Tracksperanto::Tool::Base
   
   parameter :x_shift,  :cast => :float, :desc => "Amount of horizontal shift (in px)", :default => 0
   parameter :y_shift,  :cast => :float, :desc => "Amount of vertical shift (in px)", :default => 0

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

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 # Slips the keyframe positions by a specific integer amount of frames, positive values slip forward (later in time). Useful if you just edited some stuff onto
 # the beginning if your sequence and need to extend your tracks.
-class Tracksperanto::Middleware::Slipper < Tracksperanto::Middleware::Base
+class Tracksperanto::Tool::Slipper < Tracksperanto::Tool::Base
   
   parameter :slip,  :cast => :int, :desc => "Number of frames to slip related to the current frames", :default => 0
   

data/lib/tools/start_trim.rb

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+# This tool removes all keyframes before frame 0, and skips trackers entirely if they are all before frame 0
+class Tracksperanto::Tool::StartTrim < Tracksperanto::Tool::Base
+  
+  def self.action_description
+    "Remove all the keyframes that are on frames below 1"
+  end
+  
+  def start_export( img_width, img_height)
+    @exporter = Tracksperanto::Tool::LengthCutoff.new(@exporter, :min_length => 1) # Ensure at least one keyframe
+    super
+  end
+  
+  def export_point(frame, float_x, float_y, float_residual)
+    return super unless frame < 0
+  end
+end

data/lib/tracksperanto/pf_coords.rb

@@ -0,0 +1,9 @@
+module Tracksperanto::PFCoords
+  def to_pfcoord(xperanto_value)
+    xperanto_value.to_f - 0.5
+  end
+  
+  def from_pfcoord(pf_value)
+    pf_value.to_f + 0.5
+  end
+end

data/lib/tracksperanto/simple_export.rb

@@ -6,7 +6,7 @@ module Tracksperanto::SimpleExport
   # Before calling this, initialize the exporter with the proper
   # IO handle
   def just_export(trackers_array, comp_width, comp_height)
-    lint = Tracksperanto::Middleware::Lint.new(self)
+    lint = Tracksperanto::Tool::Lint.new(self)
     
     lint.start_export(comp_width, comp_height)
     trackers_array.each do | t |

data/lib/tracksperanto/uv_coordinates.rb

@@ -1,23 +1,25 @@
 # -*- encoding : utf-8 -*-
-# Syntheyes and some other apps use a relative UV coordinate sustem. For Syntheyes, zero is at the
-# optical center of the image, and goes positive right and up. Since Tracksperanto works in absolute
-# pixels we need to convert to and fro.
+# For Syntheyes, zero is at the
+# optical center of the image, and goes positive right and up. The corners get the [-1..1] coordinates
+# respectively. Since Tracksperanto works in absolute pixels we need to convert to and from these cords.
+# Note that Syntheyes actually assumes the center of the first pixel to be at -1,1 so a small
+# adjustment is necessary to maintain subpixel accuracy.
 module Tracksperanto::UVCoordinates
   
-  # UV coords used by Syntheyes and it's lens distortion algos.
+  # Convert absoilute X and Y values off the BL corner into Syntheyes UV coordinates
   def absolute_to_uv(abs_x, abs_y, w, h)
     [convert_to_uv(abs_x, w), convert_to_uv(abs_y, h) * -1]
   end
   
-  def convert_to_uv(absolute_value, absolute_side)
-    x = (absolute_value / absolute_side.to_f) - 0.5
-    # .2 to -.3, y is reversed and coords are double
-    x * 2
+  # Convert absoilute pixel value off the BL corner into Syntheyes UV coordinate
+  def convert_to_uv(abs_value, absolute_side)
+    uv_value = (((abs_value.to_f - 0.5) / (absolute_side.to_f - 1)) - 0.5) * 2.0
   end
-  
-  def convert_from_uv(absolute_side, uv_value)
-    # First, start from zero (-.1 becomes .4)
-    value_off_corner = (uv_value.to_f / 2) + 0.5
-    absolute_side * value_off_corner
+
+  # Convert Syntheyes UV value into absoilute pixel value off the BL corner
+  def convert_from_uv(uv_value, absolute_side)
+    # Account for the fact that Syntheyes assumes the
+    # pixel values to be at the center of the pixel
+    abs_value = (((uv_value.to_f / 2.0) + 0.5) * (absolute_side.to_f - 1)) + 0.5
   end
 end

data/lib/tracksperanto.rb

@@ -3,16 +3,16 @@
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '2.12.0'
+  VERSION = '3.0.0'
   
   module Import; end
   module Export; end
-  module Middleware; end
+  module Tool; end
   module Pipeline; end
   
   class UnknownExporterError < NameError; end
   class UnknownImporterError < NameError; end
-  class UnknownMiddlewareError < NameError; end
+  class UnknownToolError < NameError; end
   
   class << self
     # Returns the array of all exporter classes defined
@@ -21,8 +21,8 @@ module Tracksperanto
     # Returns the array of all importer classes defined
     attr_accessor :importers
     
-    # Returns the array of all available middlewares
-    attr_accessor :middlewares
+    # Returns the array of all available tools
+    attr_accessor :tools
     
     # Returns the names of all the importers
     def importer_names
@@ -34,9 +34,9 @@ module Tracksperanto
       exporters.map{|e| e.const_name }
     end
     
-    # Returns the names of all the middlewares
-    def middleware_names
-      middlewares.map{|e| e.const_name }
+    # Returns the names of all the tools
+    def tool_names
+      tools.map{|e| e.const_name }
     end
     
     def exporters
@@ -55,15 +55,15 @@ module Tracksperanto
     end
   end
   
-  self.exporters, self.importers, self.middlewares = [], [], []
+  self.exporters, self.importers, self.tools = [], [], []
 
-  # Case-insensitive search for a middleware class by name
-  def self.get_middleware(name)
-    middlewares.each do | x |
+  # Case-insensitive search for a tool class by name
+  def self.get_tool(name)
+    tools.each do | x |
       return x if x.const_name.downcase == name.downcase
     end
     
-    raise UnknownMiddlewareError, "Unknown middleware #{name.inspect}"
+    raise UnknownToolError, "Unknown tool #{name.inspect}"
   end
     
   # Case-insensitive search for an export module by name
@@ -103,6 +103,7 @@ end
   buffering_reader
   parameters
   yield_non_empty
+  pf_coords
 ).each do | submodule |
   require File.join(Tracksperanto::PATH, "tracksperanto", submodule)
 end
@@ -117,8 +118,8 @@ Dir.glob(File.dirname(__FILE__) + '/export/*.rb').sort.each do | i |
   require i
 end
 
-# Load middleware
-Dir.glob(File.dirname(__FILE__) + '/middleware/*.rb').sort.each do | i |
+# Load tool
+Dir.glob(File.dirname(__FILE__) + '/tools/*.rb').sort.each do | i |
   require i
 end
 

data/test/export/samples/ref_PFMatchit.2dt

@@ -3,52 +3,52 @@
 "Parabolic_1_from_top_left"
 1
 19
-1 0.000 1080.000 0.000
-2 96.000 874.800 0.006
-3 192.000 691.200 0.012
-4 288.000 529.200 0.018
-5 384.000 388.800 0.024
-6 480.000 270.000 0.030
-7 576.000 172.800 0.036
-8 672.000 97.200 0.042
-9 768.000 43.200 0.048
-10 864.000 10.800 0.054
-13 1152.000 43.200 0.071
-14 1248.000 97.200 0.077
-15 1344.000 172.800 0.083
-16 1440.000 270.000 0.089
-17 1536.000 388.800 0.095
-18 1632.000 529.200 0.101
-19 1728.000 691.200 0.107
-20 1824.000 874.800 0.113
-21 1920.000 1080.000 0.119
+1 -0.500 1079.500 0.000
+2 95.500 874.300 0.006
+3 191.500 690.700 0.012
+4 287.500 528.700 0.018
+5 383.500 388.300 0.024
+6 479.500 269.500 0.030
+7 575.500 172.300 0.036
+8 671.500 96.700 0.042
+9 767.500 42.700 0.048
+10 863.500 10.300 0.054
+13 1151.500 42.700 0.071
+14 1247.500 96.700 0.077
+15 1343.500 172.300 0.083
+16 1439.500 269.500 0.089
+17 1535.500 388.300 0.095
+18 1631.500 528.700 0.101
+19 1727.500 690.700 0.107
+20 1823.500 874.300 0.113
+21 1919.500 1079.500 0.119
 
 
 "Parabolic_2_from_bottom_right"
 1
 19
-1 1920.000 0.000 0.000
-2 1824.000 205.200 0.006
-3 1728.000 388.800 0.012
-4 1632.000 550.800 0.018
-5 1536.000 691.200 0.024
-6 1440.000 810.000 0.030
-7 1344.000 907.200 0.036
-8 1248.000 982.800 0.042
-9 1152.000 1036.800 0.048
-10 1056.000 1069.200 0.054
-13 768.000 1036.800 0.071
-14 672.000 982.800 0.077
-15 576.000 907.200 0.083
-16 480.000 810.000 0.089
-17 384.000 691.200 0.095
-18 288.000 550.800 0.101
-19 192.000 388.800 0.107
-20 96.000 205.200 0.113
-21 0.000 0.000 0.119
+1 1919.500 -0.500 0.000
+2 1823.500 204.700 0.006
+3 1727.500 388.300 0.012
+4 1631.500 550.300 0.018
+5 1535.500 690.700 0.024
+6 1439.500 809.500 0.030
+7 1343.500 906.700 0.036
+8 1247.500 982.300 0.042
+9 1151.500 1036.300 0.048
+10 1055.500 1068.700 0.054
+13 767.500 1036.300 0.071
+14 671.500 982.300 0.077
+15 575.500 906.700 0.083
+16 479.500 809.500 0.089
+17 383.500 690.700 0.095
+18 287.500 550.300 0.101
+19 191.500 388.300 0.107
+20 95.500 204.700 0.113
+21 -0.500 -0.500 0.119
 
 
 "SingleFrame_InTheMiddle"
 1
 1
-1 970.000 550.000 0.000
+1 969.500 549.500 0.000

data/test/export/samples/ref_PFTrack.2dt

@@ -2,50 +2,50 @@
 
 "Parabolic_1_from_top_left"
 19
-0 0.000 1080.000 0.000
-1 96.000 874.800 0.006
-2 192.000 691.200 0.012
-3 288.000 529.200 0.018
-4 384.000 388.800 0.024
-5 480.000 270.000 0.030
-6 576.000 172.800 0.036
-7 672.000 97.200 0.042
-8 768.000 43.200 0.048
-9 864.000 10.800 0.054
-12 1152.000 43.200 0.071
-13 1248.000 97.200 0.077
-14 1344.000 172.800 0.083
-15 1440.000 270.000 0.089
-16 1536.000 388.800 0.095
-17 1632.000 529.200 0.101
-18 1728.000 691.200 0.107
-19 1824.000 874.800 0.113
-20 1920.000 1080.000 0.119
+0 -0.500 1079.500 0.000
+1 95.500 874.300 0.006
+2 191.500 690.700 0.012
+3 287.500 528.700 0.018
+4 383.500 388.300 0.024
+5 479.500 269.500 0.030
+6 575.500 172.300 0.036
+7 671.500 96.700 0.042
+8 767.500 42.700 0.048
+9 863.500 10.300 0.054
+12 1151.500 42.700 0.071
+13 1247.500 96.700 0.077
+14 1343.500 172.300 0.083
+15 1439.500 269.500 0.089
+16 1535.500 388.300 0.095
+17 1631.500 528.700 0.101
+18 1727.500 690.700 0.107
+19 1823.500 874.300 0.113
+20 1919.500 1079.500 0.119
 
 
 "Parabolic_2_from_bottom_right"
 19
-0 1920.000 0.000 0.000
-1 1824.000 205.200 0.006
-2 1728.000 388.800 0.012
-3 1632.000 550.800 0.018
-4 1536.000 691.200 0.024
-5 1440.000 810.000 0.030
-6 1344.000 907.200 0.036
-7 1248.000 982.800 0.042
-8 1152.000 1036.800 0.048
-9 1056.000 1069.200 0.054
-12 768.000 1036.800 0.071
-13 672.000 982.800 0.077
-14 576.000 907.200 0.083
-15 480.000 810.000 0.089
-16 384.000 691.200 0.095
-17 288.000 550.800 0.101
-18 192.000 388.800 0.107
-19 96.000 205.200 0.113
-20 0.000 0.000 0.119
+0 1919.500 -0.500 0.000
+1 1823.500 204.700 0.006
+2 1727.500 388.300 0.012
+3 1631.500 550.300 0.018
+4 1535.500 690.700 0.024
+5 1439.500 809.500 0.030
+6 1343.500 906.700 0.036
+7 1247.500 982.300 0.042
+8 1151.500 1036.300 0.048
+9 1055.500 1068.700 0.054
+12 767.500 1036.300 0.071
+13 671.500 982.300 0.077
+14 575.500 906.700 0.083
+15 479.500 809.500 0.089
+16 383.500 690.700 0.095
+17 287.500 550.300 0.101
+18 191.500 388.300 0.107
+19 95.500 204.700 0.113
+20 -0.500 -0.500 0.119
 
 
 "SingleFrame_InTheMiddle"
 1
-0 970.000 550.000 0.000
+0 969.500 549.500 0.000

data/test/export/samples/ref_PFTrack5.2dt

@@ -3,52 +3,52 @@
 "Parabolic_1_from_top_left"
 "Primary"
 19
-0 0.000 1080.000 0.000
-1 96.000 874.800 0.006
-2 192.000 691.200 0.012
-3 288.000 529.200 0.018
-4 384.000 388.800 0.024
-5 480.000 270.000 0.030
-6 576.000 172.800 0.036
-7 672.000 97.200 0.042
-8 768.000 43.200 0.048
-9 864.000 10.800 0.054
-12 1152.000 43.200 0.071
-13 1248.000 97.200 0.077
-14 1344.000 172.800 0.083
-15 1440.000 270.000 0.089
-16 1536.000 388.800 0.095
-17 1632.000 529.200 0.101
-18 1728.000 691.200 0.107
-19 1824.000 874.800 0.113
-20 1920.000 1080.000 0.119
+0 -0.500 1079.500 0.000
+1 95.500 874.300 0.006
+2 191.500 690.700 0.012
+3 287.500 528.700 0.018
+4 383.500 388.300 0.024
+5 479.500 269.500 0.030
+6 575.500 172.300 0.036
+7 671.500 96.700 0.042
+8 767.500 42.700 0.048
+9 863.500 10.300 0.054
+12 1151.500 42.700 0.071
+13 1247.500 96.700 0.077
+14 1343.500 172.300 0.083
+15 1439.500 269.500 0.089
+16 1535.500 388.300 0.095
+17 1631.500 528.700 0.101
+18 1727.500 690.700 0.107
+19 1823.500 874.300 0.113
+20 1919.500 1079.500 0.119
 
 
 "Parabolic_2_from_bottom_right"
 "Primary"
 19
-0 1920.000 0.000 0.000
-1 1824.000 205.200 0.006
-2 1728.000 388.800 0.012
-3 1632.000 550.800 0.018
-4 1536.000 691.200 0.024
-5 1440.000 810.000 0.030
-6 1344.000 907.200 0.036
-7 1248.000 982.800 0.042
-8 1152.000 1036.800 0.048
-9 1056.000 1069.200 0.054
-12 768.000 1036.800 0.071
-13 672.000 982.800 0.077
-14 576.000 907.200 0.083
-15 480.000 810.000 0.089
-16 384.000 691.200 0.095
-17 288.000 550.800 0.101
-18 192.000 388.800 0.107
-19 96.000 205.200 0.113
-20 0.000 0.000 0.119
+0 1919.500 -0.500 0.000
+1 1823.500 204.700 0.006
+2 1727.500 388.300 0.012
+3 1631.500 550.300 0.018
+4 1535.500 690.700 0.024
+5 1439.500 809.500 0.030
+6 1343.500 906.700 0.036
+7 1247.500 982.300 0.042
+8 1151.500 1036.300 0.048
+9 1055.500 1068.700 0.054
+12 767.500 1036.300 0.071
+13 671.500 982.300 0.077
+14 575.500 906.700 0.083
+15 479.500 809.500 0.089
+16 383.500 690.700 0.095
+17 287.500 550.300 0.101
+18 191.500 388.300 0.107
+19 95.500 204.700 0.113
+20 -0.500 -0.500 0.119
 
 
 "SingleFrame_InTheMiddle"
 "Primary"
 1
-0 970.000 550.000 0.000
+0 969.500 549.500 0.000

data/test/export/samples/ref_Syntheyes.txt

@@ -1,39 +1,39 @@
-Parabolic1FromTopLeft 0 -1.000000 -1.000000 15
-Parabolic1FromTopLeft 1 -0.900000 -0.620000 7
-Parabolic1FromTopLeft 2 -0.800000 -0.280000 7
-Parabolic1FromTopLeft 3 -0.700000 0.020000 7
-Parabolic1FromTopLeft 4 -0.600000 0.280000 7
-Parabolic1FromTopLeft 5 -0.500000 0.500000 7
-Parabolic1FromTopLeft 6 -0.400000 0.680000 7
-Parabolic1FromTopLeft 7 -0.300000 0.820000 7
-Parabolic1FromTopLeft 8 -0.200000 0.920000 7
-Parabolic1FromTopLeft 9 -0.100000 0.980000 7
-Parabolic1FromTopLeft 12 0.200000 0.920000 15
-Parabolic1FromTopLeft 13 0.300000 0.820000 7
-Parabolic1FromTopLeft 14 0.400000 0.680000 7
-Parabolic1FromTopLeft 15 0.500000 0.500000 7
-Parabolic1FromTopLeft 16 0.600000 0.280000 7
-Parabolic1FromTopLeft 17 0.700000 0.020000 7
-Parabolic1FromTopLeft 18 0.800000 -0.280000 7
-Parabolic1FromTopLeft 19 0.900000 -0.620000 7
-Parabolic1FromTopLeft 20 1.000000 -1.000000 7
-Parabolic2FromBottomRight 0 1.000000 1.000000 15
-Parabolic2FromBottomRight 1 0.900000 0.620000 7
-Parabolic2FromBottomRight 2 0.800000 0.280000 7
-Parabolic2FromBottomRight 3 0.700000 -0.020000 7
-Parabolic2FromBottomRight 4 0.600000 -0.280000 7
-Parabolic2FromBottomRight 5 0.500000 -0.500000 7
-Parabolic2FromBottomRight 6 0.400000 -0.680000 7
-Parabolic2FromBottomRight 7 0.300000 -0.820000 7
-Parabolic2FromBottomRight 8 0.200000 -0.920000 7
-Parabolic2FromBottomRight 9 0.100000 -0.980000 7
-Parabolic2FromBottomRight 12 -0.200000 -0.920000 15
-Parabolic2FromBottomRight 13 -0.300000 -0.820000 7
-Parabolic2FromBottomRight 14 -0.400000 -0.680000 7
-Parabolic2FromBottomRight 15 -0.500000 -0.500000 7
-Parabolic2FromBottomRight 16 -0.600000 -0.280000 7
-Parabolic2FromBottomRight 17 -0.700000 -0.020000 7
-Parabolic2FromBottomRight 18 -0.800000 0.280000 7
-Parabolic2FromBottomRight 19 -0.900000 0.620000 7
-Parabolic2FromBottomRight 20 -1.000000 1.000000 7
-SingleFrameInTheMiddle 0 0.010417 -0.018519 15
+Parabolic1FromTopLeft 0 -1.000521 -1.000927 15
+Parabolic1FromTopLeft 1 -0.900469 -0.620575 7
+Parabolic1FromTopLeft 2 -0.800417 -0.280259 7
+Parabolic1FromTopLeft 3 -0.700365 0.020019 7
+Parabolic1FromTopLeft 4 -0.600313 0.280259 7
+Parabolic1FromTopLeft 5 -0.500261 0.500463 7
+Parabolic1FromTopLeft 6 -0.400208 0.680630 7
+Parabolic1FromTopLeft 7 -0.300156 0.820760 7
+Parabolic1FromTopLeft 8 -0.200104 0.920853 7
+Parabolic1FromTopLeft 9 -0.100052 0.980908 7
+Parabolic1FromTopLeft 12 0.200104 0.920853 15
+Parabolic1FromTopLeft 13 0.300156 0.820760 7
+Parabolic1FromTopLeft 14 0.400208 0.680630 7
+Parabolic1FromTopLeft 15 0.500261 0.500463 7
+Parabolic1FromTopLeft 16 0.600313 0.280259 7
+Parabolic1FromTopLeft 17 0.700365 0.020019 7
+Parabolic1FromTopLeft 18 0.800417 -0.280259 7
+Parabolic1FromTopLeft 19 0.900469 -0.620575 7
+Parabolic1FromTopLeft 20 1.000521 -1.000927 7
+Parabolic2FromBottomRight 0 1.000521 1.000927 15
+Parabolic2FromBottomRight 1 0.900469 0.620575 7
+Parabolic2FromBottomRight 2 0.800417 0.280259 7
+Parabolic2FromBottomRight 3 0.700365 -0.020019 7
+Parabolic2FromBottomRight 4 0.600313 -0.280259 7
+Parabolic2FromBottomRight 5 0.500261 -0.500463 7
+Parabolic2FromBottomRight 6 0.400208 -0.680630 7
+Parabolic2FromBottomRight 7 0.300156 -0.820760 7
+Parabolic2FromBottomRight 8 0.200104 -0.920853 7
+Parabolic2FromBottomRight 9 0.100052 -0.980908 7
+Parabolic2FromBottomRight 12 -0.200104 -0.920853 15
+Parabolic2FromBottomRight 13 -0.300156 -0.820760 7
+Parabolic2FromBottomRight 14 -0.400208 -0.680630 7
+Parabolic2FromBottomRight 15 -0.500261 -0.500463 7
+Parabolic2FromBottomRight 16 -0.600313 -0.280259 7
+Parabolic2FromBottomRight 17 -0.700365 -0.020019 7
+Parabolic2FromBottomRight 18 -0.800417 0.280259 7
+Parabolic2FromBottomRight 19 -0.900469 0.620575 7
+Parabolic2FromBottomRight 20 -1.000521 1.000927 7
+SingleFrameInTheMiddle 0 0.010422 -0.018536 15

data/test/import/test_pftrack_import.rb

@@ -38,12 +38,12 @@ class PFTrackImportTest < Test::Unit::TestCase
     assert_equal 341, trackers[0].keyframes.length
     
     assert_equal 41, first_kf.frame
-    assert_in_delta 984.611, first_kf.abs_x, DELTA
-    assert_in_delta 30.220, first_kf.abs_y, DELTA
+    assert_in_delta 985.111, first_kf.abs_x, DELTA
+    assert_in_delta 30.72, first_kf.abs_y, DELTA
     assert_in_delta 0.0, first_kf.residual, DELTA
     
     last_kf = trackers[0].keyframes[-1]
-    assert_in_delta 729.330, last_kf.abs_x, DELTA
+    assert_in_delta 729.83, last_kf.abs_x, DELTA
     
     assert_equal "Tracker41", trackers[-1].name
     assert_equal 467, trackers[-1].keyframes.length
@@ -83,11 +83,11 @@ class PFTrackImportTest < Test::Unit::TestCase
     
     assert_equal "Auto_00016_Primary", acc[18].name
     assert_equal 34, acc[18].length
-    assert_in_delta 1331.017, acc[18][0].abs_x, DELTA
+    assert_in_delta 1331.517, acc[18][0].abs_x, DELTA
     
     assert_equal "Auto_00016_Secondary", acc[19].name
     assert_equal 34, acc[19].length
-    assert_in_delta 1335.609, acc[19][0].abs_x, DELTA
+    assert_in_delta 1336.109, acc[19][0].abs_x, DELTA
     
     assert_equal "Auto_00021_Primary", acc[20].name
     assert_equal 0, acc[20].length

data/test/import/test_shake_script_import.rb

@@ -54,7 +54,15 @@ class ShakeScriptImportTest < Test::Unit::TestCase
     assert_equal "Tracker1_track2", t2.name
     
   end
-
+  
+  ### Disabled for now, I don't feel like overhauling the Shake parser ATM
+  # def test_parsing_case
+  #  fixture = File.open(File.dirname(__FILE__) + '/samples/shake_script/205_030_shaketrack_v01_pd.shk')
+  #  trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture).to_a
+  #  assert_equal 3, trackers.length
+  # end
+  ###
+  
   def test_parsing_three_tracks_in_one_stabilizer_node
     fixture = File.open(File.dirname(__FILE__) + '/samples/shake_script/three_tracks_in_one_stabilizer.shk')