tracksperanto 2.3.1 → 2.3.2

data/DEVELOPER_DOCS.rdoc

@@ -46,7 +46,11 @@ Play responsibly.
   # Create the importer object, for example for a Shake script.
   # get_importer will give you the good class even you get the capitalization
   # wrong!
-  some_importer = Tracksperanto.get_importer("shakescript").new(:width => 1024, :height => 576)
+  some_importer = Tracksperanto.get_importer("shakescript").new
+  
+  # This importer needs to know width and height
+  some_importer.width = 1024
+  some_importer.height = 576
   some_importer.io = File.open("source_file.fmt")
   
   # The importer responds to each() so if your file is not too big you can just load all the trackers
@@ -55,7 +59,8 @@ Play responsibly.
   trackers = some_importer.to_a
   
   # Create the exporter and pass the output file to it
-  some_exporter = Tracksperanto.get_exporter("flamestabilizer").new(File.open("exported_file.other", "wb"))
+  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)

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.3.2 / 2011-10-05
+
+* Fixed handling of inline comments which are tacked onto the line in in Shake scripts
+
 === 2.3.1 / 2011-08-05
 
 * Fixed support for curly braces in Shake scripts

data/Manifest.txt

@@ -114,6 +114,7 @@ test/import/samples/pftrack5/apft.2dt
 test/import/samples/pftrack5/empty_trackers.2dt
 test/import/samples/pftrack5/garage.2dt
 test/import/samples/shake_script/REDACTED_shake_file.shk
+test/import/samples/shake_script/comments_inline_with_args.shk
 test/import/samples/shake_script/designated_global_range_starting_at_negative_frame.shk
 test/import/samples/shake_script/four_tracks_in_one_matchmove.shk
 test/import/samples/shake_script/four_tracks_in_one_stabilizer.shk

data/lib/import/shake_grammar/catcher.rb

@@ -18,9 +18,9 @@ module Tracksperanto::ShakeGrammar
     end
     
     def push(atom)
-      # Send primitive types to parent
-      return super if !atom.is_a?(Array)
-      return super if atom[0] != :funcall
+      
+      # Send everything but funcalls to parent
+      return super unless atom.is_a?(Array) && atom[0] == :funcall
       
       meth_for_shake_func, args = atom[1].downcase, atom[2..-1]
       if can_handle_meth?(meth_for_shake_func)
@@ -34,6 +34,10 @@ module Tracksperanto::ShakeGrammar
     
     private
     
+    # Suppress comment output
+    def push_comment
+    end
+    
     def can_handle_meth?(m)
       # Ruby 1.9 - match on stringified methname
       @meths ||= self.class.public_instance_methods(false).map{|mn| mn.to_s }

data/lib/import/shake_grammar/lexer.rb

@@ -22,22 +22,18 @@ module Tracksperanto::ShakeGrammar
     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!
+      @in_comment ? consume_comment! : consume_atom!
     end
     
     private
     
-    def in_comment?
-      (@buf.strip =~ /^\/\//) ? true : false
+    def push_comment
+      push [:comment, @buf.gsub(/(\s+?)\/\/{1}/, '')]
     end
     
-    def consume_comment(c)
-      if c == "\n" # Comment
-        push [:comment, @buf.gsub(/(\s+?)\/\/{1}/, '')]
-        erase_buffer
-      else
-        @buf << c
-      end
+    def consume_comment!
+      push_comment
+      erase_buffer
     end
     
     def parse
@@ -52,9 +48,18 @@ module Tracksperanto::ShakeGrammar
         raise WrongInput, "Stack overflow at level #{MAX_STACK_DEPTH}, this is probably a LISP program uploaded by accident"
       end
       
-      return consume_comment(c) if in_comment? 
-      
-      if !@buf.empty? && (c == "(") # Funcall
+      if c == '/' && (@buf[-1].chr rescue nil) == '/' # Comment start
+        # If some other data from this line has been accumulated we first consume that
+        @buf = @buf[0..-2] # everything except the opening slash of the comment
+        consume_atom!
+        erase_buffer
+        @in_comment = true
+      elsif @in_comment && c == "\n" # Comment end
+        consume_comment!
+        @in_comment = false
+      elsif @in_comment
+        @buf << c
+      elsif !@buf.empty? && (c == "(") # Funcall
         push([:funcall, @buf.strip] + self.class.new(@io, @sentinel, limit_to_one_stmt = false, @stack_depth + 1).stack)
         erase_buffer
       elsif c == '{' # OFX curly braces or a subexpression in a node's knob

data/lib/import/shake_script.rb

@@ -55,15 +55,11 @@ class Tracksperanto::Import::ShakeScript < Tracksperanto::Import::Base
     
     # Find whether the passed atom includes a [:trk] on any level
     def deep_include?(array_or_element, atom_name)
-      return true if array_or_element == atom_name
-      if array_or_element.is_a?(Array)
-        array_or_element.each do | elem |
-           if elem == atom_name
-             return true
-           elsif elem.is_a?(Array)
-             return true if deep_include?(elem, atom_name)
-           end
-        end
+      return false unless array_or_element.is_a?(Array)
+      return true if array_or_element[0] == atom_name
+      
+      array_or_element.each do | elem |
+         return true if deep_include?(elem, atom_name)
       end
       
       false

data/lib/tracksperanto.rb

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

data/test/import/samples/shake_script/comments_inline_with_args.shk

@@ -0,0 +1,50 @@
+// SynthEyes Shake Track Node Exporter V1.0: Z:\data\diablo2\PROJECTS\cstl\324\03_projectfiles\trk\033_001\cstl_324_033_001-trk_v001.sni
+// Last modified: Mon, May 09, 2011 01:26:25 PM
+
+SetTimeRange("1-85");
+SetFps(24);
+SetDefaultWidth(1920);
+SetDefaultHeight(1080);
+SetDefaultAspect(1);
+SetDefaultViewerAspect(1);
+
+Camera01 = SFileIn("Z:/data/diablo2/PROJECTS/cstl/324/01_plates/cstl_324_033_001/cstl_324_033_001.113764-113848#.dpx", "Auto", 0, 0, "v1.0", "0");
+
+Camera01Trackers = Tracker(
+    Camera01,
+    "1-85",		// frame range
+    "1/16",
+    "luminance",
+    0.75,			// reference tolerance
+    "use start frame",		// reference behavior
+    0.5,			// failure tolerance
+    "stop",			// failure behavior
+    0,				// limit processing
+    1,				// referenceFrame
+    "v2.0",			// version
+    0.3,			// red weight
+    0.59,			// green weight
+    0.11,			// blue weight
+    0,				// preprocess enable
+    10				// bluramount
+,
+"Tracker8",
+Linear(0,1727.497@11,1729.391@12,1714.006@13,1696.344@14,1677.673@15,1637.689@16,1584.849@17,1528.008@18,1484.662@19,1472.029@20,1467.682@21,1474.517@22,1494.075@23,1510.224@24,1499.975@25,1472.502@26,1447.493@27,1429.835@28,1404.183@29,1369.445@30,1325.846@31,1278.610@32,1238.860@33,1206.774@34,1182.349@35,1159.561@36,1137.313@37,1111.545@38,1078.042@39,1041.072@40,1005.497@41,978.491@42,954.440@43,929.000@44,898.421@45,873.071@46,856.303@47,837.241@48,809.188@49,783.901@50,756.538@51,730.009@52,706.267@53,684.506@54,667.815@55,651.130@56,631.953@57,610.457@58,593.213@59,576.348@60,556.045@61,531.711@62,506.865@63,488.134@64,465.266@65,443.245@66,418.787@67,399.049@68,380.186@69,373.219@70,371.262@71,383.415@72,405.825@73,406.667@74,408.459@75,400.621@76,383.862@77,353.858@78,317.118@79,298.241@80,290.865@81,291.547@82,287.669@83,290.916@84,295.451@85),
+Linear(0,88.443@11,84.424@12,82.926@13,75.231@14,66.464@15,62.430@16,66.678@17,79.557@18,89.894@19,92.462@20,88.651@21,76.788@22,60.223@23,40.360@24,31.789@25,39.438@26,51.803@27,59.439@28,65.565@29,76.408@30,92.743@31,114.579@32,143.579@33,173.668@34,202.582@35,226.035@36,244.656@37,262.681@38,284.617@39,313.519@40,345.197@41,379.172@42,410.373@43,435.367@44,455.919@45,478.536@46,502.790@47,522.315@48,537.508@49,550.096@50,563.470@51,575.356@52,586.827@53,598.049@54,609.536@55,617.847@56,625.440@57,635.337@58,648.787@59,663.970@60,676.129@61,682.121@62,683.631@63,683.683@64,678.989@65,671.017@66,662.129@67,652.608@68,642.686@69,638.763@70,637.336@71,641.800@72,650.983@73,651.921@74,652.894@75,650.068@76,647.759@77,641.547@78,640.176@79,637.899@80,639.422@81,644.954@82,650.235@83,654.866@84,657.863@85),
+
+    1,				// Correlation
+    -43.200,
+    43.200,
+    -43.200,
+    43.200,
+    -72.000,
+    72.000,
+    -72.000,
+    72.000,
+    Linear(0,1727.497@11,1729.391@12,1714.006@13,1696.344@14,1677.673@15,1637.689@16,1584.849@17,1528.008@18,1484.662@19,1472.029@20,1467.682@21,1474.517@22,1494.075@23,1510.224@24,1499.975@25,1472.502@26,1447.493@27,1429.835@28,1404.183@29,1369.445@30,1325.846@31,1278.610@32,1238.860@33,1206.774@34,1182.349@35,1159.561@36,1137.313@37,1111.545@38,1078.042@39,1041.072@40,1005.497@41,978.491@42,954.440@43,929.000@44,898.421@45,873.071@46,856.303@47,837.241@48,809.188@49,783.901@50,756.538@51,730.009@52,706.267@53,684.506@54,667.815@55,651.130@56,631.953@57,610.457@58,593.213@59,576.348@60,556.045@61,531.711@62,506.865@63,488.134@64,465.266@65,443.245@66,418.787@67,399.049@68,380.186@69,373.219@70,371.262@71,383.415@72,405.825@73,406.667@74,408.459@75,400.621@76,383.862@77,353.858@78,317.118@79,298.241@80,290.865@81,291.547@82,287.669@83,290.916@84,295.451@85),
+
+    Linear(0,88.443@11,84.424@12,82.926@13,75.231@14,66.464@15,62.430@16,66.678@17,79.557@18,89.894@19,92.462@20,88.651@21,76.788@22,60.223@23,40.360@24,31.789@25,39.438@26,51.803@27,59.439@28,65.565@29,76.408@30,92.743@31,114.579@32,143.579@33,173.668@34,202.582@35,226.035@36,244.656@37,262.681@38,284.617@39,313.519@40,345.197@41,379.172@42,410.373@43,435.367@44,455.919@45,478.536@46,502.790@47,522.315@48,537.508@49,550.096@50,563.470@51,575.356@52,586.827@53,598.049@54,609.536@55,617.847@56,625.440@57,635.337@58,648.787@59,663.970@60,676.129@61,682.121@62,683.631@63,683.683@64,678.989@65,671.017@66,662.129@67,652.608@68,642.686@69,638.763@70,637.336@71,641.800@72,650.983@73,651.921@74,652.894@75,650.068@76,647.759@77,641.547@78,640.176@79,637.899@80,639.422@81,644.954@82,650.235@83,654.866@84,657.863@85),
+
+    1,				// visible
+    1				// enabled
+);

data/test/import/test_shake_lexer.rb

@@ -101,6 +101,26 @@ class ShakeLexerTest < Test::Unit::TestCase
     s)
   end
   
+  def test_lexer_with_inline_comments_munged_into_arguments
+    st = 'Tracker(
+        0,				// preprocess enable
+        10				// bluramount
+    ,
+    "Tracker8")'
+    
+    s = parse(st)
+    assert_equal(
+      [[
+        :funcall,
+        "Tracker",
+        0,
+        [:comment, " preprocess enable"],
+        10,
+        [:comment, " bluramount"],
+        "Tracker8"
+      ]],s)
+  end
+  
   def test_lexer_with_ofx_curly_braces
     s = parse(File.read(OFX_CURLY_BRACES))
     assert_equal(

data/test/import/test_shake_script_import.rb

@@ -139,4 +139,11 @@ class ShakeScriptImportTest < Test::Unit::TestCase
     assert_equal 145, trackers[0].length
   end
   
+  def test_tracker_node_from_syntheyes
+    fixture = File.open(File.dirname(__FILE__) + "/samples/shake_script/comments_inline_with_args.shk")
+    trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture, :width => 1920, :height => 1080).to_a
+    assert_equal 1, trackers.length
+    assert_equal "Camera01Trackers_Tracker8", trackers[0].name
+    
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 2
   - 3
-  - 1
-  version: 2.3.1
+  - 2
+  version: 2.3.2
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-08 00:00:00 +02:00
+date: 2011-05-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -192,6 +192,7 @@ files:
 - test/import/samples/pftrack5/empty_trackers.2dt
 - test/import/samples/pftrack5/garage.2dt
 - test/import/samples/shake_script/REDACTED_shake_file.shk
+- test/import/samples/shake_script/comments_inline_with_args.shk
 - test/import/samples/shake_script/designated_global_range_starting_at_negative_frame.shk
 - test/import/samples/shake_script/four_tracks_in_one_matchmove.shk
 - test/import/samples/shake_script/four_tracks_in_one_stabilizer.shk