From 14209acc516fc4efbb06b3e2404fb688dabcdbd7 Mon Sep 17 00:00:00 2001 From: Marco Hutter Date: Mon, 6 May 2024 16:03:01 +0200 Subject: [PATCH] Update golden spec files --- .../BatchedAnimated/batchedAnimated.gltf | 37 ++- .../Batched/BatchedColors/batchedColors.gltf | 214 ++++-------------- .../BatchedColorsMix/batchedColorsMix.gltf | 214 ++++-------------- .../batchedColorsTranslucent.gltf | 214 ++++-------------- .../batchedDeprecated1.gltf | 28 +-- .../batchedDeprecated2.gltf | 28 +-- .../BatchedExpiration/batchedExpiration.gltf | 34 +-- .../BatchedTextured/batchedTextured.gltf | 36 +-- .../batchedTranslucent.gltf | 34 +-- .../batchedTranslucentOpaqueMix.gltf | 54 ++--- .../Batched/BatchedWGS84/batchedWGS84.gltf | 34 +-- .../batchedWithBatchTable.gltf | 50 ++-- .../batchedWithBatchTableBinary.gltf | 42 ++-- .../batchedWithBoundingSphere.gltf | 34 +-- .../batchedWithCopyright.gltf | 34 +-- .../batchedWithRtcCenter.gltf | 34 +-- .../batchedWithTransformBox.gltf | 34 +-- .../batchedWithTransformRegion.gltf | 34 +-- .../batchedWithTransformSphere.gltf | 34 +-- .../batchedWithVertexColors.gltf | 34 +-- .../batchedWithoutBatchTable.gltf | 18 +- 21 files changed, 322 insertions(+), 953 deletions(-) diff --git a/specs/data/migration/golden_gltf/Batched/BatchedAnimated/batchedAnimated.gltf b/specs/data/migration/golden_gltf/Batched/BatchedAnimated/batchedAnimated.gltf index b94e5f6d..4d9a2a43 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedAnimated/batchedAnimated.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedAnimated/batchedAnimated.gltf @@ -37,8 +37,8 @@ }, { "type": "SCALAR", - "componentType": 5126, - "count": 240, + "componentType": 5123, + "count": 360, "bufferView": 1, "byteOffset": 0 }, @@ -46,8 +46,8 @@ "type": "VEC3", "componentType": 5126, "count": 3, - "bufferView": 1, - "byteOffset": 960 + "bufferView": 2, + "byteOffset": 0 }, { "type": "SCALAR", @@ -59,15 +59,8 @@ "min": [ 0 ], - "bufferView": 1, - "byteOffset": 996 - }, - { - "type": "SCALAR", - "componentType": 5123, - "count": 360, "bufferView": 2, - "byteOffset": 0 + "byteOffset": 36 } ], "bufferViews": [ @@ -81,39 +74,39 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 1008 + "byteLength": 720, + "target": 34963 }, { "buffer": 0, - "byteOffset": 7728, - "byteLength": 720, - "target": 34963 + "byteOffset": 7440, + "byteLength": 48 }, { "buffer": 0, - "byteOffset": 8448, + "byteOffset": 7488, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 8458, + "byteOffset": 7498, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8498, + "byteOffset": 7538, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8538, + "byteOffset": 7578, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 8578 + "byteLength": 7618 } ], "materials": [ @@ -134,7 +127,7 @@ }, "mode": 4, "material": 0, - "indices": 6, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ diff --git a/specs/data/migration/golden_gltf/Batched/BatchedColors/batchedColors.gltf b/specs/data/migration/golden_gltf/Batched/BatchedColors/batchedColors.gltf index 1837d2f5..215046de 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedColors/batchedColors.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedColors/batchedColors.gltf @@ -35,144 +35,74 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 2, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 3, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 4, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 5, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 6, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 7, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 8, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 9, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 10, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 0 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 72 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 144 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 216 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 288 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 360 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 432 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 504 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 576 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 648 } ], @@ -187,102 +117,34 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 7680, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 8640, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 9600, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 10560, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 11520, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 12480, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 13440, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 14400, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 15360, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 16320, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 17040, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 17050, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 17090, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 17130, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 17170 + "byteLength": 7570 } ], "materials": [ @@ -408,7 +270,7 @@ }, "mode": 4, "material": 0, - "indices": 13, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -425,11 +287,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 3 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 1, - "indices": 14, + "indices": 4, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -446,11 +308,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 4 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 2, - "indices": 15, + "indices": 5, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -467,11 +329,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 5 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 3, - "indices": 16, + "indices": 6, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -488,11 +350,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 6 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 4, - "indices": 17, + "indices": 7, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -509,11 +371,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 7 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 5, - "indices": 18, + "indices": 8, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -530,11 +392,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 8 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 6, - "indices": 19, + "indices": 9, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -551,11 +413,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 9 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 7, - "indices": 20, + "indices": 10, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -572,11 +434,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 10 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 8, - "indices": 21, + "indices": 11, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -593,11 +455,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 11 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 9, - "indices": 22, + "indices": 12, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -694,16 +556,16 @@ "count": 10, "properties": { "id": { - "values": 12 + "values": 2 }, "Longitude": { - "values": 13 + "values": 3 }, "Latitude": { - "values": 14 + "values": 4 }, "Height": { - "values": 15 + "values": 5 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedColorsMix/batchedColorsMix.gltf b/specs/data/migration/golden_gltf/Batched/BatchedColorsMix/batchedColorsMix.gltf index f6bd12b5..c4168322 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedColorsMix/batchedColorsMix.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedColorsMix/batchedColorsMix.gltf @@ -35,144 +35,74 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 2, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 3, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 4, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 5, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 6, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 7, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 8, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 9, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 10, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 0 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 72 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 144 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 216 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 288 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 360 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 432 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 504 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 576 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 648 } ], @@ -187,102 +117,34 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 7680, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 8640, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 9600, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 10560, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 11520, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 12480, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 13440, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 14400, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 15360, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 16320, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 17040, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 17050, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 17090, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 17130, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 17170 + "byteLength": 7570 } ], "materials": [ @@ -418,7 +280,7 @@ }, "mode": 4, "material": 0, - "indices": 13, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -435,11 +297,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 3 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 1, - "indices": 14, + "indices": 4, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -456,11 +318,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 4 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 2, - "indices": 15, + "indices": 5, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -477,11 +339,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 5 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 3, - "indices": 16, + "indices": 6, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -498,11 +360,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 6 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 4, - "indices": 17, + "indices": 7, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -519,11 +381,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 7 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 5, - "indices": 18, + "indices": 8, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -540,11 +402,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 8 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 6, - "indices": 19, + "indices": 9, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -561,11 +423,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 9 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 7, - "indices": 20, + "indices": 10, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -582,11 +444,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 10 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 8, - "indices": 21, + "indices": 11, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -603,11 +465,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 11 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 9, - "indices": 22, + "indices": 12, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -704,16 +566,16 @@ "count": 10, "properties": { "id": { - "values": 12 + "values": 2 }, "Longitude": { - "values": 13 + "values": 3 }, "Latitude": { - "values": 14 + "values": 4 }, "Height": { - "values": 15 + "values": 5 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedColorsTranslucent/batchedColorsTranslucent.gltf b/specs/data/migration/golden_gltf/Batched/BatchedColorsTranslucent/batchedColorsTranslucent.gltf index 4cacf609..bc8f40dd 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedColorsTranslucent/batchedColorsTranslucent.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedColorsTranslucent/batchedColorsTranslucent.gltf @@ -35,144 +35,74 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 2, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 3, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 4, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 5, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 6, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 7, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 8, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 9, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 10, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 0 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 72 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 144 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 216 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 288 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 360 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 432 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 504 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 576 }, { "type": "SCALAR", "componentType": 5123, "count": 36, - "bufferView": 11, + "bufferView": 1, "byteOffset": 648 } ], @@ -187,102 +117,34 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 7680, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 8640, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 9600, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 10560, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 11520, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 12480, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 13440, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 14400, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 15360, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 16320, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 17040, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 17050, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 17090, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 17130, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 17170 + "byteLength": 7570 } ], "materials": [ @@ -428,7 +290,7 @@ }, "mode": 4, "material": 0, - "indices": 13, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -445,11 +307,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 3 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 1, - "indices": 14, + "indices": 4, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -466,11 +328,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 4 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 2, - "indices": 15, + "indices": 5, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -487,11 +349,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 5 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 3, - "indices": 16, + "indices": 6, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -508,11 +370,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 6 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 4, - "indices": 17, + "indices": 7, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -529,11 +391,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 7 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 5, - "indices": 18, + "indices": 8, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -550,11 +412,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 8 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 6, - "indices": 19, + "indices": 9, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -571,11 +433,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 9 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 7, - "indices": 20, + "indices": 10, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -592,11 +454,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 10 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 8, - "indices": 21, + "indices": 11, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -613,11 +475,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 11 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 9, - "indices": 22, + "indices": 12, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -714,16 +576,16 @@ "count": 10, "properties": { "id": { - "values": 12 + "values": 2 }, "Longitude": { - "values": 13 + "values": 3 }, "Latitude": { - "values": 14 + "values": 4 }, "Height": { - "values": 15 + "values": 5 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedDeprecated1/batchedDeprecated1.gltf b/specs/data/migration/golden_gltf/Batched/BatchedDeprecated1/batchedDeprecated1.gltf index 129b5cc5..38344f85 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedDeprecated1/batchedDeprecated1.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedDeprecated1/batchedDeprecated1.gltf @@ -35,13 +35,6 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 0, - "byteOffset": 28 - }, { "type": "SCALAR", "componentType": 5123, @@ -54,41 +47,41 @@ { "buffer": 0, "byteOffset": 0, - "byteLength": 7680, - "byteStride": 32, + "byteLength": 6720, + "byteStride": 28, "target": 34962 }, { "buffer": 0, - "byteOffset": 7680, + "byteOffset": 6720, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 8400, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 8410, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8450, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8490, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 8530 + "byteLength": 7570 } ], "materials": [ @@ -105,12 +98,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "BATCHID": 2, - "_FEATURE_ID_0": 3 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 0, - "indices": 4, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ diff --git a/specs/data/migration/golden_gltf/Batched/BatchedDeprecated2/batchedDeprecated2.gltf b/specs/data/migration/golden_gltf/Batched/BatchedDeprecated2/batchedDeprecated2.gltf index 129b5cc5..38344f85 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedDeprecated2/batchedDeprecated2.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedDeprecated2/batchedDeprecated2.gltf @@ -35,13 +35,6 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 0, - "byteOffset": 28 - }, { "type": "SCALAR", "componentType": 5123, @@ -54,41 +47,41 @@ { "buffer": 0, "byteOffset": 0, - "byteLength": 7680, - "byteStride": 32, + "byteLength": 6720, + "byteStride": 28, "target": 34962 }, { "buffer": 0, - "byteOffset": 7680, + "byteOffset": 6720, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 8400, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 8410, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8450, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8490, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 8530 + "byteLength": 7570 } ], "materials": [ @@ -105,12 +98,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "BATCHID": 2, - "_FEATURE_ID_0": 3 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 0, - "indices": 4, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ diff --git a/specs/data/migration/golden_gltf/Batched/BatchedExpiration/batchedExpiration.gltf b/specs/data/migration/golden_gltf/Batched/BatchedExpiration/batchedExpiration.gltf index df32097b..c60ee5e6 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedExpiration/batchedExpiration.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedExpiration/batchedExpiration.gltf @@ -35,18 +35,11 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 360, - "bufferView": 2, + "bufferView": 1, "byteOffset": 0 } ], @@ -61,39 +54,34 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 7680, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 8400, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 8410, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8450, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8490, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 8530 + "byteLength": 7570 } ], "materials": [ @@ -114,7 +102,7 @@ }, "mode": 4, "material": 0, - "indices": 4, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -211,16 +199,16 @@ "count": 10, "properties": { "id": { - "values": 3 + "values": 2 }, "Longitude": { - "values": 4 + "values": 3 }, "Latitude": { - "values": 5 + "values": 4 }, "Height": { - "values": 6 + "values": 5 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedTextured/batchedTextured.gltf b/specs/data/migration/golden_gltf/Batched/BatchedTextured/batchedTextured.gltf index 5bed8627..53a8fd02 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedTextured/batchedTextured.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedTextured/batchedTextured.gltf @@ -42,25 +42,18 @@ "bufferView": 1, "byteOffset": 32 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 2, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 360, - "bufferView": 3, + "bufferView": 2, "byteOffset": 0 } ], "bufferViews": [ { "buffer": 0, - "byteOffset": 10320, + "byteOffset": 9360, "byteLength": 15490 }, { @@ -73,32 +66,27 @@ { "buffer": 0, "byteOffset": 8640, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 9600, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 25816, + "byteOffset": 24856, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 25826, + "byteOffset": 24866, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 25866, + "byteOffset": 24906, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 25906, + "byteOffset": 24946, "byteLength": 40 } ], @@ -126,7 +114,7 @@ "buffers": [ { "name": "buffer", - "byteLength": 25946 + "byteLength": 24986 } ], "materials": [ @@ -151,7 +139,7 @@ }, "mode": 4, "material": 0, - "indices": 5, + "indices": 4, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -248,16 +236,16 @@ "count": 10, "properties": { "id": { - "values": 4 + "values": 3 }, "Longitude": { - "values": 5 + "values": 4 }, "Latitude": { - "values": 6 + "values": 5 }, "Height": { - "values": 7 + "values": 6 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedTranslucent/batchedTranslucent.gltf b/specs/data/migration/golden_gltf/Batched/BatchedTranslucent/batchedTranslucent.gltf index 2e7498f0..4897c96f 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedTranslucent/batchedTranslucent.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedTranslucent/batchedTranslucent.gltf @@ -35,18 +35,11 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 360, - "bufferView": 2, + "bufferView": 1, "byteOffset": 0 } ], @@ -61,39 +54,34 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 7680, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 8400, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 8410, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8450, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8490, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 8530 + "byteLength": 7570 } ], "materials": [ @@ -122,7 +110,7 @@ }, "mode": 4, "material": 0, - "indices": 4, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -219,16 +207,16 @@ "count": 10, "properties": { "id": { - "values": 3 + "values": 2 }, "Longitude": { - "values": 4 + "values": 3 }, "Latitude": { - "values": 5 + "values": 4 }, "Height": { - "values": 6 + "values": 5 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedTranslucentOpaqueMix/batchedTranslucentOpaqueMix.gltf b/specs/data/migration/golden_gltf/Batched/BatchedTranslucentOpaqueMix/batchedTranslucentOpaqueMix.gltf index 10f10b07..b777d11b 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedTranslucentOpaqueMix/batchedTranslucentOpaqueMix.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedTranslucentOpaqueMix/batchedTranslucentOpaqueMix.gltf @@ -35,32 +35,18 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 2, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 180, - "bufferView": 3, + "bufferView": 1, "byteOffset": 0 }, { "type": "SCALAR", "componentType": 5123, "count": 180, - "bufferView": 3, + "bufferView": 1, "byteOffset": 360 } ], @@ -75,46 +61,34 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960, - "byteStride": 4, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 7680, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 8640, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 9360, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 9370, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 9410, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 9450, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 9490 + "byteLength": 7570 } ], "materials": [ @@ -148,7 +122,7 @@ }, "mode": 4, "material": 0, - "indices": 5, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -165,11 +139,11 @@ "attributes": { "POSITION": 0, "NORMAL": 1, - "_FEATURE_ID_0": 3 + "_FEATURE_ID_0": 2 }, "mode": 4, "material": 1, - "indices": 6, + "indices": 4, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -266,16 +240,16 @@ "count": 10, "properties": { "id": { - "values": 4 + "values": 2 }, "Longitude": { - "values": 5 + "values": 3 }, "Latitude": { - "values": 6 + "values": 4 }, "Height": { - "values": 7 + "values": 5 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedWGS84/batchedWGS84.gltf b/specs/data/migration/golden_gltf/Batched/BatchedWGS84/batchedWGS84.gltf index 2e2e0944..ce2812a2 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedWGS84/batchedWGS84.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedWGS84/batchedWGS84.gltf @@ -35,18 +35,11 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 360, - "bufferView": 2, + "bufferView": 1, "byteOffset": 0 } ], @@ -61,39 +54,34 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 7680, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 8400, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 8410, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8450, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8490, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 8530 + "byteLength": 7570 } ], "materials": [ @@ -114,7 +102,7 @@ }, "mode": 4, "material": 0, - "indices": 4, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -201,16 +189,16 @@ "count": 10, "properties": { "id": { - "values": 3 + "values": 2 }, "Longitude": { - "values": 4 + "values": 3 }, "Latitude": { - "values": 5 + "values": 4 }, "Height": { - "values": 6 + "values": 5 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedWithBatchTable/batchedWithBatchTable.gltf b/specs/data/migration/golden_gltf/Batched/BatchedWithBatchTable/batchedWithBatchTable.gltf index f0e3f1b2..2a0ddecf 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedWithBatchTable/batchedWithBatchTable.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedWithBatchTable/batchedWithBatchTable.gltf @@ -35,18 +35,11 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 360, - "bufferView": 2, + "bufferView": 1, "byteOffset": 0 } ], @@ -61,59 +54,54 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 7680, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 8400, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 8410, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8450, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8490, + "byteOffset": 7530, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8530, + "byteOffset": 7570, "byteLength": 290 }, { "buffer": 0, - "byteOffset": 8820, + "byteOffset": 7860, "byteLength": 44 }, { "buffer": 0, - "byteOffset": 8864, + "byteOffset": 7904, "byteLength": 210 }, { "buffer": 0, - "byteOffset": 9074, + "byteOffset": 8114, "byteLength": 124 } ], "buffers": [ { "name": "buffer", - "byteLength": 9198 + "byteLength": 8238 } ], "materials": [ @@ -134,7 +122,7 @@ }, "mode": 4, "material": 0, - "indices": 4, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -245,24 +233,24 @@ "count": 10, "properties": { "id": { - "values": 3 + "values": 2 }, "Longitude": { - "values": 4 + "values": 3 }, "Latitude": { - "values": 5 + "values": 4 }, "Height": { - "values": 6 + "values": 5 }, "info": { - "values": 7, - "stringOffsets": 8 + "values": 6, + "stringOffsets": 7 }, "rooms": { - "values": 9, - "stringOffsets": 10 + "values": 8, + "stringOffsets": 9 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedWithBatchTableBinary/batchedWithBatchTableBinary.gltf b/specs/data/migration/golden_gltf/Batched/BatchedWithBatchTableBinary/batchedWithBatchTableBinary.gltf index 2eb6e04d..352a94ba 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedWithBatchTableBinary/batchedWithBatchTableBinary.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedWithBatchTableBinary/batchedWithBatchTableBinary.gltf @@ -35,18 +35,11 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 360, - "bufferView": 2, + "bufferView": 1, "byteOffset": 0 } ], @@ -61,49 +54,44 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 7680, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 8400, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 8410, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8450, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8490, + "byteOffset": 7530, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8530, + "byteOffset": 7570, "byteLength": 240 }, { "buffer": 0, - "byteOffset": 8770, + "byteOffset": 7810, "byteLength": 10 } ], "buffers": [ { "name": "buffer", - "byteLength": 8780 + "byteLength": 7820 } ], "materials": [ @@ -124,7 +112,7 @@ }, "mode": 4, "material": 0, - "indices": 4, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -235,22 +223,22 @@ "count": 10, "properties": { "id": { - "values": 3 + "values": 2 }, "Longitude": { - "values": 4 + "values": 3 }, "Latitude": { - "values": 5 + "values": 4 }, "Height": { - "values": 6 + "values": 5 }, "cartographic": { - "values": 7 + "values": 6 }, "code": { - "values": 8 + "values": 7 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedWithBoundingSphere/batchedWithBoundingSphere.gltf b/specs/data/migration/golden_gltf/Batched/BatchedWithBoundingSphere/batchedWithBoundingSphere.gltf index df32097b..c60ee5e6 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedWithBoundingSphere/batchedWithBoundingSphere.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedWithBoundingSphere/batchedWithBoundingSphere.gltf @@ -35,18 +35,11 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 360, - "bufferView": 2, + "bufferView": 1, "byteOffset": 0 } ], @@ -61,39 +54,34 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 7680, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 8400, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 8410, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8450, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8490, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 8530 + "byteLength": 7570 } ], "materials": [ @@ -114,7 +102,7 @@ }, "mode": 4, "material": 0, - "indices": 4, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -211,16 +199,16 @@ "count": 10, "properties": { "id": { - "values": 3 + "values": 2 }, "Longitude": { - "values": 4 + "values": 3 }, "Latitude": { - "values": 5 + "values": 4 }, "Height": { - "values": 6 + "values": 5 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedWithCopyright/batchedWithCopyright.gltf b/specs/data/migration/golden_gltf/Batched/BatchedWithCopyright/batchedWithCopyright.gltf index 16fca010..9bd98dc1 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedWithCopyright/batchedWithCopyright.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedWithCopyright/batchedWithCopyright.gltf @@ -36,18 +36,11 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 360, - "bufferView": 2, + "bufferView": 1, "byteOffset": 0 } ], @@ -62,39 +55,34 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 7680, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 8400, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 8410, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8450, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8490, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 8530 + "byteLength": 7570 } ], "materials": [ @@ -115,7 +103,7 @@ }, "mode": 4, "material": 0, - "indices": 4, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -212,16 +200,16 @@ "count": 10, "properties": { "id": { - "values": 3 + "values": 2 }, "Longitude": { - "values": 4 + "values": 3 }, "Latitude": { - "values": 5 + "values": 4 }, "Height": { - "values": 6 + "values": 5 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedWithRtcCenter/batchedWithRtcCenter.gltf b/specs/data/migration/golden_gltf/Batched/BatchedWithRtcCenter/batchedWithRtcCenter.gltf index dd4832dc..edcda3f6 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedWithRtcCenter/batchedWithRtcCenter.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedWithRtcCenter/batchedWithRtcCenter.gltf @@ -35,18 +35,11 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 360, - "bufferView": 2, + "bufferView": 1, "byteOffset": 0 } ], @@ -61,39 +54,34 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 7680, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 8400, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 8410, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8450, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8490, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 8530 + "byteLength": 7570 } ], "materials": [ @@ -114,7 +102,7 @@ }, "mode": 4, "material": 0, - "indices": 4, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -211,16 +199,16 @@ "count": 10, "properties": { "id": { - "values": 3 + "values": 2 }, "Longitude": { - "values": 4 + "values": 3 }, "Latitude": { - "values": 5 + "values": 4 }, "Height": { - "values": 6 + "values": 5 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedWithTransformBox/batchedWithTransformBox.gltf b/specs/data/migration/golden_gltf/Batched/BatchedWithTransformBox/batchedWithTransformBox.gltf index e670c078..38344f85 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedWithTransformBox/batchedWithTransformBox.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedWithTransformBox/batchedWithTransformBox.gltf @@ -35,18 +35,11 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 360, - "bufferView": 2, + "bufferView": 1, "byteOffset": 0 } ], @@ -61,39 +54,34 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 7680, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 8400, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 8410, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8450, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8490, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 8530 + "byteLength": 7570 } ], "materials": [ @@ -114,7 +102,7 @@ }, "mode": 4, "material": 0, - "indices": 4, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -201,16 +189,16 @@ "count": 10, "properties": { "id": { - "values": 3 + "values": 2 }, "Longitude": { - "values": 4 + "values": 3 }, "Latitude": { - "values": 5 + "values": 4 }, "Height": { - "values": 6 + "values": 5 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedWithTransformRegion/batchedWithTransformRegion.gltf b/specs/data/migration/golden_gltf/Batched/BatchedWithTransformRegion/batchedWithTransformRegion.gltf index e670c078..38344f85 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedWithTransformRegion/batchedWithTransformRegion.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedWithTransformRegion/batchedWithTransformRegion.gltf @@ -35,18 +35,11 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 360, - "bufferView": 2, + "bufferView": 1, "byteOffset": 0 } ], @@ -61,39 +54,34 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 7680, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 8400, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 8410, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8450, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8490, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 8530 + "byteLength": 7570 } ], "materials": [ @@ -114,7 +102,7 @@ }, "mode": 4, "material": 0, - "indices": 4, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -201,16 +189,16 @@ "count": 10, "properties": { "id": { - "values": 3 + "values": 2 }, "Longitude": { - "values": 4 + "values": 3 }, "Latitude": { - "values": 5 + "values": 4 }, "Height": { - "values": 6 + "values": 5 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedWithTransformSphere/batchedWithTransformSphere.gltf b/specs/data/migration/golden_gltf/Batched/BatchedWithTransformSphere/batchedWithTransformSphere.gltf index e670c078..38344f85 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedWithTransformSphere/batchedWithTransformSphere.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedWithTransformSphere/batchedWithTransformSphere.gltf @@ -35,18 +35,11 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 360, - "bufferView": 2, + "bufferView": 1, "byteOffset": 0 } ], @@ -61,39 +54,34 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 7680, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 8400, + "byteOffset": 7440, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 8410, + "byteOffset": 7450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8450, + "byteOffset": 7490, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 8490, + "byteOffset": 7530, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 8530 + "byteLength": 7570 } ], "materials": [ @@ -114,7 +102,7 @@ }, "mode": 4, "material": 0, - "indices": 4, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -201,16 +189,16 @@ "count": 10, "properties": { "id": { - "values": 3 + "values": 2 }, "Longitude": { - "values": 4 + "values": 3 }, "Latitude": { - "values": 5 + "values": 4 }, "Height": { - "values": 6 + "values": 5 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedWithVertexColors/batchedWithVertexColors.gltf b/specs/data/migration/golden_gltf/Batched/BatchedWithVertexColors/batchedWithVertexColors.gltf index bc6eff01..749833d7 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedWithVertexColors/batchedWithVertexColors.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedWithVertexColors/batchedWithVertexColors.gltf @@ -43,18 +43,11 @@ "bufferView": 0, "byteOffset": 28 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 360, - "bufferView": 2, + "bufferView": 1, "byteOffset": 0 } ], @@ -69,39 +62,34 @@ { "buffer": 0, "byteOffset": 7680, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 8640, "byteLength": 720, "target": 34963 }, { "buffer": 0, - "byteOffset": 9360, + "byteOffset": 8400, "byteLength": 10 }, { "buffer": 0, - "byteOffset": 9370, + "byteOffset": 8410, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 9410, + "byteOffset": 8450, "byteLength": 40 }, { "buffer": 0, - "byteOffset": 9450, + "byteOffset": 8490, "byteLength": 40 } ], "buffers": [ { "name": "buffer", - "byteLength": 9490 + "byteLength": 8530 } ], "materials": [ @@ -123,7 +111,7 @@ }, "mode": 4, "material": 0, - "indices": 5, + "indices": 4, "extensions": { "EXT_mesh_features": { "featureIds": [ @@ -220,16 +208,16 @@ "count": 10, "properties": { "id": { - "values": 3 + "values": 2 }, "Longitude": { - "values": 4 + "values": 3 }, "Latitude": { - "values": 5 + "values": 4 }, "Height": { - "values": 6 + "values": 5 } } } diff --git a/specs/data/migration/golden_gltf/Batched/BatchedWithoutBatchTable/batchedWithoutBatchTable.gltf b/specs/data/migration/golden_gltf/Batched/BatchedWithoutBatchTable/batchedWithoutBatchTable.gltf index e05fbc84..276d3c5a 100644 --- a/specs/data/migration/golden_gltf/Batched/BatchedWithoutBatchTable/batchedWithoutBatchTable.gltf +++ b/specs/data/migration/golden_gltf/Batched/BatchedWithoutBatchTable/batchedWithoutBatchTable.gltf @@ -35,18 +35,11 @@ "bufferView": 0, "byteOffset": 24 }, - { - "type": "SCALAR", - "componentType": 5126, - "count": 240, - "bufferView": 1, - "byteOffset": 0 - }, { "type": "SCALAR", "componentType": 5123, "count": 360, - "bufferView": 2, + "bufferView": 1, "byteOffset": 0 } ], @@ -61,11 +54,6 @@ { "buffer": 0, "byteOffset": 6720, - "byteLength": 960 - }, - { - "buffer": 0, - "byteOffset": 7680, "byteLength": 720, "target": 34963 } @@ -73,7 +61,7 @@ "buffers": [ { "name": "buffer", - "byteLength": 8400 + "byteLength": 7440 } ], "materials": [ @@ -94,7 +82,7 @@ }, "mode": 4, "material": 0, - "indices": 4, + "indices": 3, "extensions": { "EXT_mesh_features": { "featureIds": [