feat(mesh): mesh-rework number 2

Mesh rework 2

Author: Jannik-Hm

examples/example.go

@@ -20,17 +20,6 @@ var config = MVRTypes.MVRParserConfig{
 	ReadThumbnail:     true,
 	GDTFParserWorkers: 4,
 	StageMeshWorkers:  4,
-	ModelConfig: MVRTypes.ModelConfig{
-		Global: MVRTypes.GlobalModelConfig{
-			RenderOnlyAddressedFixture: true,
-		},
-		Individual: map[string]MVRTypes.ModelNodeConfig{
-			"FA992217-CB18-D844-9D42-5B791B2BF05E": {
-				Exclude:                    MVRTypes.GetBoolPtr(false),
-				RenderOnlyAddressedFixture: MVRTypes.GetBoolPtr(true),
-			},
-		},
-	},
 }
 
 func main() {
@@ -58,12 +47,29 @@ func main() {
 	// write mesh as STL
 	meshFile, _ := os.Create("Test.stl")
 	mesh := &MeshTypes.Mesh{}
-	for _, fixture := range mvrData.StageModel.FixtureModels {
+
+	model_config := MVRTypes.ModelConfig{
+		Global: MVRTypes.GlobalModelConfig{
+			RenderOnlyAddressedFixture: true,
+		},
+		Individual: map[string]MVRTypes.ModelNodeConfig{
+			"FA992217-CB18-D844-9D42-5B791B2BF05E": { // Group ID for testing
+				Exclude:                    MVRTypes.GetBoolPtr(true),
+				RenderOnlyAddressedFixture: nil,
+			},
+			"FA992217-300B-9B39-62E4-66BF061CC63A": { // Layer ID for testing
+				Exclude: nil,
+			},
+		},
+	}
+
+	stage_model := mvrData.GetStageModel(model_config)
+	for _, fixture := range stage_model.FixtureModels {
 		for _, part := range fixture.MeshModel {
 			mesh.Add(&part.Mesh)
 		}
 	}
-	for _, sceneObject := range mvrData.StageModel.SceneObjectModels {
+	for _, sceneObject := range stage_model.SceneObjectModels {
 		for _, part := range sceneObject.MeshModel {
 			mesh.Add(&part.Mesh)
 		}

mvr-parser.go

@@ -62,8 +62,7 @@ func ParseMVRZipReader(zipfile *zip.Reader, config MVRTypes.MVRParserConfig) (*M
 	}
 
 	if config.MeshHandling >= MVRTypes.BuildStageModel {
-		meshTasks := MVRTypes.MeshTasks{}
-		parsedData.GenerateMeshes(&meshTasks, config.ModelConfig)
+		parsedData.GenerateMeshes()
 	}
 
 	return parsedData, nil

pkg/types/childlist.go

@@ -84,3 +84,14 @@ func ReadMeshes[T MeshReader](src []T, fileMap map[string]*zip.File) error {
 	}
 	return nil
 }
+
+func (c *ChildList) addNodeModelsToStageModel(stageModel *StageModel, modelConfig ModelConfig, parentConfig ModelNodeConfig) {
+	addNodeModelsToStageModel(c.SceneObjects, stageModel, modelConfig, parentConfig)
+	addNodeModelsToStageModel(c.GroupObjects, stageModel, modelConfig, parentConfig)
+	addNodeModelsToStageModel(c.FocusPoints, stageModel, modelConfig, parentConfig)
+	addNodeModelsToStageModel(c.Fixtures, stageModel, modelConfig, parentConfig)
+	addNodeModelsToStageModel(c.Supports, stageModel, modelConfig, parentConfig)
+	addNodeModelsToStageModel(c.Trusses, stageModel, modelConfig, parentConfig)
+	addNodeModelsToStageModel(c.VideoScreens, stageModel, modelConfig, parentConfig)
+	addNodeModelsToStageModel(c.Projectors, stageModel, modelConfig, parentConfig)
+}

pkg/types/config.go

@@ -30,5 +30,17 @@ type MVRParserConfig struct {
 	ReadThumbnail     bool
 	GDTFParserWorkers int
 	StageMeshWorkers  int
-	ModelConfig       ModelConfig
+}
+
+func getConfigOverrides(modelConfig ModelConfig, parentModelConfig ModelNodeConfig, uuid string) ModelNodeConfig {
+	if _, found := modelConfig.Individual[uuid]; found {
+		temp := modelConfig.Individual[uuid]
+		if temp.Exclude != nil {
+			parentModelConfig.Exclude = temp.Exclude
+		}
+		if temp.RenderOnlyAddressedFixture != nil {
+			parentModelConfig.RenderOnlyAddressedFixture = temp.RenderOnlyAddressedFixture
+		}
+	}
+	return parentModelConfig
 }

pkg/types/fixture.go

@@ -35,6 +35,7 @@ type Fixture struct {
 	CustomIdType     int
 	Mappings         []*Mapping
 	Gobo             *Gobo
+	Model            FixtureModel
 	ChildList
 }
 
@@ -62,6 +63,19 @@ func (a *Fixture) ReadMesh(fileMap map[string]*zip.File) error {
 	return a.ChildList.ReadMesh(fileMap)
 }
 
+func (a *Fixture) addNodeModelsToStageModel(stageModel *StageModel, modelConfig ModelConfig, parentConfig ModelNodeConfig) {
+	config := getConfigOverrides(modelConfig, parentConfig, a.UUID)
+
+	if (config.Exclude == nil ||
+		!(*config.Exclude)) &&
+		!(config.RenderOnlyAddressedFixture != nil && *config.RenderOnlyAddressedFixture &&
+			(a.Addresses == nil || len(a.Addresses.Addresses) == 0)) { // remove unpatched fixtures if desired
+		stageModel.FixtureModels = append(stageModel.FixtureModels, a.Model)
+	}
+
+	a.ChildList.addNodeModelsToStageModel(stageModel, modelConfig, config)
+}
+
 type Gobo struct {
 	Rotation float32
 }

pkg/types/focuspoint.go

@@ -11,6 +11,7 @@ type FocusPoint struct {
 	Name       string
 	Matrix     MeshTypes.Matrix
 	Class      NodeReference[Class]
+	Model      FocusPointModel
 	Geometries *Geometries
 }
 
@@ -28,3 +29,11 @@ func (a *FocusPoint) ResolveReference(refPointers *ReferencePointers) {
 func (a *FocusPoint) ReadMesh(fileMap map[string]*zip.File) error {
 	return a.Geometries.ReadMesh(fileMap)
 }
+
+func (a *FocusPoint) addNodeModelsToStageModel(stageModel *StageModel, modelConfig ModelConfig, parentConfig ModelNodeConfig) {
+	config := getConfigOverrides(modelConfig, parentConfig, a.UUID)
+
+	if config.Exclude == nil || !(*config.Exclude) {
+		stageModel.FocusPointModels = append(stageModel.FocusPointModels, a.Model)
+	}
+}

pkg/types/generalscenedescription.go

@@ -7,7 +7,6 @@ type GeneralSceneDescription struct {
 	ProviderVersion string
 	UserData        *UserData
 	Scene           *Scene
-	StageModel      *StageModel
 }
 
 func (a *GeneralSceneDescription) CreateReferencePointer(refPointers *ReferencePointers) {
@@ -17,3 +16,13 @@ func (a *GeneralSceneDescription) CreateReferencePointer(refPointers *ReferenceP
 func (a *GeneralSceneDescription) ResolveReference(refPointers *ReferencePointers) {
 	a.Scene.ResolveReference(refPointers)
 }
+
+func (a *GeneralSceneDescription) GetStageModel(config ModelConfig) StageModel {
+	model := StageModel{}
+
+	local_config := config.Global.asNodeConfig()
+
+	addNodeModelsToStageModel(a.Scene.Layers, &model, config, local_config)
+
+	return model
+}

pkg/types/groupobject.go

@@ -28,3 +28,9 @@ func (a *GroupObject) ResolveReference(refPointers *ReferencePointers) {
 func (a *GroupObject) ReadMesh(fileMap map[string]*zip.File) error {
 	return a.ChildList.ReadMesh(fileMap)
 }
+
+func (a *GroupObject) addNodeModelsToStageModel(stageModel *StageModel, modelConfig ModelConfig, parentConfig ModelNodeConfig) {
+	config := getConfigOverrides(modelConfig, parentConfig, a.UUID)
+
+	a.ChildList.addNodeModelsToStageModel(stageModel, modelConfig, config)
+}