lib/middleware/scaler.rb in tracksperanto-1.1.1 vs lib/middleware/scaler.rb in tracksperanto-1.2.0

@@ -1,15 +1,16 @@
+# Scales the comp being exported by a specific factor, together with the tracker keyframes
 class Tracksperanto::Middleware::Scaler < Tracksperanto::Middleware::Base
   DEFAULT_FACTOR = 1
   
   attr_accessor :x_factor, :y_factor
+  cast_to_float :x_factor, :y_factor
   
   # Called on export start
   def start_export( img_width, img_height)
-    # Compute the average factor
-    @residual_factor = (x_factor + y_factor) / 2
-    super( (img_width * x_factor), (img_height * y_factor))
+    set_residual_factor
+    super( (img_width * x_factor).to_i, (img_height * y_factor).to_i)
   end
   
   def y_factor
     @y_factor || DEFAULT_FACTOR
   end
@@ -17,8 +18,17 @@
   def x_factor
     @x_factor || DEFAULT_FACTOR
   end
   
   def export_point(frame, float_x, float_y, float_residual)
-    super(frame, (float_x * x_factor), (float_y * y_factor), (float_residual * @residual_factor))
+    super(frame, 
+      (float_x * x_factor), 
+      (float_y * y_factor), 
+      (float_residual * @residual_factor)
+    )
   end
+  
+  private
+    def set_residual_factor
+      @residual_factor = Math.sqrt((x_factor ** 2) + (y_factor ** 2))
+    end
 end
\ No newline at end of file