model Geometries now uses ove

rride colors as well + removed unused todos + error handling

Author: Jannik-Hm

colors.go

@@ -29,6 +29,7 @@ var default_colors = map[GeometryType]color.NRGBA{
 	GeometryTypeStructure:         {0, 0, 0, 255},
 	GeometryTypeSupport:           {0, 0, 0, 255},
 	GeometryTypeMagnet:            {0, 0, 0, 255},
+	GeometryTypeGeometries:        {100, 100, 100, 255},
 }
 
 var fromGDTFGeometryMap = map[GDTFTypes.GeometryType]GeometryType{
@@ -52,8 +53,6 @@ var fromGDTFGeometryMap = map[GDTFTypes.GeometryType]GeometryType{
 	GDTFTypes.GeometryTypeWiringObject:      GeometryTypeWiringObject,
 }
 
-// TODO: add "global" override
-
 func getOverrideColors(overrides OverrideColorMap) colorMap {
 	result := make(colorMap)
 	for i := range modelTypes {
@@ -80,3 +79,14 @@ func (colors colorMap) getColor(modelType ModelType, geometryType GDTFTypes.Geom
 	}
 	return modelColors[nonGDTFGeometryType], nil
 }
+
+func (colors colorMap) getGeometriesColor(modelType ModelType) (color.NRGBA, error) {
+	modelColors, ok := colors[modelType]
+	if !ok {
+		return color.NRGBA{}, fmt.Errorf("Invalid model type %d", modelType)
+	}
+	if _, ok := modelColors[GeometryTypeGeometries]; !ok {
+		return color.NRGBA{}, fmt.Errorf("Geometries color is undefined for model type %d", modelType)
+	}
+	return modelColors[GeometryTypeGeometries], nil
+}

geometry_types.go

@@ -21,6 +21,7 @@ const (
 	GeometryTypeStructure         GeometryType = "Structure"
 	GeometryTypeSupport           GeometryType = "Support"
 	GeometryTypeMagnet            GeometryType = "Magnet"
+	GeometryTypeGeometries        GeometryType = "Geometries" // used for seperately provided Geometries in MVR
 )
 
 var geometryTypes []GeometryType = []GeometryType{
@@ -42,4 +43,5 @@ var geometryTypes []GeometryType = []GeometryType{
 	GeometryTypeStructure,
 	GeometryTypeSupport,
 	GeometryTypeMagnet,
+	GeometryTypeGeometries,
 }

rasterizer.go

@@ -81,8 +81,12 @@ func drawStageModel(mesh *MVRTypes.StageModel, canvas *Canvas, config Rasterizer
 			}
 			drawMesh(part.Mesh, canvas, color)
 		}
+		geometry_color, err := colors.getGeometriesColor(ModelTypeSceneObject)
+		if err != nil {
+			return fmt.Errorf("Could not draw stage model: %s", err)
+		}
 		for _, geometry := range obj.Geometries {
-			drawMesh(geometry, canvas, color.NRGBA{100, 100, 100, 255})
+			drawMesh(geometry, canvas, geometry_color)
 		}
 	}
 
@@ -104,8 +108,12 @@ func drawStageModel(mesh *MVRTypes.StageModel, canvas *Canvas, config Rasterizer
 				fixtureLabel{fixture: fixture.Fixture, fixture_bounding_box: bb},
 			)
 
+			geometry_color, err := colors.getGeometriesColor(ModelTypeFixture)
+			if err != nil {
+				return fmt.Errorf("Could not draw stage model: %s", err)
+			}
 			for _, geometry := range fixture.Geometries {
-				drawMesh(geometry, canvas, color.NRGBA{100, 100, 100, 255})
+				drawMesh(geometry, canvas, geometry_color)
 			}
 		}
 	} else {
@@ -118,8 +126,12 @@ func drawStageModel(mesh *MVRTypes.StageModel, canvas *Canvas, config Rasterizer
 				drawMesh(part.Mesh, canvas, color)
 			}
 
+			geometry_color, err := colors.getGeometriesColor(ModelTypeFixture)
+			if err != nil {
+				return fmt.Errorf("Could not draw stage model: %s", err)
+			}
 			for _, geometry := range fixture.Geometries {
-				drawMesh(geometry, canvas, color.NRGBA{100, 100, 100, 255})
+				drawMesh(geometry, canvas, geometry_color)
 			}
 		}
 	}
@@ -139,7 +151,11 @@ func Draw(mesh *MVRTypes.StageModel, config RasterizerConfig) (*Canvas, error) {
 
 	normalizeAndRotateStageModel(canvas, mesh, config.Rotation)
 
-	drawStageModel(mesh, canvas, config)
+	err = drawStageModel(mesh, canvas, config)
+
+	if err != nil {
+		return nil, err
+	}
 
 	err = drawFixtureLabels(canvas)