⬆️ kool

Author: elect86

src/main/kotlin/gli_/Image.kt

@@ -4,7 +4,7 @@ import kool.adr
 import kool.cap
 import kool.free
 import glm_.glm
-import glm_.set
+import kool.set
 import glm_.vec3.Vec3i
 import org.lwjgl.system.MemoryUtil
 import org.lwjgl.system.MemoryUtil.memByteBuffer

src/main/kotlin/gli_/Storage.kt

@@ -3,10 +3,10 @@ package gli_
 import kool.adr
 import kool.free
 import glm_.glm
-import glm_.size
 import glm_.vec1.Vec1i
 import glm_.vec2.Vec2i
 import glm_.vec3.Vec3i
+import kool.rem
 import org.lwjgl.system.MemoryUtil
 import java.nio.ByteBuffer
 
@@ -74,7 +74,7 @@ class Storage {
         return glm.max(extent shr level, 1)
     }
 
-    fun size() = data!!.size
+    fun size() = data!!.rem
 
     fun data() = data!!
 

src/main/kotlin/gli_/Texture.kt

@@ -2,7 +2,7 @@ package gli_
 
 import glm_.b
 import glm_.glm
-import glm_.set
+import kool.set
 import glm_.vec1.Vec1i
 import glm_.vec2.Vec2i
 import glm_.vec3.Vec3i

src/main/kotlin/gli_/load.kt

@@ -1,7 +1,7 @@
 package gli_
 
 import gli_.tga.TgaImageReaderSpi
-import glm_.set
+import kool.set
 import glm_.vec3.Vec3i
 import java.awt.image.BufferedImage
 import java.awt.image.BufferedImage.*

src/main/kotlin/gli_/loadDds.kt

@@ -1,17 +1,13 @@
 package gli_
 
-import kool.Buffer
 import gli_.detail.has
 import gli_.dx.has
 import gli_.dx.or
 import glm_.b
-import kool.adr
-import kool.cap
-import kool.pos
 import glm_.glm
 import glm_.i
-import glm_.size
 import glm_.vec3.Vec3i
+import kool.*
 import java.net.URI
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
@@ -130,7 +126,7 @@ interface loadDds {
         val texture = Texture(getTarget(header, header10), format, Vec3i(header.width, header.height, depthCount),
                 glm.max(header10.arraySize, 1), faceCount, mipMapCount)
 
-        assert(data.size == data.pos + texture.size)
+        assert(data.rem == data.pos + texture.size)
 
         memCopy(data.adr, texture.data().adr, texture.size)
 

src/main/kotlin/gli_/loadKmg.kt

@@ -1,11 +1,11 @@
 package gli_
 
-import kool.adr
-import kool.Buffer
-import kool.pos
 import glm_.i
-import glm_.size
 import glm_.vec3.Vec3i
+import kool.Buffer
+import kool.adr
+import kool.pos
+import kool.rem
 import java.net.URI
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
@@ -41,7 +41,7 @@ interface loadKmg {
      *  @param data buffer of the texture container data to read  */
     fun loadKmg(data: ByteBuffer): Texture {
 
-        assert(data.size >= kmg.Header10.size)
+        assert(data.rem >= kmg.Header10.size)
 
         // KMG100
         run {
@@ -75,7 +75,7 @@ interface loadKmg {
                     memCopy(data.adr, dst.adr, faceSize)
 
                     data.pos += faceSize
-                    assert(data.pos <= data.size)
+                    assert(data.pos <= data.rem)
                 }
             }
 

src/main/kotlin/gli_/loadKtx.kt

@@ -6,8 +6,8 @@ import kool.Buffer
 import kool.pos
 import glm_.glm
 import glm_.i
-import glm_.size
 import glm_.vec3.Vec3i
+import kool.rem
 import java.net.URI
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
@@ -43,7 +43,7 @@ interface loadKtx {
      *  @param data buffer of the texture container data to read  */
     fun loadKtx(data: ByteBuffer): Texture {
 
-        assert(data.size >= ktx.Header10.size)
+        assert(data.rem >= ktx.Header10.size)
 
         // KTX10
         run {

src/main/kotlin/gli_/reinterpreters.kt

@@ -2,7 +2,7 @@ package gli_
 
 import glm_.BYTES
 import kool.cap
-import glm_.set
+import kool.set
 import glm_.vec1.*
 import glm_.vec2.*
 import glm_.vec3.*

src/main/kotlin/gli_/saveDds.kt

@@ -5,11 +5,7 @@ import gli_.detail.or
 import gli_.dx.has
 import glm_.L
 import glm_.b
-import kool.adr
-import kool.Buffer
-import kool.cap
-import kool.pos
-import glm_.size
+import kool.*
 import java.nio.channels.FileChannel
 import java.nio.file.Path
 import java.nio.file.Paths
@@ -137,7 +133,7 @@ interface saveDds {
         FileChannel.open(path, StandardOpenOption.CREATE, StandardOpenOption.WRITE).use {
             data.pos = 0
             while (data.hasRemaining()) it.write(data)
-            it.truncate(data.size.L)
+            it.truncate(data.rem.L)
         }
 
         return true

src/main/kotlin/gli_/saveKmg.kt

@@ -3,7 +3,7 @@ package gli_
 import kool.adr
 import kool.Buffer
 import kool.pos
-import glm_.size
+import kool.rem
 import java.nio.channels.FileChannel
 import java.nio.file.Path
 import java.nio.file.StandardOpenOption
@@ -57,7 +57,7 @@ interface saveKmg {
                     memCopy(src.adr, data.adr, faceSize)
 
                     data.pos += faceSize
-                    assert(data.pos <= data.size)
+                    assert(data.pos <= data.rem)
                 }
             }