Slim OpenglAG a bit more

Some work on https://github.com/korlibs/korge-next/issues/558
korlibs-archive · Apr 18, 2022 · abf97d4 · abf97d4
1 parent b1b91de
commit abf97d4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/korgw/src/commonMain/kotlin/com/soywiz/korag/AG.kt b/korgw/src/commonMain/kotlin/com/soywiz/korag/AG.kt
@@ -1185,9 +1185,15 @@ abstract class AG : AGFeatures, Extra by Extra.Mixin() {
         return old
     }
 
-    open fun readColor(bitmap: Bitmap32): Unit = TODO()
-    open fun readDepth(width: Int, height: Int, out: FloatArray): Unit = TODO()
-    open fun readStencil(bitmap: Bitmap8): Unit = TODO()
+    open fun readColor(bitmap: Bitmap32): Unit {
+        commandsSync { it.readPixels(0, 0, bitmap.width, bitmap.height, bitmap.data.ints, ReadKind.COLOR) }
+    }
+    open fun readDepth(width: Int, height: Int, out: FloatArray): Unit {
+        commandsSync { it.readPixels(0, 0, width, height, out, ReadKind.DEPTH) }
+    }
+    open fun readStencil(bitmap: Bitmap8): Unit {
+        commandsSync { it.readPixels(0, 0, bitmap.width, bitmap.height, bitmap.data, ReadKind.STENCIL) }
+    }
     fun readDepth(out: FloatArray2): Unit = readDepth(out.width, out.height, out.data)
     open fun readColorTexture(texture: Texture, width: Int = backWidth, height: Int = backHeight): Unit = TODO()
     fun readColor() = Bitmap32(backWidth, backHeight).apply { readColor(this) }

diff --git a/korgw/src/commonMain/kotlin/com/soywiz/korag/gl/OpenglAG.kt b/korgw/src/commonMain/kotlin/com/soywiz/korag/gl/OpenglAG.kt
@@ -391,18 +391,6 @@ abstract class AGOpengl : AG() {
         override fun toString(): String = "AGOpengl.GlTexture($tex)"
     }
 
-    override fun readColor(bitmap: Bitmap32) {
-        commandsSync { it.readPixels(0, 0, bitmap.width, bitmap.height, bitmap.data.ints, ReadKind.COLOR) }
-    }
-
-    override fun readDepth(width: Int, height: Int, out: FloatArray) {
-        commandsSync { it.readPixels(0, 0, width, height, out, ReadKind.DEPTH) }
-    }
-
-    override fun readStencil(bitmap: Bitmap8) {
-        commandsSync { it.readPixels(0, 0, bitmap.width, bitmap.height, bitmap.data, ReadKind.STENCIL) }
-    }
-
     override fun readColorTexture(texture: Texture, width: Int, height: Int) {
         texture.bind()
         gl.copyTexImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 0, 0, width, height, 0)