diff --git a/all-is-cubes-desktop/tests/end-to-end/record-ok-gltf.out/test-record-lighting-bench.gltf b/all-is-cubes-desktop/tests/end-to-end/record-ok-gltf.out/test-record-lighting-bench.gltf index a9f6acac3..83fa41925 100644 --- a/all-is-cubes-desktop/tests/end-to-end/record-ok-gltf.out/test-record-lighting-bench.gltf +++ b/all-is-cubes-desktop/tests/end-to-end/record-ok-gltf.out/test-record-lighting-bench.gltf @@ -1,11 +1,11 @@ { "accessors": [ { + "type": "VEC3", "bufferView": 0, "byteOffset": 0, "count": 1680, "componentType": 5126, - "type": "VEC3", "min": [ 0.0, 28.0, @@ -19,11 +19,11 @@ "name": "chunk [0, -1, 0] position" }, { + "type": "VEC4", "bufferView": 0, "byteOffset": 12, "count": 1680, "componentType": 5126, - "type": "VEC4", "min": [ 0.5, 0.5, @@ -39,11 +39,11 @@ "name": "chunk [0, -1, 0] base color" }, { + "type": "VEC2", "bufferView": 0, "byteOffset": 28, "count": 1680, "componentType": 5126, - "type": "VEC2", "min": [ 0.0, 0.0 @@ -55,19 +55,19 @@ "name": "chunk [0, -1, 0] base color texcoords" }, { + "type": "SCALAR", "bufferView": 1, "byteOffset": 0, "count": 2520, "componentType": 5123, - "type": "SCALAR", "name": "chunk [0, -1, 0] opaque index" }, { + "type": "VEC3", "bufferView": 2, "byteOffset": 0, "count": 1104, "componentType": 5126, - "type": "VEC3", "min": [ 0.0, 0.0, @@ -81,11 +81,11 @@ "name": "chunk [0, 0, 0] position" }, { + "type": "VEC4", "bufferView": 2, "byteOffset": 12, "count": 1104, "componentType": 5126, - "type": "VEC4", "min": [ 0.5, 0.19272807240486145, @@ -101,11 +101,11 @@ "name": "chunk [0, 0, 0] base color" }, { + "type": "VEC2", "bufferView": 2, "byteOffset": 28, "count": 1104, "componentType": 5126, - "type": "VEC2", "min": [ 0.0, 0.0 @@ -117,11 +117,11 @@ "name": "chunk [0, 0, 0] base color texcoords" }, { + "type": "SCALAR", "bufferView": 3, "byteOffset": 0, "count": 1656, "componentType": 5123, - "type": "SCALAR", "name": "chunk [0, 0, 0] opaque index" } ], @@ -177,58 +177,32 @@ ], "cameras": [ { + "type": "perspective", "perspective": { "aspectRatio": 1.3333334, "yfov": 1.5707964, "zfar": 200.0, "znear": 0.03125 - }, - "type": "perspective" + } } ], "materials": [ { - "alphaMode": "OPAQUE", - "doubleSided": false, "name": "aic-vertex-opaque", "pbrMetallicRoughness": { - "baseColorFactor": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "metallicFactor": 0.0, - "roughnessFactor": 1.0 - }, - "emissiveFactor": [ - 0.0, - 0.0, - 0.0 - ] + "metallicFactor": 0.0 + } }, { "alphaMode": "BLEND", - "doubleSided": false, "name": "aic-vertex-transparent", "pbrMetallicRoughness": { - "baseColorFactor": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "metallicFactor": 0.0, - "roughnessFactor": 1.0 + "metallicFactor": 0.0 }, - "emissiveFactor": [ - 0.0, - 0.0, - 0.0 - ], "extensions": { - "KHR_materials_transmission": { - "transmissionFactor": 0.0 + "KHR_materials_transmission": {}, + "KHR_materials_volume": { + "thicknessFactor": 1.0 } } } diff --git a/all-is-cubes-port/src/gltf/tests/export_block_defs/export_block_defs.gltf b/all-is-cubes-port/src/gltf/tests/export_block_defs/export_block_defs.gltf index d38d186c0..fd42c9df4 100644 --- a/all-is-cubes-port/src/gltf/tests/export_block_defs/export_block_defs.gltf +++ b/all-is-cubes-port/src/gltf/tests/export_block_defs/export_block_defs.gltf @@ -1,11 +1,11 @@ { "accessors": [ { + "type": "VEC3", "bufferView": 0, "byteOffset": 0, "count": 24, "componentType": 5126, - "type": "VEC3", "min": [ 0.0, 0.0, @@ -19,11 +19,11 @@ "name": "'block0' position" }, { + "type": "VEC4", "bufferView": 0, "byteOffset": 12, "count": 24, "componentType": 5126, - "type": "VEC4", "min": [ 0.04288181662559509, 0.040675945580005646, @@ -39,11 +39,11 @@ "name": "'block0' base color" }, { + "type": "VEC2", "bufferView": 0, "byteOffset": 28, "count": 24, "componentType": 5126, - "type": "VEC2", "min": [ 0.0, 0.0 @@ -55,19 +55,19 @@ "name": "'block0' base color texcoords" }, { + "type": "SCALAR", "bufferView": 1, "byteOffset": 0, "count": 36, "componentType": 5123, - "type": "SCALAR", "name": "'block0' opaque index" }, { + "type": "VEC3", "bufferView": 2, "byteOffset": 0, "count": 24, "componentType": 5126, - "type": "VEC3", "min": [ 0.0, 0.0, @@ -81,11 +81,11 @@ "name": "'block1' position" }, { + "type": "VEC4", "bufferView": 2, "byteOffset": 12, "count": 24, "componentType": 5126, - "type": "VEC4", "min": [ 0.873272180557251, 0.8710663318634033, @@ -101,11 +101,11 @@ "name": "'block1' base color" }, { + "type": "VEC2", "bufferView": 2, "byteOffset": 28, "count": 24, "componentType": 5126, - "type": "VEC2", "min": [ 0.0, 0.0 @@ -117,11 +117,11 @@ "name": "'block1' base color texcoords" }, { + "type": "SCALAR", "bufferView": 3, "byteOffset": 0, "count": 36, "componentType": 5123, - "type": "SCALAR", "name": "'block1' opaque index" } ], @@ -177,47 +177,21 @@ ], "materials": [ { - "alphaMode": "OPAQUE", - "doubleSided": false, "name": "aic-vertex-opaque", "pbrMetallicRoughness": { - "baseColorFactor": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "metallicFactor": 0.0, - "roughnessFactor": 1.0 - }, - "emissiveFactor": [ - 0.0, - 0.0, - 0.0 - ] + "metallicFactor": 0.0 + } }, { "alphaMode": "BLEND", - "doubleSided": false, "name": "aic-vertex-transparent", "pbrMetallicRoughness": { - "baseColorFactor": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "metallicFactor": 0.0, - "roughnessFactor": 1.0 + "metallicFactor": 0.0 }, - "emissiveFactor": [ - 0.0, - 0.0, - 0.0 - ], "extensions": { - "KHR_materials_transmission": { - "transmissionFactor": 0.0 + "KHR_materials_transmission": {}, + "KHR_materials_volume": { + "thicknessFactor": 1.0 } } } diff --git a/all-is-cubes-port/src/gltf/tests/export_space/export_space.gltf b/all-is-cubes-port/src/gltf/tests/export_space/export_space.gltf index 962f4c43a..178475213 100644 --- a/all-is-cubes-port/src/gltf/tests/export_space/export_space.gltf +++ b/all-is-cubes-port/src/gltf/tests/export_space/export_space.gltf @@ -1,11 +1,11 @@ { "accessors": [ { + "type": "VEC3", "bufferView": 0, "byteOffset": 0, "count": 24, "componentType": 5126, - "type": "VEC3", "min": [ 0.0, 0.0, @@ -19,11 +19,11 @@ "name": "'x' position" }, { + "type": "VEC4", "bufferView": 0, "byteOffset": 12, "count": 24, "componentType": 5126, - "type": "VEC4", "min": [ 0.5, 0.5, @@ -39,11 +39,11 @@ "name": "'x' base color" }, { + "type": "VEC2", "bufferView": 0, "byteOffset": 28, "count": 24, "componentType": 5126, - "type": "VEC2", "min": [ 0.0, 0.0 @@ -55,11 +55,11 @@ "name": "'x' base color texcoords" }, { + "type": "SCALAR", "bufferView": 1, "byteOffset": 0, "count": 36, "componentType": 5123, - "type": "SCALAR", "name": "'x' opaque index" } ], @@ -96,47 +96,21 @@ ], "materials": [ { - "alphaMode": "OPAQUE", - "doubleSided": false, "name": "aic-vertex-opaque", "pbrMetallicRoughness": { - "baseColorFactor": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "metallicFactor": 0.0, - "roughnessFactor": 1.0 - }, - "emissiveFactor": [ - 0.0, - 0.0, - 0.0 - ] + "metallicFactor": 0.0 + } }, { "alphaMode": "BLEND", - "doubleSided": false, "name": "aic-vertex-transparent", "pbrMetallicRoughness": { - "baseColorFactor": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "metallicFactor": 0.0, - "roughnessFactor": 1.0 + "metallicFactor": 0.0 }, - "emissiveFactor": [ - 0.0, - 0.0, - 0.0 - ], "extensions": { - "KHR_materials_transmission": { - "transmissionFactor": 0.0 + "KHR_materials_transmission": {}, + "KHR_materials_volume": { + "thicknessFactor": 1.0 } } }