mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 11:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

ebitenutil: Fix OpenFile() so it works with wasm (#674)

Browse Source 
Fixes #673 

* Change to use `js.NewCallback`
* Use `uint8contentWrapper := js.Global().Get("Uint8Array").New(content)`, without this all the bytes in `data` stays zeroed. (TypedArray cannot use `set` on an ArrayBuffer)
This commit is contained in:
Jake Bentvelzen 2018-08-27 04:46:15 +10:00 committed by Hajime Hoshi
parent c25f5b03e0
commit 2938afd82a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ebitenutil/file_js.go
View File

@ -39,7 +39,7 @@ func OpenFile(path string) (ReadSeekCloser, error) {
req := js.Global().Get("XMLHttpRequest").New()
req.Call("open", "GET", path, true)
req.Set("responseType", "arraybuffer")
req.Call("addEventListener", "load", func() {
loadCallback := js.NewCallback(func([]js.Value) {
defer close(ch)
status := req.Get("status").Int()
if 200 <= status && status < 400 {
@ -48,19 +48,24 @@ func OpenFile(path string) (ReadSeekCloser, error) {
}
err = errors.New(fmt.Sprintf("http error: %d", status))
})
req.Call("addEventListener", "error", func() {
defer loadCallback.Release()
req.Call("addEventListener", "load", loadCallback)
errorCallback := js.NewCallback(func([]js.Value) {
defer close(ch)
err = errors.New(fmt.Sprintf("XMLHttpRequest error: %s", req.Get("statusText").String()))
})
req.Call("addEventListener", "error", errorCallback)
defer errorCallback.Release()
req.Call("send")
<-ch
if err != nil {
return nil, err
}
data := make([]byte, content.Get("byteLength").Int())
uint8contentWrapper := js.Global().Get("Uint8Array").New(content)
data := make([]byte, uint8contentWrapper.Get("byteLength").Int())
arr := js.TypedArrayOf(data)
arr.Call("set", content)
arr.Call("set", uint8contentWrapper)
arr.Release()
f := &file{bytes.NewReader(data)}
return f, nil