node correctly manages zeros array

qmuntal · Mar 25, 2019 · eed3107 · eed3107
1 parent 7f33887
commit eed3107
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/struct.go b/struct.go
@@ -156,19 +156,15 @@ type Node struct {
 	Weights     []float64   `json:"weights,omitempty"` // The weights of the instantiated Morph Target.
 }
 
-// NewNode returns a default Node.
-func NewNode() *Node {
-	return &Node{
+// UnmarshalJSON unmarshal the node with the correct default values.
+func (n *Node) UnmarshalJSON(data []byte) error {
+	type alias Node
+	def := Node{
 		Matrix:   [16]float64{1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1},
 		Rotation: [4]float64{0, 0, 0, 1},
 		Scale:    [3]float64{1, 1, 1},
 	}
-}
-
-// UnmarshalJSON unmarshal the node with the correct default values.
-func (n *Node) UnmarshalJSON(data []byte) error {
-	type alias Node
-	tmp := alias(*NewNode())
+	tmp := alias(def)
 	err := json.Unmarshal(data, &tmp)
 	if err == nil {
 		*n = Node(tmp)
@@ -183,13 +179,22 @@ func (n *Node) MarshalJSON() ([]byte, error) {
 	if err == nil {
 		if n.Matrix == [16]float64{1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1} {
 			out = removeProperty([]byte(`"matrix":[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1]`), out)
+		} else if n.Matrix == [16]float64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} {
+			out = removeProperty([]byte(`"matrix":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]`), out)
 		}
+
 		if n.Rotation == [4]float64{0, 0, 0, 1} {
 			out = removeProperty([]byte(`"rotation":[0,0,0,1]`), out)
+		} else if n.Rotation == [4]float64{0, 0, 0, 0} {
+			out = removeProperty([]byte(`"rotation":[0,0,0,0]`), out)
 		}
+
 		if n.Scale == [3]float64{1, 1, 1} {
 			out = removeProperty([]byte(`"scale":[1,1,1]`), out)
+		} else if n.Scale == [3]float64{0, 0, 0} {
+			out = removeProperty([]byte(`"scale":[0,0,0]`), out)
 		}
+
 		if n.Translation == [3]float64{0, 0, 0} {
 			out = removeProperty([]byte(`"translation":[0,0,0]`), out)
 		}

diff --git a/struct_test.go b/struct_test.go
@@ -258,14 +258,19 @@ func TestNode_MarshalJSON(t *testing.T) {
 			Rotation: [4]float64{0, 0, 0, 1},
 			Scale:    [3]float64{1, 1, 1},
 		}, []byte("{}"), false},
+		{"default2", &Node{
+			Matrix:   [16]float64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+			Rotation: [4]float64{0, 0, 0, 0},
+			Scale:    [3]float64{0, 0, 0},
+		}, []byte("{}"), false},
 		{"empty", &Node{
 			Matrix:   [16]float64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 			Rotation: [4]float64{0, 0, 0, 0},
 			Scale:    [3]float64{0, 0, 0},
 			Camera:   Index(0),
 			Skin:     Index(0),
 			Mesh:     Index(0),
-		}, []byte(`{"camera":0,"skin":0,"matrix":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"mesh":0,"rotation":[0,0,0,0],"scale":[0,0,0]}`), false},
+		}, []byte(`{"camera":0,"skin":0,"mesh":0}`), false},
 		{"nodefault", &Node{
 			Matrix:      [16]float64{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 			Rotation:    [4]float64{1, 0, 0, 0},