lib/middleware/prefix.rb test/middleware/test_prefix.rb @@ -1,3 +1,7 @@ +=== 1.5.7 / 2009-11-08 + +* Add a Prefix middleware that prefixes tracker names + === 1.5.6 / 2009-11-08 * Rerelase of 1.5.5 without the huge binary blob in the middle History.txt @@ -31,6 +31,7 @@ lib/import/shake_text.rb lib/import/syntheyes.rb lib/middleware/base.rb lib/middleware/golden.rb +lib/middleware/prefix.rb lib/middleware/reformat.rb lib/middleware/scaler.rb lib/middleware/shift.rb @@ -93,11 +94,11 @@ test/import/samples/one_tracker_with_break_in_grp.nk test/import/samples/shake_tracker_nodes.shk test/import/samples/shake_tracker_nodes_to_syntheyes.txt test/import/samples/shake_tracker_with_no_anim.shk +test/import/samples/shake_trackers_with_Nspline.shk test/import/samples/sourcefile_pftrack.2dt test/import/samples/three_tracks_in_one_stabilizer.shk test/import/samples/two_shake_trackers.txt test/import/samples/two_tracks_in_one_tracker.shk -test/import/samples/shake_trackers_with_Nspline.shk test/import/test_3de_import.rb test/import/test_3de_import3.rb test/import/test_flame_import.rb @@ -111,6 +112,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_prefix.rb test/middleware/test_reformat_middleware.rb test/middleware/test_scaler_middleware.rb test/middleware/test_shift_middleware.rb @@ -120,4 +122,4 @@ test/test_extio.rb test/test_format_detector.rb test/test_keyframe.rb test/test_simple_export.rb -test/test_tracker.rb \ No newline at end of file +test/test_tracker.rb Manifest.txt @@ -25,6 +25,7 @@ slip = 0 golden_tracks = false x_shift = 0 y_shift = 0 +set_prefix = '' readers = Tracksperanto.importer_names @@ -43,6 +44,7 @@ parser = OptionParser.new do | p | exit(-1) end end + p.on(" -p", "--prefix PREFIX", String, "A prefix to prepend to tracker names in bluk") { |w| set_prefix = w } p.on(" -w", "--width WIDTH_IN_PIXELS", Integer, "Absolute input comp width in pixels (will try to autodetect)") { |w| width = w } p.on(" -h", "--height HEIGHT_IN_PIXELS", Integer, "Absolute input comp height in pixels (will try to autodetect)") {|w| height = w } p.on(" -xs", "--xscale X_SCALING_FACTOR", Float, "Scale the result in X by this factor (1.0 is the default)") {|sx| scale_x = sx } @@ -82,7 +84,7 @@ end pipe = Tracksperanto::Pipeline::Base.new pipe.progress_block = lambda{|percent, msg| STDOUT.write(".") } -pipe.run(input_file, :pix_w => width, :pix_h => height, :parser => reader_klass) do | scaler, slipper, golden, reformat, shift | +pipe.run(input_file, :pix_w => width, :pix_h => height, :parser => reader_klass) do | scaler, slipper, golden, reformat, shift, prefix | slipper.slip = slip scaler.x_factor = scale_x scaler.y_factor = scale_y @@ -91,5 +93,6 @@ pipe.run(input_file, :pix_w => width, :pix_h => height, :parser => reader_klass) reformat.height = reformat_h if reformat_h shift.x_shift = x_shift shift.y_shift = y_shift + prefix.prefix = set_prefix end STDOUT.write("\n") \ No newline at end of file bin/tracksperanto @@ -148,7 +148,8 @@ class Tracksperanto::Pipeline::Base golden = Tracksperanto::Middleware::Golden.new(slipper) reformat = Tracksperanto::Middleware::Reformat.new(golden) shift = Tracksperanto::Middleware::Shift.new(reformat) - [scaler, slipper, golden, reformat, shift] + prefix = Tracksperanto::Middleware::Prefix.new(shift) + [scaler, slipper, golden, reformat, shift, prefix] end # Open the file for writing and register it to be closed automatically lib/pipeline/base.rb @@ -4,7 +4,7 @@ require 'tempfile' module Tracksperanto PATH = File.expand_path(File.dirname(__FILE__)) - VERSION = '1.5.6' + VERSION = '1.5.7' module Import; end module Export; end lib/tracksperanto.rb a963776f2dc6e48f89912ca1b78c1d75dc5418e8 Julik me@julik.nl http://github.com/julik/tracksperanto/commit/132bd14bcddd43e9e0e9ed0524a1f8888e28e510 132bd14bcddd43e9e0e9ed0524a1f8888e28e510 2009-11-08T13:54:04-08:00 2009-11-08T13:54:04-08:00 Add a Prefix middleware for prefixing tracker names 8792edf11ff4aa1e4156b0283a9a0aa3d40d0827 Julik me@julik.nl