Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(GLTFExporter): prefer native Blob/URL methods #282

Merged
merged 3 commits into from
Sep 23, 2023
Merged

refactor(GLTFExporter): prefer native Blob/URL methods #282

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fb762b
refactor(GLTFExporter): prefer native Blob/URL methods
CodyJasonBennett Aug 24, 2023
a4d7f3d
fix: implement readAsDataURL
CodyJasonBennett Aug 25, 2023
529864f
chore: cleanup
CodyJasonBennett Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 27 additions & 35 deletions src/exporters/GLTFExporter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ import {
WebGLRenderer,
} from 'three'

async function readAsDataURL(blob) {
const buffer = await blob.arrayBuffer()
const data = btoa(String.fromCharCode(...new Uint8Array(buffer)))
return `data:${blob.type || ''};base64,${data}`
}

let _renderer
let fullscreenQuadGeometry
let fullscreenQuadMaterial
Expand Down Expand Up @@ -527,11 +533,9 @@ class GLTFWriter {
if (options.binary === true) {
// https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#glb-file-format-specification

const reader = new FileReader()
reader.readAsArrayBuffer(blob)
reader.onloadend = function () {
blob.arrayBuffer().then((result) => {
// Binary chunk.
const binaryChunk = getPaddedArrayBuffer(reader.result)
const binaryChunk = getPaddedArrayBuffer(result)
const binaryChunkPrefix = new DataView(new ArrayBuffer(GLB_CHUNK_PREFIX_BYTES))
binaryChunkPrefix.setUint32(0, binaryChunk.byteLength, true)
binaryChunkPrefix.setUint32(4, GLB_CHUNK_TYPE_BIN, true)
Expand Down Expand Up @@ -559,24 +563,16 @@ class GLTFWriter {
type: 'application/octet-stream',
})

const glbReader = new FileReader()
glbReader.readAsArrayBuffer(glbBlob)
glbReader.onloadend = function () {
onDone(glbReader.result)
}
}
glbBlob.arrayBuffer().then(onDone)
})
} else {
if (json.buffers && json.buffers.length > 0) {
const reader = new FileReader()
reader.readAsDataURL(blob)
reader.onloadend = function () {
const base64data = reader.result
json.buffers[0].uri = base64data
onDone(json)
}
} else {
onDone(json)
readAsDataURL(blob).then((uri) => {
json.buffers[0].uri = uri
})
}

onDone(json)
}
}

Expand Down Expand Up @@ -941,21 +937,17 @@ class GLTFWriter {

if (!json.bufferViews) json.bufferViews = []

return new Promise(function (resolve) {
const reader = new FileReader()
reader.readAsArrayBuffer(blob)
reader.onloadend = function () {
const buffer = getPaddedArrayBuffer(reader.result)
return blob.arrayBuffer().then((result) => {
const buffer = getPaddedArrayBuffer(result)

const bufferViewDef = {
buffer: writer.processBuffer(buffer),
byteOffset: writer.byteOffset,
byteLength: buffer.byteLength,
}

writer.byteOffset += buffer.byteLength
resolve(json.bufferViews.push(bufferViewDef) - 1)
const bufferViewDef = {
buffer: writer.processBuffer(buffer),
byteOffset: writer.byteOffset,
byteLength: buffer.byteLength,
}

writer.byteOffset += buffer.byteLength
return json.bufferViews.push(bufferViewDef) - 1
})
}

Expand Down Expand Up @@ -1115,9 +1107,9 @@ class GLTFWriter {
} else {
pending.push(
getToBlobPromise(canvas, mimeType)
.then((blob) => new FileReader().readAsDataURL(blob))
.then((dataURL) => {
imageDef.uri = dataURL
.then(readAsDataURL)
.then((uri) => {
imageDef.uri = uri
}),
)
}
Expand Down
Loading