mirror of
https://github.com/hajimehoshi/ebiten.git
synced 2024-12-24 10:48:53 +01:00
affine: User nillable pattern for ColorM
This commit is contained in:
parent
1b39c05fd4
commit
8c8e512059
16
colorm.go
16
colorm.go
@ -32,12 +32,12 @@ const ColorMDim = affine.ColorMDim
|
||||
//
|
||||
// The initial value is identity.
|
||||
type ColorM struct {
|
||||
impl affine.ColorM
|
||||
impl *affine.ColorM
|
||||
}
|
||||
|
||||
// Reset resets the ColorM as identity.
|
||||
func (c *ColorM) Reset() {
|
||||
c.impl.Reset()
|
||||
c.impl = nil
|
||||
}
|
||||
|
||||
// Apply pre-multiplies a vector (r, g, b, a, 1) by the matrix
|
||||
@ -50,23 +50,23 @@ func (c *ColorM) Apply(clr color.Color) color.Color {
|
||||
// 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.
|
||||
func (c *ColorM) Concat(other ColorM) {
|
||||
c.impl.Concat(&other.impl)
|
||||
c.impl = c.impl.Concat(other.impl)
|
||||
}
|
||||
|
||||
// Add is deprecated as of 1.5.0-alpha.
|
||||
// Note that this doesn't make sense as an operation for affine matrices.
|
||||
func (c *ColorM) Add(other ColorM) {
|
||||
c.impl.Add(other.impl)
|
||||
c.impl = c.impl.Add(other.impl)
|
||||
}
|
||||
|
||||
// Scale scales the matrix by (r, g, b, a).
|
||||
func (c *ColorM) Scale(r, g, b, a float64) {
|
||||
c.impl.Scale(float32(r), float32(g), float32(b), float32(a))
|
||||
c.impl = c.impl.Scale(float32(r), float32(g), float32(b), float32(a))
|
||||
}
|
||||
|
||||
// Translate translates the matrix by (r, g, b, a).
|
||||
func (c *ColorM) Translate(r, g, b, a float64) {
|
||||
c.impl.Translate(float32(r), float32(g), float32(b), float32(a))
|
||||
c.impl = c.impl.Translate(float32(r), float32(g), float32(b), float32(a))
|
||||
}
|
||||
|
||||
// RotateHue rotates the hue.
|
||||
@ -82,7 +82,7 @@ func (c *ColorM) RotateHue(theta float64) {
|
||||
//
|
||||
// This conversion uses RGB to/from YCrCb conversion.
|
||||
func (c *ColorM) ChangeHSV(hueTheta float64, saturationScale float64, valueScale float64) {
|
||||
c.impl.ChangeHSV(hueTheta, float32(saturationScale), float32(valueScale))
|
||||
c.impl = c.impl.ChangeHSV(hueTheta, float32(saturationScale), float32(valueScale))
|
||||
}
|
||||
|
||||
// Element returns a value of a matrix at (i, j).
|
||||
@ -96,7 +96,7 @@ func (c *ColorM) Element(i, j int) float64 {
|
||||
|
||||
// SetElement sets an element at (i, j).
|
||||
func (c *ColorM) SetElement(i, j int, element float64) {
|
||||
c.impl.SetElement(i, j, float32(element))
|
||||
c.impl = c.impl.SetElement(i, j, float32(element))
|
||||
}
|
||||
|
||||
// Monochrome is deprecated as of 1.6.0-alpha. Use ChangeHSV(0, 0, 1) instead.
|
||||
|
2
image.go
2
image.go
@ -212,7 +212,7 @@ func (i *Image) DrawImage(img *Image, options *DrawImageOptions) error {
|
||||
filter = graphics.Filter(img.filter)
|
||||
}
|
||||
|
||||
i.restorable.DrawImage(img.restorable, sx0, sy0, sx1, sy1, options.GeoM.impl, &options.ColorM.impl, mode, filter)
|
||||
i.restorable.DrawImage(img.restorable, sx0, sy0, sx1, sy1, options.GeoM.impl, options.ColorM.impl, mode, filter)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
@ -49,11 +49,6 @@ type ColorM struct {
|
||||
translate []float32
|
||||
}
|
||||
|
||||
func (c *ColorM) Reset() {
|
||||
c.body = nil
|
||||
c.translate = nil
|
||||
}
|
||||
|
||||
func clamp(x float32) float32 {
|
||||
if x > 1 {
|
||||
return 1
|
||||
@ -65,7 +60,7 @@ func clamp(x float32) float32 {
|
||||
}
|
||||
|
||||
func (c *ColorM) Apply(clr color.Color) color.Color {
|
||||
if c.body == nil {
|
||||
if c == nil || c.body == nil {
|
||||
return clr
|
||||
}
|
||||
r, g, b, a := clr.RGBA()
|
||||
@ -96,51 +91,58 @@ func (c *ColorM) Apply(clr color.Color) color.Color {
|
||||
}
|
||||
|
||||
func (c *ColorM) UnsafeElements() ([]float32, []float32) {
|
||||
if c.body == nil {
|
||||
c.body = colorMIdentityBody
|
||||
c.translate = colorMIdentityTranslate
|
||||
if c == nil || c.body == nil {
|
||||
return colorMIdentityBody, colorMIdentityTranslate
|
||||
}
|
||||
return c.body, c.translate
|
||||
}
|
||||
|
||||
// SetElement sets an element at (i, j).
|
||||
func (c *ColorM) SetElement(i, j int, element float32) {
|
||||
if c.body == nil {
|
||||
c.body = colorMIdentityBody
|
||||
c.translate = colorMIdentityTranslate
|
||||
func (c *ColorM) SetElement(i, j int, element float32) *ColorM {
|
||||
newC := &ColorM{
|
||||
body: make([]float32, 16),
|
||||
translate: make([]float32, 4),
|
||||
}
|
||||
if c == nil || c.body == nil {
|
||||
copy(newC.body, colorMIdentityBody)
|
||||
copy(newC.translate, colorMIdentityTranslate)
|
||||
} else {
|
||||
copy(newC.body, c.body)
|
||||
copy(newC.translate, c.translate)
|
||||
}
|
||||
if j < (ColorMDim - 1) {
|
||||
es := make([]float32, len(c.body))
|
||||
copy(es, c.body)
|
||||
es[i+j*(ColorMDim-1)] = element
|
||||
c.body = es
|
||||
newC.body[i+j*(ColorMDim-1)] = element
|
||||
} else {
|
||||
es := make([]float32, len(c.translate))
|
||||
copy(es, c.translate)
|
||||
es[i] = element
|
||||
c.translate = es
|
||||
newC.translate[i] = element
|
||||
}
|
||||
return newC
|
||||
}
|
||||
|
||||
func (c *ColorM) Equals(other *ColorM) bool {
|
||||
if c.body == nil {
|
||||
if other.body == nil {
|
||||
if (c == nil || c.body == nil) && (other == nil || other.body == nil) {
|
||||
return true
|
||||
}
|
||||
c.body = colorMIdentityBody
|
||||
c.translate = colorMIdentityTranslate
|
||||
|
||||
lhsb := colorMIdentityBody
|
||||
lhst := colorMIdentityTranslate
|
||||
rhsb := colorMIdentityBody
|
||||
rhst := colorMIdentityTranslate
|
||||
if other != nil {
|
||||
lhsb = other.body
|
||||
lhst = other.translate
|
||||
}
|
||||
if other.body == nil {
|
||||
other.body = colorMIdentityBody
|
||||
other.translate = colorMIdentityTranslate
|
||||
if c != nil {
|
||||
rhsb = c.body
|
||||
rhst = c.translate
|
||||
}
|
||||
for i := range c.body {
|
||||
if c.body[i] != other.body[i] {
|
||||
|
||||
for i := range lhsb {
|
||||
if lhsb[i] != rhsb[i] {
|
||||
return false
|
||||
}
|
||||
}
|
||||
for i := range c.translate {
|
||||
if c.translate[i] != other.translate[i] {
|
||||
for i := range lhst {
|
||||
if lhst[i] != rhst[i] {
|
||||
return false
|
||||
}
|
||||
}
|
||||
@ -149,67 +151,81 @@ func (c *ColorM) Equals(other *ColorM) bool {
|
||||
|
||||
// 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.
|
||||
func (c *ColorM) Concat(other *ColorM) {
|
||||
if c.body == nil {
|
||||
c.body = colorMIdentityBody
|
||||
c.translate = colorMIdentityTranslate
|
||||
func (c *ColorM) Concat(other *ColorM) *ColorM {
|
||||
if c == nil || c.body == nil {
|
||||
return other
|
||||
}
|
||||
if other.body == nil {
|
||||
other.body = colorMIdentityBody
|
||||
other.translate = colorMIdentityTranslate
|
||||
if other == nil || other.body == nil {
|
||||
return c
|
||||
}
|
||||
|
||||
lhsb := colorMIdentityBody
|
||||
lhst := colorMIdentityTranslate
|
||||
rhsb := colorMIdentityBody
|
||||
rhst := colorMIdentityTranslate
|
||||
if other != nil {
|
||||
lhsb = other.body
|
||||
lhst = other.translate
|
||||
}
|
||||
if c != nil {
|
||||
rhsb = c.body
|
||||
rhst = c.translate
|
||||
}
|
||||
|
||||
return &ColorM{
|
||||
// TODO: This is a temporary hack to calculate multiply of transposed matrices.
|
||||
// Fix mulSquare implmentation and swap the arguments.
|
||||
c.body = mulSquare(c.body, other.body, ColorMDim-1)
|
||||
|
||||
lhsb := other.body
|
||||
lhst := other.translate
|
||||
rhst := c.translate
|
||||
c.translate = []float32{
|
||||
body: mulSquare(rhsb, lhsb, ColorMDim-1),
|
||||
translate: []float32{
|
||||
lhsb[0]*rhst[0] + lhsb[4]*rhst[1] + lhsb[8]*rhst[2] + lhsb[12]*rhst[3] + lhst[0],
|
||||
lhsb[1]*rhst[0] + lhsb[5]*rhst[1] + lhsb[9]*rhst[2] + lhsb[13]*rhst[3] + lhst[1],
|
||||
lhsb[2]*rhst[0] + lhsb[6]*rhst[1] + lhsb[10]*rhst[2] + lhsb[14]*rhst[3] + lhst[2],
|
||||
lhsb[3]*rhst[0] + lhsb[7]*rhst[1] + lhsb[11]*rhst[2] + lhsb[15]*rhst[3] + lhst[3],
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// Add is deprecated.
|
||||
func (c *ColorM) Add(other ColorM) {
|
||||
// Implementation is just for backward compatibility.
|
||||
if c.body == nil {
|
||||
c.body = colorMIdentityBody
|
||||
c.translate = colorMIdentityTranslate
|
||||
func (c *ColorM) Add(other *ColorM) *ColorM {
|
||||
lhsb := colorMIdentityBody
|
||||
lhst := colorMIdentityTranslate
|
||||
rhsb := colorMIdentityBody
|
||||
rhst := colorMIdentityTranslate
|
||||
if other != nil {
|
||||
lhsb = other.body
|
||||
lhst = other.translate
|
||||
}
|
||||
if other.body == nil {
|
||||
other.body = colorMIdentityBody
|
||||
other.translate = colorMIdentityTranslate
|
||||
if c != nil {
|
||||
rhsb = c.body
|
||||
rhst = c.translate
|
||||
}
|
||||
|
||||
body := make([]float32, len(c.body))
|
||||
for i := range c.body {
|
||||
body[i] = c.body[i] + other.body[i]
|
||||
newC := &ColorM{
|
||||
body: make([]float32, 16),
|
||||
translate: make([]float32, 4),
|
||||
}
|
||||
for i := range lhsb {
|
||||
newC.body[i] = lhsb[i] + rhsb[i]
|
||||
}
|
||||
for i := range lhst {
|
||||
newC.translate[i] = lhst[i] + rhst[i]
|
||||
}
|
||||
|
||||
translate := make([]float32, len(c.translate))
|
||||
for i := range c.translate {
|
||||
translate[i] = c.translate[i] + other.translate[i]
|
||||
}
|
||||
|
||||
c.body = body
|
||||
c.translate = translate
|
||||
return newC
|
||||
}
|
||||
|
||||
// Scale scales the matrix by (r, g, b, a).
|
||||
func (c *ColorM) Scale(r, g, b, a float32) {
|
||||
if c.body == nil {
|
||||
c.body = []float32{
|
||||
func (c *ColorM) Scale(r, g, b, a float32) *ColorM {
|
||||
if c == nil || c.body == nil {
|
||||
return &ColorM{
|
||||
body: []float32{
|
||||
r, 0, 0, 0,
|
||||
0, g, 0, 0,
|
||||
0, 0, b, 0,
|
||||
0, 0, 0, a,
|
||||
},
|
||||
translate: colorMIdentityTranslate,
|
||||
}
|
||||
c.translate = colorMIdentityTranslate
|
||||
return
|
||||
}
|
||||
es := make([]float32, len(c.body))
|
||||
copy(es, c.body)
|
||||
@ -219,22 +235,25 @@ func (c *ColorM) Scale(r, g, b, a float32) {
|
||||
es[i*(ColorMDim-1)+2] *= b
|
||||
es[i*(ColorMDim-1)+3] *= a
|
||||
}
|
||||
c.body = es
|
||||
|
||||
c.translate = []float32{
|
||||
return &ColorM{
|
||||
body: es,
|
||||
translate: []float32{
|
||||
c.translate[0] * r,
|
||||
c.translate[1] * g,
|
||||
c.translate[2] * b,
|
||||
c.translate[3] * a,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// Translate translates the matrix by (r, g, b, a).
|
||||
func (c *ColorM) Translate(r, g, b, a float32) {
|
||||
if c.body == nil {
|
||||
c.body = colorMIdentityBody
|
||||
c.translate = []float32{r, g, b, a}
|
||||
return
|
||||
func (c *ColorM) Translate(r, g, b, a float32) *ColorM {
|
||||
if c == nil || c.body == nil {
|
||||
return &ColorM{
|
||||
body: colorMIdentityBody,
|
||||
translate: []float32{r, g, b, a},
|
||||
}
|
||||
}
|
||||
es := make([]float32, len(c.translate))
|
||||
copy(es, c.translate)
|
||||
@ -242,7 +261,10 @@ func (c *ColorM) Translate(r, g, b, a float32) {
|
||||
es[1] += g
|
||||
es[2] += b
|
||||
es[3] += a
|
||||
c.translate = es
|
||||
return &ColorM{
|
||||
body: c.body,
|
||||
translate: es,
|
||||
}
|
||||
}
|
||||
|
||||
var (
|
||||
@ -251,7 +273,7 @@ var (
|
||||
// Cb: [-0.5 - 0.5]
|
||||
// Cr: [-0.5 - 0.5]
|
||||
|
||||
rgbToYCbCr = ColorM{
|
||||
rgbToYCbCr = &ColorM{
|
||||
body: []float32{
|
||||
0.2990, -0.1687, 0.5000, 0,
|
||||
0.5870, -0.3313, -0.4187, 0,
|
||||
@ -260,7 +282,7 @@ var (
|
||||
},
|
||||
translate: []float32{0, 0, 0, 0},
|
||||
}
|
||||
yCbCrToRgb = ColorM{
|
||||
yCbCrToRgb = &ColorM{
|
||||
body: []float32{
|
||||
1, 1, 1, 0,
|
||||
0, -0.34414, 1.77200, 0,
|
||||
@ -277,11 +299,11 @@ var (
|
||||
// valueScale is a value to scale value (a.k.a. brightness).
|
||||
//
|
||||
// This conversion uses RGB to/from YCrCb conversion.
|
||||
func (c *ColorM) ChangeHSV(hueTheta float64, saturationScale float32, valueScale float32) {
|
||||
func (c *ColorM) ChangeHSV(hueTheta float64, saturationScale float32, valueScale float32) *ColorM {
|
||||
sin, cos := math.Sincos(hueTheta)
|
||||
s32, c32 := float32(sin), float32(cos)
|
||||
c.Concat(&rgbToYCbCr)
|
||||
c.Concat(&ColorM{
|
||||
c = c.Concat(rgbToYCbCr)
|
||||
c = c.Concat(&ColorM{
|
||||
body: []float32{
|
||||
1, 0, 0, 0,
|
||||
0, c32, s32, 0,
|
||||
@ -292,6 +314,7 @@ func (c *ColorM) ChangeHSV(hueTheta float64, saturationScale float32, valueScale
|
||||
})
|
||||
s := saturationScale
|
||||
v := valueScale
|
||||
c.Scale(v, s*v, s*v, 1)
|
||||
c.Concat(&yCbCrToRgb)
|
||||
c = c.Scale(v, s*v, s*v, 1)
|
||||
c = c.Concat(yCbCrToRgb)
|
||||
return c
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ func (q *commandQueue) EnqueueDrawImageCommand(dst, src *Image, vertices []float
|
||||
dst: dst,
|
||||
src: src,
|
||||
verticesNum: len(vertices),
|
||||
color: *clr,
|
||||
color: clr,
|
||||
mode: mode,
|
||||
filter: filter,
|
||||
}
|
||||
@ -188,7 +188,7 @@ type drawImageCommand struct {
|
||||
dst *Image
|
||||
src *Image
|
||||
verticesNum int
|
||||
color affine.ColorM
|
||||
color *affine.ColorM
|
||||
mode opengl.CompositeMode
|
||||
filter Filter
|
||||
}
|
||||
|
@ -248,7 +248,7 @@ func areSameFloat32Array(a, b []float32) bool {
|
||||
}
|
||||
|
||||
// useProgram uses the program (programTexture).
|
||||
func (s *openGLState) useProgram(proj []float32, texture opengl.Texture, dst, src *Image, colorM affine.ColorM, filter Filter) {
|
||||
func (s *openGLState) useProgram(proj []float32, texture opengl.Texture, dst, src *Image, colorM *affine.ColorM, filter Filter) {
|
||||
c := opengl.GetContext()
|
||||
|
||||
var program opengl.Program
|
||||
|
@ -33,7 +33,7 @@ const MaxImageSize = graphics.MaxImageSize
|
||||
type drawImageHistoryItem struct {
|
||||
image *Image
|
||||
vertices []float32
|
||||
colorm affine.ColorM
|
||||
colorm *affine.ColorM
|
||||
mode opengl.CompositeMode
|
||||
filter graphics.Filter
|
||||
}
|
||||
@ -131,7 +131,7 @@ var (
|
||||
)
|
||||
|
||||
func init() {
|
||||
clearColorM.Scale(0, 0, 0, 0)
|
||||
clearColorM = clearColorM.Scale(0, 0, 0, 0)
|
||||
}
|
||||
|
||||
// clearIfVolatile clears the image if the image is volatile.
|
||||
@ -207,7 +207,7 @@ func (i *Image) appendDrawImageHistory(image *Image, vertices []float32, colorm
|
||||
item := &drawImageHistoryItem{
|
||||
image: image,
|
||||
vertices: vertices,
|
||||
colorm: *colorm,
|
||||
colorm: colorm,
|
||||
mode: mode,
|
||||
filter: filter,
|
||||
}
|
||||
@ -332,7 +332,7 @@ func (i *Image) restore() error {
|
||||
if c.image.hasDependency() {
|
||||
panic("not reached")
|
||||
}
|
||||
gimg.DrawImage(c.image.image, c.vertices, &c.colorm, c.mode, c.filter)
|
||||
gimg.DrawImage(c.image.image, c.vertices, c.colorm, c.mode, c.filter)
|
||||
}
|
||||
i.image = gimg
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user