Add Surface.copyFrom helpers to concrete surface companion objects

JD557 · Jan 5, 2025 · bff4f83 · bff4f83
1 parent f0ddadd
commit bff4f83
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 6 deletions.
diff --git a/backend/js/src/main/scala/eu/joaocosta/minart/backend/ImageDataOpaqueSurface.scala b/backend/js/src/main/scala/eu/joaocosta/minart/backend/ImageDataOpaqueSurface.scala
@@ -16,7 +16,7 @@ import org.scalajs.dom.{
   window
 }
 
-import eu.joaocosta.minart.graphics.{Color, MutableSurface}
+import eu.joaocosta.minart.graphics.{Color, MutableSurface, Surface}
 
 /** A mutable surface backed by an ImageData that drops the alpha channel when puting pixels.
   *
@@ -80,6 +80,13 @@ final class ImageDataOpaqueSurface(val data: ImageData) extends MutableSurface {
 
 object ImageDataOpaqueSurface {
 
+  /** Copies a surface into an opaque ImageData backed surface.
+    *
+    *  @param surface surface to copy from
+    */
+  def copyFrom(surface: Surface): ImageDataOpaqueSurface =
+    ImageDataOpaqueSurface.tabulate(surface.width, surface.height)(surface.unsafeGetPixel)
+
   /** Produces an opaque ImageData backed surface containing values of a given function
     *  over ranges of integer values starting from 0.
     *

diff --git a/backend/js/src/main/scala/eu/joaocosta/minart/backend/ImageDataSurface.scala b/backend/js/src/main/scala/eu/joaocosta/minart/backend/ImageDataSurface.scala
@@ -15,7 +15,7 @@ import org.scalajs.dom.{
   window
 }
 
-import eu.joaocosta.minart.graphics.{Color, MutableSurface}
+import eu.joaocosta.minart.graphics.{Color, MutableSurface, Surface}
 
 /** A mutable surface backed by an ImageData.
   *
@@ -78,6 +78,13 @@ final class ImageDataSurface(val data: ImageData) extends MutableSurface {
 
 object ImageDataSurface {
 
+  /** Copies a surface into an ImageData backed surface.
+    *
+    *  @param surface surface to copy from
+    */
+  def copyFrom(surface: Surface): ImageDataSurface =
+    ImageDataSurface.tabulate(surface.width, surface.height)(surface.unsafeGetPixel)
+
   /** Produces an ImageData backed surface containing values of a given function
     *  over ranges of integer values starting from 0.
     *

diff --git a/backend/jvm/src/main/scala/eu/joaocosta/minart/backend/BufferedImageSurface.scala b/backend/jvm/src/main/scala/eu/joaocosta/minart/backend/BufferedImageSurface.scala
@@ -70,6 +70,13 @@ final class BufferedImageSurface(val bufferedImage: BufferedImage) extends Mutab
 
 object BufferedImageSurface {
 
+  /** Copies a surface into an BufferedImage backed surface.
+    *
+    *  @param surface surface to copy from
+    */
+  def copyFrom(surface: Surface): BufferedImageSurface =
+    BufferedImageSurface.tabulate(surface.width, surface.height)(surface.unsafeGetPixel)
+
   /** Produces a BufferedImage backed surface containing values of a given function
     *  over ranges of integer values starting from 0.
     *

diff --git a/core/shared/src/main/scala/eu/joaocosta/minart/graphics/RamSurface.scala b/core/shared/src/main/scala/eu/joaocosta/minart/graphics/RamSurface.scala
@@ -43,12 +43,21 @@ final class RamSurface(val dataBuffer: Vector[Array[Color]]) extends MutableSurf
 
 object RamSurface {
 
+  /** Copies a surface into a RAM Surface surface.
+    *
+    * This is just an alias to Suface#toRamSurface.
+    *
+    * @param surface surface to copy from
+    */
+  def copyFrom(surface: Surface): RamSurface =
+    surface.toRamSurface()
+
   /** Produces a RAM surface containing values of a given function
-    *  over ranges of integer values starting from 0.
+    * over ranges of integer values starting from 0.
     *
-    *  @param width the surface width
-    *  @param height the surface height
-    *  @param f the function computing the element values
+    * @param width the surface width
+    * @param height the surface height
+    * @param f the function computing the element values
     */
   def tabulate(width: Int, height: Int)(f: (Int, Int) => Color): RamSurface = {
     val b = Vector.newBuilder[Array[Color]]