Added PaintReference to clean up paint feature

McAJBen · Feb 2, 2020 · 12e521f · 12e521f
1 parent 45d1538
commit 12e521f
Show file tree

Hide file tree

Showing 19 changed files with 865 additions and 960 deletions.
diff --git a/Dungeon Board/Paint/Mornien Underground/7.png b/Dungeon Board/Paint/Mornien Underground/7.png
diff --git a/src/control/ControlPaint.kt b/src/control/ControlPaint.kt
diff --git a/src/control/ControlPaintListener.kt b/src/control/ControlPaintListener.kt
@@ -1,8 +1,6 @@
 package control
 
-import util.Resources
-import java.awt.Point
-import java.awt.image.BufferedImage
+import paint.PaintReference
 
 /**
  * a listener for events coming from `ControlPaint`
@@ -12,31 +10,13 @@ import java.awt.image.BufferedImage
 interface ControlPaintListener {
 
     /**
-     * sets the dimension of the image to be painted
+     * updates the display with a new `PaintReference`
+     * @param ref the new reference
      */
-    fun setImageSize()
-
-    /**
-     * sets the mask to draw over the image
-     * @param mask an image where every pixel is either Color.BLACK or transparent
-     */
-    fun setMask(mask: BufferedImage = Resources.BLANK_CURSOR)
+    fun setPaintReference(ref: PaintReference)
 
     /**
      * tells display to repaint
      */
     fun repaint()
-
-    /**
-     * sets the window to a specific scale and position
-     * @param scale the zoom scale for the image
-     * @param windowPos the offset of the top left corner of the image
-     */
-    fun setWindow(scale: Double, windowPos: Point)
-
-    /**
-     * sets the window position
-     * @param windowPos the offset of the top left corner of the image
-     */
-    fun setWindowPos(windowPos: Point)
 }
diff --git a/src/control/ControlPictures.kt b/src/control/ControlPictures.kt
@@ -3,14 +3,13 @@ package control
 import display.DisplayPictures
 import display.Scale
 import main.Mode
-import util.Colors
-import util.Resources
-import util.Settings
-import util.createButton
+import util.*
 import java.awt.BorderLayout
 import java.awt.Dimension
 import java.io.File
+import java.util.concurrent.Executors
 import javax.swing.BorderFactory
+import javax.swing.JButton
 import javax.swing.JComboBox
 import javax.swing.JScrollPane
 
@@ -123,7 +122,21 @@ class ControlPictures(
             }
 
             picturePanel.clearButtons()
-            PPButtonCreator(picturePanel, folder).run()
+
+            val executor = Executors.newFixedThreadPool(Settings.SYS_THREADS)
+            folder.listFilesInOrder().filter {
+                it.extension.equals("PNG", ignoreCase = true)
+                        || it.extension.equals("JPG", ignoreCase = true)
+                        || it.extension.equals("JPEG", ignoreCase = true)
+            }.map {
+                executor.submit<JButton> {
+                    picturePanel.createPPButton(it)
+                }
+            }.forEach {
+                picturePanel.add(it.get())
+            }
+            executor.shutdown()
+
             repaint()
             revalidate()
             display.removeAllImages()

diff --git a/src/control/PPButtonCreator.kt b/src/control/PPButtonCreator.kt
diff --git a/src/display/Cube.kt b/src/display/Cube.kt
@@ -1,7 +1,7 @@
 package display
 
 import util.Resources
-import util.Settings
+import util.Settings.DISPLAY_SIZE
 import java.awt.Graphics2D
 import java.awt.Point
 import java.util.*
@@ -26,8 +26,8 @@ class Cube {
      * the current position of the top left corner
      */
     private val point = Point(
-        rand.nextInt(Settings.DISPLAY_SIZE!!.width - Resources.ICON_DVD.iconWidth),
-        rand.nextInt(Settings.DISPLAY_SIZE!!.height - Resources.ICON_DVD.iconHeight)
+        rand.nextInt(DISPLAY_SIZE.width - Resources.ICON_DVD.iconWidth),
+        rand.nextInt(DISPLAY_SIZE.height - Resources.ICON_DVD.iconHeight)
     )
 
     /**
@@ -83,8 +83,8 @@ class Cube {
                 }
             } else {
                 point.x += speed
-                if (point.x > Settings.DISPLAY_SIZE!!.width - Resources.ICON_DVD.iconWidth) {
-                    point.x = Settings.DISPLAY_SIZE!!.width - Resources.ICON_DVD.iconWidth
+                if (point.x > DISPLAY_SIZE.width - Resources.ICON_DVD.iconWidth) {
+                    point.x = DISPLAY_SIZE.width - Resources.ICON_DVD.iconWidth
                     vertical = true
                     verticalHit = true
                 }
@@ -100,8 +100,8 @@ class Cube {
                 }
             } else {
                 point.y += speed
-                if (point.y > Settings.DISPLAY_SIZE!!.height - Resources.ICON_DVD.iconHeight) {
-                    point.y = Settings.DISPLAY_SIZE!!.height - Resources.ICON_DVD.iconHeight
+                if (point.y > DISPLAY_SIZE.height - Resources.ICON_DVD.iconHeight) {
+                    point.y = DISPLAY_SIZE.height - Resources.ICON_DVD.iconHeight
                     horizontal = true
                     if (verticalHit) {
                         flag = true

diff --git a/src/display/DisplayLoading.kt b/src/display/DisplayLoading.kt
@@ -2,6 +2,7 @@ package display
 
 import main.Mode
 import util.Settings
+import util.Settings.DISPLAY_SIZE
 import java.awt.AlphaComposite
 import java.awt.Color
 import java.awt.Graphics
@@ -214,24 +215,24 @@ class DisplayLoading(window: DisplayWindow) : Display(window) {
         if (currentImage != null) {
             if (upScale) {
                 if (timer <= FADE_IN) {
-                    g2d.drawImage(oldImage, 0, 0, Settings.DISPLAY_SIZE!!.width, Settings.DISPLAY_SIZE!!.height, null)
+                    g2d.drawImage(oldImage, 0, 0, DISPLAY_SIZE.width, DISPLAY_SIZE.height, null)
                 }
                 g2d.composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, fade)
-                g2d.drawImage(currentImage, 0, 0, Settings.DISPLAY_SIZE!!.width, Settings.DISPLAY_SIZE!!.height, null)
+                g2d.drawImage(currentImage, 0, 0, DISPLAY_SIZE.width, DISPLAY_SIZE.height, null)
             } else {
                 g2d.color = Color(currentImage!!.getRGB(0, 0))
-                g2d.fillRect(0, 0, Settings.DISPLAY_SIZE!!.width, Settings.DISPLAY_SIZE!!.height)
+                g2d.fillRect(0, 0, DISPLAY_SIZE.width, DISPLAY_SIZE.height)
                 if (timer <= FADE_IN && oldImage != null) {
                     g2d.composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1 - fade)
                     g2d.drawImage(
-                        oldImage, (Settings.DISPLAY_SIZE!!.width - oldImage!!.width) / 2,
-                        (Settings.DISPLAY_SIZE!!.height - oldImage!!.height) / 2, null
+                        oldImage, (DISPLAY_SIZE.width - oldImage!!.width) / 2,
+                        (DISPLAY_SIZE.height - oldImage!!.height) / 2, null
                     )
                 }
                 g2d.composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, fade)
                 g2d.drawImage(
-                    currentImage, (Settings.DISPLAY_SIZE!!.width - currentImage!!.width) / 2,
-                    (Settings.DISPLAY_SIZE!!.height - currentImage!!.height) / 2, null
+                    currentImage, (DISPLAY_SIZE.width - currentImage!!.width) / 2,
+                    (DISPLAY_SIZE.height - currentImage!!.height) / 2, null
                 )
             }
         }