tracksperanto 1.6.7 → 1.6.8

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.6.8 / 2010-01-13
+
+* Fix frame gap handling for repeating gaps in the Nuke importer
+
 === 1.6.7 / 2010-01-13
 
 * Fix frame gap sizes in the Nuke exporter (thanks Michael Lester)

data/Manifest.txt

@@ -86,6 +86,7 @@ test/import/samples/nuke/018.nk
 test/import/samples/nuke/one_tracker_with_break.nk
 test/import/samples/nuke/one_tracker_with_break_in_grp.nk
 test/import/samples/nuke/tracker_with_differing_gaps.nk
+test/import/samples/nuke/tracker_with_repeating_gaps.nk
 test/import/samples/pftrack4/sourcefile_pftrack.2dt
 test/import/samples/pftrack5/garage.2dt
 test/import/samples/shake_script/four_tracks_in_one_matchmove.shk

data/lib/import/nuke_script.rb

@@ -60,16 +60,22 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
       atoms, tuples = curve_text.gsub(/\}/m, ' }').split, []
       # Nuke saves curves very efficiently. x(keyframe_number) means that an uninterrupted sequence of values will start,
       # after which values follow. When the curve is interrupted in some way a new x(keyframe_number) will signifu that we
-      # skip to that specified keyframe and the curve continues from there
+      # skip to that specified keyframe and the curve continues from there, in gap size defined by the last fragment.
+      # That is, x1 1 x3 2 3 4 will place 2, 3 and 4 at 2-frame increments
       
       last_processed_keyframe = 1
+      intraframe_gap_size = 1
       while atom = atoms.shift
         if atom =~ SECTION_START
           last_processed_keyframe = $1.to_i
+          if tuples.any?
+            last_captured_frame = tuples[-1][0]
+            intraframe_gap_size = last_processed_keyframe - last_captured_frame
+          end
         elsif  atom =~ KEYFRAME
           report_progress("Reading curve at frame #{last_processed_keyframe}")
           tuples << [last_processed_keyframe, $1.to_f]
-          last_processed_keyframe += 1
+          last_processed_keyframe += intraframe_gap_size
         elsif atom == '}'
           return tuples
         end

data/lib/tracksperanto.rb

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

data/test/import/samples/nuke/tracker_with_repeating_gaps.nk

@@ -0,0 +1,79 @@
+#! /Applications/Nuke5.2v3/Nuke5.2v3.app/Contents/MacOS/Nuke5.2v3 -nx
+version 5.2300
+define_window_layout_xml {<?xml version="1.0" encoding="UTF-8"?>
+<layout version="1.0">
+    <window x="0" y="22" w="1680" h="1024" screen="0">
+        <splitter orientation="1">
+            <split size="1062"></split>
+            <splitter orientation="1">
+                <split size="40"></split>
+                <dock id="" hideTitles="1" activePageId="Toolbar.1">
+                    <page id="Toolbar.1"></page>
+                </dock>
+                <split size="1018"></split>
+                <splitter orientation="2">
+                    <split size="499"></split>
+                    <dock id="" activePageId="Viewer.1">
+                        <page id="Viewer.1"></page>
+                    </dock>
+                    <split size="499"></split>
+                    <dock id="" activePageId="DAG.1">
+                        <page id="DAG.1"></page>
+                        <page id="Curve Editor.1"></page>
+                    </dock>
+                </splitter>
+            </splitter>
+            <split size="614"></split>
+            <dock id="" activePageId="Properties.1">
+                <page id="Properties.1"></page>
+                <page id="Script Editor.1"></page>
+            </dock>
+        </splitter>
+    </window>
+</layout>
+}
+Root {
+ inputs 0
+ name /Code/apps/tracksperanto/test/import/samples/nuke/tracker_with_repeating_gaps.nk
+ frame 12
+ format "2048 1556 0 0 2048 1556 1 2K_Super_35(full-ap)"
+ proxy_type scale
+ proxy_format "1024 778 0 0 1024 778 1 1K_Super_35(full-ap)"
+}
+Viewer {
+ inputs 0
+ frame 12
+ name Viewer1
+ xpos -40
+ ypos -10
+}
+Constant {
+ inputs 0
+ channels rgb
+ name Constant1
+ xpos -265
+ ypos -191
+}
+Tracker3 {
+ track1 {{curve x1 196 326 440 x6 554 658 752} {curve x1 574 556 534 x6 512 492 476}}
+ offset1 {0 0}
+ pattern1 {-32 -32 32 32}
+ search1 {-22 -22 22 22}
+ track2 {1126 676}
+ offset2 {0 0}
+ pattern2 {-32 -32 32 32}
+ search2 {-22 -22 22 22}
+ track3 {1126 880}
+ offset3 {0 0}
+ pattern3 {-32 -32 32 32}
+ search3 {-22 -22 22 22}
+ track4 {922 880}
+ offset4 {0 0}
+ pattern4 {-32 -32 32 32}
+ search4 {-22 -22 22 22}
+ translate {{curve x1 0 130 244 x6 358 462 556} {curve x1 0 -18 -40 x6 -62 -82 -98}}
+ center {{curve x1 196 196 196 x6 196 196 196} {curve x1 574 574 574 x6 574 574 574}}
+ name Tracker1
+ xpos -265
+ ypos -119
+}

data/test/import/test_nuke_import.rb

@@ -51,6 +51,19 @@ class NukeImportTest < Test::Unit::TestCase
     assert_equal 109, t[-1].frame
   end
   
+  def test_parsing_node_with_succesive_gaps_larger_than_one_frame
+    fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/tracker_with_repeating_gaps.nk')
+    parser = Tracksperanto::Import::NukeScript.new
+    parser.width = 2048
+    parser.height = 1556
+    trackers = parser.parse(fixture)
+    assert_equal 1, trackers.length
+    t = trackers[0]
+    assert_equal 5, t[3].frame
+    assert_equal 8, t[4].frame
+    assert_equal 11, t[5].frame
+  end
+  
   def test_parsing_from_nuke_group
     fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/one_tracker_with_break_in_grp.nk')
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -133,6 +133,7 @@ files:
 - test/import/samples/nuke/one_tracker_with_break.nk
 - test/import/samples/nuke/one_tracker_with_break_in_grp.nk
 - test/import/samples/nuke/tracker_with_differing_gaps.nk
+- test/import/samples/nuke/tracker_with_repeating_gaps.nk
 - test/import/samples/pftrack4/sourcefile_pftrack.2dt
 - test/import/samples/pftrack5/garage.2dt
 - test/import/samples/shake_script/four_tracks_in_one_matchmove.shk