flame_channel_parser 1.1.1 → 1.1.2

data/Manifest.txt

@@ -10,9 +10,7 @@ lib/parser_2012.rb
 lib/segments.rb
 plots.numbers
 plots_2012.numbers
-test/baked.csv
 test/channel_with_constants.dat
-test/curve.csv
 test/sample_channel.dat
 test/snaps/FLEM_BrokenTangents.action
 test/snaps/FLEM_advanced_curve.png

data/README.rdoc

@@ -4,15 +4,18 @@
 
 == DESCRIPTION:
 
-Includes a small library for parsing and baking anmation curves made on Discrodesk Floke/Inflinto, also known as flame.
+Includes a small library for extracting, parsing and baking animation curves made on Discrodesk Floke/Inflinto, also known as flame.
+Thanks to Marijn Eken, Philippe Soeiro and Andre Gagnon for their support and advice.
 
 == FEATURES/PROBLEMS:
 
-* Only constant extrapolation for now, no looping or pingpong or linear
+* No pingpong or loop extrapolation for now
 * Expressions on channels won't be evaluated (obviously!)
 
 == SYNOPSIS:
 
+Currently there is no application that you can use directly, the parser is now a library that you can use in your own scripts
+    
     require "flame_channel_parser"
     channels = File.open("TW_Setup.timewarp") do | f |
       FlameChannelParser.parse(f)
@@ -33,11 +36,11 @@ Includes a small library for parsing and baking anmation curves made on Discrode
     
 == REQUIREMENTS:
 
-* FIX (list of requirements)
+* Ruby 1.8.6 and above
 
 == INSTALL:
 
-* FIX (sudo gem install, anything else)
+* gem install flame_channel_parser
 
 == LICENSE:
 

data/lib/flame_channel_parser.rb

@@ -1,10 +1,17 @@
 require "delegate"
 
 module FlameChannelParser
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
   
   # Parse a Flame setup into an array of ChannelBlock objects
   def self.parse(io)
+    parser_class = detect_parser_class_from(io)
+    parser_class.new.parse(io)
+  end
+  
+  private
+  
+  def self.detect_parser_class_from(io)
     # Scan the IO
     parser_class = Parser2011
     until io.eof?
@@ -15,10 +22,12 @@ module FlameChannelParser
       end
     end
     io.rewind
-    parser_class.new.parse(io)
+    
+    return parser_class
   end
 end
 
-require File.dirname(__FILE__) + "/parser_2011"
-require File.dirname(__FILE__) + "/parser_2012"
-require File.dirname(__FILE__) + "/interpolator"
+require File.expand_path(File.dirname(__FILE__)) + "/parser_2011"
+require File.expand_path(File.dirname(__FILE__)) + "/parser_2012"
+require File.expand_path(File.dirname(__FILE__)) + "/segments"
+require File.expand_path(File.dirname(__FILE__)) + "/interpolator"

data/lib/interpolator.rb

@@ -6,44 +6,42 @@ require File.expand_path(File.dirname(__FILE__)) + "/segments"
 #
 #   i = Interpolator.new(parsed_channel)
 #   i.value_at(245.5) # => will interpolate and return the value
-#
 class FlameChannelParser::Interpolator
   include FlameChannelParser::Segments
   
-  attr_reader :segments
-  
   NEG_INF = (-1.0/0.0)
   POS_INF = (1.0/0.0)
   
   # The constructor will accept a ChannelBlock object and convert it internally to a number of
   # segments from which samples can be made
   def initialize(channel)
+    @segments = []
     
     # Edge case - channel has no anim at all
     if (channel.length == 0)
-      @segments = [ConstantFunction.new(channel.base_value)]
+      @segments << [ConstantFunction.new(channel.base_value)]
     elsif (channel.length == 1)
-      @segments = [ConstantFunction.new(channel[0].value)]
+      @segments << [ConstantFunction.new(channel[0].value)]
     else
-      @segments = []
       
-      # TODO: extrapolation is set for the whole channel, both begin and end.
       # First the prepolating segment
-      @segments << ConstantPrepolate.new(channel[0].frame, channel[0].value)
+      @segments << pick_prepolation(channel.extrapolation, channel[0])
       
-      # The last key defines extrapolation for the rest of the curve...
+      # Then all the intermediate segments, one segment between each pair of keys
       channel[0..-2].each_with_index do | key, index |
         @segments << key_pair_to_segment(key, channel[index + 1])
       end
       
       # so we just output it separately
-      @segments << ConstantExtrapolate.new(@segments[-1].end_frame, channel[-1].value)
+      @segments << pick_extrapolation(channel.extrapolation, channel[-1])
     end
   end
   
   # Sample the value of the animation curve at this frame
   def sample_at(frame)
     segment = @segments.find{|s| s.defines?(frame) }
+    raise "No segment on this curve that can interpolate the value at #{frame}" unless segment
+    
     segment.value_at(frame)
   end
   
@@ -65,6 +63,23 @@ class FlameChannelParser::Interpolator
   
   private
   
+  def pick_prepolation(extrap_symbol, first_key)
+    if extrap_symbol == :linear
+      LinearPrepolate.new(first_key.frame, first_key.value, first_key.left_slope)
+    else
+      ConstantPrepolate.new(first_key.frame, first_key.value)
+    end
+  end
+  
+  def pick_extrapolation(extrap_symbol, last_key)
+    if extrap_symbol == :linear
+      LinearExtrapolate.new(last_key.frame, last_key.value, last_key.right_slope)
+    else
+      ConstantExtrapolate.new(last_key.frame, last_key.value)
+    end
+  end
+  
+  
   # We need both the preceding and the next key
   def key_pair_to_segment(key, next_key)
     case key.interpolation
@@ -75,7 +90,7 @@ class FlameChannelParser::Interpolator
           key.r_handle_y, 
           next_key.l_handle_x, next_key.l_handle_y)
       when :natural, :hermite
-        HermiteSegment.new(key.frame, next_key.frame, key.value, next_key.value, key.right_slope, incoming_slope(next_key))
+        HermiteSegment.new(key.frame, next_key.frame, key.value, next_key.value, key.right_slope, next_key.left_slope)
       when :constant
         ConstantSegment.new(key.frame, next_key.frame, key.value)
       else # Linear and safe
@@ -83,10 +98,5 @@ class FlameChannelParser::Interpolator
     end
   end
   
-  # Flame uses the right slope for both left and right unless the BrokenSlope tag is set
-  def incoming_slope(key)
-    key.broken? ? key.left_slope : key.right_slope
-  end
-  
 end
 

data/lib/parser_2011.rb

@@ -1,16 +1,26 @@
 require "delegate"
 
+# Basic parser used for setups from versions up to 2011
 class FlameChannelParser::Parser2011
   
+  # Represents a keyframe
   class Key
     attr_accessor :frame, :value, :interpolation, :extrapolation, :left_slope, :right_slope, :break_slope
     alias_method :to_s, :inspect
     
+    # Unless the key is broken? we should just use the right slope
+    def left_slope
+      return right_slope unless broken?
+      @left_slope
+    end
+    
+    # Tells whether the slope of this keyframe is broken (not smooth)
     def broken?
       break_slope
     end
   end
   
+  # Defines a number of regular expression matchers applied to the file as it is being parsed
   def matchers
     [
       [:frame, :to_i,  /Frame ([\-\d\.]+)/],
@@ -27,9 +37,13 @@ class FlameChannelParser::Parser2011
     Key.new
   end
   
+  # Represents a channel parsed from the Flame setup. Contains
+  # the channel metadata and keyframes
   class ChannelBlock < DelegateClass(Array)
     attr_accessor :base_value
     attr_accessor :name
+    attr_accessor :extrapolation
+    
     def initialize(io, channel_name, parent_parser)
       super([])
       
@@ -38,6 +52,7 @@ class FlameChannelParser::Parser2011
       
       base_value_matcher = /Value ([\-\d\.]+)/
       keyframe_count_matcher = /Size (\d+)/
+      extrapolation_matcher = /Extrapolation (\w+)/
       indent = nil
       
       while line = io.gets
@@ -51,6 +66,8 @@ class FlameChannelParser::Parser2011
           $1.to_i.times { push(extract_key_from(io)) }
         elsif line =~ base_value_matcher && empty?
           self.base_value = $1.to_f
+        elsif line =~ extrapolation_matcher
+          self.extrapolation = symbolize_literal($1)
         elsif line.strip == end_mark
           break
         end
@@ -58,7 +75,12 @@ class FlameChannelParser::Parser2011
       
     end
     
-
+    # Get an Interpolator from this channel
+    def to_interpolator
+      FlameChannelParser::Inteprolator.new(self)
+    end
+    
+    private
     
     def create_key
       Key.new
@@ -89,7 +111,7 @@ class FlameChannelParser::Parser2011
       raise "Did not detect any keyframes!"
     end
     
-    LITERALS = %w( linear constant natural hermite)
+    LITERALS = %w( linear constant natural hermite cubic bezier)
     
     def symbolize_literal(v)
       LITERALS.include?(v) ? v.to_sym : v
@@ -104,18 +126,16 @@ class FlameChannelParser::Parser2011
     until io.eof?
       line = io.gets
       if line =~ CHANNEL_MATCHER && channel_is_useful?($1)
-        report_progress("Extracting channel #{$1}")
         channels << ChannelBlock.new(io, $1, self)
       end
     end
     channels
   end
   
+  # Override this method to skip some channels, this will speedup
+  # your code alot
   def channel_is_useful?(channel_name)
     true
   end
   
-  def report_progress(message)
-    # flunk
-  end
 end

data/lib/parser_2012.rb

@@ -1,6 +1,7 @@
 require "delegate"
 require File.dirname(__FILE__) + "/interpolator"
 
+# This parser is automatically used for 2012 setups
 class FlameChannelParser::Parser2012 < FlameChannelParser::Parser2011
 
   class ModernKey
@@ -19,6 +20,8 @@ class FlameChannelParser::Parser2012 < FlameChannelParser::Parser2011
     
     # Compute pre-212 slope which we use for interpolations
     def left_slope
+      return right_slope unless broken?
+      
       dy = value - l_handle_y
       dx = l_handle_x - frame
       dy / dx  * -1

data/lib/segments.rb

@@ -23,7 +23,6 @@ module FlameChannelParser::Segments
     def initialize(from_frame, to_frame, value)
       @start_frame = from_frame
       @end_frame = to_frame
-    
       @v1 = value
     end
   end
@@ -65,19 +64,22 @@ module FlameChannelParser::Segments
       # CC = {P1, P2, T1, T2}
       p1, p2, t1, t2 = value1, value2, tangent1.to_f * frame_interval, tangent2.to_f * frame_interval
       @hermite = Vector[p1, p2, t1, t2]
+      @basis = HERMATRIX * @hermite
     end
   
     # P[s_] = S[s].h.CC where s is 0..1 float interpolant on T (interval)
     def value_at(frame)
-    
+      return @hermite[0] if frame == @start_frame
+      
+      # Get the 0 < T < 1 interval we will interpolate on
       # Q[frame_] = P[ ( frame - 149 ) / (time_to - time_from)]
-      on_t_interval = (frame - @start_frame).to_f / (@end_frame - @start_frame)
+      t = (frame - @start_frame).to_f / (@end_frame - @start_frame)
     
       # S[s_] = {s^3, s^2, s^1, s^0}
-      multipliers_vec = Vector[on_t_interval ** 3,  on_t_interval ** 2, on_t_interval ** 1, on_t_interval ** 0]
+      multipliers_vec = Vector[t ** 3,  t ** 2, t ** 1, t ** 0]
     
       # P[s_] = S[s].h.CC --> Kaboom!
-      interpolated_scalar = dot_product(HERMATRIX * @hermite, multipliers_vec)
+      interpolated_scalar = dot_product(@basis, multipliers_vec)
     end
   
     private
@@ -95,17 +97,19 @@ module FlameChannelParser::Segments
   class BezierSegment < LinearSegment
     def initialize(x1, x2, y1, y2, t1x, t1y, t2x, t2y)
       @start_frame, @end_frame = x1, x2
-
+      
       @a = Point.new(x1, y1, t1x, t1y)
       @b = Point.new(x2, y2, t2x, t2y)
     end
-
+    
     def value_at(frame)
+      return @a.y if frame == @start_frame
+      
       # Solve T from X. This determines the correlation between X and T.
       t = approximate_t(frame, @a.x, @a.tanx, @b.tanx, @b.x)
       vy = bezier(t, @a.y, @a.tany, @b.tany, @b.y)
     end
-
+    
     private
     
     # t is the T interpolant (0 < T < 1)
@@ -116,68 +120,65 @@ module FlameChannelParser::Segments
     def bezier(t, a, b, c, d)
       a + (a*(-3) + b*3)*(t) + (a*3 - b*6 + c*3)*(t**2) + (-a + b*3 - c*3 + d)*(t**3)
     end
-
+    
     def clamp(value)
        return 0.0 if value < 0
        return 1.0 if value > 1
        return value
     end
-
-    # /**
-    # * Returns the approximated parameter of a parametric curve for the value X
-    # * @param atX At which value should the parameter be evaluated
-    # * @param p0x The first interpolation point of a curve segment
-    # * @param c0x The first control point of a curve segment
-    # * @param c1x The second control point of a curve segment
-    # * @param P1_x The second interpolation point of a curve segment
-    # * @return The parametric argument that is used to retrieve atX using the parametric function representation of this curve
-    # */
-
+    
+    
     APPROXIMATION_EPSILON = 1.0e-09 
     VERYSMALL = 1.0e-20 
-    MAXIMUM_ITERATIONS = 1000
-
+    MAXIMUM_ITERATIONS = 100
+    
     # This is how OPENCOLLADA suggests approximating Bezier animation curves
     # http://www.collada.org/public_forum/viewtopic.php?f=12&t=1132
+    # Returns the approximated parameter of a parametric curve for the value X
+    # @param atX At which value should the parameter be evaluated
+    # @param p0x The first interpolation point of a curve segment
+    # @param c0x The first control point of a curve segment
+    # @param c1x The second control point of a curve segment
+    # @param P1_x The second interpolation point of a curve segment
+    # @return The parametric argument that is used to retrieve atX using the parametric function representation of this curve
     def approximate_t (atX, p0x, c0x, c1x, p1x )
-
-       return 0.0 if (atX - p0x < VERYSMALL)
-       return 1.0 if  (p1x - atX < VERYSMALL)
-
-       u, v = 0.0, 1.0
-
-       #  iteratively apply subdivision to approach value atX
-       MAXIMUM_ITERATIONS.times do
-
-          # de Casteljau Subdivision. 
-          a = (p0x + c0x) / 2.0
-          b = (c0x + c1x) / 2.0 
-          c = (c1x + p1x) / 2.0
-          d = (a + b) / 2.0 
-          e = (b + c) / 2.0 
-          f = (d + e) / 2.0 # this one is on the curve!
-
-          # The curve point is close enough to our wanted atX
-          if ((f - atX).abs < APPROXIMATION_EPSILON) 
-             return clamp((u + v)*0.5)
-          end
-
-          # dichotomy
-          if (f < atX)
-             p0x = f
-             c0x = e 
-             c1x = c 
-             u = (u + v) / 2.0 
-          else
-             c0x = a
-             c1x = d
-             p1x = f
-             v = (u + v) / 2.0 
-          end 
-       end 
-
-       return ClampToZeroOne((u + v) / 2) 
-
+      
+      return 0.0 if (atX - p0x < VERYSMALL)
+      return 1.0 if  (p1x - atX < VERYSMALL)
+      
+      u, v = 0.0, 1.0
+      
+      #  iteratively apply subdivision to approach value atX
+      MAXIMUM_ITERATIONS.times do
+      
+         # de Casteljau Subdivision. 
+         a = (p0x + c0x) / 2.0
+         b = (c0x + c1x) / 2.0 
+         c = (c1x + p1x) / 2.0
+         d = (a + b) / 2.0 
+         e = (b + c) / 2.0 
+         f = (d + e) / 2.0 # this one is on the curve!
+      
+         # The curve point is close enough to our wanted atX
+         if ((f - atX).abs < APPROXIMATION_EPSILON) 
+            return clamp((u + v)*0.5)
+         end
+      
+         # dichotomy
+         if (f < atX)
+            p0x = f
+            c0x = e 
+            c1x = c 
+            u = (u + v) / 2.0 
+         else
+            c0x = a
+            c1x = d
+            p1x = f
+            v = (u + v) / 2.0 
+         end 
+      end 
+      
+      clamp((u + v) / 2.0) 
     end
   end
   
@@ -192,11 +193,21 @@ module FlameChannelParser::Segments
     def value_at(frame)
       @value
     end
+  end
   
-    private
-      def frame_increment
-        23.0
-      end
+  # This segment does prepolation with a linear coefficient
+  class LinearPrepolate < LinearSegment
+    def initialize(upto_frame, base_value, tangent)
+      @value = base_value
+      @end_frame = upto_frame
+      @start_frame = NEG_INF
+      @tangent = tangent.to_f
+    end
+    
+    def value_at(frame)
+      frame_diff = (frame - @end_frame)
+      @value + (@tangent * frame_diff)
+    end
   end
   
   # This segment does extrapolation using a constant value
@@ -212,6 +223,19 @@ module FlameChannelParser::Segments
     end
   end
   
+  # This segment does extrapolation using the tangent from the preceding keyframe
+  class LinearExtrapolate < ConstantExtrapolate
+    def initialize(from_frame, base_value, tangent)
+      super(from_frame, base_value)
+      @tangent = tangent
+    end
+  
+    def value_at(frame)
+      frame_diff = (frame - @start_frame)
+      @base_value + (@tangent * frame_diff)
+    end
+  end
+  
   # This can be used for an anim curve that stays constant all along
   class ConstantFunction < ConstantSegment
   

data/test/test_flame_channel_parser.rb

@@ -1,4 +1,5 @@
 require "test/unit"
+require File.dirname(__FILE__) + "/../lib/flame_channel_parser"
 
 class TestFlameChannelParser < Test::Unit::TestCase
   D = 0.0001

data/test/test_interpolator.rb

@@ -6,6 +6,16 @@ require File.dirname(__FILE__) + "/../lib/flame_channel_parser"
 class TestInterpolator < Test::Unit::TestCase
   DELTA = 0.05
   
+  def send_curves_to_clipboard(range, ref_i, sample_i)
+    # This is handy for plotting
+    begin
+      IO.popen("pbcopy", "w") do | buf |
+        range.map{|f| buf.puts "%03f\t%03f" % [ref_i.sample_at(f), sample_i.sample_at(f)] }
+      end
+    rescue Errno::EPIPE # There is no pbcopy on this box, sorry
+    end
+  end
+  
   def assert_same_interpolation(range, ref_channel, sample_channel)
     ref_i, sample_i = [ref_channel, sample_channel].map{|c| FlameChannelParser::Interpolator.new(c) }
     
@@ -19,10 +29,7 @@ class TestInterpolator < Test::Unit::TestCase
       end
     rescue Test::Unit::AssertionFailedError => e
       STDERR.puts "Curves were not the same so I will now copy the two curves to the clipboard"
-      # This is handy for plotting
-      IO.popen("pbcopy", "w") do | buf |
-        range.map{|f| buf.puts "%03f\t%03f" % [ref_i.sample_at(f), sample_i.sample_at(f)] }
-      end
+      send_curves_to_clipboard(range, ref_i, sample_i)
       raise e
     end
   end
@@ -32,7 +39,8 @@ class TestInterpolator < Test::Unit::TestCase
     constants = FlameChannelParser.parse(data).find{|c| c.name == "constants"}
     interp =  FlameChannelParser::Interpolator.new(constants)
     
-    vs = [770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 1017.36, 1017.36]
+    vs = [770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41,
+      770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 770.41, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 858.177, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 939.407, 1017.36, 1017.36]
     
     values = (-5..116).map{|f| interp.sample_at(f) }
     assert_equal vs, values
@@ -84,6 +92,6 @@ class TestInterpolator < Test::Unit::TestCase
     
     reference = channels_in_action.find{|c| c.name == "position/x" && c.length > 2 }
     sampled = channels_in_action.find{|c| c.name == "position/y" && c.length > 2 }
-    assert_same_interpolation(1..330, reference, sampled)
+    assert_same_interpolation(-10..300, reference, sampled)
   end
 end

data/test/test_segments.rb

@@ -31,7 +31,6 @@ class TestConstantSegment < Test::Unit::TestCase
 end
 
 class TestBezierSegment < Test::Unit::TestCase
-  D = 0.001
   
   def test_segment
     seg = BezierSegment.new(
@@ -248,14 +247,23 @@ class TestHermiteSegment < Test::Unit::TestCase
 end
 
 class TestLinearPrepolate < Test::Unit::TestCase
-  def test_fail
-    flunk
+  def test_segment
+    seg = LinearPrepolate.new(123, -4, 2)
+    assert seg.defines?(122)
+    assert seg.defines?(-99999)
+    assert_equal( -2, seg.value_at(124))
+    assert_equal( -52, seg.value_at(99))
   end
 end
 
 class TestLinearExtrapolate < Test::Unit::TestCase
-  def test_fail
-    flunk
+  def test_segment
+    seg = LinearExtrapolate.new(123, -4, 2)
+    assert seg.defines?(123)
+    assert seg.defines?(9999999999)
+    assert !seg.defines?(122)
+    assert_equal( -2, seg.value_at(124))
+    assert_equal 198, seg.value_at(224)
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flame_channel_parser
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +02:00
+date: 2011-05-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,9 @@ dependencies:
         version: 2.9.1
   type: :development
   version_requirements: *id001
-description: Includes a small library for parsing and baking anmation curves made on Discrodesk Floke/Inflinto, also known as flame.
+description: |-
+  Includes a small library for extracting, parsing and baking animation curves made on Discrodesk Floke/Inflinto, also known as flame.
+  Thanks to Marijn Eken, Philippe Soeiro and Andre Gagnon for their support and advice.
 email: 
 - me@julik.nl
 executables: []
@@ -58,9 +60,7 @@ files:
 - lib/segments.rb
 - plots.numbers
 - plots_2012.numbers
-- test/baked.csv
 - test/channel_with_constants.dat
-- test/curve.csv
 - test/sample_channel.dat
 - test/snaps/FLEM_BrokenTangents.action
 - test/snaps/FLEM_advanced_curve.png
@@ -108,7 +108,7 @@ rubyforge_project: flame_channel_parser
 rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
-summary: Includes a small library for parsing and baking anmation curves made on Discrodesk Floke/Inflinto, also known as flame.
+summary: Includes a small library for extracting, parsing and baking animation curves made on Discrodesk Floke/Inflinto, also known as flame
 test_files: 
 - test/test_flame_channel_parser.rb
 - test/test_interpolator.rb

data/test/baked.csv

@@ -1,201 +0,0 @@
-x,y
-1,-459.0
-2,-426.528
-3,-394.055
-4,-361.583
-5,-329.111
-6,-296.638
-7,-264.166
-8,-231.694
-9,-199.221
-10,-166.749
-11,-134.277
-12,-101.804
-13,-69.3319
-14,-36.8595
-15,-4.38721
-16,28.0851
-17,60.5575
-18,93.0298
-19,125.502
-20,157.975
-21,190.447
-22,222.919
-23,222.543
-24,221.735
-25,220.506
-26,218.867
-27,216.83
-28,214.406
-29,211.608
-30,208.445
-31,204.931
-32,201.075
-33,196.89
-34,192.387
-35,187.578
-36,182.473
-37,177.085
-38,171.425
-39,165.503
-40,159.333
-41,152.924
-42,146.29
-43,139.44
-44,132.386
-45,125.141
-46,117.715
-47,110.119
-48,102.366
-49,94.4661
-50,86.4316
-51,78.2735
-52,70.0034
-53,61.6327
-54,53.1728
-55,44.6353
-56,36.0314
-57,27.3727
-58,18.6705
-59,9.93645
-60,1.18185
-61,-7.58185
-62,-16.3432
-63,-25.0907
-64,-33.813
-65,-42.4985
-66,-51.136
-67,-59.714
-68,-68.2209
-69,-76.6454
-70,-84.9759
-71,-93.2012
-72,-101.31
-73,-109.29
-74,-117.131
-75,-124.82
-76,-132.347
-77,-139.7
-78,-146.868
-79,-153.839
-80,-160.601
-81,-167.144
-82,-173.456
-83,-179.525
-84,-185.34
-85,-190.889
-86,-196.162
-87,-201.146
-88,-205.83
-89,-210.204
-90,-214.254
-91,-217.97
-92,-221.341
-93,-224.355
-94,-227.0
-95,-227.0
-96,-227.0
-97,-227.0
-98,-227.0
-99,-227.0
-100,-227.0
-101,-227.0
-102,-227.0
-103,-227.0
-104,-227.0
-105,-227.0
-106,-227.0
-107,-227.0
-108,-227.0
-109,-227.0
-110,-227.0
-111,-227.0
-112,-227.0
-113,-227.0
-114,-227.0
-115,-227.0
-116,-227.0
-117,1.23907
-118,15.1943
-119,28.8842
-120,42.297
-121,55.421
-122,68.2446
-123,80.7561
-124,92.9438
-125,104.796
-126,116.301
-127,127.447
-128,138.223
-129,148.616
-130,158.616
-131,168.21
-132,177.387
-133,186.135
-134,194.442
-135,202.297
-136,209.689
-137,216.604
-138,223.032
-139,228.961
-140,234.38
-141,239.276
-142,243.638
-143,247.455
-144,250.714
-145,253.404
-146,255.513
-147,257.03
-148,257.942
-149,258.239
-150,257.937
-151,257.074
-152,255.674
-153,253.759
-154,251.352
-155,248.476
-156,245.152
-157,241.405
-158,237.255
-159,232.727
-160,227.842
-161,222.624
-162,217.094
-163,211.276
-164,205.192
-165,198.865
-166,192.317
-167,185.571
-168,178.65
-169,171.576
-170,164.372
-171,157.06
-172,149.664
-173,142.205
-174,134.707
-175,127.192
-176,119.683
-177,112.202
-178,104.772
-179,97.4151
-180,90.1547
-181,83.0132
-182,76.0132
-183,69.1772
-184,62.528
-185,56.0881
-186,49.8802
-187,43.9269
-188,38.2508
-189,32.8746
-190,27.8209
-191,23.1124
-192,18.7715
-193,14.8212
-194,11.2838
-195,8.18198
-196,5.53853
-197,3.37598
-198,1.71692
-199,0.584045
-200,0.0

data/test/curve.csv

@@ -1,7 +0,0 @@
-frame,value,interpolation,extrapolation,left_slope,right_slope
-1,-459.0,linear,,,
-22,222.919,hermite,,2.49462,-0.156017
-94,-227.0,constant,,-2.33348,-2.45723
-117,1.23907,natural,,14.0841,14.0841
-149,258.239,hermite,,-0.0149286,-0.0149286
-200,0.0,hermite,,,-0.302127