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

Change useProgramTexture not to return program

Browse Source
This commit is contained in:
Hajime Hoshi 2015-01-12 21:04:52 +09:00
parent 01dbc515b5
commit 9418d4c577
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
internal/graphics/internal/shader/drawtexture.go
View File

@ -40,12 +40,11 @@ type TextureQuads interface {
var initialized = false var initialized = false
func DrawTexture(c *opengl.Context, texture opengl.Texture, projectionMatrix *[4][4]float64, quads TextureQuads, geo Matrix, color Matrix) error { func DrawTexture(c *opengl.Context, texture opengl.Texture, projectionMatrix *[4][4]float64, quads TextureQuads, geo Matrix, color Matrix) error {
// unsafe.SizeOf can't be used because unsafe doesn't work with GopherJS.
const float32Size = 4
// TODO: WebGL doesn't seem to have Check gl.MAX_ELEMENTS_VERTICES or gl.MAX_ELEMENTS_INDICES so far. // TODO: WebGL doesn't seem to have Check gl.MAX_ELEMENTS_VERTICES or gl.MAX_ELEMENTS_INDICES so far.
// Let's use them to compare to len(quads). // Let's use them to compare to len(quads) in the future.
const stride = 4 * 4 const stride = 4 * 4
if !initialized { if !initialized {
if err := initialize(c); err != nil { if err := initialize(c); err != nil {
return err return err
@ -57,21 +56,8 @@ func DrawTexture(c *opengl.Context, texture opengl.Texture, projectionMatrix *[4
return nil return nil
} }
program := useProgramTexture(c, glMatrix(projectionMatrix), geo, color) f := useProgramTexture(c, glMatrix(projectionMatrix), texture, geo, color)
defer f.FinishProgram()
// We don't have to call gl.ActiveTexture here: GL_TEXTURE0 is the default active texture
// See also: https://www.opengl.org/sdk/docs/man2/xhtml/glActiveTexture.xml
c.BindTexture(texture)
c.EnableVertexAttribArray(program, "vertex")
c.EnableVertexAttribArray(program, "tex_coord")
defer func() {
c.DisableVertexAttribArray(program, "tex_coord")
c.DisableVertexAttribArray(program, "vertex")
}()
c.VertexAttribPointer(program, "vertex", stride, uintptr(float32Size*0))
c.VertexAttribPointer(program, "tex_coord", stride, uintptr(float32Size*2))
vertices := make([]float32, 0, stride*quads.Len()) vertices := make([]float32, 0, stride*quads.Len())
for i := 0; i < quads.Len(); i++ { for i := 0; i < quads.Len(); i++ {

27
internal/graphics/internal/shader/program.go
View File

@ -64,7 +64,17 @@ func initialize(c *opengl.Context) error {
var lastProgram opengl.Program var lastProgram opengl.Program
func useProgramTexture(c *opengl.Context, projectionMatrix []float32, geo Matrix, color Matrix) opengl.Program { type programFinisher func()
func (p programFinisher) FinishProgram() {
p()
}
func useProgramTexture(c *opengl.Context, projectionMatrix []float32, texture opengl.Texture, geo Matrix, color Matrix) programFinisher {
// unsafe.SizeOf can't be used because unsafe doesn't work with GopherJS.
const float32Size = 4
const stride = 4 * 4
if lastProgram != programTexture { if lastProgram != programTexture {
c.UseProgram(programTexture) c.UseProgram(programTexture)
lastProgram = programTexture lastProgram = programTexture
@ -107,5 +117,18 @@ func useProgramTexture(c *opengl.Context, projectionMatrix []float32, geo Matrix
} }
c.UniformFloats(program, "color_matrix_translation", glColorMatrixTranslation) c.UniformFloats(program, "color_matrix_translation", glColorMatrixTranslation)
return program // We don't have to call gl.ActiveTexture here: GL_TEXTURE0 is the default active texture
// See also: https://www.opengl.org/sdk/docs/man2/xhtml/glActiveTexture.xml
c.BindTexture(texture)
c.EnableVertexAttribArray(program, "vertex")
c.EnableVertexAttribArray(program, "tex_coord")
c.VertexAttribPointer(program, "vertex", stride, uintptr(float32Size*0))
c.VertexAttribPointer(program, "tex_coord", stride, uintptr(float32Size*2))
return func() {
c.DisableVertexAttribArray(program, "tex_coord")
c.DisableVertexAttribArray(program, "vertex")
}
} }