Merge pull request #1 from Patch2PDF/chores-and-rotation-change

Chores and rotation change

Author: Jannik-Hm

config.go

@@ -1,9 +1,11 @@
 package rasterizer
 
+import "github.com/Patch2PDF/GDTF-Mesh-Reader/v2/pkg/MeshTypes"
+
 type RasterizerConfig struct {
 	CanvasConfig   CanvasConfig
 	RenderLabels   bool
-	Rotation       Rotation
+	Rotation       MeshTypes.Matrix
 	OverrideColors OverrideColorMap
 }
 

examples/main.go

@@ -9,6 +9,7 @@ import (
 	"runtime/pprof"
 
 	GDTFMeshReader "github.com/Patch2PDF/GDTF-Mesh-Reader/v2"
+	"github.com/Patch2PDF/GDTF-Mesh-Reader/v2/pkg/MeshTypes"
 	MVRParser "github.com/Patch2PDF/MVR-Parser"
 	MVRTypes "github.com/Patch2PDF/MVR-Parser/pkg/types"
 	rasterizer "github.com/Patch2PDF/Stagemodel-Rasterizer"
@@ -43,14 +44,6 @@ func main() {
 	}
 	GDTFMeshReader.LoadPrimitives()
 
-	// content, err := gdtf.ParseGDTFByFilename("test.gdtf", true, false)
-	// // content, err := gdtf.ParseGDTFByFilename("test3.gdtf", true, false)
-	// if err != nil {
-	// 	log.Fatalf("%s", err)
-	// }
-	// mesh, err := content.BuildMesh("32Ch")
-	// // mesh, err := content.BuildMesh("36 channel")
-
 	mvr, err := zip.OpenReader("test5.mvr")
 	if err != nil {
 		log.Fatal(err)
@@ -87,13 +80,6 @@ func main() {
 
 	stage_model := mvrData.GetStageModel(model_config)
 
-	stageModelCopy1 := stage_model.Copy()
-	stageModelCopy2 := stage_model.Copy()
-	// TODO: instead of copy, rotate back? (multiply new matrix with inverse of previous) --> need to add function to Mesh-Reader module
-
-	// buf1 := &bytes.Buffer{}
-	// buf2 := &bytes.Buffer{}
-
 	overrideColors := rasterizer.OverrideColorMap{
 		// rasterizer.ModelTypeFixture: map[rasterizer.GeometryType]*color.NRGBA{
 		// 	rasterizer.GeometryTypeAxis: {R: 255, G: 0, B: 0, A: 255},
@@ -109,29 +95,21 @@ func main() {
 		LabelFontSize: 10,
 	}
 
-	canvas1, err := rasterizer.Draw(&stageModelCopy1, rasterizer.RasterizerConfig{RenderLabels: true, Rotation: rasterizer.Rotation{Alpha: 80, Beta: 0, Gamma: 200}, OverrideColors: overrideColors, CanvasConfig: canvasConfig})
+	rotation1 := MeshTypes.GenerateRotationMatrix(80, 0, 200)
+	canvas1, err := rasterizer.Draw(&stage_model, rasterizer.RasterizerConfig{RenderLabels: false, Rotation: rotation1, OverrideColors: overrideColors, CanvasConfig: canvasConfig})
 	if err != nil {
 		log.Fatal(err)
 	}
-	// canvas1.SaveAsPNG(buf1)
+
+	rotation2 := MeshTypes.GenerateRotationMatrix(90, 0, 180)
+	rotation2 = rotation2.ReverseTransformation(rotation1)
 	rasterizer.SaveCanvasAsPNGFile("side.png", canvas1)
-	canvas2, err := rasterizer.Draw(&stageModelCopy2, rasterizer.RasterizerConfig{RenderLabels: true, Rotation: rasterizer.Rotation{Alpha: 90, Beta: 0, Gamma: 180}, OverrideColors: overrideColors, CanvasConfig: canvasConfig})
+	canvas2, err := rasterizer.Draw(&stage_model, rasterizer.RasterizerConfig{RenderLabels: true, Rotation: rotation2, OverrideColors: overrideColors, CanvasConfig: canvasConfig})
 	if err != nil {
 		log.Fatal(err)
 	}
-	// canvas2.SaveAsPNG(buf2)
 	rasterizer.SaveCanvasAsPNGFile("front.png", canvas2)
 
-	// eg := errgroup.Group{}
-
-	// for range 2 {
-	// 	eg.Go(func() error {
-	// 		rasterizer.SaveCanvasAsPNGFile()
-	// 	})
-	// }
-
-	// wg.Wait()
-
 	pprof.StopCPUProfile()
 
 	runtime.GC() // Get up-to-date statistics
@@ -141,26 +119,3 @@ func main() {
 
 	f.Close()
 }
-
-// func main() {
-// 	// fmt.Printf("%s", rasterizer.DrawLabel(0, 0))
-// 	// rasterizer.InitFace()
-
-// 	// dst := image.NewNRGBA(image.Rect(0, 0, 110, 50))
-
-// 	// fmt.Println(rasterizer.DrawLabelBox(dst, 0, 0, "Lgtm rtfm\nexcept you"))
-
-// 	// f, err := os.Create("out.png")
-// 	// if err != nil {
-// 	// 	log.Fatalf("failed to create file: %v", err)
-// 	// }
-// 	// defer f.Close()
-
-// 	// if err := png.Encode(f, dst); err != nil {
-// 	// 	log.Fatalf("failed to encode image: %v", err)
-// 	// }
-// 	err := rasterizer.DrawLabel(0, 0, "Lgtm rtfm\nexcept you")
-// 	if err != nil {
-// 		log.Fatal(err)
-// 	}
-// }

go.mod

@@ -3,9 +3,9 @@ module github.com/Patch2PDF/Stagemodel-Rasterizer
 go 1.25.6
 
 require (
-	github.com/Patch2PDF/GDTF-Mesh-Reader/v2 v2.0.1
-	github.com/Patch2PDF/GDTF-Parser v0.3.0
-	github.com/Patch2PDF/MVR-Parser v0.2.0
+	github.com/Patch2PDF/GDTF-Mesh-Reader/v2 v2.1.0
+	github.com/Patch2PDF/GDTF-Parser v0.4.0
+	github.com/Patch2PDF/MVR-Parser v0.3.0
 )
 
 require golang.org/x/text v0.34.0 // indirect

go.sum

@@ -1,9 +1,9 @@
-github.com/Patch2PDF/GDTF-Mesh-Reader/v2 v2.0.1 h1:xc6xxlDRv9s19um206MW6lYsZU7sXOfHgROuo7PxTZg=
-github.com/Patch2PDF/GDTF-Mesh-Reader/v2 v2.0.1/go.mod h1:zAcGHlYdE75hdFo624nQfQHTzw9+NfPJT8Eo2mB1lI8=
-github.com/Patch2PDF/GDTF-Parser v0.3.0 h1:aUPiTMJrlNW06nMdzxbRuqU4ZVsrskC14ZzKN7gsUz0=
-github.com/Patch2PDF/GDTF-Parser v0.3.0/go.mod h1:4NWUS8fNAQJjQetvlZvrVE/lv2oFaEkuPUKc/r/TugE=
-github.com/Patch2PDF/MVR-Parser v0.2.0 h1:DeSFvosI2JdgoXJu8BADzngRgfXQN7sQkawg/zdzfrs=
-github.com/Patch2PDF/MVR-Parser v0.2.0/go.mod h1:Zrm84J9+nE/e0F8i6d94Am4u4xbGt8AgVa2JNkLcCNg=
+github.com/Patch2PDF/GDTF-Mesh-Reader/v2 v2.1.0 h1:Do1+QFw7sNf6B1lE8T9rokVGQQ3I1EhYqK7OPL4ep1Q=
+github.com/Patch2PDF/GDTF-Mesh-Reader/v2 v2.1.0/go.mod h1:zAcGHlYdE75hdFo624nQfQHTzw9+NfPJT8Eo2mB1lI8=
+github.com/Patch2PDF/GDTF-Parser v0.4.0 h1:ZdZDxIjm4K63tTVtf48K0sYJCyppuID1m4P2b4QfvM8=
+github.com/Patch2PDF/GDTF-Parser v0.4.0/go.mod h1:i3hZmZ2wIJ294MllgqQ+wQn4RtuYIWL1KLSn9Gseqdw=
+github.com/Patch2PDF/MVR-Parser v0.3.0 h1:bdvRFxkTc0oK2uxo7o0SK0JMtcdJu+/e2nsKNmODE80=
+github.com/Patch2PDF/MVR-Parser v0.3.0/go.mod h1:DwJgsZcqTyn+eD3KG6OVUwHvpK56HjXFqGdI/UY4z+E=
 github.com/go-test/deep v1.0.1 h1:UQhStjbkDClarlmv0am7OXXO4/GaPdCGiUiMTvi28sg=
 github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/qmuntal/gltf v0.28.0 h1:C4A1temWMPtcI2+qNfpfRq8FEJxoBGUN3ZZM8BCc+xU=

model_manipulation.go

@@ -69,9 +69,8 @@ func calculateStageModelMinAndMax(stageModel *StageModel) (min MeshTypes.Vector,
 	return min, max
 }
 
-func normalizeAndRotateStageModel(canvas *Canvas, stageModel *StageModel, rotation Rotation) {
+func normalizeAndRotateStageModel(canvas *Canvas, stageModel *StageModel, rotationMatrix MeshTypes.Matrix) {
 	// rotate
-	rotationMatrix := generateRotationMatrix(rotation.Alpha, rotation.Beta, rotation.Gamma)
 	rotateAndTranslateStageModel(stageModel, rotationMatrix)
 
 	// get bounding box

rasterizer.go

@@ -11,12 +11,6 @@ import (
 	MVRTypes "github.com/Patch2PDF/MVR-Parser/pkg/types"
 )
 
-type Rotation struct {
-	Alpha float64
-	Beta  float64
-	Gamma float64
-}
-
 type boundingBox struct {
 	left   int
 	top    int