Upgrade firefly-go SDK

Author: Kalle Fagerberg

assets/assets.go

@@ -9,7 +9,7 @@ import (
 )
 
 var (
-	buf [1036376]byte
+	buf [1366914]byte
 
 	Field            firefly.Image
 	FireflyHighlight util.SpriteSheet
@@ -23,7 +23,7 @@ var (
 	RacingMapTrees    firefly.Image
 	RacingMapTreetops firefly.Image
 	RacingMapClouds   util.SpriteSheet
-	RacingMapMask     util.ExtImage
+	RacingMapMask     firefly.Image
 	RacingPlace       util.SpriteSheet
 	VictorySplash     util.SpriteSheet
 	DefeatSplash      util.SpriteSheet
@@ -71,7 +71,7 @@ func Load() {
 	RacingMapTrees = loader.LoadImage("racing-map-trees")
 	RacingMapTreetops = loader.LoadImage("racing-map-treetops")
 	RacingMapClouds = util.SplitImageByCount(loader.LoadImage("racing-map-clouds"), firefly.S(2, 1))
-	RacingMapMask = loader.LoadExtImage("racing-map-mask")
+	RacingMapMask = loader.LoadImage("racing-map-mask")
 	RacingPlace = util.SplitImageBySize(loader.LoadImage("racing-place"), firefly.S(28, 33))
 	VictorySplash = util.SplitImageByCount(loader.LoadImage("victory-splash"), firefly.S(3, 3))
 	DefeatSplash = util.SplitImageByCount(loader.LoadImage("defeat-splash"), firefly.S(3, 3))
@@ -105,7 +105,7 @@ func (loader *Loader) LoadFile(path string) firefly.File {
 	// https://github.com/firefly-zero/firefly-runtime/issues/7
 	fileSize := firefly.GetFileSize(path)
 	file := firefly.LoadFile(path, loader.buf[:fileSize])
-	written := len(file.Raw)
+	written := len(file.Bytes())
 	loader.used += written
 	loader.buf = loader.buf[written:]
 	return file
@@ -115,10 +115,6 @@ func (loader *Loader) LoadImage(path string) firefly.Image {
 	return loader.LoadFile(path).Image()
 }
 
-func (loader *Loader) LoadExtImage(path string) util.ExtImage {
-	return util.NewExtImage(loader.LoadFile(path))
-}
-
 func (loader *Loader) LoadFont(path string) firefly.Font {
 	return loader.LoadFile(path).Font()
 }

go.mod

@@ -4,6 +4,6 @@ go 1.25.5
 
 require (
 	github.com/applejag/firefly-go-math v0.2.0
-	github.com/firefly-zero/firefly-go v0.10.0
+	github.com/firefly-zero/firefly-go v0.11.0
 	github.com/orsinium-labs/tinymath v1.1.0
 )

go.sum

@@ -1,6 +1,6 @@
 github.com/applejag/firefly-go-math v0.2.0 h1:IiDXTbHpLDU8LR8LP3RKGpyUA59mQp2HwAdkDyLLask=
 github.com/applejag/firefly-go-math v0.2.0/go.mod h1:XbmMPAO9vDIYvwAJIPlY6HE0m1RZ3tXgn3GP9agFXos=
-github.com/firefly-zero/firefly-go v0.10.0 h1:CFEVPrXdLCZYgMna2DMncZ+lR01xg3danlXtIw+dJkE=
-github.com/firefly-zero/firefly-go v0.10.0/go.mod h1:+X/XGyPdES51OESkV8NSf1mszEBZionoROM7x2pBofw=
+github.com/firefly-zero/firefly-go v0.11.0 h1:+Y5EE0sXxjylZo9H3U3+VpPU1bCXdq0q7xnrpn207pg=
+github.com/firefly-zero/firefly-go v0.11.0/go.mod h1:osit9/kxcqSUBVozePb7LNzOHy3FQ7ii1Z0mL82pWu0=
 github.com/orsinium-labs/tinymath v1.1.0 h1:KomdsyLHB7vE3f1nRAJF2dyf1m/gnM2HxfTeV1vS5UA=
 github.com/orsinium-labs/tinymath v1.1.0/go.mod h1:WPXX6ei3KSXG7JfA03a+ekCYaY9SWN4I+JRl2p6ck+A=

pkg/scenes/racebattle/player.go

@@ -119,7 +119,7 @@ func (f *Firefly) Move(to ffmath.Vec) {
 	}
 	for delta.RadiusSquared() > 0.01 {
 		to = f.Pos.Add(delta)
-		switch assets.RacingMapMask.GetColorAt(to.Point()) {
+		switch assets.RacingMapMask.GetPixel(to.Point()) {
 		case firefly.ColorWhite:
 			f.Pos = to
 			return

pkg/state/state.go

@@ -97,12 +97,12 @@ func (g *GameState) LoadSave() bool {
 		return false
 	}
 	g.Reset()
-	if err := g.UnmarshalBinary(file.Raw); err != nil {
+	if err := g.UnmarshalBinary(file); err != nil {
 		firefly.LogError("failed to load save: " + err.Error())
 		return false
 	}
 
-	firefly.LogDebug("loaded saved game, size: " + strconv.Itoa(len(file.Raw)) + " B")
+	firefly.LogDebug("loaded saved game, size: " + strconv.Itoa(len(file)) + " B")
 	return true
 }