Merge pull request #49 from ricardomatias/orx-image-fit

Externalize fitting algorithm

orx-image-fit/src/main/kotlin/ImageFit.kt

@@ -11,28 +11,28 @@ enum class FitMethod {
     Contain
 }
 
-fun Drawer.imageFit(
+fun fitRectangle(
-        img: ColorBuffer,
+        src: Rectangle,
-        x: Double = 0.0,
+        dest: Rectangle,
-        y: Double = 0.0,
-        width: Double = img.width.toDouble(),
-        height: Double = img.height.toDouble(),
         horizontalPosition: Double = 0.0,
         verticalPosition: Double = 0.0,
         fitMethod: FitMethod = FitMethod.Cover
-) {
+): Pair<Rectangle, Rectangle> {
-    val sourceWidth = img.width.toDouble()
+    val sourceWidth = src.width
-    val sourceHeight = img.height.toDouble()
+    val sourceHeight = src.height
-
-    var targetX = x
-    var targetY = y
 
+    var targetX: Double
+    var targetY: Double
     var targetWidth: Double
     var targetHeight: Double
 
     val source: Rectangle
     val target: Rectangle
 
+    val (x, y) = dest.corner
+    val width = dest.width
+    val height = dest.height
+
     when (fitMethod) {
         FitMethod.Contain -> {
             targetWidth = width
@@ -87,5 +87,26 @@ fun Drawer.imageFit(
         }
     }
 
+    return Pair(source, target)
+}
+
+fun Drawer.imageFit(
+        img: ColorBuffer,
+        x: Double = 0.0,
+        y: Double = 0.0,
+        width: Double = img.width.toDouble(),
+        height: Double = img.height.toDouble(),
+        horizontalPosition: Double = 0.0,
+        verticalPosition: Double = 0.0,
+        fitMethod: FitMethod = FitMethod.Cover
+) {
+    val (source, target) = fitRectangle(
+            img.bounds,
+            Rectangle(x, y, width, height),
+            horizontalPosition,
+            verticalPosition,
+            fitMethod
+    )
+
     image(img, source, target)
 }