mstar/canvas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more clipping fixes

Browse source
This commit is contained in:
Thomas Friedel 2018-04-30 11:25:25 +02:00
parent 48a2c698df
commit 3a51ce9843
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
images.go
View file

@ -249,6 +249,8 @@ func (cv *Canvas) DrawImage(image interface{}, coords ...float64) {
p2 := cv.tf(vec{dx + dw, dy + dh}) p2 := cv.tf(vec{dx + dw, dy + dh})
p3 := cv.tf(vec{dx + dw, dy}) p3 := cv.tf(vec{dx + dw, dy})
gli.StencilFunc(gl_EQUAL, 0, 0xFF)
gli.BindBuffer(gl_ARRAY_BUFFER, buf) gli.BindBuffer(gl_ARRAY_BUFFER, buf)
data := [16]float32{float32(p0[0]), float32(p0[1]), float32(p1[0]), float32(p1[1]), float32(p2[0]), float32(p2[1]), float32(p3[0]), float32(p3[1]), data := [16]float32{float32(p0[0]), float32(p0[1]), float32(p1[0]), float32(p1[1]), float32(p2[0]), float32(p2[1]), float32(p3[0]), float32(p3[1]),
float32(sx), float32(sy), float32(sx), float32(sy + sh), float32(sx + sw), float32(sy + sh), float32(sx + sw), float32(sy)} float32(sx), float32(sy), float32(sx), float32(sy + sh), float32(sx + sw), float32(sy + sh), float32(sx + sw), float32(sy)}
@ -268,4 +270,6 @@ func (cv *Canvas) DrawImage(image interface{}, coords ...float64) {
gli.DrawArrays(gl_TRIANGLE_FAN, 0, 4) gli.DrawArrays(gl_TRIANGLE_FAN, 0, 4)
gli.DisableVertexAttribArray(ir.vertex) gli.DisableVertexAttribArray(ir.vertex)
gli.DisableVertexAttribArray(ir.texCoord) gli.DisableVertexAttribArray(ir.texCoord)
gli.StencilFunc(gl_ALWAYS, 0, 0xFF)
} }

4
text.go
View file

@ -181,6 +181,8 @@ func (cv *Canvas) FillText(str string, x, y float64) {
x -= float64(strWidth) x -= float64(strWidth)
} }
gli.StencilFunc(gl_EQUAL, 0, 0xFF)
gli.BindBuffer(gl_ARRAY_BUFFER, buf) gli.BindBuffer(gl_ARRAY_BUFFER, buf)
vertex, alphaTexCoord := cv.useAlphaShader(&cv.state.fill, 1) vertex, alphaTexCoord := cv.useAlphaShader(&cv.state.fill, 1)
@ -219,6 +221,8 @@ func (cv *Canvas) FillText(str string, x, y float64) {
gli.DisableVertexAttribArray(alphaTexCoord) gli.DisableVertexAttribArray(alphaTexCoord)
gli.ActiveTexture(gl_TEXTURE0) gli.ActiveTexture(gl_TEXTURE0)
gli.StencilFunc(gl_ALWAYS, 0, 0xFF)
} }
type TextMetrics struct { type TextMetrics struct {