Fixed: cam.drawOptionsCM.GeoM.Reset()

setanarut · setanarut · commit e06816687b27 · 2024-12-17T20:45:39.000+03:00
diff --git a/camera.go b/camera.go
@@ -369,7 +369,7 @@ func (cam *Camera) DrawWithColorM(worldObject *ebiten.Image, cm colorm.ColorM, w
 	cam.drawOptionsCM = worldObjectOps
 	cam.ApplyCameraTransform(&cam.drawOptionsCM.GeoM)
 	colorm.DrawImage(screen, worldObject, cm, worldObjectOps)
-	cam.drawOptions.GeoM.Reset()
+	cam.drawOptionsCM.GeoM.Reset()
 }
 
 type ShakeOptions struct {
diff --git a/go.mod b/go.mod
@@ -20,5 +20,6 @@ require golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
 
 retract (
 	v2.6.0 // nil pointer dereference (jpg) in demo code.
+	v2.93.0 // GeoM.Reset() bug.
 	[v2.0.0, v2.2.0]
 )

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ func (cam Camera) DrawWithColorM(worldObject ebiten.Image, cm colorm.ColorM, w`
`369`	`369`	`cam.drawOptionsCM = worldObjectOps`
`370`	`370`	`cam.ApplyCameraTransform(&cam.drawOptionsCM.GeoM)`
`371`	`371`	`colorm.DrawImage(screen, worldObject, cm, worldObjectOps)`
`372`		`- cam.drawOptions.GeoM.Reset()`
	`372`	`+ cam.drawOptionsCM.GeoM.Reset()`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`type ShakeOptions struct {`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,6 @@ require golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect`
`20`	`20`
`21`	`21`	`retract (`
`22`	`22`	`v2.6.0 // nil pointer dereference (jpg) in demo code.`
	`23`	`+ v2.93.0 // GeoM.Reset() bug.`
`23`	`24`	`[v2.0.0, v2.2.0]`
`24`	`25`	`)`