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

affine: Add ColorM.Equals

Browse Source
This commit is contained in:
Hajime Hoshi 2016-11-01 00:28:07 +09:00
parent d02c67a996
commit 4915531450
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/affine/colorm.go
View File

@ -75,6 +75,16 @@ func (c *ColorM) dim() int {
return ColorMDim return ColorMDim
} }
func (c *ColorM) Equals(other *ColorM) bool {
if c.values == "" {
c.values = colorMIdentityValue
}
if other.values == "" {
other.values = colorMIdentityValue
}
return c.values == other.values
}
// Concat multiplies a color matrix with the other color matrix. // Concat multiplies a color matrix with the other color matrix.
// This is same as muptiplying the matrix other and the matrix c in this order. // This is same as muptiplying the matrix other and the matrix c in this order.
func (c *ColorM) Concat(other ColorM) { func (c *ColorM) Concat(other ColorM) {

8
internal/graphics/command.go
View File

@ -235,12 +235,8 @@ func (c *drawImageCommand) isMergeable(other *drawImageCommand) bool {
if c.src != other.src { if c.src != other.src {
return false return false
} }
for i := 0; i < 4; i++ { if !c.color.Equals(&other.color) {
for j := 0; j < 5; j++ { return false
if c.color.Element(i, j) != other.color.Element(i, j) {
return false
}
}
} }
if c.mode != other.mode { if c.mode != other.mode {
return false return false