flame_channel_parser 1.1.2 → 1.2.0

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.2.0 / 2011-05-20
+
+* Ensure single-key channels interpolate correctly
+
+=== 1.1.1 / 2011-05-17
+
+* Added support for 2012 Bezier splines
+
 === 1.1.1 / 2011-05-17
 
 * Added support for 2012 Bezier splines

data/Manifest.txt

@@ -20,6 +20,7 @@ test/snaps/FLEM_curves_example.action
 test/snaps/FLEM_curves_example_migrated_to_2012.action
 test/snaps/FLEM_std_curve.png
 test/snaps/TW.timewarp
+test/snaps/TW_SingleFrameExtrapolated_from2011.timewarp
 test/test_flame_channel_parser.rb
 test/test_interpolator.rb
 test/test_segments.rb

data/lib/flame_channel_parser.rb

@@ -1,7 +1,7 @@
 require "delegate"
 
 module FlameChannelParser
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
   
   # Parse a Flame setup into an array of ChannelBlock objects
   def self.parse(io)

data/lib/interpolator.rb

@@ -18,10 +18,8 @@ class FlameChannelParser::Interpolator
     @segments = []
     
     # Edge case - channel has no anim at all
-    if (channel.length == 0)
-      @segments << [ConstantFunction.new(channel.base_value)]
-    elsif (channel.length == 1)
-      @segments << [ConstantFunction.new(channel[0].value)]
+    if channel.length.zero?
+      @segments << ConstantFunction.new(channel.base_value)
     else
       
       # First the prepolating segment

data/lib/parser_2011.rb

@@ -77,7 +77,7 @@ class FlameChannelParser::Parser2011
     
     # Get an Interpolator from this channel
     def to_interpolator
-      FlameChannelParser::Inteprolator.new(self)
+      FlameChannelParser::Interpolator.new(self)
     end
     
     private

data/test/snaps/TW_SingleFrameExtrapolated_from2011.timewarp

@@ -0,0 +1,64 @@
+TimewarpFileVersion 1.0
+CreationDate Tue May  3 18:11:03 2011
+
+
+Fields 0
+Frames 236
+Origin 1
+RenderType yes
+SamplingStep 0
+Interpolation 0
+FlowQuality 0
+Animation
+	Channel Speed
+		Extrapolation constant
+		Value 125
+		Size 1
+		KeyVersion 1
+		Key 0
+			Frame 1
+			Value 125
+			Interpolation hermite
+			RightAutomaticSlope no
+			LeftAutomaticSlope no
+			BreakSlope yes
+			End
+		Uncollapsed
+		End
+	Channel Timing/Timing
+		Extrapolation linear
+		Value 1
+		Size 1
+		KeyVersion 1
+		Key 0
+			Frame 1
+			Value 1
+			Interpolation hermite
+			RightSlope 1.25
+			RightAutomaticSlope no
+			LeftAutomaticSlope no
+			End
+		Uncollapsed
+		End
+	Channel Mix/Mix
+		Extrapolation constant
+		Value 0
+		End
+	Channel Trail/Pre_Trail
+		Extrapolation constant
+		Value 1
+		End
+	Channel Trail/Pre_Weight
+		Extrapolation constant
+		Value 100
+		End
+	Channel Trail/Post_Trail
+		Extrapolation constant
+		Value 1
+		End
+	Channel Trail/Post_Weight
+		Extrapolation constant
+		Value 100
+		End
+	ChannelEnd
+End

data/test/test_flame_channel_parser.rb

@@ -41,6 +41,8 @@ class TestFlameChannelParser < Test::Unit::TestCase
     last_chan = channels[-1]
     assert_equal "position/y", last_chan.name
     assert_equal 6, last_chan.length
+    i = last_chan.to_interpolator
+    assert_kind_of FlameChannelParser::Interpolator, i
   end
   
   def test_action_from_2012

data/test/test_interpolator.rb

@@ -94,4 +94,15 @@ class TestInterpolator < Test::Unit::TestCase
     sampled = channels_in_action.find{|c| c.name == "position/y" && c.length > 2 }
     assert_same_interpolation(-10..300, reference, sampled)
   end
+  
+  def test_tw_with_constant
+    data = File.open(File.dirname(__FILE__) + "/snaps/TW_SingleFrameExtrapolated_from2011.timewarp")
+    channels_in_tw = FlameChannelParser.parse(data)
+    chan = channels_in_tw.find{|c| c.name == "Timing/Timing"}
+    
+    interp = chan.to_interpolator
+    assert_in_delta 1, interp.sample_at(1), DELTA
+    assert_in_delta 374.75, interp.sample_at(300), DELTA
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flame_channel_parser
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
   - 2
-  version: 1.1.2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -70,6 +70,7 @@ files:
 - test/snaps/FLEM_curves_example_migrated_to_2012.action
 - test/snaps/FLEM_std_curve.png
 - test/snaps/TW.timewarp
+- test/snaps/TW_SingleFrameExtrapolated_from2011.timewarp
 - test/test_flame_channel_parser.rb
 - test/test_interpolator.rb
 - test/test_segments.rb