BREAKING CHANGE: converted size vector to ptr, allowing nil for original size

Nullable Size Vector

Author: Jannik-Hm

main.go

@@ -24,7 +24,7 @@ func LoadPrimitives() error {
 // Get Model by mesh file or PrimitiveType.
 //
 // Note: requires LoadPrimitives() to be run beforehand if you want to get a primitive
-func GetModel(conf ModelReaderConf, desiredSize MeshTypes.Vector) (*MeshTypes.Mesh, error) {
+func GetModel(conf ModelReaderConf, desiredSize *MeshTypes.Vector) (*MeshTypes.Mesh, error) {
 	var mesh *MeshTypes.Mesh
 
 	if conf.File != nil && conf.Filename != nil && *conf.Filename != "" {
@@ -41,7 +41,7 @@ func GetModel(conf ModelReaderConf, desiredSize MeshTypes.Vector) (*MeshTypes.Me
 			if err != nil {
 				return nil, err
 			}
-			mesh, err = FileHandlers.Load3DS(&data, &desiredSize)
+			mesh, err = FileHandlers.Load3DS(&data, desiredSize)
 			if err != nil {
 				return nil, err
 			}
@@ -54,7 +54,9 @@ func GetModel(conf ModelReaderConf, desiredSize MeshTypes.Vector) (*MeshTypes.Me
 		}
 		tempMesh := Primitives.Primitives[conf.PrimitiveType].Copy()
 		mesh = &tempMesh
-		mesh.ScaleToDimensions(&desiredSize)
+		if desiredSize != nil {
+			mesh.ScaleToDimensions(desiredSize)
+		}
 	}
 
 	return mesh, nil

pkg/MeshTypes/mesh.go

@@ -71,12 +71,7 @@ func (obj *Mesh) calculateBoundingBox() Vector {
 	}
 }
 
-func (obj *Mesh) ScaleToDimensions(desiredSize *Vector) error {
-	actual := obj.calculateBoundingBox()
-	if actual.X == 0 && actual.Y == 0 && actual.Z == 0 {
-		return fmt.Errorf("invalid Mesh with 0 dimension")
-	}
-	scaling := desiredSize.Div(actual)
+func (obj *Mesh) Scale(scaling Vector) error {
 	scaledVectors := make(map[*Vertex]struct{})
 	for _, triangle := range obj.Triangles {
 		if _, exists := scaledVectors[triangle.V0]; !exists {
@@ -94,3 +89,12 @@ func (obj *Mesh) ScaleToDimensions(desiredSize *Vector) error {
 	}
 	return nil
 }
+
+func (obj *Mesh) ScaleToDimensions(desiredSize *Vector) error {
+	actual := obj.calculateBoundingBox()
+	if actual.X == 0 && actual.Y == 0 && actual.Z == 0 {
+		return fmt.Errorf("invalid Mesh with 0 dimension")
+	}
+	scaling := desiredSize.Div(actual)
+	return obj.Scale(scaling)
+}

pkg/file_handlers/gltf.go

@@ -10,7 +10,7 @@ import (
 	"github.com/qmuntal/gltf"
 )
 
-func LoadGLTF(file io.Reader, desiredSize Types.Vector) ([]*Types.Mesh, error) {
+func LoadGLTF(file io.Reader, desiredSize *Types.Vector) ([]*Types.Mesh, error) {
 	var doc gltf.Document
 	gltf.NewDecoder(file).Decode(&doc)
 
@@ -20,11 +20,14 @@ func LoadGLTF(file io.Reader, desiredSize Types.Vector) ([]*Types.Mesh, error) {
 		for _, p := range m.Primitives {
 			// contains Min and Max attr (for dimension calc)
 			posAccessor := doc.Accessors[p.Attributes[gltf.POSITION]]
-			scaling := Types.Vector{
-				// axes inverted to convert to correct coordinate system
-				X: desiredSize.X / (posAccessor.Max[0] - posAccessor.Min[0]),
-				Y: desiredSize.Y / (posAccessor.Max[2] - posAccessor.Min[2]),
-				Z: desiredSize.Z / (posAccessor.Max[1] - posAccessor.Min[1]),
+			scaling := Types.Vector{X: 1, Y: 1, Z: 1}
+			if desiredSize != nil {
+				scaling = Types.Vector{
+					// axes inverted to convert to correct coordinate system
+					X: desiredSize.X / (posAccessor.Max[0] - posAccessor.Min[0]),
+					Y: desiredSize.Y / (posAccessor.Max[2] - posAccessor.Min[2]),
+					Z: desiredSize.Z / (posAccessor.Max[1] - posAccessor.Min[1]),
+				}
 			}
 			positions, err := gltfVec3(&doc, posAccessor, scaling)
 			if err != nil {