TinyGltfImporter: more backporting

src/MagnumPlugins/TinyGltfImporter/Test/CMakeLists.txt

@@ -141,14 +141,13 @@ corrade_add_test(TinyGltfImporterTest
         mesh-invalid.bin
         mesh-invalid.gltf
         mesh-invalid-accessor-oob.gltf
-        mesh-invalid-accessor-short.gltf
         mesh-invalid-buffer-oob.gltf
         mesh-invalid-bufferview-oob.gltf
-        mesh-invalid-bufferview-short.gltf
-        mesh-invalid-mismatching-attribute-count.gltf
         mesh-multiple-primitives.gltf
         mesh-primitives-types.gltf
         mesh-primitives-types.bin
+        mesh-skin-attributes.gltf
+        mesh-skin-attributes.bin
         mesh-unordered-attributes.gltf
         přívodní-šňůra.gltf
         přívodní-šňůra.bin
@@ -162,12 +161,14 @@ corrade_add_test(TinyGltfImporterTest
         scene-nodefault.gltf
         scene-nodefault.glb
         scene-invalid-camera-oob.gltf
+        scene-invalid-child-not-root.gltf
         scene-invalid-child-oob.gltf
         scene-invalid-default-oob.gltf
         scene-invalid-light-oob.gltf
         scene-invalid-material-oob-multi-primitive.gltf
         scene-invalid-material-oob.gltf
         scene-invalid-mesh-oob.gltf
+        scene-invalid-multiple-parents.gltf
         scene-invalid-node-oob.gltf
         scene-invalid-skin-oob-multi-primitive.gltf
         scene-invalid-skin-oob.gltf
@@ -191,8 +192,17 @@ corrade_add_test(TinyGltfImporterTest
         texture-default-sampler.glb
         texture-empty-sampler.gltf
         texture-empty-sampler.glb
+        texture-extensions.gltf
+        texture-extensions-invalid.gltf
+        texture-extensions-invalid-basisu-oob.gltf
         texture-invalid.gltf
-        texture-missing-source.gltf)
+        texture-invalid-image-oob.gltf
+        texture-invalid-sampler-oob.gltf
+        texture-missing-source.gltf
+        version-legacy.gltf
+        version-supported.gltf
+        version-unsupported.gltf
+        version-unsupported-min.gltf)
 target_include_directories(TinyGltfImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>)
 if(MAGNUM_TINYGLTFIMPORTER_BUILD_STATIC)
     target_link_libraries(TinyGltfImporterTest PRIVATE TinyGltfImporter)

src/MagnumPlugins/TinyGltfImporter/Test/animation-invalid.gltf

@@ -119,6 +119,44 @@
                     "output": 0
                 }
             ]
+        },
+        {
+            "name": "invalid input accessor",
+            "channels": [
+                {
+                    "sampler": 0,
+                    "target": {
+                        "node": 0,
+                        "path": "translation"
+                    }
+                }
+            ],
+            "samplers": [
+                {
+                    "input": 3,
+                    "interpolation": "STEP",
+                    "output": 2
+                }
+            ]
+        },
+        {
+            "name": "invalid output accessor",
+            "channels": [
+                {
+                    "sampler": 0,
+                    "target": {
+                        "node": 0,
+                        "path": "translation"
+                    }
+                }
+            ],
+            "samplers": [
+                {
+                    "input": 1,
+                    "interpolation": "STEP",
+                    "output": 4
+                }
+            ]
         }
     ],
     "note": "additional accessor bounds checks are tested inside mesh-invalid.gltf",
@@ -143,6 +181,20 @@
             "componentType": 5126,
             "count": 0,
             "type": "VEC3"
+        },
+        {
+            "bufferView": 0,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 10,
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 0,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 10,
+            "type": "VEC3"
         }
     ],
     "bufferViews": [

src/MagnumPlugins/TinyGltfImporter/Test/gltf2glb.py

@@ -55,6 +55,7 @@ def pad_size_32b(size): return (4 - size%4)%4
 with open(file_in) as f:
     data = json.load(f)
 
+bin_length = 0
 bin_data = bytearray()
 
 if not args.no_embed and "buffers" in data:
@@ -66,6 +67,7 @@ def pad_size_32b(size): return (4 - size%4)%4
         else:
             with open(uri, 'rb') as bf:
                 d = bf.read()
+        bin_length = data['buffers'][0]['byteLength']
         bin_data.extend(d)
 
 if args.bundle_images:
@@ -99,12 +101,14 @@ def pad_size_32b(size): return (4 - size%4)%4
         del image['uri']
         image['bufferView'] = len(data['bufferViews']) - 1
 
+    bin_length = len(bin_data)
+
 # Pad the buffer, update its length
 if not args.no_embed and 'buffers' in data and data['buffers']:
     bin_data.extend(b' '*pad_size_32b(len(bin_data)))
 
     del data['buffers'][0]['uri']
-    data['buffers'][0]['byteLength'] = len(bin_data)
+    data['buffers'][0]['byteLength'] = bin_length
 
 json_data = json.dumps(data, separators=(',', ':')).encode('utf-8')
 # Append padding bytes so that BIN chunk is aligned to 4 bytes

src/MagnumPlugins/TinyGltfImporter/Test/image-basis-embedded.gltf

@@ -1 +1 @@
-{"textures":[{"extensions":{"GOOGLE_texture_basis":{"source":1}}}],"images":[{"mimeType":"image/png","uri":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAADCAYAAABbNsX4AAAACXBIWXMAAAsTAAALEwEAmpwYAAAASElEQVQIHQ3JOwqAMBBAwWfwgyIpJJWQ+/fBxhO5iHUQ42Z12mnStlvfOcZpoDzKW5S2qiKXYGbEuBLCgrtzRqvh/fwHHHLyAZ75HS8LboO+AAAAAElFTkSuQmCC"},{"mimeType":"image/x-basis","uri":"data:application/octet-stream;base64,c0ITAE0AtAyTAAAA0MECAAABAAAAAwAAAAAAAAAAAAAAAAAAAAAAAwB7AAAAKwAAAwCmAAAADQAAswAAACsAAABNAAAAAAAAAAAAAAAAAAAAAAUAAwACAAEA3gAAAAEAAABbegAAAAEAAgABAAEAAQDfAAAAAQAAAOCuAcAEAAAAAAAAwgCIABAAAAAAOQeACQABAAAAAIQIwBQAAQAAAACShR+4AFT9V1WNFvb3p6KiogIAwUQAAAAAAADyX20AmAAAAAAAAEFGAEwAEAAAAIBAcQAwAQAAAAAAgAACagw="}],"extensionsUsed":["GOOGLE_texture_basis"],"extensionsRequired":["GOOGLE_texture_basis"]}
+{"asset":{"version":"2.0"},"textures":[{"extensions":{"GOOGLE_texture_basis":{"source":1}}}],"images":[{"mimeType":"image/png","uri":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAADCAYAAABbNsX4AAAACXBIWXMAAAsTAAALEwEAmpwYAAAASElEQVQIHQ3JOwqAMBBAwWfwgyIpJJWQ+/fBxhO5iHUQ42Z12mnStlvfOcZpoDzKW5S2qiKXYGbEuBLCgrtzRqvh/fwHHHLyAZ75HS8LboO+AAAAAElFTkSuQmCC"},{"mimeType":"image/x-basis","uri":"data:application/octet-stream;base64,c0ITAE0AtAyTAAAA0MECAAABAAAAAwAAAAAAAAAAAAAAAAAAAAAAAwB7AAAAKwAAAwCmAAAADQAAswAAACsAAABNAAAAAAAAAAAAAAAAAAAAAAUAAwACAAEA3gAAAAEAAABbegAAAAEAAgABAAEAAQDfAAAAAQAAAOCuAcAEAAAAAAAAwgCIABAAAAAAOQeACQABAAAAAIQIwBQAAQAAAACShR+4AFT9V1WNFvb3p6KiogIAwUQAAAAAAADyX20AmAAAAAAAAEFGAEwAEAAAAIBAcQAwAQAAAAAAgAACagw="}],"extensionsUsed":["GOOGLE_texture_basis"],"extensionsRequired":["GOOGLE_texture_basis"]}