refactoring finished

internal/video/pattern.go

@@ -1,6 +1,11 @@
 package video
 
-import "sort"
+import (
+	"fmt"
+	"sort"
+
+	"mxl-pattern-generator/kernels"
+)
 
 type PatternInfo struct {
 	Name        string
@@ -9,52 +14,60 @@ type PatternInfo struct {
 
 type pattern struct {
 	PatternInfo
-	kernelPath string
+	kernelSource string
 }
 
 var patterns = map[string]pattern{
 	"ebu75": {
-		PatternInfo: PatternInfo{Name: "ebu75", Description: "EBU 75% Color Bar Signal"},
-		kernelPath:  "kernels/static/ebu75.wgsl",
+		PatternInfo:  PatternInfo{Name: "ebu75", Description: "EBU 75% Color Bar Signal"},
+		kernelSource: mustReadKernel("static/ebu75.wgsl"),
 	},
 	"ebu75-move": {
-		PatternInfo: PatternInfo{Name: "ebu75-move", Description: "EBU 75% Color Bar Signal with moving square"},
-		kernelPath:  "kernels/dynamic/ebu75.wgsl",
+		PatternInfo:  PatternInfo{Name: "ebu75-move", Description: "EBU 75% Color Bar Signal with moving square"},
+		kernelSource: mustReadKernel("dynamic/ebu75.wgsl"),
 	},
 	"ebu100": {
-		PatternInfo: PatternInfo{Name: "ebu100", Description: "EBU 100% Color Bar Signal"},
-		kernelPath:  "kernels/static/ebu100.wgsl",
+		PatternInfo:  PatternInfo{Name: "ebu100", Description: "EBU 100% Color Bar Signal"},
+		kernelSource: mustReadKernel("static/ebu100.wgsl"),
 	},
 	"ebu100-move": {
-		PatternInfo: PatternInfo{Name: "ebu100-move", Description: "EBU 100% Color Bar Signal with moving square"},
-		kernelPath:  "kernels/dynamic/ebu100.wgsl",
+		PatternInfo:  PatternInfo{Name: "ebu100-move", Description: "EBU 100% Color Bar Signal with moving square"},
+		kernelSource: mustReadKernel("dynamic/ebu100.wgsl"),
 	},
 	"smpte": {
-		PatternInfo: PatternInfo{Name: "smpte", Description: "SMPTE RP-219 Color Bar Signal"},
-		kernelPath:  "kernels/static/smpteBars.wgsl",
+		PatternInfo:  PatternInfo{Name: "smpte", Description: "SMPTE RP-219 Color Bar Signal"},
+		kernelSource: mustReadKernel("static/smpteBars.wgsl"),
 	},
 	"smpte-move": {
-		PatternInfo: PatternInfo{Name: "smpte-move", Description: "SMPTE RP-219 Color Bar Signal with moving square"},
-		kernelPath:  "kernels/dynamic/smpteBars.wgsl",
+		PatternInfo:  PatternInfo{Name: "smpte-move", Description: "SMPTE RP-219 Color Bar Signal with moving square"},
+		kernelSource: mustReadKernel("dynamic/smpteBars.wgsl"),
 	},
 	"gray-bars": {
-		PatternInfo: PatternInfo{Name: "gray-bars", Description: "13-step grayscale bars (Y 64..940)"},
-		kernelPath:  "kernels/static/yBars.wgsl",
+		PatternInfo:  PatternInfo{Name: "gray-bars", Description: "13-step grayscale bars (Y 64..940)"},
+		kernelSource: mustReadKernel("static/yBars.wgsl"),
 	},
 	"gray-bars-move": {
-		PatternInfo: PatternInfo{Name: "gray-bars-move", Description: "13-step grayscale bars (Y 64..940) with moving square"},
-		kernelPath:  "kernels/dynamic/yBars.wgsl",
+		PatternInfo:  PatternInfo{Name: "gray-bars-move", Description: "13-step grayscale bars (Y 64..940) with moving square"},
+		kernelSource: mustReadKernel("dynamic/yBars.wgsl"),
 	},
 	"gray-ramp": {
-		PatternInfo: PatternInfo{Name: "gray-ramp", Description: "Y gradient (black -> 100% white)"},
-		kernelPath:  "kernels/static/yRamp.wgsl",
+		PatternInfo:  PatternInfo{Name: "gray-ramp", Description: "Y gradient (black -> 100% white)"},
+		kernelSource: mustReadKernel("static/yRamp.wgsl"),
 	},
 	"gray-ramp-move": {
-		PatternInfo: PatternInfo{Name: "gray-ramp-move", Description: "Y gradient with moving square"},
-		kernelPath:  "kernels/dynamic/yRamp.wgsl",
+		PatternInfo:  PatternInfo{Name: "gray-ramp-move", Description: "Y gradient with moving square"},
+		kernelSource: mustReadKernel("dynamic/yRamp.wgsl"),
 	},
 }
 
+func mustReadKernel(name string) string {
+	source, err := kernels.Read(name)
+	if err != nil {
+		panic(fmt.Sprintf("read embedded video kernel %q: %v", name, err))
+	}
+	return string(source)
+}
+
 func HasPattern(name string) bool {
 	_, ok := patterns[name]
 	return ok

internal/video/pattern_test.go

@@ -40,8 +40,8 @@ func TestPatternRegistryKeysMatchNames(t *testing.T) {
 		if pattern.Name != name {
 			t.Errorf("pattern map key %q does not match pattern name %q", name, pattern.Name)
 		}
-		if pattern.kernelPath == "" {
-			t.Errorf("pattern %q has an empty kernel path", name)
+		if pattern.kernelSource == "" {
+			t.Errorf("pattern %q has empty kernel source", name)
 		}
 	}
 }

internal/video/runner.go

@@ -6,6 +6,8 @@ import (
 	"errors"
 	"fmt"
 	"log"
+
+	"mxl-pattern-generator/assets"
 	"mxl-pattern-generator/internal/generator"
 
 	"github.com/qvest-digital/go-mxl/mxl"
@@ -18,7 +20,7 @@ func Run(ctx context.Context, inst *mxl.Instance, cfg Config) (runErr error) {
 	}
 
 	// TODO: fall back to a CPU generator if GPU initialization fails.
-	gen, err := generator.NewWGPUGenerator(cfg.Width(), cfg.Height(), pattern.kernelPath)
+	gen, err := generator.NewWGPUGenerator(cfg.Width(), cfg.Height(), pattern.kernelSource)
 	if err != nil {
 		return fmt.Errorf("initialize wgpu video generator: %w", err)
 	}
@@ -102,7 +104,7 @@ func buildTextOverlay(cfg Config) (overlay *generator.TextOverlay, resultErr err
 		return nil, nil
 	}
 
-	face, err := generator.LoadFace("assets/fonts/JetBrainsMonoNLNerdFontMono-Regular.ttf", 48)
+	face, err := generator.NewFace(assets.JetBrainsMono, 48)
 	if err != nil {
 		return nil, fmt.Errorf("load text overlay font: %w", err)
 	}

internal/video/runner_test.go

@@ -34,9 +34,6 @@ func TestBuildTextOverlayDisabled(t *testing.T) {
 }
 
 func TestBuildTextOverlayPositioning(t *testing.T) {
-	// Production assets are resolved from the repository root.
-	t.Chdir("../..")
-
 	tests := []struct {
 		name    string
 		overlay OverlayConfig
@@ -59,8 +56,6 @@ func TestBuildTextOverlayPositioning(t *testing.T) {
 }
 
 func TestBuildTextOverlayRejectsInvalidPosition(t *testing.T) {
-	t.Chdir("../..")
-
 	tests := []struct {
 		name       string
 		overlay    OverlayConfig