kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[orx-dnk3, orx-runway] Use new loadImage interface

Browse Source
This commit is contained in:
Edwin Jakobs
2024-03-08 20:43:03 +01:00
parent ae3ad13703
commit 00776ae90d
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orx-jvm/orx-dnk3/src/main/kotlin/gltf/GltfScene.kt
View File

@@ -9,6 +9,7 @@ import org.openrndr.math.Matrix44
import org.openrndr.math.Quaternion import org.openrndr.math.Quaternion
import org.openrndr.math.Vector3 import org.openrndr.math.Vector3
import org.openrndr.math.transforms.transform import org.openrndr.math.transforms.transform
import org.openrndr.utils.buffer.MPPBuffer
import java.io.File import java.io.File
import java.nio.Buffer import java.nio.Buffer
import java.nio.ByteOrder import java.nio.ByteOrder
@@ -92,7 +93,8 @@ fun GltfFile.buildSceneNodes(): GltfSceneData {
require(localBufferView.byteLength != null) require(localBufferView.byteLength != null)
localBuffer.position(localBufferView.byteOffset) localBuffer.position(localBufferView.byteOffset)
localBuffer.limit(localBufferView.byteOffset + localBufferView.byteLength) localBuffer.limit(localBufferView.byteOffset + localBufferView.byteLength)
val cb = ColorBuffer.fromBuffer(localBuffer, null)
val cb = loadImage(MPPBuffer(localBuffer))
cb.generateMipmaps() cb.generateMipmaps()
cb.filter(MinifyingFilter.LINEAR_MIPMAP_LINEAR, MagnifyingFilter.LINEAR) cb.filter(MinifyingFilter.LINEAR_MIPMAP_LINEAR, MagnifyingFilter.LINEAR)
cb.anisotropy = 100.0 cb.anisotropy = 100.0

11
orx-jvm/orx-runway/src/main/kotlin/RunwayHttp.kt
View File

@@ -22,18 +22,7 @@ fun ColorBuffer.toData(format: ImageFileFormat = ImageFileFormat.JPG): String {
return "data:image/jpeg;base64,$base64Data" return "data:image/jpeg;base64,$base64Data"
} }
/**
* Construct a color buffer from a base64 data string
*/
fun ColorBuffer.Companion.fromData(data: String): ColorBuffer {
val decoder = Base64.getDecoder()
val commaIndex = data.indexOf(",")
val imageData = decoder.decode(data.drop(commaIndex + 1))
ByteArrayInputStream(imageData).use {
return ColorBuffer.fromStream(it)
}
}
/** /**
* Perform a Runway query * Perform a Runway query