mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/graphicscommand: better strings for ColorM

Browse Source
This commit is contained in:
Hajime Hoshi 2022-06-30 11:13:02 +09:00
parent c8f0bf52e4
commit a9c9e18ff4
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
colorm.go
View File

@ -46,7 +46,7 @@ func (c *ColorM) affineColorM() affine.ColorM {
// String returns a string representation of ColorM. // String returns a string representation of ColorM.
func (c *ColorM) String() string { func (c *ColorM) String() string {
return affine.ColorMString(c.affineColorM()) return c.affineColorM().String()
} }
// Reset resets the ColorM as identity. // Reset resets the ColorM as identity.

16
internal/affine/colorm.go
View File

@ -42,6 +42,8 @@ var (
// Before applying a matrix, a color is un-multiplied, and after applying the matrix, // Before applying a matrix, a color is un-multiplied, and after applying the matrix,
// the color is multiplied again. // the color is multiplied again.
type ColorM interface { type ColorM interface {
String() string
IsIdentity() bool IsIdentity() bool
ScaleOnly() bool ScaleOnly() bool
At(i, j int) float32 At(i, j int) float32
@ -71,7 +73,7 @@ type ColorM interface {
scaleElements() (r, g, b, a float32) scaleElements() (r, g, b, a float32)
} }
func ColorMString(c ColorM) string { func colorMString(c ColorM) string {
var b [16]float32 var b [16]float32
var t [4]float32 var t [4]float32
c.Elements(&b, &t) c.Elements(&b, &t)
@ -93,6 +95,18 @@ type colorMImplBodyTranslate struct {
translate [4]float32 translate [4]float32
} }
func (c ColorMIdentity) String() string {
return "Identity[]"
}
func (c colorMImplScale) String() string {
return fmt.Sprintf("Scale[%f, %f, %f, %f]", c.scale[0], c.scale[1], c.scale[2], c.scale[3])
}
func (c *colorMImplBodyTranslate) String() string {
return colorMString(c)
}
func clamp(x float32) float32 { func clamp(x float32) float32 {
if x > 1 { if x > 1 {
return 1 return 1

2
internal/graphicscommand/command.go
View File

@ -381,7 +381,7 @@ func (c *drawTrianglesCommand) String() string {
r := fmt.Sprintf("(x:%d, y:%d, width:%d, height:%d)", r := fmt.Sprintf("(x:%d, y:%d, width:%d, height:%d)",
int(c.dstRegion.X), int(c.dstRegion.Y), int(c.dstRegion.Width), int(c.dstRegion.Height)) int(c.dstRegion.X), int(c.dstRegion.Y), int(c.dstRegion.Width), int(c.dstRegion.Height))
return fmt.Sprintf("draw-triangles: dst: %s <- src: [%s], dst region: %s, num of indices: %d, colorm: %v, mode: %s, filter: %s, address: %s, even-odd: %t", dst, strings.Join(srcstrs[:], ", "), r, c.nindices, c.color, mode, filter, address, c.evenOdd) return fmt.Sprintf("draw-triangles: dst: %s <- src: [%s], dst region: %s, num of indices: %d, colorm: %s, mode: %s, filter: %s, address: %s, even-odd: %t", dst, strings.Join(srcstrs[:], ", "), r, c.nindices, c.color, mode, filter, address, c.evenOdd)
} }
// Exec executes the drawTrianglesCommand. // Exec executes the drawTrianglesCommand.