tracksperanto 3.5.4 → 3.5.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 3.5.5
+
+* Fix joining animation curves that had negative frame numbers (might happen in Nuke scripts)
+
 === 3.5.4
 
 * Fix parsing Nuke scripts with Tracker4 where some tracks were expression-only

data/lib/tracksperanto.rb

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

data/lib/tracksperanto/zip_tuples.rb

@@ -10,14 +10,20 @@ module Tracksperanto::ZipTuples
   #
   # We make use of the fact that setting an offset index in an array fills it with nils up to
   # the index inserted
-  def zip_curve_tuples(*curves)
-    tuples = curves.inject([]) do | tuples, curve_of_at_and_value |
-      curve_of_at_and_value.each do | frame, value |
-       tuples[frame] = tuples[frame] ? (tuples[frame] << value) : [frame, value]
+  def zip_curve_tuples(*given_curves)
+    tuples = {}
+    given_curves.each_with_index do | curve, curve_i |
+      curve.each do | frame_value_tuple |
+        frame, value = frame_value_tuple
+        tuples[frame] ||= Array.new(given_curves.length)
+        tuples[frame][curve_i] = value
       end
-      tuples
     end
     
-    tuples.reject{|e| e.nil? || (e.length < (curves.length + 1)) }
+    tuples.delete_if {|k,v| v.include?(nil) } # If any of the positions is nil
+    
+    tuples.keys.sort.map do | frame_in_order |
+      [frame_in_order] + tuples[frame_in_order]
+    end
   end
 end

data/test/import/test_nuke_import.rb

@@ -279,6 +279,17 @@ class NukeImportTest < Test::Unit::TestCase
     assert_equal 5, trackers.length
   end
   
+  def test_no_failure_with_negative_frame_indices_in_curve
+    fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/sh110_trackers_004_ipad1.nk')
+    parser = Tracksperanto::Import::NukeScript.new(:io => fixture)
+    parser.width = 2688
+    parser.height = 1512
+    trackers = parser.to_a
+    assert_equal 4, trackers.length
+    assert_equal 'Tracker1_track_1', trackers[0].name
+    assert_equal 99, trackers[0].length
+  end
+  
   def test_zip_channels
     tuples_x = [[1, 125], [3, 234], [5, 456], [9,876]]
     tuples_y = [[2, 437], [3, 123], [6, 432], [9, 430]]

data/test/test_zip_tuples.rb

@@ -9,17 +9,24 @@ class TestZipTuples < Test::Unit::TestCase
   end
   
   def test_zip_with_standard_dataset
-    assert_equal [[1, 123, 234]], zip_curve_tuples([[1, 123], [1,234]])
+    assert_equal [[1, 123, 234]], zip_curve_tuples([[1, 123]], [[1, 234]])
   end
 
   def test_zip_with_missing_step
-    assert_equal [[1, 123, 345], [2, 234]], zip_curve_tuples([[1, 123], [1, 345], [2,234]])
+    assert_equal [[1, 123, 234]], zip_curve_tuples([[1, 123], [2, 456]], [[1, 234]])
   end
-  
+
   def test_zip_with_two_curves
     curve_a = [[1, 123], [2, 345]]
     curve_b = [[1, 23.4], [2, 14.5]]
     result = [[1, 123, 23.4], [2, 345, 14.5]]
     assert_equal result, zip_curve_tuples(curve_a, curve_b)
   end
+  
+  def test_zip_with_negative_frame_indices
+    curve_a = [[-100, 123], [24, 345]]
+    curve_b = [[-100, 23.4], [24, 14.5]]
+    result = [[-100, 123, 23.4], [24, 345, 14.5]]
+    assert_equal result, zip_curve_tuples(curve_a, curve_b)
+  end
 end

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tracksperanto}
-  s.version = "3.5.4"
+  s.version = "3.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = %q{2014-11-08}
+  s.date = %q{2014-11-24}
   s.default_executable = %q{tracksperanto}
   s.description = %q{Converts 2D track exports between different apps like Flame, MatchMover, PFTrack...}
   s.email = %q{me@julik.nl}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 3
   - 5
-  - 4
-  version: 3.5.4
+  - 5
+  version: 3.5.5
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-11-08 00:00:00 +01:00
+date: 2014-11-24 00:00:00 +01:00
 default_executable: tracksperanto
 dependencies: 
 - !ruby/object:Gem::Dependency