mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-12 12:08:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use js.TypedArray

Browse Source 
This is still WIP. There is a rendering issue on Wasm.
This commit is contained in:
Hajime Hoshi 2018-07-06 02:34:17 +09:00
parent e61af537f4
commit 8f12dfc496
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ebitenutil/file_js.go
View File

@ -58,8 +58,10 @@ func OpenFile(path string) (ReadSeekCloser, error) {
return nil, err
}
var data []byte
js.ValueOf(data).Call("set", content)
data := make([]byte, content.Get("byteLength").Int())
arr := js.TypedArrayOf(data)
arr.Call("set", content)
arr.Release()
f := &file{bytes.NewReader(data)}
return f, nil
}

21
internal/opengl/context_js.go
View File

@ -201,7 +201,10 @@ func (c *Context) FramebufferPixels(f Framebuffer, width, height int) ([]byte, e
c.bindFramebuffer(f)
pixels := make([]byte, 4*width*height)
gl.Call("readPixels", 0, 0, width, height, rgba, unsignedByte, pixels)
p := js.TypedArrayOf(pixels)
gl.Call("readPixels", 0, 0, width, height, rgba, unsignedByte, p)
p.Release()
if e := gl.Call("getError"); e.Int() != noError.Int() {
return nil, errors.New(fmt.Sprintf("opengl: error: %d", e))
}
@ -229,12 +232,14 @@ func (c *Context) IsTexture(t Texture) bool {
return gl.Call("isTexture", js.Value(t)).Bool()
}
func (c *Context) TexSubImage2D(p []byte, x, y, width, height int) {
func (c *Context) TexSubImage2D(pixels []byte, x, y, width, height int) {
gl := c.gl
// void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
// GLsizei width, GLsizei height,
// GLenum format, GLenum type, ArrayBufferView? pixels);
p := js.TypedArrayOf(pixels)
gl.Call("texSubImage2D", texture2d, 0, x, y, width, height, rgba, unsignedByte, p)
p.Release()
}
func (c *Context) NewFramebuffer(t Texture) (Framebuffer, error) {
@ -359,7 +364,9 @@ func (c *Context) UniformFloats(p Program, location string, v []float32) {
case 4:
gl.Call("uniform4f", js.Value(l), v[0], v[1], v[2], v[3])
case 16:
gl.Call("uniformMatrix4fv", js.Value(l), false, js.ValueOf(v))
arr := js.TypedArrayOf(v)
gl.Call("uniformMatrix4fv", js.Value(l), false, arr)
arr.Release()
default:
panic("not reached")
}
@ -411,12 +418,16 @@ func (c *Context) BindBuffer(bufferType BufferType, b Buffer) {
func (c *Context) ArrayBufferSubData(data []float32) {
gl := c.gl
gl.Call("bufferSubData", int(ArrayBuffer), 0, js.ValueOf(data))
arr := js.TypedArrayOf(data)
gl.Call("bufferSubData", int(ArrayBuffer), 0, arr)
arr.Release()
}
func (c *Context) ElementArrayBufferSubData(data []uint16) {
gl := c.gl
gl.Call("bufferSubData", int(ElementArrayBuffer), 0, js.ValueOf(data))
arr := js.TypedArrayOf(data)
gl.Call("bufferSubData", int(ElementArrayBuffer), 0, arr)
arr.Release()
}
func (c *Context) DeleteBuffer(b Buffer) {