moved canvas dimensions + label font settings to CanvasConfig

Author: Jannik-Hm

canvas.go

@@ -18,22 +18,22 @@ type Canvas struct {
 	fixture_zbuf   []bool // used for label placement to search for "free" pixels
 }
 
-func (cv *Canvas) Init(width int, height int) error {
-	cv.width = width
-	cv.height = height
+func (cv *Canvas) Init(canvasConfig CanvasConfig) error {
+	cv.width = canvasConfig.Width
+	cv.height = canvasConfig.Height
 
-	cv.canvas = image.NewNRGBA(image.Rect(0, 0, width, height))
+	cv.canvas = image.NewNRGBA(image.Rect(0, 0, canvasConfig.Width, canvasConfig.Height))
 
-	cv.fixture_zbuf = make([]bool, height*width)
+	cv.fixture_zbuf = make([]bool, canvasConfig.Height*canvasConfig.Width)
 
-	cv.zbuffer = make([]float64, height*width)
+	cv.zbuffer = make([]float64, canvasConfig.Height*canvasConfig.Width)
 	for i := range cv.zbuffer {
 		cv.zbuffer[i] = math.Inf(-1)
 	}
 
 	var err error
 
-	cv.label_face, err = initFontFace(10, 300)
+	cv.label_face, err = initFontFace(canvasConfig.LabelFontSize, canvasConfig.LabelDPI, canvasConfig.LabelFont)
 	if err != nil {
 		return err
 	}

config.go

@@ -1,7 +1,16 @@
 package rasterizer
 
 type RasterizerConfig struct {
+	CanvasConfig   CanvasConfig
 	RenderLabels   bool
 	Rotation       Rotation
 	OverrideColors OverrideColorMap
 }
+
+type CanvasConfig struct {
+	Width         int
+	Height        int
+	LabelFont     []byte
+	LabelDPI      float64
+	LabelFontSize float64
+}

label_drawer.go

@@ -15,11 +15,6 @@ import (
 	"golang.org/x/image/math/fixed"
 )
 
-var (
-	//go:embed fonts/DejaVuSansMono.ttf
-	fontBytes []byte
-)
-
 type fontFace struct {
 	face        *font.Face
 	ascent      int
@@ -35,7 +30,7 @@ type padding struct {
 	left   int
 }
 
-func initFontFace(size float64, dpi float64) (*fontFace, error) {
+func initFontFace(size float64, dpi float64, fontBytes []byte) (*fontFace, error) {
 	parsed_font, err := opentype.Parse(fontBytes)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse font bytes: %v", err)

rasterizer.go

@@ -218,11 +218,8 @@ func drawStageModel(mesh *MVRTypes.StageModel, canvas *Canvas, config Rasterizer
 }
 
 func Draw(mesh *MVRTypes.StageModel, config RasterizerConfig) (*Canvas, error) {
-	const width = 4000
-	const height = 3000
-
 	canvas := &Canvas{}
-	err := canvas.Init(width, height)
+	err := canvas.Init(config.CanvasConfig)
 
 	if err != nil {
 		return nil, err