tracksperanto 1.7.1 → 1.7.2

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.7.2 / 2010-01-31
+
+* Add a Lerp middleware 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
+
 === 1.7.1 / 2010-01-24
 
 * Fix Ruby 1.9 compatibility

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/lerp.rb
 lib/middleware/prefix.rb
 lib/middleware/reformat.rb
 lib/middleware/scaler.rb
@@ -100,6 +101,7 @@ test/import/samples/shake_text/one_shake_tracker_from_first.txt
 test/import/samples/shake_text/two_shake_trackers.txt
 test/import/samples/syntheyes_2d_paths/cola_plate.txt
 test/import/samples/syntheyes_2d_paths/flyover2DP_syntheyes.txt
+test/import/samples/syntheyes_2d_paths/one_tracker.txt
 test/import/samples/syntheyes_2d_paths/shake_tracker_nodes_to_syntheyes.txt
 test/import/test_3de_import.rb
 test/import/test_3de_import3.rb
@@ -115,6 +117,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_lerp_middleware.rb
 test/middleware/test_prefix.rb
 test/middleware/test_reformat_middleware.rb
 test/middleware/test_scaler_middleware.rb
@@ -126,3 +129,4 @@ test/test_format_detector.rb
 test/test_keyframe.rb
 test/test_simple_export.rb
 test/test_tracker.rb
+test/test_tracksperanto.rb

data/bin/tracksperanto

@@ -27,6 +27,7 @@ x_shift = 0
 y_shift = 0
 set_prefix = ''
 sole_format = nil
+lerp = false
 reader_name = "ShakeScript"
 readers = Tracksperanto.importer_names
 writers = Tracksperanto.exporter_names
@@ -60,6 +61,7 @@ parser = OptionParser.new do | p |
  }
  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 }
+ p.on("--lerp", "Linearly interpolate missing keyframes") {|v| lerp = true }
  p.on("--version", "Show the version and exit") {|v| 
     puts "#{Tracksperanto::VERSION} running on Ruby #{RUBY_VERSION} on #{RUBY_PLATFORM}"
     puts "Copyright 2008-#{Time.now.year} by Guerilla-DI (Julik Tarkhanov and contributors)"
@@ -118,7 +120,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 |
+pipe.run(input_file, :pix_w => width, :pix_h => height, :parser => reader_klass) do | scaler, slipper, golden, reformat, shift, prefix, lerpm |
   slipper.slip = slip
   scaler.x_factor = scale_x
   scaler.y_factor = scale_y
@@ -128,5 +130,6 @@ pipe.run(input_file, :pix_w => width, :pix_h => height, :parser => reader_klass)
   shift.x_shift = x_shift
   shift.y_shift = y_shift
   prefix.prefix = set_prefix
+  lerpm.enabled = lerp
 end
 STDOUT.puts("\rConverted #{pipe.converted_points} trackers with #{pipe.converted_keyframes} keys")

data/lib/export/nuke_script.rb

@@ -11,11 +11,16 @@ Tracker3 {
     KEYFRAME_PRECISION_TEMPLATE = "%.4f"
     PREAMBLE = %[
 version 5.1200
+Root {
+ inputs 0
+ frame 1
+ last_frame %d
+}
 Constant {
  inputs 0
  channels rgb
- format "1920 1080 0 0 1920 1080 1"
- name CompSize_1920x1080
+ format "%d %d 0 0 %d %d 1"
+ name CompSize_%dx%d
  postage_stamp false
  xpos 0
  ypos -60
@@ -35,19 +40,22 @@ Constant {
     end
     
     def start_export(w, h)
-      @io.puts(PREAMBLE.gsub(/1920/, w.to_s).gsub(/1080/, h.to_s))
-      @ypos = 0
+      @max_frame, @ypos, @w, @h = 0, 0, w, h
+      # At the start of the file we need to provide the length of the script.
+      # We allocate an IO for the file being output that will contain all the trackers,
+      # and then write that one into the script preceded by the preamble that sets length
+      # based on the last frame position in time
+      @trackers_io = Tempfile.new("nukex")
     end
     
     # We accumulate a tracker and on end dump it out in one piece
     def start_tracker_segment(tracker_name)
       # Setup for the next tracker
-      @tracker = T.new
-      @tracker.name = tracker_name
+      @tracker = T.new(:name => tracker_name)
     end
     
     def end_tracker_segment
-      @io.puts( 
+      @trackers_io.puts( 
         NODE_TEMPLATE % [curves_from_tuples(@tracker), @tracker.name, (@ypos += SCHEMATIC_OFFSET)]
       )
     end
@@ -55,6 +63,15 @@ Constant {
     def export_point(frame, abs_float_x, abs_float_y, float_residual)
       # Nuke uses 1-based frames
       @tracker << [frame + 1, abs_float_x, abs_float_y]
+      @max_frame = frame if frame > @max_frame
+    end
+    
+    def end_export
+      @trackers_io.rewind
+      preamble_values = [@max_frame + 1, @w, @h, @w, @h, @w, @h]
+      @io.puts(PREAMBLE % preamble_values)
+      @io.write(@trackers_io.read) until @trackers_io.eof?
+      @trackers_io.close!
     end
     
     private

data/lib/import/shake_grammar/lexer.rb

@@ -1,4 +1,6 @@
 module Tracksperanto::ShakeGrammar
+  class WrongInput < RuntimeError; end
+  
   # Since Shake uses a C-like language for it's scripts we rig up a very sloppy
   # but concise C-like lexer to cope
   class Lexer
@@ -15,8 +17,8 @@ module Tracksperanto::ShakeGrammar
     # The second argument is a "sentinel" that is going to be passed
     # to the downstream lexers instantiated for nested data structures.
     # You can use the sentinel to collect data from child nodes for example.
-    def initialize(with_io, sentinel = nil, limit_to_one_stmt = false)
-      @io, @stack, @buf, @sentinel, @limit_to_one_stmt  = with_io, [], '', sentinel, @limit_to_one_stmt
+    def initialize(with_io, sentinel = nil, limit_to_one_stmt = false, stack_depth = 0)
+      @io, @stack, @buf, @sentinel, @limit_to_one_stmt, @stack_depth  = with_io, [], '', sentinel, limit_to_one_stmt, stack_depth
       catch(STOP_TOKEN) { parse until @io.eof? }
       in_comment? ? consume_comment("\n") : consume_atom!
     end
@@ -37,11 +39,21 @@ module Tracksperanto::ShakeGrammar
     end
     
     def parse
+      
       c = @io.read(1)
+      
+      if @buf.length > 32000 # Wrong format and the buffer is filled up, bail
+        raise WrongInput, "Buffer overflow at 32K, this is definitely not a Shake script"
+      end
+      
+      if @stack_depth > 127 # Wrong format - parentheses overload
+        raise WrongInput, "Stack overflow at level 128, this is probably a LISP program uploaded by accident"
+      end
+      
       return consume_comment(c) if in_comment? 
       
       if !@buf.empty? && (c == "(") # Funcall
-        push([:funcall, @buf.strip] + self.class.new(@io, @sentinel).stack)
+        push([:funcall, @buf.strip] + self.class.new(@io, @sentinel, false, @stack_depth + 1).stack)
         @buf = ''
       elsif c == "[" # Array, booring
         push([:arr, self.class.new(@io).stack])
@@ -57,7 +69,7 @@ module Tracksperanto::ShakeGrammar
       elsif (c == ";" || c == "\n")
         # Skip these - the subexpression already is expanded anyway
       elsif (c == "=")
-        push [:assign, @buf.strip, self.class.new(@io, @sentinel, to_semicolon = true).stack.shift]
+        push [:assign, @buf.strip, self.class.new(@io, @sentinel, to_semicolon = true, @stack_depth + 1).stack.shift]
         @buf = ''
       else
         @buf << c

data/lib/middleware/lerp.rb

@@ -0,0 +1,62 @@
+# This middleware adds linearly interpolated keyframes BETWEEN the keyframes passing through the exporter
+class Tracksperanto::Middleware::Lerp < Tracksperanto::Middleware::Base
+  attr_accessor :enabled
+  
+  def initialize(*whatever)
+    super
+  end
+  
+  def end_tracker_segment
+    @last_f, @last_x, @last_y, @last_res = nil, nil, nil, nil
+    super
+  end
+  
+  def export_point(frame, float_x, float_y, float_residual)
+    
+    if @enabled && @last_f && (frame - @last_f > 1) # Interpolate!
+      interpolated_frames = []
+      interpolated_x = []
+      lerp(@last_f, @last_x, frame, float_x) do | interp_f, interp_x |
+        interpolated_frames << interp_f
+        interpolated_x << interp_x
+      end
+      
+      interpolated_y = []
+      lerp(@last_f, @last_y, frame, float_y) do | interp_f, interp_y |
+        interpolated_y << interp_y
+      end
+      
+      interpolated_res = []
+      lerp(@last_f, @last_res, frame, float_residual) do | interp_f, interp_res |
+        interpolated_res << interp_res
+      end
+      
+      tuples = interpolated_frames.zip(interpolated_x).zip(interpolated_y).zip(interpolated_res).map{|e| e.flatten }
+      tuples.each do | f, x, y, r |
+        super(f.to_i, x, y, r)
+      end
+    else
+      super(frame, float_x + (@x_shift || 0), float_y + (@y_shift || 0), float_residual)
+    end
+    
+    @last_f, @last_x, @last_y, @last_res = frame, float_x, float_y, float_residual
+  end
+  
+  private
+    # Do a simple linear interpolxion. The function will yield
+    # the interim X and Y, one tuple per whole value between the set points,
+    # and return the last tuple (so you can return-assign from it in a loop)
+    def lerp(last_x, last_y, x, y) #:yields: interp_x, interp_y
+      if last_x.nil?
+        yield(x, y)
+      else
+        gap_size = x - last_x
+        increment = (y.to_f - last_y) / gap_size.to_f
+        (1..gap_size).each do | index |
+          yield(last_x + index, last_y + (increment * index))
+        end
+      end
+
+      return [x, y]
+    end
+end

data/lib/pipeline/base.rb

@@ -148,7 +148,8 @@ class Tracksperanto::Pipeline::Base
     reformat = Tracksperanto::Middleware::Reformat.new(golden)
     shift = Tracksperanto::Middleware::Shift.new(reformat)
     prefix = Tracksperanto::Middleware::Prefix.new(shift)
-    [scaler, slipper, golden, reformat, shift, prefix]
+    lerp = Tracksperanto::Middleware::Lerp.new(prefix)
+    [scaler, slipper, golden, reformat, shift, prefix, lerp]
   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.1'
+  VERSION = '1.7.2'
   
   module Import; end
   module Export; end

data/test/export/samples/ref_NukeScript.nk

@@ -1,5 +1,10 @@
 
 version 5.1200
+Root {
+ inputs 0
+ frame 1
+ last_frame 21
+}
 Constant {
  inputs 0
  channels rgb

data/test/export/test_nuke_export.rb

@@ -3,7 +3,21 @@ require File.dirname(__FILE__) + '/../helper'
 class NukeExportTest < Test::Unit::TestCase
   include ParabolicTracks
   P = File.dirname(__FILE__) + "/samples/ref_NukeScript.nk"
-  
+  PREAMBLE = 'version 5.1200
+Root {
+ inputs 0
+ frame 1
+ last_frame 1
+}
+Constant {
+ inputs 0
+ channels rgb
+ format "1080 720 0 0 1080 720 1"
+ name CompSize_1080x720
+ postage_stamp false
+ xpos 0
+ ypos -60
+}'
   def test_export_output_written
     ensure_same_output Tracksperanto::Export::NukeScript, P
   end
@@ -19,4 +33,13 @@ class NukeExportTest < Test::Unit::TestCase
     curves = x.send(:curves_from_tuples, tuples)
     assert_equal "{curve i x6 234.0000 x8 144.0000 x9 231.0000 232.0000} {curve i x6 145.0000 x8 223.0000 x9 189.0000 190.0000}", curves
   end
+  
+  def test_compsize_not_overridden
+    o = StringIO.new
+    x = Tracksperanto::Export::NukeScript.new(o)
+    x.start_export(1080, 720)
+    x.end_export
+    assert_equal PREAMBLE, o.string.strip 
+  end
+  
 end

data/test/import/samples/syntheyes_2d_paths/one_tracker.txt

@@ -0,0 +1,49 @@
+Tracker1 1 0.534170 0.262748 15
+Tracker1 2 0.529106 0.271534 15
+Tracker1 3 0.519590 0.276720 15
+Tracker1 4 0.505941 0.279593 15
+Tracker1 5 0.492117 0.282147 15
+Tracker1 6 0.473923 0.286924 15
+Tracker1 7 0.448403 0.286272 15
+Tracker1 8 0.417549 0.284215 7
+Tracker1 9 0.384929 0.282190 7
+Tracker1 10 0.353343 0.276352 7
+Tracker1 11 0.326983 0.261854 7
+Tracker1 12 0.307420 0.241051 7
+Tracker1 13 0.294273 0.216698 15
+Tracker1 14 0.284551 0.179775 7
+Tracker1 15 0.275643 0.139854 7
+Tracker1 16 0.269627 0.097185 7
+Tracker1 17 0.265121 0.055921 7
+Tracker1 18 0.261474 0.016123 7
+Tracker1 19 0.259958 -0.017824 15
+Tracker1 20 0.259865 -0.050091 7
+Tracker1 21 0.261076 -0.079522 7
+Tracker1 22 0.266876 -0.106130 7
+Tracker1 23 0.278061 -0.127863 7
+Tracker1 24 0.292528 -0.147697 7
+Tracker1 25 0.309343 -0.165303 15
+Tracker1 26 0.326480 -0.180183 7
+Tracker1 27 0.344691 -0.193969 7
+Tracker1 28 0.365476 -0.204905 7
+Tracker1 29 0.388225 -0.211803 7
+Tracker1 30 0.412228 -0.216392 7
+Tracker1 31 0.435676 -0.219055 15
+Tracker1 32 0.459568 -0.218204 7
+Tracker1 33 0.482528 -0.213783 7
+Tracker1 34 0.505475 -0.210264 7
+Tracker1 35 0.527886 -0.209445 7
+Tracker1 36 0.549428 -0.207653 7
+Tracker1 37 0.570387 -0.205963 15
+Tracker1 38 0.590096 -0.203837 7
+Tracker1 39 0.609588 -0.200976 7
+Tracker1 40 0.629251 -0.195805 7
+Tracker1 41 0.648441 -0.190597 7
+Tracker1 42 0.666821 -0.184932 7
+Tracker1 43 0.683569 -0.180815 15
+Tracker1 44 0.700128 -0.178974 7
+Tracker1 45 0.716387 -0.179853 7
+Tracker1 46 0.733495 -0.181219 7
+Tracker1 47 0.750154 -0.182144 7
+Tracker1 48 0.766540 -0.183834 23
+Tracker1 49 0.782901 -0.186439 15

data/test/import/test_shake_lexer.rb

@@ -3,6 +3,20 @@ require File.dirname(__FILE__) + '/../helper'
 class ShakeLexerTest < Test::Unit::TestCase
   P = File.dirname(__FILE__) + "/samples/shake_script/shake_tracker_nodes.shk"
   L = Tracksperanto::ShakeGrammar::Lexer
+  WRONG = File.dirname(__FILE__) + "/samples/flame_stabilizer/hugeFlameSetup.stabilizer"
+  
+  def test_raises_wrong_input_when_buffer_gets_too_large
+    assert_raise(Tracksperanto::ShakeGrammar::WrongInput) do
+       parse(File.open(WRONG), L)
+    end
+  end
+  
+  def test_raises_wrong_input_on_stack_size
+    huge_stack = "(" * 345
+    assert_raise(Tracksperanto::ShakeGrammar::WrongInput) do
+       parse(StringIO.new(huge_stack), L)
+    end
+  end
   
   def test_parse_single_cmt
     cmt = " // Mary had a little lamb"
@@ -94,7 +108,7 @@ class ShakeLexerTest < Test::Unit::TestCase
   
   def test_parse_varassign
     s = parse 'Foo = Blur(Foo, 1, 2, 3); 1'
-    assert_equal [[:assign, "Foo", [:funcall, "Blur", [:atom, "Foo"], 1, 2, 3]]], s
+    assert_equal [[:assign, "Foo", [:funcall, "Blur", [:atom, "Foo"], 1, 2, 3]], 1], s
   end
   
   def test_parse_whole_file_does_not_raise

data/test/import/test_shake_script_import.rb

@@ -9,7 +9,7 @@ class ShakeScriptImportTest < Test::Unit::TestCase
     trackers = Tracksperanto::Import::ShakeScript.new.parse(fixture)
     assert_equal 50, trackers.length
     
-    t = trackers[0]
+    t = trackers[-1]
     assert_equal "Tracker8_track1", t.name
     
     first_kf = t.keyframes[0]
@@ -101,7 +101,7 @@ class ShakeScriptImportTest < Test::Unit::TestCase
     fixture = File.open(File.dirname(__FILE__) + "/samples/shake_script/stabilize_nodes_with_hermite.shk")
     trackers = Tracksperanto::Import::ShakeScript.new.parse(fixture)
     assert_equal 3, trackers.length
-    last_t = trackers[-1]
+    last_t = trackers[0]
     assert_equal "Stabilize1_track1", last_t.name
     assert_equal 73, last_t.length
     

data/test/import/test_syntheyes_import.rb

@@ -37,4 +37,15 @@ class SyntheyesImportTest < Test::Unit::TestCase
     trackers = parser.parse(fixture)
     assert_equal 6, trackers.length
   end
+  
+  def test_parsing_with_one_tracker
+    fixture = File.open(File.dirname(__FILE__) + '/samples/syntheyes_2d_paths/one_tracker.txt')
+    parser = Tracksperanto::Import::Syntheyes.new
+    parser.width = 1920
+    parser.height = 1080
+    trackers = parser.parse(fixture)
+    assert_equal 1, trackers.length
+    assert_equal 49, trackers[0].length
+  end
+  
 end

data/test/middleware/test_lerp_middleware.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/../helper'
+
+class LerpMiddlewareTest < Test::Unit::TestCase
+  def test_lerp
+    receiver = flexmock
+    m = Tracksperanto::Middleware::Lerp.new(receiver, :enabled => true)
+    receiver.should_receive(:start_export).with(720, 576).once
+    receiver.should_receive(:start_tracker_segment).with("Foo").once
+    receiver.should_receive(:export_point).with(1, 1.0, 2.0, 0).once
+    receiver.should_receive(:export_point).with(2, 2.0, 3.0, 0).once
+    receiver.should_receive(:export_point).with(3, 3.0, 4.0, 0).once
+    receiver.should_receive(:export_point).with(4, 4.0, 5.0, 0).once
+    receiver.should_receive(:end_tracker_segment).once
+    receiver.should_receive(:end_export).once
+    
+    m.start_export(720, 576)
+    m.start_tracker_segment("Foo")
+    m.export_point(1, 1.0, 2.0, 0)
+    m.export_point(4, 4.0, 5.0, 0)
+    m.end_tracker_segment
+    m.end_export
+  end
+  
+  def test_lerp_should_react_to_enabled_flag
+    receiver = flexmock
+    m = Tracksperanto::Middleware::Lerp.new(receiver, :enabled => false)
+    receiver.should_receive(:start_export).with(720, 576).once
+    receiver.should_receive(:start_tracker_segment).with("Foo").once
+    receiver.should_receive(:export_point).with(1, 1.0, 2.0, 0).once
+    receiver.should_receive(:export_point).with(4, 4.0, 5.0, 0).once
+    receiver.should_receive(:end_tracker_segment).once
+    receiver.should_receive(:end_export).once
+    
+    m.start_export(720, 576)
+    m.start_tracker_segment("Foo")
+    m.export_point(1, 1.0, 2.0, 0)
+    m.export_point(4, 4.0, 5.0, 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.1
+  version: 1.7.2
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-28 00:00:00 +01:00
+date: 2010-01-31 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/lerp.rb
 - lib/middleware/prefix.rb
 - lib/middleware/reformat.rb
 - lib/middleware/scaler.rb
@@ -147,6 +148,7 @@ files:
 - test/import/samples/shake_text/two_shake_trackers.txt
 - test/import/samples/syntheyes_2d_paths/cola_plate.txt
 - test/import/samples/syntheyes_2d_paths/flyover2DP_syntheyes.txt
+- test/import/samples/syntheyes_2d_paths/one_tracker.txt
 - test/import/samples/syntheyes_2d_paths/shake_tracker_nodes_to_syntheyes.txt
 - test/import/test_3de_import.rb
 - test/import/test_3de_import3.rb
@@ -162,6 +164,7 @@ files:
 - test/import/test_shake_text_import.rb
 - test/import/test_syntheyes_import.rb
 - test/middleware/test_golden_middleware.rb
+- test/middleware/test_lerp_middleware.rb
 - test/middleware/test_prefix.rb
 - test/middleware/test_reformat_middleware.rb
 - test/middleware/test_scaler_middleware.rb
@@ -173,6 +176,7 @@ files:
 - test/test_keyframe.rb
 - test/test_simple_export.rb
 - test/test_tracker.rb
+- test/test_tracksperanto.rb
 has_rdoc: true
 homepage: http://guerilla-di.org/tracksperanto
 licenses: []
@@ -227,6 +231,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_lerp_middleware.rb
 - test/middleware/test_prefix.rb
 - test/middleware/test_reformat_middleware.rb
 - test/middleware/test_scaler_middleware.rb