Merge pull request #64 from qmuntal/embed

Support binary glTF files where first buffer is not binary
qmuntal · Oct 6, 2022 · 7a8f8bb · 7a8f8bb
2 parents 6914b8d + ccd6768
commit 7a8f8bb
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 2 deletions.
diff --git a/decoder.go b/decoder.go
@@ -78,7 +78,7 @@ func (d *Decoder) Decode(doc *Document) error {
 	}
 
 	var externalBufferIndex = 0
-	if isBinary && len(doc.Buffers) > 0 {
+	if isBinary && len(doc.Buffers) > 0 && doc.Buffers[0].URI == "" {
 		externalBufferIndex = 1
 		if err := d.decodeBinaryBuffer(doc.Buffers[0]); err != nil {
 			return err

diff --git a/encode.go b/encode.go
@@ -111,7 +111,7 @@ func (e *Encoder) Encode(doc *Document) error {
 
 	for i := externalBufferIndex; i < len(doc.Buffers); i++ {
 		buf := doc.Buffers[i]
-		if len(buf.Data) == 0 || buf.URI == "" {
+		if len(buf.Data) == 0 || buf.URI == "" || buf.IsEmbeddedResource() {
 			continue
 		}
 		if err = e.encodeBuffer(buf); err != nil {

diff --git a/gltf_test.go b/gltf_test.go
@@ -1,6 +1,7 @@
 package gltf
 
 import (
+	"path/filepath"
 	"reflect"
 	"testing"
 )
@@ -325,3 +326,19 @@ func TestSizeOfElement(t *testing.T) {
 		})
 	}
 }
+
+func TestIssue63(t *testing.T) {
+	srcDoc, err := Open("testdata/issue63/simple.gltf")
+	if nil != err {
+		t.Fatal(err)
+	}
+	outputGlb := filepath.Join(t.TempDir(), "out.glb")
+	err = SaveBinary(srcDoc, outputGlb)
+	if nil != err {
+		t.Fatal(err)
+	}
+	_, err = Open(outputGlb)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/testdata/issue63/simple.gltf b/testdata/issue63/simple.gltf
@@ -0,0 +1,102 @@
+{
+  "scenes": [
+    {
+      "nodes": [0, 1]
+    }
+  ],
+  "nodes": [
+    {
+      "mesh": 0
+    },
+    {
+      "mesh": 0,
+      "name": "guid",
+      "matrix": [
+        2.0,
+        0.0,
+        0.0,
+        0.0,
+        0.0,
+        0.866,
+        0.5,
+        0.0,
+        0.0,
+        -0.25,
+        0.433,
+        0.0,
+        10.0,
+        20.0,
+        30.0,
+        1.0
+      ]
+    }
+  ],
+
+  "meshes": [
+    {
+      "primitives": [
+        {
+          "attributes": {
+            "POSITION": 1,
+            "NORMAL": 2
+          },
+          "indices": 0
+        }
+      ]
+    }
+  ],
+
+  "buffers": [
+    {
+      "uri": "data:application/octet-stream;base64,AAABAAIAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8=",
+      "byteLength": 80
+    }
+  ],
+  "bufferViews": [
+    {
+      "buffer": 0,
+      "byteOffset": 0,
+      "byteLength": 6,
+      "target": 34963
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 8,
+      "byteLength": 72,
+      "target": 34962
+    }
+  ],
+  "accessors": [
+    {
+      "bufferView": 0,
+      "byteOffset": 0,
+      "componentType": 5123,
+      "count": 3,
+      "type": "SCALAR",
+      "max": [2],
+      "min": [0]
+    },
+    {
+      "bufferView": 1,
+      "byteOffset": 0,
+      "componentType": 5126,
+      "count": 3,
+      "type": "VEC3",
+      "max": [1.0, 1.0, 0.0],
+      "min": [0.0, 0.0, 0.0]
+    },
+    {
+      "bufferView": 1,
+      "byteOffset": 36,
+      "componentType": 5126,
+      "count": 3,
+      "type": "VEC3",
+      "max": [0.0, 0.0, 1.0],
+      "min": [0.0, 0.0, 1.0]
+    }
+  ],
+
+  "asset": {
+    "version": "2.0"
+  }
+}