tracksperanto 1.7.3 → 1.7.4

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.7.4 / 2010-02-02
+
+* 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
+
 === 1.7.3 / 2010-02-02
 
 * Fixed the --only option in the commandline binary

data/Manifest.txt

@@ -31,6 +31,7 @@ lib/import/shake_text.rb
 lib/import/syntheyes.rb
 lib/middleware/base.rb
 lib/middleware/golden.rb
+lib/middleware/length_cutoff.rb
 lib/middleware/lerp.rb
 lib/middleware/prefix.rb
 lib/middleware/reformat.rb
@@ -117,6 +118,7 @@ test/import/test_shake_script_import.rb
 test/import/test_shake_text_import.rb
 test/import/test_syntheyes_import.rb
 test/middleware/test_golden_middleware.rb
+test/middleware/test_length_cutoff_middleware.rb
 test/middleware/test_lerp_middleware.rb
 test/middleware/test_prefix.rb
 test/middleware/test_reformat_middleware.rb

data/bin/tracksperanto

@@ -25,6 +25,7 @@ slip = 0
 golden_tracks = false
 x_shift = 0
 y_shift = 0
+length_gate = 0
 set_prefix = ''
 sole_format = nil
 lerp = false
@@ -51,13 +52,16 @@ parser = OptionParser.new do | p |
    golden_tracks = g_flag
  }
  p.on(" -rx", "--reformat-x NEW_PIX_WIDTH", Integer, "Reformat the comp to this width and scale all tracks to it") {|rw| 
-    reformat_w = rw
+   reformat_w = rw
  }
  p.on(" -ry", "--reformat-y NEW_PIX_HEIGHT", Integer, "Reformat the comp to this height and scale all tracks to it") {|rh|
-    reformat_h = rh
+   reformat_h = rh
  }
  p.on(" -o", "--only EXPORTER_NAME", String, "Only export the selected format, format must be one of #{writers.join(", ")}") {|f|
-     sole_format = f
+   sole_format = f
+ }
+ p.on(" -m", "--min-length LENGTH_IN_FRAMES", Integer, "Only export trackers having more than X keyframes") {|f| 
+   length_gate = f
  }
  p.on(" -xm", "--xshift X_IN_PIXELS", Float, "Move the points left or right") {|sx| x_shift = sx }
  p.on(" -ym", "--yshift Y_IN_PIXELS", Float, "Move the points up or down") {|sx| y_shift = sx }
@@ -120,7 +124,7 @@ if sole_format
   end
 end
 
-pipe.run(input_file, :pix_w => width, :pix_h => height, :parser => reader_klass) do | scaler, slipper, golden, reformat, shift, prefix, lerpm |
+pipe.run(input_file, :pix_w => width, :pix_h => height, :parser => reader_klass) do | scaler, slipper, golden, reformat, shift, prefix, lerpm, len |
   slipper.slip = slip
   scaler.x_factor = scale_x
   scaler.y_factor = scale_y
@@ -131,5 +135,6 @@ pipe.run(input_file, :pix_w => width, :pix_h => height, :parser => reader_klass)
   shift.y_shift = y_shift
   prefix.prefix = set_prefix
   lerpm.enabled = lerp
+  len.min_length = length_gate
 end
 STDOUT.puts("\rConverted #{pipe.converted_points} trackers with #{pipe.converted_keyframes} keys")

data/lib/export/syntheyes.rb

@@ -1,7 +1,17 @@
-# Export for Syntheyes tracker UVs
+# Export for Syntheyes tracker UVs. We actually just use prebaked sample values, and do not use bitmasks such as
+# OUTCOME_RUN = 1 
+# OUTCOME_ENABLE = 2  -- mirrors the enable track 
+# OUTCOME_OK = 4   -- usable u/v present on this frame 
+# OUTCOME_KEY = 8   -- there is a key here (OK will be on too) 
+# OUTCOME_JUMPED = 16 
+# OUTCOME_OUTASIGHT = 32 
 class Tracksperanto::Export::SynthEyes < Tracksperanto::Export::Base
   include Tracksperanto::UVCoordinates
   
+  STATUS_KF = 30
+  STATUS_STD = 7
+  STATUS_REENABLE = 15
+  
   def self.desc_and_extension
     "syntheyes_2dt.txt"
   end
@@ -15,11 +25,27 @@ class Tracksperanto::Export::SynthEyes < Tracksperanto::Export::Base
   end
   
   def start_tracker_segment(tracker_name)
-    @tracker_name = tracker_name
+    @last_f, @tracker_name = nil, tracker_name
   end
   
   def export_point(frame, abs_float_x, abs_float_y, float_residual)
     values = [@tracker_name, frame] + absolute_to_uv(abs_float_x, abs_float_y, @width, @height)
-    @io.puts("%s %d %.6f %.6f 30" % values)
+    values << get_outcome_code(frame)
+    @io.puts("%s %d %.6f %.6f %d" % values)
   end
+  
+  private
+    # It's very important that we provide an outcome code for Syntheyes. Regular keyframes get
+    # STATUS_STD, and after a gap we have to signal STATUS_REENABLE, otherwise this might bust solves
+    def get_outcome_code(frame)
+      outcome = if @last_f.nil?
+        STATUS_KF
+      elsif @last_f && (@last_f != frame -1)
+        STATUS_REENABLE
+      else
+        STATUS_STD
+      end
+      @last_f = frame
+      outcome
+    end
 end

data/lib/middleware/length_cutoff.rb

@@ -0,0 +1,24 @@
+# This middleware removes trackers that contain less than min_length keyframes
+# from the exported batch
+class Tracksperanto::Middleware::LengthCutoff < Tracksperanto::Middleware::Base
+  attr_accessor :min_length
+  cast_to_int :min_length
+  
+  def start_tracker_segment(name)
+    @tracker = Tracksperanto::Tracker.new(:name => name)
+  end
+  
+  def end_tracker_segment
+    return if ((min_length > 0)  && (@tracker.length < min_length))
+    
+    @exporter.start_tracker_segment(@tracker.name)
+    @tracker.each{|kf| @exporter.export_point(kf.frame, kf.abs_x, kf.abs_y, kf.residual) }
+    @exporter.end_tracker_segment
+  end
+  
+  def export_point(frame, float_x, float_y, float_residual)
+    @tracker.keyframe! :abs_x => float_x, :abs_y => float_y, :residual => float_residual, :frame => frame
+  end
+  
+  
+end

data/lib/pipeline/base.rb

@@ -149,7 +149,8 @@ class Tracksperanto::Pipeline::Base
     shift = Tracksperanto::Middleware::Shift.new(reformat)
     prefix = Tracksperanto::Middleware::Prefix.new(shift)
     lerp = Tracksperanto::Middleware::Lerp.new(prefix)
-    [scaler, slipper, golden, reformat, shift, prefix, lerp]
+    lengate = Tracksperanto::Middleware::LengthCutoff.new(lerp)
+    [scaler, slipper, golden, reformat, shift, prefix, lerp, lengate]
   end
   
   # Open the file for writing and register it to be closed automatically

data/lib/tracksperanto.rb

@@ -4,7 +4,7 @@ require 'tempfile'
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '1.7.3'
+  VERSION = '1.7.4'
   
   module Import; end
   module Export; end

data/test/export/samples/ref_Mayalive.txt

@@ -10,8 +10,6 @@
 0 7 -0.5333333333 -0.8200000000 0.0333333333
 0 8 -0.3555555556 -0.9200000000 0.0380952381
 0 9 -0.1777777778 -0.9800000000 0.0428571429
-0 10 0.0000000000 -1.0000000000 0.0476190476
-0 11 0.1777777778 -0.9800000000 0.0523809524
 0 12 0.3555555556 -0.9200000000 0.0571428571
 0 13 0.5333333333 -0.8200000000 0.0619047619
 0 14 0.7111111111 -0.6800000000 0.0666666667
@@ -32,8 +30,6 @@
 1 7 0.5333333333 0.8200000000 0.0333333333
 1 8 0.3555555556 0.9200000000 0.0380952381
 1 9 0.1777777778 0.9800000000 0.0428571429
-1 10 0.0000000000 1.0000000000 0.0476190476
-1 11 -0.1777777778 0.9800000000 0.0523809524
 1 12 -0.3555555556 0.9200000000 0.0571428571
 1 13 -0.5333333333 0.8200000000 0.0619047619
 1 14 -0.7111111111 0.6800000000 0.0666666667

data/test/export/samples/ref_Mayalive_CustomAspect.txt

@@ -10,8 +10,6 @@
 0 7 -0.5340000000 -0.8200000000 0.0333333333
 0 8 -0.3560000000 -0.9200000000 0.0380952381
 0 9 -0.1780000000 -0.9800000000 0.0428571429
-0 10 -0.0000000000 -1.0000000000 0.0476190476
-0 11 0.1780000000 -0.9800000000 0.0523809524
 0 12 0.3560000000 -0.9200000000 0.0571428571
 0 13 0.5340000000 -0.8200000000 0.0619047619
 0 14 0.7120000000 -0.6800000000 0.0666666667
@@ -32,8 +30,6 @@
 1 7 0.5340000000 0.8200000000 0.0333333333
 1 8 0.3560000000 0.9200000000 0.0380952381
 1 9 0.1780000000 0.9800000000 0.0428571429
-1 10 -0.0000000000 1.0000000000 0.0476190476
-1 11 -0.1780000000 0.9800000000 0.0523809524
 1 12 -0.3560000000 0.9200000000 0.0571428571
 1 13 -0.5340000000 0.8200000000 0.0619047619
 1 14 -0.7120000000 0.6800000000 0.0666666667

data/test/export/samples/ref_NukeScript.nk

@@ -16,14 +16,14 @@ Constant {
 }
 
 Tracker3 {
-     track1 {{curve i x1 0.0000 x2 96.0000 192.0000 288.0000 384.0000 480.0000 576.0000 672.0000 768.0000 864.0000 960.0000 1056.0000 1152.0000 1248.0000 1344.0000 1440.0000 1536.0000 1632.0000 1728.0000 1824.0000 1920.0000} {curve i x1 1080.0000 x2 874.8000 691.2000 529.2000 388.8000 270.0000 172.8000 97.2000 43.2000 10.8000 0.0000 10.8000 43.2000 97.2000 172.8000 270.0000 388.8000 529.2000 691.2000 874.8000 1080.0000}}
+     track1 {{curve i x1 0.0000 x2 96.0000 192.0000 288.0000 384.0000 480.0000 576.0000 672.0000 768.0000 864.0000 x13 1152.0000 x14 1248.0000 1344.0000 1440.0000 1536.0000 1632.0000 1728.0000 1824.0000 1920.0000} {curve i x1 1080.0000 x2 874.8000 691.2000 529.2000 388.8000 270.0000 172.8000 97.2000 43.2000 10.8000 x13 43.2000 x14 97.2000 172.8000 270.0000 388.8000 529.2000 691.2000 874.8000 1080.0000}}
      name Parabolic_1_from_top_left
      xpos 0
      ypos 30
 }
 
 Tracker3 {
-     track1 {{curve i x1 1920.0000 x2 1824.0000 1728.0000 1632.0000 1536.0000 1440.0000 1344.0000 1248.0000 1152.0000 1056.0000 960.0000 864.0000 768.0000 672.0000 576.0000 480.0000 384.0000 288.0000 192.0000 96.0000 0.0000} {curve i x1 0.0000 x2 205.2000 388.8000 550.8000 691.2000 810.0000 907.2000 982.8000 1036.8000 1069.2000 1080.0000 1069.2000 1036.8000 982.8000 907.2000 810.0000 691.2000 550.8000 388.8000 205.2000 0.0000}}
+     track1 {{curve i x1 1920.0000 x2 1824.0000 1728.0000 1632.0000 1536.0000 1440.0000 1344.0000 1248.0000 1152.0000 1056.0000 x13 768.0000 x14 672.0000 576.0000 480.0000 384.0000 288.0000 192.0000 96.0000 0.0000} {curve i x1 0.0000 x2 205.2000 388.8000 550.8000 691.2000 810.0000 907.2000 982.8000 1036.8000 1069.2000 x13 1036.8000 x14 982.8000 907.2000 810.0000 691.2000 550.8000 388.8000 205.2000 0.0000}}
      name Parabolic_2_from_bottom_right
      xpos 0
      ypos 60

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

@@ -1,7 +1,7 @@
 
 
 "Parabolic_1_from_top_left"
-21
+19
 0 0.000 1080.000 0.000
 1 96.000 874.800 0.006
 2 192.000 691.200 0.012
@@ -12,8 +12,6 @@
 7 672.000 97.200 0.042
 8 768.000 43.200 0.048
 9 864.000 10.800 0.054
-10 960.000 0.000 0.060
-11 1056.000 10.800 0.065
 12 1152.000 43.200 0.071
 13 1248.000 97.200 0.077
 14 1344.000 172.800 0.083
@@ -26,7 +24,7 @@
 
 
 "Parabolic_2_from_bottom_right"
-21
+19
 0 1920.000 0.000 0.000
 1 1824.000 205.200 0.006
 2 1728.000 388.800 0.012
@@ -37,8 +35,6 @@
 7 1248.000 982.800 0.042
 8 1152.000 1036.800 0.048
 9 1056.000 1069.200 0.054
-10 960.000 1080.000 0.060
-11 864.000 1069.200 0.065
 12 768.000 1036.800 0.071
 13 672.000 982.800 0.077
 14 576.000 907.200 0.083

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

@@ -2,7 +2,7 @@
 
 "Parabolic_1_from_top_left"
 "Primary"
-21
+19
 0 0.000 1080.000 0.000
 1 96.000 874.800 0.006
 2 192.000 691.200 0.012
@@ -13,8 +13,6 @@
 7 672.000 97.200 0.042
 8 768.000 43.200 0.048
 9 864.000 10.800 0.054
-10 960.000 0.000 0.060
-11 1056.000 10.800 0.065
 12 1152.000 43.200 0.071
 13 1248.000 97.200 0.077
 14 1344.000 172.800 0.083
@@ -28,7 +26,7 @@
 
 "Parabolic_2_from_bottom_right"
 "Primary"
-21
+19
 0 1920.000 0.000 0.000
 1 1824.000 205.200 0.006
 2 1728.000 388.800 0.012
@@ -39,8 +37,6 @@
 7 1248.000 982.800 0.042
 8 1152.000 1036.800 0.048
 9 1056.000 1069.200 0.054
-10 960.000 1080.000 0.060
-11 864.000 1069.200 0.065
 12 768.000 1036.800 0.071
 13 672.000 982.800 0.077
 14 576.000 907.200 0.083

data/test/export/samples/ref_ShakeText.txt

@@ -10,8 +10,6 @@ TrackName Parabolic_1_from_top_left
    8.00   672.000   97.200   0.667
    9.00   768.000   43.200   0.619
    10.00   864.000   10.800   0.571
-   11.00   960.000   0.000   0.524
-   12.00   1056.000   10.800   0.476
    13.00   1152.000   43.200   0.429
    14.00   1248.000   97.200   0.381
    15.00   1344.000   172.800   0.333
@@ -34,8 +32,6 @@ TrackName Parabolic_2_from_bottom_right
    8.00   1248.000   982.800   0.667
    9.00   1152.000   1036.800   0.619
    10.00   1056.000   1069.200   0.571
-   11.00   960.000   1080.000   0.524
-   12.00   864.000   1069.200   0.476
    13.00   768.000   1036.800   0.429
    14.00   672.000   982.800   0.381
    15.00   576.000   907.200   0.333

data/test/export/samples/ref_Syntheyes.txt

@@ -1,42 +1,38 @@
 Parabolic_1_from_top_left 0 -1.000000 -1.000000 30
-Parabolic_1_from_top_left 1 -0.900000 -0.620000 30
-Parabolic_1_from_top_left 2 -0.800000 -0.280000 30
-Parabolic_1_from_top_left 3 -0.700000 0.020000 30
-Parabolic_1_from_top_left 4 -0.600000 0.280000 30
-Parabolic_1_from_top_left 5 -0.500000 0.500000 30
-Parabolic_1_from_top_left 6 -0.400000 0.680000 30
-Parabolic_1_from_top_left 7 -0.300000 0.820000 30
-Parabolic_1_from_top_left 8 -0.200000 0.920000 30
-Parabolic_1_from_top_left 9 -0.100000 0.980000 30
-Parabolic_1_from_top_left 10 0.000000 1.000000 30
-Parabolic_1_from_top_left 11 0.100000 0.980000 30
-Parabolic_1_from_top_left 12 0.200000 0.920000 30
-Parabolic_1_from_top_left 13 0.300000 0.820000 30
-Parabolic_1_from_top_left 14 0.400000 0.680000 30
-Parabolic_1_from_top_left 15 0.500000 0.500000 30
-Parabolic_1_from_top_left 16 0.600000 0.280000 30
-Parabolic_1_from_top_left 17 0.700000 0.020000 30
-Parabolic_1_from_top_left 18 0.800000 -0.280000 30
-Parabolic_1_from_top_left 19 0.900000 -0.620000 30
-Parabolic_1_from_top_left 20 1.000000 -1.000000 30
+Parabolic_1_from_top_left 1 -0.900000 -0.620000 7
+Parabolic_1_from_top_left 2 -0.800000 -0.280000 7
+Parabolic_1_from_top_left 3 -0.700000 0.020000 7
+Parabolic_1_from_top_left 4 -0.600000 0.280000 7
+Parabolic_1_from_top_left 5 -0.500000 0.500000 7
+Parabolic_1_from_top_left 6 -0.400000 0.680000 7
+Parabolic_1_from_top_left 7 -0.300000 0.820000 7
+Parabolic_1_from_top_left 8 -0.200000 0.920000 7
+Parabolic_1_from_top_left 9 -0.100000 0.980000 7
+Parabolic_1_from_top_left 12 0.200000 0.920000 15
+Parabolic_1_from_top_left 13 0.300000 0.820000 7
+Parabolic_1_from_top_left 14 0.400000 0.680000 7
+Parabolic_1_from_top_left 15 0.500000 0.500000 7
+Parabolic_1_from_top_left 16 0.600000 0.280000 7
+Parabolic_1_from_top_left 17 0.700000 0.020000 7
+Parabolic_1_from_top_left 18 0.800000 -0.280000 7
+Parabolic_1_from_top_left 19 0.900000 -0.620000 7
+Parabolic_1_from_top_left 20 1.000000 -1.000000 7
 Parabolic_2_from_bottom_right 0 1.000000 1.000000 30
-Parabolic_2_from_bottom_right 1 0.900000 0.620000 30
-Parabolic_2_from_bottom_right 2 0.800000 0.280000 30
-Parabolic_2_from_bottom_right 3 0.700000 -0.020000 30
-Parabolic_2_from_bottom_right 4 0.600000 -0.280000 30
-Parabolic_2_from_bottom_right 5 0.500000 -0.500000 30
-Parabolic_2_from_bottom_right 6 0.400000 -0.680000 30
-Parabolic_2_from_bottom_right 7 0.300000 -0.820000 30
-Parabolic_2_from_bottom_right 8 0.200000 -0.920000 30
-Parabolic_2_from_bottom_right 9 0.100000 -0.980000 30
-Parabolic_2_from_bottom_right 10 0.000000 -1.000000 30
-Parabolic_2_from_bottom_right 11 -0.100000 -0.980000 30
-Parabolic_2_from_bottom_right 12 -0.200000 -0.920000 30
-Parabolic_2_from_bottom_right 13 -0.300000 -0.820000 30
-Parabolic_2_from_bottom_right 14 -0.400000 -0.680000 30
-Parabolic_2_from_bottom_right 15 -0.500000 -0.500000 30
-Parabolic_2_from_bottom_right 16 -0.600000 -0.280000 30
-Parabolic_2_from_bottom_right 17 -0.700000 -0.020000 30
-Parabolic_2_from_bottom_right 18 -0.800000 0.280000 30
-Parabolic_2_from_bottom_right 19 -0.900000 0.620000 30
-Parabolic_2_from_bottom_right 20 -1.000000 1.000000 30
+Parabolic_2_from_bottom_right 1 0.900000 0.620000 7
+Parabolic_2_from_bottom_right 2 0.800000 0.280000 7
+Parabolic_2_from_bottom_right 3 0.700000 -0.020000 7
+Parabolic_2_from_bottom_right 4 0.600000 -0.280000 7
+Parabolic_2_from_bottom_right 5 0.500000 -0.500000 7
+Parabolic_2_from_bottom_right 6 0.400000 -0.680000 7
+Parabolic_2_from_bottom_right 7 0.300000 -0.820000 7
+Parabolic_2_from_bottom_right 8 0.200000 -0.920000 7
+Parabolic_2_from_bottom_right 9 0.100000 -0.980000 7
+Parabolic_2_from_bottom_right 12 -0.200000 -0.920000 15
+Parabolic_2_from_bottom_right 13 -0.300000 -0.820000 7
+Parabolic_2_from_bottom_right 14 -0.400000 -0.680000 7
+Parabolic_2_from_bottom_right 15 -0.500000 -0.500000 7
+Parabolic_2_from_bottom_right 16 -0.600000 -0.280000 7
+Parabolic_2_from_bottom_right 17 -0.700000 -0.020000 7
+Parabolic_2_from_bottom_right 18 -0.800000 0.280000 7
+Parabolic_2_from_bottom_right 19 -0.900000 0.620000 7
+Parabolic_2_from_bottom_right 20 -1.000000 1.000000 7

data/test/export/samples/ref_equalizer.txt

@@ -1,7 +1,7 @@
 2
 Parabolic_1_from_top_left
 0
-21
+19
 1 0.000000000000000 1080.000000000000000
 2 95.999999999999972 874.800000000000068
 3 191.999999999999943 691.200000000000159
@@ -12,8 +12,6 @@ Parabolic_1_from_top_left
 8 672.000000000000000 97.200000000000003
 9 768.000000000000000 43.200000000000010
 10 864.000000000000000 10.800000000000002
-11 960.000000000000000 0.000000000000000
-12 1056.000000000000000 10.800000000000002
 13 1152.000000000000000 43.200000000000010
 14 1248.000000000000000 97.200000000000003
 15 1344.000000000000000 172.800000000000040
@@ -25,7 +23,7 @@ Parabolic_1_from_top_left
 21 1920.000000000000000 1080.000000000000000
 Parabolic_2_from_bottom_right
 0
-21
+19
 1 1920.000000000000000 0.000000000000000
 2 1824.000000000000000 205.199999999999932
 3 1728.000000000000000 388.799999999999841
@@ -36,8 +34,6 @@ Parabolic_2_from_bottom_right
 8 1248.000000000000000 982.800000000000068
 9 1152.000000000000000 1036.799999999999955
 10 1056.000000000000000 1069.200000000000045
-11 960.000000000000000 1080.000000000000000
-12 864.000000000000000 1069.200000000000045
 13 768.000000000000000 1036.799999999999955
 14 672.000000000000000 982.800000000000068
 15 576.000000000000000 907.199999999999932

data/test/export/samples/ref_equalizer3.txt

@@ -10,8 +10,6 @@ Parabolic_1_from_top_left
 	8	672.000	97.200
 	9	768.000	43.200
 	10	864.000	10.800
-	11	960.000	0.000
-	12	1056.000	10.800
 	13	1152.000	43.200
 	14	1248.000	97.200
 	15	1344.000	172.800
@@ -32,8 +30,6 @@ Parabolic_2_from_bottom_right
 	8	1248.000	982.800
 	9	1152.000	1036.800
 	10	1056.000	1069.200
-	11	960.000	1080.000
-	12	864.000	1069.200
 	13	768.000	1036.800
 	14	672.000	982.800
 	15	576.000	907.200

data/test/export/samples/ref_matchmover.rz2

@@ -14,8 +14,6 @@ pointTrack  "Parabolic_1_from_top_left"  rgb( 255 0 0 )
 	8	   672.000     982.800     p+( 0.666667 )	
 	9	   768.000     1036.800     p+( 0.619048 )	
 	10	   864.000     1069.200     p+( 0.571429 )	
-	11	   960.000     1080.000     p+( 0.523810 )	
-	12	   1056.000     1069.200     p+( 0.476190 )	
 	13	   1152.000     1036.800     p+( 0.428571 )	
 	14	   1248.000     982.800     p+( 0.380952 )	
 	15	   1344.000     907.200     p+( 0.333333 )	
@@ -38,8 +36,6 @@ pointTrack  "Parabolic_2_from_bottom_right"  rgb( 255 0 0 )
 	8	   1248.000     97.200     p+( 0.666667 )	
 	9	   1152.000     43.200     p+( 0.619048 )	
 	10	   1056.000     10.800     p+( 0.571429 )	
-	11	   960.000     0.000     p+( 0.523810 )	
-	12	   864.000     10.800     p+( 0.476190 )	
 	13	   768.000     43.200     p+( 0.428571 )	
 	14	   672.000     97.200     p+( 0.380952 )	
 	15	   576.000     172.800     p+( 0.333333 )	

data/test/export/test_pftrack5_export.rb

@@ -14,6 +14,6 @@ class PFTrack5ExportTest < Test::Unit::TestCase
   P = File.dirname(__FILE__) + "/samples/ref_PFTrack5.2dt"
   
   def test_export_output_written
-    create_reference_output Tracksperanto::Export::PFTrack5, P
+    ensure_same_output Tracksperanto::Export::PFTrack5, P
   end
 end

data/test/helper.rb

@@ -45,17 +45,22 @@ module ParabolicTracks
   
   residual_unit = 1.0 / x_uv_chain.length
   
+  SKIPS = [10,11]
   FIRST_TRACK = Tracksperanto::Tracker.new(:name => "Parabolic_1_from_top_left") do | t |
     tuples_for_tracker_1.each do | (f, x, y )|
       ax, ay = uv_to_abs(x, y, 1920, 1080)
-      t.keyframe!(:frame => f, :abs_x => ax, :abs_y => ay, :residual => (f * residual_unit))
+      unless SKIPS.include?(f)
+        t.keyframe!(:frame => f, :abs_x => ax, :abs_y => ay, :residual => (f * residual_unit))
+      end
     end
   end
   
   SECOND_TRACK = Tracksperanto::Tracker.new(:name => "Parabolic_2_from_bottom_right") do | t |
     tuples_for_tracker_2.each do | (f, x, y )|
       ax, ay = uv_to_abs(x, y, 1920, 1080)
-      t.keyframe!(:frame => f, :abs_x => ax, :abs_y => ay, :residual => (f * residual_unit))
+      unless SKIPS.include?(f)
+        t.keyframe!(:frame => f, :abs_x => ax, :abs_y => ay, :residual => (f * residual_unit))
+      end
     end
   end
   

data/test/import/test_pftrack_import.rb

@@ -10,8 +10,9 @@ class PFTrackImportTest < Test::Unit::TestCase
   end
   
   def test_parsing_from_importable_pftrack_4
+    
     fixture = File.open(File.dirname(__FILE__) + '/samples/pftrack4/sourcefile_pftrack.2dt')
-
+    
     parser = Tracksperanto::Import::PFTrack.new
     parser.width = 2560
     parser.height = 1080
@@ -45,4 +46,5 @@ class PFTrackImportTest < Test::Unit::TestCase
     assert_equal "Tracker121", trackers[0].name
     assert_equal 189, trackers[0].length
   end
+  
 end

data/test/middleware/test_length_cutoff_middleware.rb

@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../helper'
+
+class LengthCutoffMiddlewareTest < Test::Unit::TestCase
+  def test_default_length_set_to_zero_and_ignored
+    receiver = flexmock
+    m = Tracksperanto::Middleware::LengthCutoff.new(receiver)
+    assert_equal 0, m.min_length
+  end
+  
+  def test_slip_supports_hash_init
+    receiver = flexmock
+    m = Tracksperanto::Middleware::LengthCutoff.new(receiver, :min_length => 23)
+    assert_equal 23, m.min_length
+  end
+  
+  def test_slipper_bypasses_methods
+    receiver = flexmock
+    receiver.should_receive(:start_export).once.with(120,120)
+    receiver.should_receive(:start_tracker_segment).once.with("Tracker")
+    12.times do | i |
+      receiver.should_receive(:export_point).with(i, 100, 100, 0)
+    end
+    receiver.should_receive(:end_tracker_segment).once
+    receiver.should_receive(:end_export).once
+    
+    
+    m = Tracksperanto::Middleware::LengthCutoff.new(receiver, :min_length => 12)
+    m.start_export(120, 120)
+    m.start_tracker_segment("Tracker")
+    12.times {|t|  m.export_point(t, 100, 100, 0) }
+    m.end_tracker_segment
+    m.start_tracker_segment("Tracker2")
+    11.times {|t|  m.export_point(t, 100, 100, 0) }
+    m.end_tracker_segment
+    m.end_export
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 +01:00
+date: 2010-02-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,6 +78,7 @@ files:
 - lib/import/syntheyes.rb
 - lib/middleware/base.rb
 - lib/middleware/golden.rb
+- lib/middleware/length_cutoff.rb
 - lib/middleware/lerp.rb
 - lib/middleware/prefix.rb
 - lib/middleware/reformat.rb
@@ -164,6 +165,7 @@ files:
 - test/import/test_shake_text_import.rb
 - test/import/test_syntheyes_import.rb
 - test/middleware/test_golden_middleware.rb
+- test/middleware/test_length_cutoff_middleware.rb
 - test/middleware/test_lerp_middleware.rb
 - test/middleware/test_prefix.rb
 - test/middleware/test_reformat_middleware.rb
@@ -231,6 +233,7 @@ test_files:
 - test/import/test_shake_text_import.rb
 - test/import/test_syntheyes_import.rb
 - test/middleware/test_golden_middleware.rb
+- test/middleware/test_length_cutoff_middleware.rb
 - test/middleware/test_lerp_middleware.rb
 - test/middleware/test_prefix.rb
 - test/middleware/test_reformat_middleware.rb