V2.97.0 (#12)

* v2.97.0
- Fixed an issue where CenterOffset was not added when ShakeEnabled was true.
- Update go.mod deps
- Update Examples

* update readme and examples

Author: setanarut

README.md

@@ -24,6 +24,7 @@ A pseudo code:
 ```Go
 func (g *Game) Update() error {
   g.MainCamera.LookAt(player.X, player.Y)
+  playerDrawImageOptions.GeoM.Reset()
   // Apply all world-space `playerDrawImageOptions.GeoM{}` transform here
  }
 func (g *Game) Draw(screen *ebiten.Image) {
@@ -46,4 +47,12 @@ Run director example on your local machine
 
 ```console
 go run github.com/setanarut/kamera/v2/examples/director@latest
+```
+
+### Director (colorm package)
+
+Run director_colorm example on your local machine
+
+```console
+go run github.com/setanarut/kamera/v2/examples/director_colorm@latest
 ```

camera.go

@@ -223,6 +223,9 @@ func (cam *Camera) LookAt(targetX, targetY float64) {
 			cam.X = targetX
 			cam.Y = targetY
 		}
+	case None:
+		cam.X = targetX
+		cam.Y = targetY
 	default:
 		cam.X = targetX
 		cam.Y = targetY
@@ -255,6 +258,8 @@ func (cam *Camera) LookAt(targetX, targetY float64) {
 		cam.ActualAngle += cam.Angle
 		cam.X += cam.TraumaOffsetX
 		cam.Y += cam.TraumaOffsetY
+		cam.X += cam.CenterOffsetX
+		cam.Y += cam.CenterOffsetY
 
 		// tick
 		cam.Tick += cam.TickSpeed
@@ -329,6 +334,9 @@ func (cam *Camera) Reset() {
 
 const cameraStats = `TargetX: %.2f
 TargetY: %.2f
+Top-left X: %.2f
+Top-left Y: %.2f
+Size: %.2f %.2f
 Cam Rotation: %.2f
 Zoom factor: %.2f
 ShakeEnabled: %v
@@ -356,6 +364,9 @@ func (cam *Camera) String() string {
 		cameraStats,
 		cam.X-cam.CenterOffsetX,
 		cam.Y-cam.CenterOffsetY,
+		cam.X,
+		cam.Y,
+		cam.Width, cam.Height,
 		cam.ActualAngle,
 		cam.ZoomFactorShake,
 		cam.ShakeEnabled,

examples/director/main.go

@@ -33,8 +33,8 @@ Backspace     Reset camera
 R             Rotate                     
 `
 	w, h                                = 1024., 768.
-	camSpeed, zoomSpeedFactor, rotSpeed = 7.0, 1.02, 0.02
-	targetX, targetY                    = w / 2, h / 2
+	camSpeed, zoomSpeedFactor, rotSpeed = 2.0, 1.02, 0.02
+	targetX, targetY                    = 0., 0.
 	cam                                 = kamera.NewCamera(targetX, targetY, w, h)
 	dio                                 = &ebiten.DrawImageOptions{}
 	spriteSheet                         *ebiten.Image
@@ -44,17 +44,6 @@ type Game struct{}
 
 func (g *Game) Update() error {
 
-	aX, aY := Normalize(Axis())
-
-	targetX += aX * camSpeed
-	targetY += aY * camSpeed
-
-	cam.LookAt(targetX, targetY)
-
-	if inpututil.IsKeyJustPressed(ebiten.KeyG) {
-		cam.SetSize(500, 500)
-	}
-
 	if inpututil.IsKeyJustPressed(ebiten.KeyT) {
 		cam.AddTrauma(1.0)
 	}
@@ -67,7 +56,7 @@ func (g *Game) Update() error {
 	}
 
 	if inpututil.IsKeyJustPressed(ebiten.KeySpace) {
-		targetX, targetY = rand.Float64()*w, rand.Float64()*h
+		targetX, targetY = rand.Float64()*200, rand.Float64()*200
 	}
 
 	if inpututil.IsKeyJustPressed(ebiten.KeyTab) {
@@ -99,22 +88,26 @@ func (g *Game) Update() error {
 	}
 
 	if ebiten.IsKeyPressed(ebiten.KeyBackspace) {
-		targetX, targetY = w/2, h/2
+		targetX, targetY = 0, 0
+		cam.SetCenter(0, 0)
 		cam.Reset()
 	}
 
+	cam.LookAt(targetX, targetY)
+	dio.GeoM.Reset()
+	aX, aY := Normalize(Axis())
+	aX *= camSpeed
+	aY *= camSpeed
+
+	targetX += aX
+	targetY += aY
+
 	return nil
 }
 
 func (g *Game) Draw(screen *ebiten.Image) {
+	cam.Draw(spriteSheet, dio, screen)
 
-	for y := 0; y < 4; y++ {
-		for x := 0; x < 4; x++ {
-			dio.GeoM.Reset()
-			dio.GeoM.Translate(float64(x*300), float64(y*300))
-			cam.Draw(spriteSheet, dio, screen)
-		}
-	}
 	// Draw camera crosshair
 	cx, cy := float32(w/2), float32(h/2)
 	vector.StrokeLine(screen, cx-100, cy, cx+100, cy, 1, color.White, true)

examples/director_colorm/main.go

@@ -34,24 +34,17 @@ Backspace     Reset camera
 R             Rotate                     
 `
 	w, h                                = 1024., 768.
-	camSpeed, zoomSpeedFactor, rotSpeed = 7.0, 1.02, 0.02
-	targetX, targetY                    = w / 2, h / 2
+	camSpeed, zoomSpeedFactor, rotSpeed = 2.0, 1.02, 0.02
+	targetX, targetY                    = 0., 0.
 	cam                                 = kamera.NewCamera(targetX, targetY, w, h)
-	colormDIO                           = &colorm.DrawImageOptions{}
+	dio                                 = &colorm.DrawImageOptions{}
 	spriteSheet                         *ebiten.Image
 )
 
 type Game struct{}
 
 func (g *Game) Update() error {
 
-	aX, aY := Normalize(Axis())
-
-	targetX += aX * camSpeed
-	targetY += aY * camSpeed
-
-	cam.LookAt(targetX, targetY)
-
 	if inpututil.IsKeyJustPressed(ebiten.KeyT) {
 		cam.AddTrauma(1.0)
 	}
@@ -64,7 +57,7 @@ func (g *Game) Update() error {
 	}
 
 	if inpututil.IsKeyJustPressed(ebiten.KeySpace) {
-		targetX, targetY = rand.Float64()*w, rand.Float64()*h
+		targetX, targetY = rand.Float64()*200, rand.Float64()*200
 	}
 
 	if inpututil.IsKeyJustPressed(ebiten.KeyTab) {
@@ -96,27 +89,28 @@ func (g *Game) Update() error {
 	}
 
 	if ebiten.IsKeyPressed(ebiten.KeyBackspace) {
-		targetX, targetY = w/2, h/2
+		targetX, targetY = 0, 0
+		cam.SetCenter(0, 0)
 		cam.Reset()
 	}
 
+	cam.LookAt(targetX, targetY)
+	dio.GeoM.Reset()
+	aX, aY := Normalize(Axis())
+	aX *= camSpeed
+	aY *= camSpeed
+
+	targetX += aX
+	targetY += aY
+
 	return nil
 }
 
 func (g *Game) Draw(screen *ebiten.Image) {
-
 	var cm colorm.ColorM
 
 	cm.ChangeHSV(2, 1, 0.5)
-
-	// Draw backgorund tiles
-	for y := 0; y < 4; y++ {
-		for x := 0; x < 4; x++ {
-			colormDIO.GeoM.Reset()
-			colormDIO.GeoM.Translate(float64(x*300), float64(y*300))
-			cam.DrawWithColorM(spriteSheet, cm, colormDIO, screen)
-		}
-	}
+	cam.DrawWithColorM(spriteSheet, cm, dio, screen)
 
 	// Draw camera crosshair
 	cx, cy := float32(w/2), float32(h/2)