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

internal/mipmap, internal/atlas: Integrate for-loops for color scaling

Browse Source
This commit is contained in:
Hajime Hoshi 2021-09-23 00:19:23 +09:00
parent 8063f2050c
commit 4b64eadfe5
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
internal/atlas/image.go
View File

@ -429,6 +429,18 @@ func (i *Image) drawTriangles(srcs [graphics.ShaderImageNum]*Image, vertices []f
i.processSrc(src) i.processSrc(src)
} }
cr := float32(1)
cg := float32(1)
cb := float32(1)
ca := float32(1)
if !colorm.IsIdentity() && colorm.ScaleOnly() {
cr = colorm.At(0, 0)
cg = colorm.At(1, 1)
cb = colorm.At(2, 2)
ca = colorm.At(3, 3)
colorm = affine.ColorMIdentity{}
}
var dx, dy float32 var dx, dy float32
// A screen image doesn't have its padding. // A screen image doesn't have its padding.
if !i.screen { if !i.screen {
@ -446,12 +458,16 @@ func (i *Image) drawTriangles(srcs [graphics.ShaderImageNum]*Image, vertices []f
ox += paddingSize ox += paddingSize
oy += paddingSize oy += paddingSize
oxf, oyf = float32(ox), float32(oy) oxf, oyf = float32(ox), float32(oy)
n := len(vertices) / graphics.VertexFloatNum n := len(vertices)
for i := 0; i < n; i++ { for i := 0; i < n; i += graphics.VertexFloatNum {
vertices[i*graphics.VertexFloatNum+0] += dx vertices[i] += dx
vertices[i*graphics.VertexFloatNum+1] += dy vertices[i+1] += dy
vertices[i*graphics.VertexFloatNum+2] += oxf vertices[i+2] += oxf
vertices[i*graphics.VertexFloatNum+3] += oyf vertices[i+3] += oyf
vertices[i+4] *= cr
vertices[i+5] *= cg
vertices[i+6] *= cb
vertices[i+7] *= ca
} }
// srcRegion can be delibarately empty when this is not needed in order to avoid unexpected // srcRegion can be delibarately empty when this is not needed in order to avoid unexpected
// performance issue (#1293). // performance issue (#1293).
@ -460,10 +476,14 @@ func (i *Image) drawTriangles(srcs [graphics.ShaderImageNum]*Image, vertices []f
srcRegion.Y += oyf srcRegion.Y += oyf
} }
} else { } else {
n := len(vertices) / graphics.VertexFloatNum n := len(vertices)
for i := 0; i < n; i++ { for i := 0; i < n; i += graphics.VertexFloatNum {
vertices[i*graphics.VertexFloatNum+0] += dx vertices[i] += dx
vertices[i*graphics.VertexFloatNum+1] += dy vertices[i+1] += dy
vertices[i+4] *= cr
vertices[i+5] *= cg
vertices[i+6] *= cb
vertices[i+7] *= ca
} }
} }

15
internal/mipmap/mipmap.go
View File

@ -121,21 +121,6 @@ func (m *Mipmap) DrawTriangles(srcs [graphics.ShaderImageNum]*Mipmap, vertices [
} }
} }
if !colorm.IsIdentity() && colorm.ScaleOnly() {
cr := colorm.At(0, 0)
cg := colorm.At(1, 1)
cb := colorm.At(2, 2)
ca := colorm.At(3, 3)
colorm = affine.ColorMIdentity{}
const n = graphics.VertexFloatNum
for i := 0; i < len(vertices)/n; i++ {
vertices[i*n+4] *= cr
vertices[i*n+5] *= cg
vertices[i*n+6] *= cb
vertices[i*n+7] *= ca
}
}
var s *buffered.Shader var s *buffered.Shader
if shader != nil { if shader != nil {
s = shader.shader s = shader.shader