Merge branch 'develop'

Author: volta2030

build.gradle.kts

@@ -13,7 +13,7 @@ repositories {
 dependencies {
     testImplementation(kotlin("test"))
     implementation ("com.github.volta2030:delta:1.1.0")
-    implementation ("com.github.Pascal-Institute:komat:1.9.1")
+    implementation ("com.github.Pascal-Institute:komat:develop-SNAPSHOT")
 }
 
 tasks.test {

src/main/kotlin/bumblebee/FileManager.kt

@@ -37,7 +37,7 @@ class FileManager {
                                         intToByteArray(imgPix.width, 4) +
                                         intToByteArray(imgPix.height, 4) +
                                         intToByteArray(imgPix.colorType.num, 1) +
-                                        imgPix.mat.elements.map { it.toByte() }.toByteArray()
+                                        imgPix.cube.toByteArray()
                         File("$filePath.pix").writeBytes(byteArray)
                     }
                    else -> {}

src/main/kotlin/bumblebee/core/ImgInspector.kt

@@ -5,26 +5,25 @@ import bumblebee.color.GRAY
 import bumblebee.color.RGB
 import bumblebee.color.RGBA
 import bumblebee.util.Converter.Companion.toHex
-import komat.space.Vect
 
 class ImgInspector {
     companion object{
         fun getColorAt(imgPix: ImgPix, row : Int, col: Int) : Color {
             return when(imgPix.bytesPerPixel){
 
-                1-> GRAY((imgPix.mat[imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row] as Byte).toUByte().toInt())
+                1-> GRAY((imgPix.cube[imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row].toByte()).toUByte().toInt())
 
                 3-> RGB(
-                    (imgPix.mat[0 + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row] as Byte).toUByte().toInt(),
-                    (imgPix.mat[1 + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row] as Byte).toUByte().toInt(),
-                    (imgPix.mat[2 + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row] as Byte).toUByte().toInt())
+                    (imgPix.cube[0 + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row].toByte()).toUByte().toInt(),
+                    (imgPix.cube[1 + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row].toByte()).toUByte().toInt(),
+                    (imgPix.cube[2 + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row].toByte()).toUByte().toInt())
 
                 //GBAR to RGBA
                 4-> RGBA(
-                    (imgPix.mat[3 + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row] as Byte).toUByte().toInt(),
-                    (imgPix.mat[0 + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row] as Byte).toUByte().toInt(),
-                    (imgPix.mat[1 + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row] as Byte).toUByte().toInt(),
-                    (imgPix.mat[2 + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row] as Byte).toUByte().toInt()
+                    (imgPix.cube[3 + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row].toByte()).toUByte().toInt(),
+                    (imgPix.cube[0 + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row].toByte()).toUByte().toInt(),
+                    (imgPix.cube[1 + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row].toByte()).toUByte().toInt(),
+                    (imgPix.cube[2 + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row].toByte()).toUByte().toInt()
                 )
 
                 else->{
@@ -36,7 +35,7 @@ class ImgInspector {
         fun getHexStringAt(imgPix: ImgPix, row : Int, col : Int) : String{
             val vect = ByteArray(imgPix.bytesPerPixel)
             for (i : Int in 0 until imgPix.bytesPerPixel){
-                vect[i] = imgPix.mat[i + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row] as Byte
+                vect[i] = imgPix.cube[i + imgPix.bytesPerPixel * col + (imgPix.width * imgPix.bytesPerPixel) * row].toByte()
             }
             return vect.toHex()
         }

src/main/kotlin/bumblebee/core/ImgPix.kt

@@ -5,7 +5,7 @@ import bumblebee.color.Color
 import bumblebee.type.*
 import bumblebee.util.Histogram
 import komat.Element
-import komat.space.Mat
+import komat.space.Cube
 import java.awt.Dimension
 import java.awt.Graphics
 import java.awt.Image
@@ -34,33 +34,32 @@ import javax.swing.WindowConstants
     val bytesPerPixel : Int
         get() = metaData.colorType.bytesPerPixel
 
-    var mat = Mat(0,0, ByteArray(0))
-
-    operator fun get(i: Int, j: Int): Element {
-        return mat.elements[i * mat.column + j]
-    }
+     //depth : row
+     //row : column
+     //column : color size
+    var cube = Cube(0,0,0, Element(0.toByte()))
 
     constructor(width: Int, height: Int, colorType: ColorType) : this() {
         metaData.width = width
         metaData.height = height
         metaData.colorType = colorType
-        this.mat = Mat(width, height* colorType.bytesPerPixel, ByteArray(width * height * colorType.bytesPerPixel))
+        cube = Cube(width, height, colorType.bytesPerPixel, Element(0.toByte()))
      }
 
     constructor(filePath : String) : this() {
         val imgPix  = FileManager.read(filePath)
         metaData.width = imgPix.width
         metaData.height = imgPix.height
         metaData.colorType = imgPix.colorType
-        this.mat = imgPix.mat
+        cube = imgPix.cube
     }
 
      public override fun clone(): ImgPix {
         return super.clone() as ImgPix
     }
 
     fun show(){
-        val buffer = DataBufferByte(mat.elements.map { it.toByte() }.toByteArray(), mat.elements.size)
+        val buffer = DataBufferByte(cube.toByteArray(), cube.elements.size)
 
         val bufferedImage : BufferedImage
         when(colorType){