diff --git a/tests/blend_export/fbx/32678-respect-import-hints-with-empty.fbx b/tests/blend_export/fbx/32678-respect-import-hints-with-empty.fbx index cf0950e..821a99c 100644 Binary files a/tests/blend_export/fbx/32678-respect-import-hints-with-empty.fbx and b/tests/blend_export/fbx/32678-respect-import-hints-with-empty.fbx differ diff --git a/tests/blend_export/fbx/43044-marker.fbx b/tests/blend_export/fbx/43044-marker.fbx index 7a6f84b..d8c589e 100644 Binary files a/tests/blend_export/fbx/43044-marker.fbx and b/tests/blend_export/fbx/43044-marker.fbx differ diff --git a/tests/blend_export/gltf/32678-respect-import-hints-with-empty.bin b/tests/blend_export/gltf/32678-respect-import-hints-with-empty.bin index b5e1cf5..07dea22 100644 Binary files a/tests/blend_export/gltf/32678-respect-import-hints-with-empty.bin and b/tests/blend_export/gltf/32678-respect-import-hints-with-empty.bin differ diff --git a/tests/blend_export/gltf/32678-respect-import-hints-with-empty.gltf b/tests/blend_export/gltf/32678-respect-import-hints-with-empty.gltf index 8f9723b..5820c03 100644 --- a/tests/blend_export/gltf/32678-respect-import-hints-with-empty.gltf +++ b/tests/blend_export/gltf/32678-respect-import-hints-with-empty.gltf @@ -18,7 +18,8 @@ 6, 7, 8, - 9 + 9, + 10 ] } ], @@ -106,6 +107,15 @@ 0, -16.017648696899414 ] + }, + { + "mesh" : 9, + "name" : "cube-convcol", + "translation" : [ + 0, + 0, + -12 + ] } ], "animations" : [ @@ -136,19 +146,19 @@ "name" : "motion", "samplers" : [ { - "input" : 29, + "input" : 32, "interpolation" : "LINEAR", - "output" : 30 + "output" : 33 }, { - "input" : 29, + "input" : 32, "interpolation" : "LINEAR", - "output" : 31 + "output" : 34 }, { - "input" : 29, + "input" : 32, "interpolation" : "LINEAR", - "output" : 32 + "output" : 35 } ] }, @@ -179,19 +189,19 @@ "name" : "move-cycle", "samplers" : [ { - "input" : 29, + "input" : 32, "interpolation" : "LINEAR", - "output" : 33 + "output" : 36 }, { - "input" : 29, + "input" : 32, "interpolation" : "LINEAR", - "output" : 34 + "output" : 37 }, { - "input" : 29, + "input" : 32, "interpolation" : "LINEAR", - "output" : 35 + "output" : 38 } ] }, @@ -222,19 +232,19 @@ "name" : "move-loop", "samplers" : [ { - "input" : 29, + "input" : 32, "interpolation" : "LINEAR", - "output" : 36 + "output" : 39 }, { - "input" : 29, + "input" : 32, "interpolation" : "LINEAR", - "output" : 37 + "output" : 40 }, { - "input" : 29, + "input" : 32, "interpolation" : "LINEAR", - "output" : 38 + "output" : 41 } ] } @@ -356,6 +366,19 @@ "indices" : 3 } ] + }, + { + "name" : "Cube.007", + "primitives" : [ + { + "attributes" : { + "POSITION" : 29, + "NORMAL" : 30, + "TEXCOORD_0" : 31 + }, + "indices" : 3 + } + ] } ], "accessors" : [ @@ -626,6 +649,34 @@ { "bufferView" : 29, "componentType" : 5126, + "count" : 24, + "max" : [ + 1, + 1, + 1 + ], + "min" : [ + -1, + -1, + -1 + ], + "type" : "VEC3" + }, + { + "bufferView" : 30, + "componentType" : 5126, + "count" : 24, + "type" : "VEC3" + }, + { + "bufferView" : 31, + "componentType" : 5126, + "count" : 24, + "type" : "VEC2" + }, + { + "bufferView" : 32, + "componentType" : 5126, "count" : 60, "max" : [ 2.5 @@ -635,24 +686,6 @@ ], "type" : "SCALAR" }, - { - "bufferView" : 30, - "componentType" : 5126, - "count" : 60, - "type" : "VEC3" - }, - { - "bufferView" : 31, - "componentType" : 5126, - "count" : 60, - "type" : "VEC4" - }, - { - "bufferView" : 32, - "componentType" : 5126, - "count" : 60, - "type" : "VEC3" - }, { "bufferView" : 33, "componentType" : 5126, @@ -688,6 +721,24 @@ "componentType" : 5126, "count" : 60, "type" : "VEC3" + }, + { + "bufferView" : 39, + "componentType" : 5126, + "count" : 60, + "type" : "VEC3" + }, + { + "bufferView" : 40, + "componentType" : 5126, + "count" : 60, + "type" : "VEC4" + }, + { + "bufferView" : 41, + "componentType" : 5126, + "count" : 60, + "type" : "VEC3" } ], "bufferViews" : [ @@ -838,58 +889,73 @@ }, { "buffer" : 0, - "byteLength" : 240, + "byteLength" : 288, "byteOffset" : 138184 }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 138472 + }, + { + "buffer" : 0, + "byteLength" : 192, + "byteOffset" : 138760 + }, + { + "buffer" : 0, + "byteLength" : 240, + "byteOffset" : 138952 + }, { "buffer" : 0, "byteLength" : 720, - "byteOffset" : 138424 + "byteOffset" : 139192 }, { "buffer" : 0, "byteLength" : 960, - "byteOffset" : 139144 + "byteOffset" : 139912 }, { "buffer" : 0, "byteLength" : 720, - "byteOffset" : 140104 + "byteOffset" : 140872 }, { "buffer" : 0, "byteLength" : 720, - "byteOffset" : 140824 + "byteOffset" : 141592 }, { "buffer" : 0, "byteLength" : 960, - "byteOffset" : 141544 + "byteOffset" : 142312 }, { "buffer" : 0, "byteLength" : 720, - "byteOffset" : 142504 + "byteOffset" : 143272 }, { "buffer" : 0, "byteLength" : 720, - "byteOffset" : 143224 + "byteOffset" : 143992 }, { "buffer" : 0, "byteLength" : 960, - "byteOffset" : 143944 + "byteOffset" : 144712 }, { "buffer" : 0, "byteLength" : 720, - "byteOffset" : 144904 + "byteOffset" : 145672 } ], "buffers" : [ { - "byteLength" : 145624, + "byteLength" : 146392, "uri" : "32678-respect-import-hints-with-empty.bin" } ] diff --git a/tests/blend_export/obj/32678-respect-import-hints-with-empty.obj b/tests/blend_export/obj/32678-respect-import-hints-with-empty.obj index afaf830..d778fbb 100644 --- a/tests/blend_export/obj/32678-respect-import-hints-with-empty.obj +++ b/tests/blend_export/obj/32678-respect-import-hints-with-empty.obj @@ -4396,3 +4396,40 @@ f 1019/1208/1063 1020/1207/1063 1018/1209/1063 1017/1210/1063 f 1017/1210/1064 1018/1209/1064 1014/1211/1064 1013/1212/1064 f 1015/1213/1065 1019/1208/1065 1017/1210/1065 1013/1214/1065 f 1020/1207/1066 1016/1215/1066 1014/1216/1066 1018/1209/1066 +o cube-convcol_Cube.007 +v -1.000000 -1.000000 -11.000000 +v -1.000000 1.000000 -11.000000 +v -1.000000 -1.000000 -13.000000 +v -1.000000 1.000000 -13.000000 +v 1.000000 -1.000000 -11.000000 +v 1.000000 1.000000 -11.000000 +v 1.000000 -1.000000 -13.000000 +v 1.000000 1.000000 -13.000000 +vt 0.375000 0.000000 +vt 0.625000 0.000000 +vt 0.625000 0.250000 +vt 0.375000 0.250000 +vt 0.625000 0.500000 +vt 0.375000 0.500000 +vt 0.625000 0.750000 +vt 0.375000 0.750000 +vt 0.625000 1.000000 +vt 0.375000 1.000000 +vt 0.125000 0.500000 +vt 0.125000 0.750000 +vt 0.875000 0.500000 +vt 0.875000 0.750000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +usemtl None +s off +f 1021/1217/1067 1022/1218/1067 1024/1219/1067 1023/1220/1067 +f 1023/1220/1068 1024/1219/1068 1028/1221/1068 1027/1222/1068 +f 1027/1222/1069 1028/1221/1069 1026/1223/1069 1025/1224/1069 +f 1025/1224/1070 1026/1223/1070 1022/1225/1070 1021/1226/1070 +f 1023/1227/1071 1027/1222/1071 1025/1224/1071 1021/1228/1071 +f 1028/1221/1072 1024/1229/1072 1022/1230/1072 1026/1223/1072