Merge pull request #47 from JD557/put-pixel-try-catch

Wrap rendering operations inside a try-catch
JD557 · Jan 3, 2021 · ac06590 · ac06590
2 parents 36cc2a8 + d71efd9
commit ac06590
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/core/js/src/main/scala/eu/joaocosta/minart/backend/HtmlCanvas.scala b/core/js/src/main/scala/eu/joaocosta/minart/backend/HtmlCanvas.scala
@@ -90,9 +90,10 @@ class HtmlCanvas(val settings: Canvas.Settings) extends LowLevelCanvas {
     buffer.data(baseAddr + 2) = c.b
   }
 
-  def putPixel(x: Int, y: Int, color: Color): Unit =
+  def putPixel(x: Int, y: Int, color: Color): Unit = try {
     if (settings.scale == 1) putPixelUnscaled(x, y, color)
     else putPixelScaled(x, y, color)
+  } catch { case _: Throwable => () }
 
   def getBackbufferPixel(x: Int, y: Int): Color = {
     val baseAddr = 4 * (y * settings.scale * settings.scaledWidth + (x * settings.scale))
@@ -123,10 +124,10 @@ class HtmlCanvas(val settings: Canvas.Settings) extends LowLevelCanvas {
       }
     }
     if (resources.contains(Canvas.Resource.Keyboard)) {
-      keyboardInput = keyboardInput.clearPressRelease
+      keyboardInput = keyboardInput.clearPressRelease()
     }
     if (resources.contains(Canvas.Resource.Pointer)) {
-      pointerInput = pointerInput.clearPressRelease
+      pointerInput = pointerInput.clearPressRelease()
     }
   }
 

diff --git a/core/jvm/src/main/scala/eu/joaocosta/minart/backend/AwtCanvas.scala b/core/jvm/src/main/scala/eu/joaocosta/minart/backend/AwtCanvas.scala
@@ -61,9 +61,10 @@ class AwtCanvas(val settings: Canvas.Settings) extends LowLevelCanvas {
         y * settings.scaledWidth + x % settings.scaledWidth,
         c.argb)
 
-  def putPixel(x: Int, y: Int, color: Color): Unit =
+  def putPixel(x: Int, y: Int, color: Color): Unit = try {
     if (settings.scale == 1) putPixelUnscaled(x, y, color)
     else putPixelScaled(x, y, color)
+  } catch { case _: Throwable => () }
 
   def getBackbufferPixel(x: Int, y: Int): Color = {
     Color.fromRGB(javaCanvas.imagePixels.getElem(y * settings.scale * settings.scaledWidth + (x * settings.scale)))
@@ -92,12 +93,12 @@ class AwtCanvas(val settings: Canvas.Settings) extends LowLevelCanvas {
     }
   }
 
-  def redraw(): Unit = {
+  def redraw(): Unit = try {
     val g = javaCanvas.buffStrategy.getDrawGraphics()
     g.drawImage(javaCanvas.image, 0, 0, settings.scaledWidth, settings.scaledHeight, javaCanvas)
     g.dispose()
     javaCanvas.buffStrategy.show()
-  }
+  } catch { case _: Throwable => () }
 
   def getKeyboardInput(): KeyboardInput = keyListener.getKeyboardInput()
   def getPointerInput(): PointerInput = mouseListener.getPointerInput()

diff --git a/core/native/src/main/scala/eu/joaocosta/minart/backend/SdlCanvas.scala b/core/native/src/main/scala/eu/joaocosta/minart/backend/SdlCanvas.scala
@@ -66,9 +66,10 @@ class SdlCanvas(val settings: Canvas.Settings) extends LowLevelCanvas {
     surface.pixels(baseAddr + 2) = c.r.toByte
   }
 
-  def putPixel(x: Int, y: Int, color: Color): Unit =
+  def putPixel(x: Int, y: Int, color: Color): Unit = try {
     if (settings.scale == 1) putPixelUnscaled(x, y, color)
     else putPixelScaled(x, y, color)
+  } catch { case _: Throwable => () }
 
   def getBackbufferPixel(x: Int, y: Int): Color = {
     // Assuming a BGRA surface

diff --git a/pure/shared/src/main/scala/eu/joaocosta/minart/pure/CanvasIO.scala b/pure/shared/src/main/scala/eu/joaocosta/minart/pure/CanvasIO.scala
@@ -53,7 +53,7 @@ object CanvasIO {
    * This operation can be perfomance intensive, so it might be worthwile
    * to implement this operation on the application code.
    */
-  val getBackbuffer: CanvasIO[Vector[Vector[Color]]] = accessCanvas(_.getBackbuffer)
+  val getBackbuffer: CanvasIO[Vector[Vector[Color]]] = accessCanvas(_.getBackbuffer())
 
   /** Gets the current keyboard input. */
   val getKeyboardInput: CanvasIO[KeyboardInput] = accessCanvas(_.getKeyboardInput())