tracksperanto 2.9.8 → 2.9.9

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.9.9
+
+* Add lens distortion middleware. Adds the possibility to remove or add Syntheyes lens distortion to your plates.
+
 === 2.9.8
 
 * Ensure that Boujou vertical coords start off 1, not off 0 - both in import and export

data/bin/tracksperanto

@@ -81,6 +81,16 @@ op.on(" -pad", "--pad PAD_FRACTION_VALUES_COMMA_SEPARATED", String, mwd("Pad"))
   $middlewares.push(["Pad", {"left_pad" => left, "right_pad"=> right, "top_pad" => top, "bottom_pad" => bottom}])
 end
 
+op.on(" -u", "--undistort K_AND_KCUBE_COMMA_SEPARATED", String, mwd("LensDisto")) do | coefficients |
+  k, kcube = coefficients.split(",").map{|e| e.to_f }
+  $middlewares.push(["LensDisto", {"k" => k, "kcube"=> kcube, "remove" => true}])
+end
+
+op.on(" -d", "--distort K_AND_KCUBE_COMMA_SEPARATED", String, mwd("LensDisto")) do | coefficients |
+  k, kcube = coefficients.split(",").map{|e| e.to_f }
+  $middlewares.push(["LensDisto", {"k" => k, "kcube"=> kcube, "remove" => false}])
+end
+
 op.on(" -crop", "--crop CROP_VALUES_COMMA_SEPARATED", String, mwd("Crop")) do | pads|
   left, right, top, bottom = pads.split(",").map{|e| e.to_i }
   $middlewares.push(["Crop", {"left" => left, "right"=> right, "top" => top, "bottom" => bottom}])

data/lib/middleware/lens_disto.rb

@@ -0,0 +1,130 @@
+# -*- encoding : utf-8 -*-
+class Tracksperanto::Middleware::LensDisto < Tracksperanto::Middleware::Base
+  include Tracksperanto::UVCoordinates
+  
+  class Vector2 < Struct.new(:x, :y)
+  end
+  
+  class RF < Struct.new(:r, :f)
+    def inspect
+      '(%0.3f %0.3f)' % [r, f]
+    end
+    
+    def m
+      r * f
+    end
+  end
+  
+  parameter :k,  :cast => :float, :desc => "Quartic distortion coefficient", :default => 0
+  parameter :kcube,  :cast => :float, :desc => "Cubic distortion coefficient", :default => 0
+  parameter :remove, :cast => :bool, :desc => "Remove distortion instead of adding it"
+  
+  STEPS = 256
+  
+  def self.action_description
+    "Apply or remove lens distortion with the Syntheyes algorithm"
+  end
+  
+  def start_export(w, h)
+    @width, @height = w, h
+    @aspect = @width.to_f / @height
+    
+    # Generate the lookup table
+    @lut = [RF.new(0.0, 1.0)]
+    max_r = @aspect + 1
+    
+    increment = max_r / STEPS
+    r = 0
+    STEPS.times do | mult |
+      r += increment
+      @lut.push(RF.new(r, disto_radius(r)))
+    end
+    
+    @lut.inspect
+    super
+  end
+  
+  def export_point(frame, float_x, float_y, float_residual)
+    x, y =  remove ? undisto(float_x, float_y) : disto(float_x, float_y)
+    super(frame, x, y, float_residual)
+  end
+  
+  private
+  
+  def with_uv(x, y)
+    vec = Vector2.new(convert_to_uv(x, @width), convert_to_uv(y, @height))
+    yield(vec)
+    [convert_from_uv(@width, vec.x), convert_from_uv(@height, vec.y)]
+  end
+  
+  # Radius is equal to aspect at the rightmost extremity
+  def disto_radius(r)
+    r2 = r ** 2
+    # Skipping the square root speeds things up if we don't need it
+    f = if kcube.abs > 0.00001
+      1 + (r2 * (k + kcube * Math.sqrt(r2)));
+    else
+      1 + (r2 * k);
+    end
+  end
+  
+  def disto(x, y)
+    with_uv(x, y) do | pt |
+      # Get the radius of the point
+      x = pt.x * @aspect
+      r = Math.sqrt(x.abs**2 + pt.y.abs**2)
+      
+      # Find the good tuples to interpolate on
+      f = disto_interpolated(r)
+      
+      pt.x = pt.x * f
+      pt.y = pt.y * f
+    end
+  end
+  
+  
+  def undisto(x, y)
+    with_uv(x, y) do | pt |
+      # Get the radius of the point
+      x = pt.x * @aspect
+      r = Math.sqrt(x.abs**2 + pt.y.abs**2)
+      
+      # Find the good tuples to interpolate on
+      f = undisto_interpolated(r)
+      
+      pt.x = pt.x / f
+      pt.y = pt.y / f
+    end
+  end
+  
+  def disto_interpolated(r)
+    left , right = nil, nil
+    @lut.each_with_index do | rf, i |
+      if rf.r > r
+        right = rf
+        left = @lut[i -1]
+        return lerp(r, left.r, right.r, left.f, right.f)
+      end
+    end
+  end
+  
+  def undisto_interpolated(r)
+    left , right = nil, nil
+    @lut.each_with_index do | xf, i |
+      if xf.m > r
+        right = xf
+        left = @lut[i -1]
+        return lerp(r, left.m, right.m, left.f, right.f)
+      end
+    end
+  end
+  
+  def lerp(x, left_x, right_x, left_y, right_y)
+    dx = right_x - left_x
+    dy = right_y - left_y
+    t = (x - left_x) / dx
+    left_y + (dy * t)
+  end
+  
+  
+end

data/lib/tracksperanto/casts.rb

@@ -29,4 +29,12 @@ module Tracksperanto::Casts
       define_method("#{an_attr}=") { |to| instance_variable_set("@#{an_attr}", to.to_s) }
     end
   end
+  
+  def cast_to_bool(*attributes)
+    attributes.each do | an_attr |
+      define_method(an_attr) { !!instance_variable_get("@#{an_attr}") }
+      define_method("#{an_attr}=") { |to| instance_variable_set("@#{an_attr}", !!to) }
+    end
+  end
+
 end

data/lib/tracksperanto.rb

@@ -3,7 +3,7 @@
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '2.9.8'
+  VERSION = '2.9.9'
   
   module Import; end
   module Export; end

data/test/import/test_3de_import.rb

@@ -27,4 +27,16 @@ class EqualizerImportTest < Test::Unit::TestCase
     assert_in_delta 232.449011732690479, first_kf.abs_y, DELTA
     assert_equal 39, first_kf.frame
   end
+  
+  def test_parsing_from_another_fixture
+    fixture = File.open(File.dirname(__FILE__) + '/samples/3de_v4/FB1880_man_v05.txt')
+    
+    parser = Tracksperanto::Import::Equalizer4.new(:io => fixture, :width => 1024, :height => 512)
+    trackers = parser.to_a
+    assert_equal 27, trackers.length
+    
+    first_t = trackers[0]
+    assert_equal "01", first_t.name
+    assert_equal 115, first_t.length
+  end
 end

data/test/middleware/test_lens_middleware.rb

@@ -0,0 +1,75 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__)) + '/../helper'
+
+class LensMiddlewareTest < Test::Unit::TestCase
+  
+  def test_action_description
+    assert_equal "Apply or remove lens distortion with the Syntheyes algorithm", Tracksperanto::Middleware::LensDisto.action_description
+  end
+  
+  def test_lens_bypasses_centerpoint
+    receiver = flexmock
+    receiver.should_receive(:start_export).once.with(1920, 1080)
+    receiver.should_receive(:start_tracker_segment).once.with("Tracker")
+    receiver.should_receive(:export_point).once.with(1, 1920 / 2.0, 1080.0 / 2.0, 0)
+    receiver.should_receive(:end_tracker_segment).once
+    receiver.should_receive(:end_export).once
+    
+    m = Tracksperanto::Middleware::LensDisto.new(receiver, :k => 0.0168)
+    m.start_export(1920, 1080)
+    m.start_tracker_segment("Tracker")
+    m.export_point(1, 1920 / 2.0, 1080.0 / 2.0, 0)
+    m.end_tracker_segment
+    m.end_export
+  end
+  
+  def test_lens_distorted
+    receiver = flexmock
+    receiver.should_receive(:start_export).once.with(1920, 1080)
+    receiver.should_receive(:start_tracker_segment).once.with("Tracker")
+    receiver.should_receive(:export_point).once.with(1, 66.03001446825158, 43.978678913818925, 0)
+    receiver.should_receive(:end_tracker_segment).once
+    receiver.should_receive(:end_export).once
+    
+    m = Tracksperanto::Middleware::LensDisto.new(receiver, :k => -0.0298, :kcube => 0.0078)
+    m.start_export(1920, 1080)
+    m.start_tracker_segment("Tracker")
+    m.export_point(1, 12.0, 14.0, 0)
+    m.end_tracker_segment
+    m.end_export
+  end
+  
+  def test_lens_undistorted
+    receiver = flexmock
+    receiver.should_receive(:start_export).once.with(1920, 1080)
+    receiver.should_receive(:start_tracker_segment).once.with("Tracker")
+    receiver.should_receive(:export_point).once.with(1, 11.999914830236555, 13.99995274335909, 0)
+    receiver.should_receive(:end_tracker_segment).once
+    receiver.should_receive(:end_export).once
+    
+    m = Tracksperanto::Middleware::LensDisto.new(receiver, :k => -0.0298, :kcube => 0.0078, :remove => true)
+    m.start_export(1920, 1080)
+    m.start_tracker_segment("Tracker")
+    m.export_point(1, 66.03001446825158, 43.978678913818925, 0)
+    m.end_tracker_segment
+    m.end_export
+  end
+  
+  def test_roundtrip
+    receiver = flexmock
+    receiver.should_receive(:start_export).once.with(1920, 1080)
+    receiver.should_receive(:start_tracker_segment).once.with("Tracker")
+    receiver.should_receive(:export_point).once.with(1, 1.0, 1.0, 0)
+    receiver.should_receive(:end_tracker_segment).once
+    receiver.should_receive(:end_export).once
+    
+    apply = Tracksperanto::Middleware::LensDisto.new(receiver, :k => -0.0298, :kcube => 0.2178)
+    remove = Tracksperanto::Middleware::LensDisto.new(apply, :k => -0.0298, :kcube => 0.2178, :remove => true)
+    
+    remove.start_export(1920, 1080)
+    remove.start_tracker_segment("Tracker")
+    remove.export_point(1, 1.0, 1.0, 0)
+    remove.end_tracker_segment
+    remove.end_export
+  end
+end

data/test/test_casts.rb

@@ -10,6 +10,7 @@ class TestCasts < Test::Unit::TestCase
     cast_to_string :str_attr
     cast_to_int :int_attr
     cast_to_float :float_attr
+    cast_to_bool :truthy
   end
   
   class Junk
@@ -31,7 +32,24 @@ class TestCasts < Test::Unit::TestCase
     assert_kind_of Float, t.float_attr
     assert_in_delta 0, t.float_attr, D
   end
-
+  
+  def test_cast_to_bool
+    t = Testable.new
+    assert_equal false, t.truthy
+    
+    t.truthy = nil
+    assert_equal false, t.truthy
+    
+    t.truthy = false
+    assert_equal false, t.truthy
+    
+    t.truthy = "yes"
+    assert_equal true, t.truthy
+    
+    t.truthy = 1
+    assert_equal true, t.truthy
+  end
+  
   def test_cast_to_int
     t = Testable.new
     

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tracksperanto"
-  s.version = "2.9.8"
+  s.version = "2.9.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2012-03-21"
+  s.date = "2012-04-10"
   s.description = "Converts 2D track exports between different apps like Flame, MatchMover, PFTrack..."
   s.email = "me@julik.nl"
   s.executables = ["tracksperanto"]
@@ -66,6 +66,7 @@ Gem::Specification.new do |s|
     "lib/middleware/flop.rb",
     "lib/middleware/golden.rb",
     "lib/middleware/length_cutoff.rb",
+    "lib/middleware/lens_disto.rb",
     "lib/middleware/lerp.rb",
     "lib/middleware/lint.rb",
     "lib/middleware/move_to_first.rb",
@@ -153,6 +154,7 @@ Gem::Specification.new do |s|
     "test/middleware/test_flop_middleware.rb",
     "test/middleware/test_golden_middleware.rb",
     "test/middleware/test_length_cutoff_middleware.rb",
+    "test/middleware/test_lens_middleware.rb",
     "test/middleware/test_lerp_middleware.rb",
     "test/middleware/test_lint_middleware.rb",
     "test/middleware/test_move_to_first_frame_middleware.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracksperanto
 version: !ruby/object:Gem::Version
-  version: 2.9.8
+  version: 2.9.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: obuf
-  requirement: &12522820 !ruby/object:Gem::Requirement
+  requirement: &12549320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *12522820
+  version_requirements: *12549320
 - !ruby/object:Gem::Dependency
   name: progressive_io
-  requirement: &12522580 !ruby/object:Gem::Requirement
+  requirement: &12549080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *12522580
+  version_requirements: *12549080
 - !ruby/object:Gem::Dependency
   name: flame_channel_parser
-  requirement: &12522340 !ruby/object:Gem::Requirement
+  requirement: &12548840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *12522340
+  version_requirements: *12548840
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &12522100 !ruby/object:Gem::Requirement
+  requirement: &12548600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *12522100
+  version_requirements: *12548600
 - !ruby/object:Gem::Dependency
   name: update_hints
-  requirement: &12521860 !ruby/object:Gem::Requirement
+  requirement: &12548360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *12521860
+  version_requirements: *12548360
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &12521620 !ruby/object:Gem::Requirement
+  requirement: &12548120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12521620
+  version_requirements: *12548120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12521380 !ruby/object:Gem::Requirement
+  requirement: &12547880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12521380
+  version_requirements: *12547880
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &12521140 !ruby/object:Gem::Requirement
+  requirement: &12547640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *12521140
+  version_requirements: *12547640
 - !ruby/object:Gem::Dependency
   name: cli_test
-  requirement: &12520900 !ruby/object:Gem::Requirement
+  requirement: &12547400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *12520900
+  version_requirements: *12547400
 description: Converts 2D track exports between different apps like Flame, MatchMover,
   PFTrack...
 email: me@julik.nl
@@ -168,6 +168,7 @@ files:
 - lib/middleware/flop.rb
 - lib/middleware/golden.rb
 - lib/middleware/length_cutoff.rb
+- lib/middleware/lens_disto.rb
 - lib/middleware/lerp.rb
 - lib/middleware/lint.rb
 - lib/middleware/move_to_first.rb
@@ -255,6 +256,7 @@ files:
 - test/middleware/test_flop_middleware.rb
 - test/middleware/test_golden_middleware.rb
 - test/middleware/test_length_cutoff_middleware.rb
+- test/middleware/test_lens_middleware.rb
 - test/middleware/test_lerp_middleware.rb
 - test/middleware/test_lint_middleware.rb
 - test/middleware/test_move_to_first_frame_middleware.rb
@@ -297,7 +299,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 648854317
+      hash: 179279919
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: