mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 19:28:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/affine: Refactoring: UnsafeScaleElements -> scaleElements

Browse Source
This commit is contained in:
Hajime Hoshi 2021-09-03 23:56:17 +09:00
parent 3406430956
commit e5c051a437
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
internal/affine/colorm.go
View File

@ -44,7 +44,6 @@ var (
type ColorM interface { type ColorM interface {
IsIdentity() bool IsIdentity() bool
ScaleOnly() bool ScaleOnly() bool
UnsafeScaleElements() *[4]float32
UnsafeElements() (*[16]float32, *[4]float32) UnsafeElements() (*[16]float32, *[4]float32)
Apply(clr color.Color) color.Color Apply(clr color.Color) color.Color
@ -67,6 +66,8 @@ type ColorM interface {
// Translate translates the matrix by (r, g, b, a). // Translate translates the matrix by (r, g, b, a).
Translate(r, g, b, a float32) ColorM Translate(r, g, b, a float32) ColorM
scaleElements() (r, g, b, a float32)
} }
func ColorMString(c ColorM) string { func ColorMString(c ColorM) string {
@ -164,16 +165,16 @@ func (c *colorMImplBodyTranslate) ScaleOnly() bool {
return true return true
} }
func (c ColorMIdentity) UnsafeScaleElements() *[4]float32 { func (c ColorMIdentity) scaleElements() (r, g, b, a float32) {
return &[...]float32{1, 1, 1, 1} return 1, 1, 1, 1
} }
func (c colorMImplScale) UnsafeScaleElements() *[4]float32 { func (c colorMImplScale) scaleElements() (r, g, b, a float32) {
return &c.scale return c.scale[0], c.scale[1], c.scale[2], c.scale[3]
} }
func (c *colorMImplBodyTranslate) UnsafeScaleElements() *[4]float32 { func (c *colorMImplBodyTranslate) scaleElements() (r, g, b, a float32) {
return &[...]float32{c.body[0], c.body[5], c.body[10], c.body[15]} return c.body[0], c.body[5], c.body[10], c.body[15]
} }
func colorToFloat32s(clr color.Color) (float32, float32, float32, float32) { func colorToFloat32s(clr color.Color) (float32, float32, float32, float32) {
@ -452,10 +453,19 @@ func (c colorMImplScale) Equals(other ColorM) bool {
if !other.ScaleOnly() { if !other.ScaleOnly() {
return false return false
} }
for i, s := range other.UnsafeScaleElements() {
if c.scale[i] != s { r, g, b, a := other.scaleElements()
return false if c.scale[0] != r {
} return false
}
if c.scale[1] != g {
return false
}
if c.scale[2] != b {
return false
}
if c.scale[3] != a {
return false
} }
return true return true
} }
@ -477,8 +487,7 @@ func (c colorMImplScale) Concat(other ColorM) ColorM {
} }
if other.ScaleOnly() { if other.ScaleOnly() {
s := other.UnsafeScaleElements() return c.Scale(other.scaleElements())
return c.Scale(s[0], s[1], s[2], s[3])
} }
lhsb, lhst := other.UnsafeElements() lhsb, lhst := other.UnsafeElements()
@ -535,9 +544,9 @@ func (c colorMImplScale) Scale(r, g, b, a float32) ColorM {
func (c *colorMImplBodyTranslate) Scale(r, g, b, a float32) ColorM { func (c *colorMImplBodyTranslate) Scale(r, g, b, a float32) ColorM {
if c.ScaleOnly() { if c.ScaleOnly() {
s := c.UnsafeScaleElements() sr, sg, sb, sa := c.scaleElements()
return colorMImplScale{ return colorMImplScale{
scale: [...]float32{r * s[0], g * s[1], b * s[2], a * s[3]}, scale: [...]float32{r * sr, g * sg, b * sb, a * sa},
} }
} }