@loaders.gl/gltf 3.1.0-alpha.4 → 3.1.0-alpha.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundle.d.ts +1 -0
- package/dist/dist.min.js +1 -1
- package/dist/dist.min.js.map +1 -1
- package/dist/es5/bundle.js +1 -1
- package/dist/es5/bundle.js.map +1 -1
- package/dist/es5/glb-loader.js +10 -33
- package/dist/es5/glb-loader.js.map +1 -1
- package/dist/es5/glb-writer.js +9 -8
- package/dist/es5/glb-writer.js.map +1 -1
- package/dist/es5/gltf-loader.js +14 -52
- package/dist/es5/gltf-loader.js.map +1 -1
- package/dist/es5/gltf-writer.js +10 -10
- package/dist/es5/gltf-writer.js.map +1 -1
- package/dist/es5/index.js +6 -6
- package/dist/es5/lib/api/gltf-extensions.js +18 -106
- package/dist/es5/lib/api/gltf-extensions.js.map +1 -1
- package/dist/es5/lib/api/gltf-scenegraph.js +447 -541
- package/dist/es5/lib/api/gltf-scenegraph.js.map +1 -1
- package/dist/es5/lib/api/normalize-gltf-v1.js +150 -280
- package/dist/es5/lib/api/normalize-gltf-v1.js.map +1 -1
- package/dist/es5/lib/api/post-process-gltf.js +279 -354
- package/dist/es5/lib/api/post-process-gltf.js.map +1 -1
- package/dist/es5/lib/encoders/encode-glb.js +19 -22
- package/dist/es5/lib/encoders/encode-glb.js.map +1 -1
- package/dist/es5/lib/encoders/encode-gltf.js +3 -5
- package/dist/es5/lib/encoders/encode-gltf.js.map +1 -1
- package/dist/es5/lib/extensions/EXT_meshopt_compression.js +39 -104
- package/dist/es5/lib/extensions/EXT_meshopt_compression.js.map +1 -1
- package/dist/es5/lib/extensions/EXT_texture_webp.js +12 -26
- package/dist/es5/lib/extensions/EXT_texture_webp.js.map +1 -1
- package/dist/es5/lib/extensions/KHR_binary_gltf.js +12 -26
- package/dist/es5/lib/extensions/KHR_binary_gltf.js.map +1 -1
- package/dist/es5/lib/extensions/KHR_draco_mesh_compression.js +76 -261
- package/dist/es5/lib/extensions/KHR_draco_mesh_compression.js.map +1 -1
- package/dist/es5/lib/extensions/KHR_texture_basisu.js +12 -26
- package/dist/es5/lib/extensions/KHR_texture_basisu.js.map +1 -1
- package/dist/es5/lib/extensions/deprecated/KHR_lights_punctual.js +40 -104
- package/dist/es5/lib/extensions/deprecated/KHR_lights_punctual.js.map +1 -1
- package/dist/es5/lib/extensions/deprecated/KHR_materials_unlit.js +24 -69
- package/dist/es5/lib/extensions/deprecated/KHR_materials_unlit.js.map +1 -1
- package/dist/es5/lib/extensions/deprecated/KHR_techniques_webgl.js +34 -90
- package/dist/es5/lib/extensions/deprecated/KHR_techniques_webgl.js.map +1 -1
- package/dist/es5/lib/gltf-utils/get-typed-array.js +6 -6
- package/dist/es5/lib/gltf-utils/get-typed-array.js.map +1 -1
- package/dist/es5/lib/gltf-utils/gltf-attribute-utils.js +19 -21
- package/dist/es5/lib/gltf-utils/gltf-attribute-utils.js.map +1 -1
- package/dist/es5/lib/gltf-utils/gltf-constants.js +7 -7
- package/dist/es5/lib/gltf-utils/gltf-constants.js.map +1 -1
- package/dist/es5/lib/gltf-utils/gltf-utils.js +16 -16
- package/dist/es5/lib/gltf-utils/gltf-utils.js.map +1 -1
- package/dist/es5/lib/gltf-utils/resolve-url.js +2 -2
- package/dist/es5/lib/gltf-utils/resolve-url.js.map +1 -1
- package/dist/es5/lib/parsers/parse-glb.js +34 -38
- package/dist/es5/lib/parsers/parse-glb.js.map +1 -1
- package/dist/es5/lib/parsers/parse-gltf.js +107 -249
- package/dist/es5/lib/parsers/parse-gltf.js.map +1 -1
- package/dist/es5/lib/utils/version.js +1 -1
- package/dist/es5/lib/utils/version.js.map +1 -1
- package/dist/es5/meshopt/meshopt-decoder.js +46 -197
- package/dist/es5/meshopt/meshopt-decoder.js.map +1 -1
- package/dist/es5/webp/webp.js +16 -84
- package/dist/es5/webp/webp.js.map +1 -1
- package/dist/esm/lib/api/gltf-scenegraph.js +1 -1
- package/dist/esm/lib/api/gltf-scenegraph.js.map +1 -1
- package/dist/esm/lib/api/normalize-gltf-v1.js +3 -3
- package/dist/esm/lib/api/normalize-gltf-v1.js.map +1 -1
- package/dist/esm/lib/api/post-process-gltf.js +12 -12
- package/dist/esm/lib/api/post-process-gltf.js.map +1 -1
- package/dist/esm/lib/extensions/EXT_meshopt_compression.js +1 -1
- package/dist/esm/lib/extensions/EXT_meshopt_compression.js.map +1 -1
- package/dist/esm/lib/extensions/EXT_texture_webp.js +1 -1
- package/dist/esm/lib/extensions/EXT_texture_webp.js.map +1 -1
- package/dist/esm/lib/gltf-utils/resolve-url.js +1 -1
- package/dist/esm/lib/gltf-utils/resolve-url.js.map +1 -1
- package/dist/esm/lib/parsers/parse-glb.js +2 -6
- package/dist/esm/lib/parsers/parse-glb.js.map +1 -1
- package/dist/esm/lib/parsers/parse-gltf.js +19 -2
- package/dist/esm/lib/parsers/parse-gltf.js.map +1 -1
- package/dist/esm/lib/utils/version.js +1 -1
- package/dist/esm/meshopt/meshopt-decoder.js +1 -1
- package/dist/esm/meshopt/meshopt-decoder.js.map +1 -1
- package/dist/esm/webp/webp.js +1 -1
- package/dist/esm/webp/webp.js.map +1 -1
- package/dist/glb-loader.d.ts +12 -0
- package/dist/glb-writer.d.ts +21 -0
- package/dist/gltf-loader.d.ts +17 -0
- package/dist/gltf-writer.d.ts +24 -0
- package/dist/index.d.ts +10 -0
- package/dist/lib/api/gltf-extensions.d.ts +25 -0
- package/dist/lib/api/gltf-scenegraph.d.ts +182 -0
- package/dist/lib/api/normalize-gltf-v1.d.ts +1 -0
- package/dist/lib/api/post-process-gltf.d.ts +1 -0
- package/dist/lib/encoders/encode-glb.d.ts +1 -0
- package/dist/lib/encoders/encode-gltf.d.ts +1 -0
- package/dist/lib/extensions/EXT_meshopt_compression.d.ts +9 -0
- package/dist/lib/extensions/EXT_texture_webp.d.ts +11 -0
- package/dist/lib/extensions/KHR_binary_gltf.d.ts +6 -0
- package/dist/lib/extensions/KHR_draco_mesh_compression.d.ts +12 -0
- package/dist/lib/extensions/KHR_texture_basisu.d.ts +11 -0
- package/dist/lib/extensions/deprecated/KHR_lights_punctual.d.ts +6 -0
- package/dist/lib/extensions/deprecated/KHR_materials_unlit.d.ts +6 -0
- package/dist/lib/extensions/deprecated/KHR_techniques_webgl.d.ts +6 -0
- package/dist/lib/gltf-utils/get-typed-array.d.ts +2 -0
- package/dist/lib/gltf-utils/gltf-attribute-utils.d.ts +5 -0
- package/dist/lib/gltf-utils/gltf-constants.d.ts +3 -0
- package/dist/lib/gltf-utils/gltf-utils.d.ts +7 -0
- package/dist/lib/gltf-utils/resolve-url.d.ts +1 -0
- package/dist/lib/parsers/parse-glb.d.ts +7 -0
- package/dist/lib/parsers/parse-gltf.d.ts +13 -0
- package/dist/lib/types/glb-types.d.ts +16 -0
- package/dist/lib/types/gltf-json-schema.d.ts +719 -0
- package/dist/lib/types/gltf-postprocessed-schema.d.ts +684 -0
- package/dist/lib/types/gltf-types.d.ts +9 -0
- package/dist/lib/utils/assert.d.ts +1 -0
- package/dist/lib/utils/version.d.ts +1 -0
- package/dist/meshopt/meshopt-decoder.d.ts +5 -0
- package/dist/webp/webp.d.ts +6 -0
- package/package.json +11 -7
- package/src/lib/parsers/parse-gltf.ts +17 -1
|
@@ -1,31 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
|
-
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
6
|
-
|
|
7
3
|
Object.defineProperty(exports, "__esModule", {
|
|
8
4
|
value: true
|
|
9
5
|
});
|
|
10
6
|
exports.normalizeGLTFV1 = normalizeGLTFV1;
|
|
11
7
|
|
|
12
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
13
|
-
|
|
14
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
15
|
-
|
|
16
8
|
var KHR_binary_glTF = _interopRequireWildcard(require("../extensions/KHR_binary_gltf"));
|
|
17
9
|
|
|
18
|
-
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function
|
|
19
|
-
|
|
20
|
-
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
10
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
21
11
|
|
|
22
|
-
function
|
|
12
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
23
13
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
|
27
|
-
|
|
28
|
-
var GLTF_ARRAYS = {
|
|
14
|
+
const GLTF_ARRAYS = {
|
|
29
15
|
accessors: 'accessor',
|
|
30
16
|
animations: 'animation',
|
|
31
17
|
buffers: 'buffer',
|
|
@@ -39,7 +25,7 @@ var GLTF_ARRAYS = {
|
|
|
39
25
|
skins: 'skin',
|
|
40
26
|
textures: 'texture'
|
|
41
27
|
};
|
|
42
|
-
|
|
28
|
+
const GLTF_KEYS = {
|
|
43
29
|
accessor: 'accessors',
|
|
44
30
|
animations: 'animation',
|
|
45
31
|
buffer: 'buffers',
|
|
@@ -54,9 +40,8 @@ var GLTF_KEYS = {
|
|
|
54
40
|
texture: 'textures'
|
|
55
41
|
};
|
|
56
42
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
(0, _classCallCheck2.default)(this, GLTFV1Normalizer);
|
|
43
|
+
class GLTFV1Normalizer {
|
|
44
|
+
constructor(gltf) {
|
|
60
45
|
this.idToIndexMap = {
|
|
61
46
|
animations: {},
|
|
62
47
|
accessors: {},
|
|
@@ -73,317 +58,202 @@ var GLTFV1Normalizer = function () {
|
|
|
73
58
|
};
|
|
74
59
|
}
|
|
75
60
|
|
|
76
|
-
(
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
this.json = gltf.json;
|
|
80
|
-
var json = gltf.json;
|
|
61
|
+
normalize(gltf, options) {
|
|
62
|
+
this.json = gltf.json;
|
|
63
|
+
const json = gltf.json;
|
|
81
64
|
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
65
|
+
switch (json.asset && json.asset.version) {
|
|
66
|
+
case '2.0':
|
|
67
|
+
return;
|
|
85
68
|
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
69
|
+
case undefined:
|
|
70
|
+
case '1.0':
|
|
71
|
+
break;
|
|
89
72
|
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
73
|
+
default:
|
|
74
|
+
console.warn("glTF: Unknown version ".concat(json.asset.version));
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
94
77
|
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
78
|
+
if (!options.normalize) {
|
|
79
|
+
throw new Error('glTF v1 is not supported.');
|
|
80
|
+
}
|
|
98
81
|
|
|
99
|
-
|
|
82
|
+
console.warn('Converting glTF v1 to glTF v2 format. This is experimental and may fail.');
|
|
100
83
|
|
|
101
|
-
|
|
84
|
+
this._addAsset(json);
|
|
102
85
|
|
|
103
|
-
|
|
86
|
+
this._convertTopLevelObjectsToArrays(json);
|
|
104
87
|
|
|
105
|
-
|
|
88
|
+
KHR_binary_glTF.preprocess(gltf);
|
|
106
89
|
|
|
107
|
-
|
|
90
|
+
this._convertObjectIdsToArrayIndices(json);
|
|
108
91
|
|
|
109
|
-
|
|
92
|
+
this._updateObjects(json);
|
|
110
93
|
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
}, {
|
|
114
|
-
key: "_addAsset",
|
|
115
|
-
value: function _addAsset(json) {
|
|
116
|
-
json.asset = json.asset || {};
|
|
117
|
-
json.asset.version = '2.0';
|
|
118
|
-
json.asset.generator = json.asset.generator || 'Normalized to glTF 2.0 by loaders.gl';
|
|
119
|
-
}
|
|
120
|
-
}, {
|
|
121
|
-
key: "_convertTopLevelObjectsToArrays",
|
|
122
|
-
value: function _convertTopLevelObjectsToArrays(json) {
|
|
123
|
-
for (var arrayName in GLTF_ARRAYS) {
|
|
124
|
-
this._convertTopLevelObjectToArray(json, arrayName);
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
}, {
|
|
128
|
-
key: "_convertTopLevelObjectToArray",
|
|
129
|
-
value: function _convertTopLevelObjectToArray(json, mapName) {
|
|
130
|
-
var objectMap = json[mapName];
|
|
131
|
-
|
|
132
|
-
if (!objectMap || Array.isArray(objectMap)) {
|
|
133
|
-
return;
|
|
134
|
-
}
|
|
94
|
+
this._updateMaterial(json);
|
|
95
|
+
}
|
|
135
96
|
|
|
136
|
-
|
|
97
|
+
_addAsset(json) {
|
|
98
|
+
json.asset = json.asset || {};
|
|
99
|
+
json.asset.version = '2.0';
|
|
100
|
+
json.asset.generator = json.asset.generator || 'Normalized to glTF 2.0 by loaders.gl';
|
|
101
|
+
}
|
|
137
102
|
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
var index = json[mapName].length;
|
|
142
|
-
json[mapName].push(object);
|
|
143
|
-
this.idToIndexMap[mapName][id] = index;
|
|
144
|
-
}
|
|
103
|
+
_convertTopLevelObjectsToArrays(json) {
|
|
104
|
+
for (const arrayName in GLTF_ARRAYS) {
|
|
105
|
+
this._convertTopLevelObjectToArray(json, arrayName);
|
|
145
106
|
}
|
|
146
|
-
}
|
|
147
|
-
key: "_convertObjectIdsToArrayIndices",
|
|
148
|
-
value: function _convertObjectIdsToArrayIndices(json) {
|
|
149
|
-
for (var arrayName in GLTF_ARRAYS) {
|
|
150
|
-
this._convertIdsToIndices(json, arrayName);
|
|
151
|
-
}
|
|
107
|
+
}
|
|
152
108
|
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
}
|
|
109
|
+
_convertTopLevelObjectToArray(json, mapName) {
|
|
110
|
+
const objectMap = json[mapName];
|
|
156
111
|
|
|
157
|
-
|
|
158
|
-
|
|
112
|
+
if (!objectMap || Array.isArray(objectMap)) {
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
159
115
|
|
|
160
|
-
|
|
161
|
-
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
162
|
-
var texture = _step.value;
|
|
116
|
+
json[mapName] = [];
|
|
163
117
|
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
118
|
+
for (const id in objectMap) {
|
|
119
|
+
const object = objectMap[id];
|
|
120
|
+
object.id = object.id || id;
|
|
121
|
+
const index = json[mapName].length;
|
|
122
|
+
json[mapName].push(object);
|
|
123
|
+
this.idToIndexMap[mapName][id] = index;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
171
126
|
|
|
172
|
-
|
|
173
|
-
|
|
127
|
+
_convertObjectIdsToArrayIndices(json) {
|
|
128
|
+
for (const arrayName in GLTF_ARRAYS) {
|
|
129
|
+
this._convertIdsToIndices(json, arrayName);
|
|
130
|
+
}
|
|
174
131
|
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
132
|
+
if ('scene' in json) {
|
|
133
|
+
json.scene = this._convertIdToIndex(json.scene, 'scene');
|
|
134
|
+
}
|
|
178
135
|
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
_iterator2.e(err);
|
|
183
|
-
} finally {
|
|
184
|
-
_iterator2.f();
|
|
185
|
-
}
|
|
136
|
+
for (const texture of json.textures) {
|
|
137
|
+
this._convertTextureIds(texture);
|
|
138
|
+
}
|
|
186
139
|
|
|
187
|
-
|
|
188
|
-
|
|
140
|
+
for (const mesh of json.meshes) {
|
|
141
|
+
this._convertMeshIds(mesh);
|
|
142
|
+
}
|
|
189
143
|
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
144
|
+
for (const node of json.nodes) {
|
|
145
|
+
this._convertNodeIds(node);
|
|
146
|
+
}
|
|
193
147
|
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
} finally {
|
|
199
|
-
_iterator3.f();
|
|
200
|
-
}
|
|
148
|
+
for (const node of json.scenes) {
|
|
149
|
+
this._convertSceneIds(node);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
201
152
|
|
|
202
|
-
|
|
203
|
-
|
|
153
|
+
_convertTextureIds(texture) {
|
|
154
|
+
if (texture.source) {
|
|
155
|
+
texture.source = this._convertIdToIndex(texture.source, 'image');
|
|
156
|
+
}
|
|
157
|
+
}
|
|
204
158
|
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
159
|
+
_convertMeshIds(mesh) {
|
|
160
|
+
for (const primitive of mesh.primitives) {
|
|
161
|
+
const {
|
|
162
|
+
attributes,
|
|
163
|
+
indices,
|
|
164
|
+
material
|
|
165
|
+
} = primitive;
|
|
208
166
|
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
} catch (err) {
|
|
212
|
-
_iterator4.e(err);
|
|
213
|
-
} finally {
|
|
214
|
-
_iterator4.f();
|
|
167
|
+
for (const attributeName in attributes) {
|
|
168
|
+
attributes[attributeName] = this._convertIdToIndex(attributes[attributeName], 'accessor');
|
|
215
169
|
}
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
value: function _convertTextureIds(texture) {
|
|
220
|
-
if (texture.source) {
|
|
221
|
-
texture.source = this._convertIdToIndex(texture.source, 'image');
|
|
170
|
+
|
|
171
|
+
if (indices) {
|
|
172
|
+
primitive.indices = this._convertIdToIndex(indices, 'accessor');
|
|
222
173
|
}
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
value: function _convertMeshIds(mesh) {
|
|
227
|
-
var _iterator5 = _createForOfIteratorHelper(mesh.primitives),
|
|
228
|
-
_step5;
|
|
229
|
-
|
|
230
|
-
try {
|
|
231
|
-
for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
|
|
232
|
-
var primitive = _step5.value;
|
|
233
|
-
var attributes = primitive.attributes,
|
|
234
|
-
indices = primitive.indices,
|
|
235
|
-
material = primitive.material;
|
|
236
|
-
|
|
237
|
-
for (var attributeName in attributes) {
|
|
238
|
-
attributes[attributeName] = this._convertIdToIndex(attributes[attributeName], 'accessor');
|
|
239
|
-
}
|
|
240
|
-
|
|
241
|
-
if (indices) {
|
|
242
|
-
primitive.indices = this._convertIdToIndex(indices, 'accessor');
|
|
243
|
-
}
|
|
244
|
-
|
|
245
|
-
if (material) {
|
|
246
|
-
primitive.material = this._convertIdToIndex(material, 'material');
|
|
247
|
-
}
|
|
248
|
-
}
|
|
249
|
-
} catch (err) {
|
|
250
|
-
_iterator5.e(err);
|
|
251
|
-
} finally {
|
|
252
|
-
_iterator5.f();
|
|
174
|
+
|
|
175
|
+
if (material) {
|
|
176
|
+
primitive.material = this._convertIdToIndex(material, 'material');
|
|
253
177
|
}
|
|
254
178
|
}
|
|
255
|
-
}
|
|
256
|
-
key: "_convertNodeIds",
|
|
257
|
-
value: function _convertNodeIds(node) {
|
|
258
|
-
var _this = this;
|
|
259
|
-
|
|
260
|
-
if (node.children) {
|
|
261
|
-
node.children = node.children.map(function (child) {
|
|
262
|
-
return _this._convertIdToIndex(child, 'node');
|
|
263
|
-
});
|
|
264
|
-
}
|
|
179
|
+
}
|
|
265
180
|
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
});
|
|
270
|
-
}
|
|
181
|
+
_convertNodeIds(node) {
|
|
182
|
+
if (node.children) {
|
|
183
|
+
node.children = node.children.map(child => this._convertIdToIndex(child, 'node'));
|
|
271
184
|
}
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
var _this2 = this;
|
|
276
|
-
|
|
277
|
-
if (scene.nodes) {
|
|
278
|
-
scene.nodes = scene.nodes.map(function (node) {
|
|
279
|
-
return _this2._convertIdToIndex(node, 'node');
|
|
280
|
-
});
|
|
281
|
-
}
|
|
185
|
+
|
|
186
|
+
if (node.meshes) {
|
|
187
|
+
node.meshes = node.meshes.map(mesh => this._convertIdToIndex(mesh, 'mesh'));
|
|
282
188
|
}
|
|
283
|
-
}
|
|
284
|
-
key: "_convertIdsToIndices",
|
|
285
|
-
value: function _convertIdsToIndices(json, topLevelArrayName) {
|
|
286
|
-
if (!json[topLevelArrayName]) {
|
|
287
|
-
console.warn("gltf v1: json doesn't contain attribute ".concat(topLevelArrayName));
|
|
288
|
-
json[topLevelArrayName] = [];
|
|
289
|
-
}
|
|
189
|
+
}
|
|
290
190
|
|
|
291
|
-
|
|
292
|
-
|
|
191
|
+
_convertSceneIds(scene) {
|
|
192
|
+
if (scene.nodes) {
|
|
193
|
+
scene.nodes = scene.nodes.map(node => this._convertIdToIndex(node, 'node'));
|
|
194
|
+
}
|
|
195
|
+
}
|
|
293
196
|
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
197
|
+
_convertIdsToIndices(json, topLevelArrayName) {
|
|
198
|
+
if (!json[topLevelArrayName]) {
|
|
199
|
+
console.warn("gltf v1: json doesn't contain attribute ".concat(topLevelArrayName));
|
|
200
|
+
json[topLevelArrayName] = [];
|
|
201
|
+
}
|
|
297
202
|
|
|
298
|
-
|
|
299
|
-
|
|
203
|
+
for (const object of json[topLevelArrayName]) {
|
|
204
|
+
for (const key in object) {
|
|
205
|
+
const id = object[key];
|
|
300
206
|
|
|
301
|
-
|
|
207
|
+
const index = this._convertIdToIndex(id, key);
|
|
302
208
|
|
|
303
|
-
|
|
304
|
-
}
|
|
305
|
-
}
|
|
306
|
-
} catch (err) {
|
|
307
|
-
_iterator6.e(err);
|
|
308
|
-
} finally {
|
|
309
|
-
_iterator6.f();
|
|
209
|
+
object[key] = index;
|
|
310
210
|
}
|
|
311
211
|
}
|
|
312
|
-
}
|
|
313
|
-
key: "_convertIdToIndex",
|
|
314
|
-
value: function _convertIdToIndex(id, key) {
|
|
315
|
-
var arrayName = GLTF_KEYS[key];
|
|
212
|
+
}
|
|
316
213
|
|
|
317
|
-
|
|
318
|
-
|
|
214
|
+
_convertIdToIndex(id, key) {
|
|
215
|
+
const arrayName = GLTF_KEYS[key];
|
|
319
216
|
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
}
|
|
217
|
+
if (arrayName in this.idToIndexMap) {
|
|
218
|
+
const index = this.idToIndexMap[arrayName][id];
|
|
323
219
|
|
|
324
|
-
|
|
220
|
+
if (!Number.isFinite(index)) {
|
|
221
|
+
throw new Error("gltf v1: failed to resolve ".concat(key, " with id ").concat(id));
|
|
325
222
|
}
|
|
326
223
|
|
|
327
|
-
return
|
|
224
|
+
return index;
|
|
328
225
|
}
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
|
|
337
|
-
var buffer = _step7.value;
|
|
338
|
-
delete buffer.type;
|
|
339
|
-
}
|
|
340
|
-
} catch (err) {
|
|
341
|
-
_iterator7.e(err);
|
|
342
|
-
} finally {
|
|
343
|
-
_iterator7.f();
|
|
344
|
-
}
|
|
226
|
+
|
|
227
|
+
return id;
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
_updateObjects(json) {
|
|
231
|
+
for (const buffer of this.json.buffers) {
|
|
232
|
+
delete buffer.type;
|
|
345
233
|
}
|
|
346
|
-
}
|
|
347
|
-
key: "_updateMaterial",
|
|
348
|
-
value: function _updateMaterial(json) {
|
|
349
|
-
var _iterator8 = _createForOfIteratorHelper(json.materials),
|
|
350
|
-
_step8;
|
|
351
|
-
|
|
352
|
-
try {
|
|
353
|
-
var _loop = function _loop() {
|
|
354
|
-
var material = _step8.value;
|
|
355
|
-
material.pbrMetallicRoughness = {
|
|
356
|
-
baseColorFactor: [1, 1, 1, 1],
|
|
357
|
-
metallicFactor: 1,
|
|
358
|
-
roughnessFactor: 1
|
|
359
|
-
};
|
|
360
|
-
var textureId = material.values && material.values.tex;
|
|
361
|
-
var textureIndex = json.textures.findIndex(function (texture) {
|
|
362
|
-
return texture.id === textureId;
|
|
363
|
-
});
|
|
364
|
-
|
|
365
|
-
if (textureIndex !== -1) {
|
|
366
|
-
material.pbrMetallicRoughness.baseColorTexture = {
|
|
367
|
-
index: textureIndex
|
|
368
|
-
};
|
|
369
|
-
}
|
|
370
|
-
};
|
|
234
|
+
}
|
|
371
235
|
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
236
|
+
_updateMaterial(json) {
|
|
237
|
+
for (const material of json.materials) {
|
|
238
|
+
material.pbrMetallicRoughness = {
|
|
239
|
+
baseColorFactor: [1, 1, 1, 1],
|
|
240
|
+
metallicFactor: 1,
|
|
241
|
+
roughnessFactor: 1
|
|
242
|
+
};
|
|
243
|
+
const textureId = material.values && material.values.tex;
|
|
244
|
+
const textureIndex = json.textures.findIndex(texture => texture.id === textureId);
|
|
245
|
+
|
|
246
|
+
if (textureIndex !== -1) {
|
|
247
|
+
material.pbrMetallicRoughness.baseColorTexture = {
|
|
248
|
+
index: textureIndex
|
|
249
|
+
};
|
|
379
250
|
}
|
|
380
251
|
}
|
|
381
|
-
}
|
|
382
|
-
|
|
383
|
-
}
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
}
|
|
384
255
|
|
|
385
|
-
function normalizeGLTFV1(gltf) {
|
|
386
|
-
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
256
|
+
function normalizeGLTFV1(gltf, options = {}) {
|
|
387
257
|
return new GLTFV1Normalizer().normalize(gltf, options);
|
|
388
258
|
}
|
|
389
259
|
//# sourceMappingURL=normalize-gltf-v1.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/api/normalize-gltf-v1.js"],"names":["GLTF_ARRAYS","accessors","animations","buffers","bufferViews","images","materials","meshes","nodes","samplers","scenes","skins","textures","GLTF_KEYS","accessor","buffer","bufferView","image","material","mesh","node","sampler","scene","skin","texture","GLTFV1Normalizer","gltf","idToIndexMap","options","json","asset","version","undefined","console","warn","normalize","Error","_addAsset","_convertTopLevelObjectsToArrays","KHR_binary_glTF","preprocess","_convertObjectIdsToArrayIndices","_updateObjects","_updateMaterial","generator","arrayName","_convertTopLevelObjectToArray","mapName","objectMap","Array","isArray","id","object","index","length","push","_convertIdsToIndices","_convertIdToIndex","_convertTextureIds","_convertMeshIds","_convertNodeIds","_convertSceneIds","source","primitives","primitive","attributes","indices","attributeName","children","map","child","topLevelArrayName","key","Number","isFinite","type","pbrMetallicRoughness","baseColorFactor","metallicFactor","roughnessFactor","textureId","values","tex","textureIndex","findIndex","baseColorTexture","normalizeGLTFV1"],"mappings":"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","sourcesContent":["/* eslint-disable camelcase */\nimport * as KHR_binary_glTF from '../extensions/KHR_binary_gltf';\n\n// Binary format changes (mainly implemented by GLBLoader)\n// https://github.com/KhronosGroup/glTF/tree/master/extensions/1.0/Khronos/KHR_binary_glTF\n\n// JSON format changes:\n// https://github.com/khronosgroup/gltf/issues/605\n\n// - [x] Top-level JSON objects are arrays now\n// - [ ] Removed indirection from animation: sampler now refers directly to accessors, #712\n// - [ ] material.parameter.value and technique.parameter.value must be an array, #690\n// - [ ] Node can have only one mesh #821\n// - [ ] Added reqs on JSON encoding\n// - [ ] Added reqs on binary data alignment #802 (comment)\n\n// Additions:\n// - [ ] Added accessor.normalized, #691, #706\n// - [ ] Added glExtensionsUsed property and 5125 (UNSIGNED_INT) accessor.componentType value, #619\n// - [ ] Added extensionsRequired property, #720, #721\n// - [ ] Added \"STEP\" as valid animation.sampler.interpolation value, #712\n\n// Removals:\n// - [x] Removed buffer.type, #786, #629\n// - [ ] Removed revision number from profile.version, #709\n// - [ ] Removed technique.functions.scissor and removed 3089 (SCISSOR_TEST) as a valid value for technique.states.enable, #681\n// - [ ] Techniques, programs, and shaders were moved out to KHR_technique_webgl extension.\n\n// Other edits:\n// - [x] asset is now required, #642\n// - [ ] buffer.byteLength and bufferView.byteLength are now required, #560.\n// - [ ] accessor.min and accessor.max are now required, #593, and clarified that the JSON value and binary data must be the same, #628.\n// - [ ] Clarified animation.sampler and animation.channel restrictions, #712\n// - [ ] skin.inverseBindMatrices is now optional, #461.\n// - [ ] Attribute parameters can't have a value defined in the technique or parameter, #563 (comment).\n// - [ ] Only TEXCOORD and COLOR attribute semantics can be written in the form [semantic]_[set_index], #563 (comment).\n// - [ ] TEXCOORD and COLOR attribute semantics must be written in the form [semantic]_[set_index], e.g., just TEXCOORD should be TEXCOORD_0, and just COLOR should be COLOR_0, #649\n// - [ ] camera.perspective.aspectRatio and camera.perspective.yfov must now be > 0, not >= 0, #563 (comment).\n// - [ ] Application-specific parameter semantics must start with an underscore, e.g., _TEMPERATURE and _SIMULATION_TIME, #563 (comment).\n// - [ ] Properties in technique.parameters must be defined in technique.uniforms or technique.attributes,\n\n// #563 (comment).\n// - [ ] technique.parameter.count can only be defined when the semantic is JOINTMATRIX or an application-specific semantic is used. It can never be defined for attribute parameters; only uniforms, d2f6945\n// - [ ] technique.parameter.semantic is required when the parameter is an attribute, 28e113d\n// - [ ] Mesh-only models are allowed, e.g., without materials, #642\n// - [ ] Skeleton hierarchies (nodes containing jointName) must be separated from non-skeleton hierarchies., #647\n// - [ ] technique.states.functions.blendColor and technique.states.functions.depthRange parameters now must match WebGL function min/max, #707\n\nconst GLTF_ARRAYS = {\n accessors: 'accessor',\n animations: 'animation',\n buffers: 'buffer',\n bufferViews: 'bufferView',\n images: 'image',\n materials: 'material',\n meshes: 'mesh',\n nodes: 'node',\n samplers: 'sampler',\n scenes: 'scene',\n skins: 'skin',\n textures: 'texture'\n};\n\nconst GLTF_KEYS = {\n accessor: 'accessors',\n animations: 'animation',\n buffer: 'buffers',\n bufferView: 'bufferViews',\n image: 'images',\n material: 'materials',\n mesh: 'meshes',\n node: 'nodes',\n sampler: 'samplers',\n scene: 'scenes',\n skin: 'skins',\n texture: 'textures'\n};\n\n/**\n * Converts (normalizes) glTF v1 to v2\n */\nclass GLTFV1Normalizer {\n constructor(gltf) {\n this.idToIndexMap = {\n animations: {},\n accessors: {},\n buffers: {},\n bufferViews: {},\n images: {},\n materials: {},\n meshes: {},\n nodes: {},\n samplers: {},\n scenes: {},\n skins: {},\n textures: {}\n };\n }\n\n /**\n * Convert (normalize) glTF < 2.0 to glTF 2.0\n * @param gltf - object with json and binChunks\n * @param options\n * @param options normalize Whether to actually normalize\n */\n normalize(gltf, options) {\n this.json = gltf.json;\n const json = gltf.json;\n\n // Check version\n switch (json.asset && json.asset.version) {\n // We are converting to v2 format. Return if there is nothing to do\n case '2.0':\n return;\n\n // This class is written to convert 1.0\n case undefined:\n case '1.0':\n break;\n\n default:\n // eslint-disable-next-line no-undef, no-console\n console.warn(`glTF: Unknown version ${json.asset.version}`);\n return;\n }\n\n if (!options.normalize) {\n // We are still missing a few conversion tricks, remove once addressed\n throw new Error('glTF v1 is not supported.');\n }\n\n // eslint-disable-next-line no-undef, no-console\n console.warn('Converting glTF v1 to glTF v2 format. This is experimental and may fail.');\n\n this._addAsset(json);\n\n // In glTF2 top-level fields are Arrays not Object maps\n this._convertTopLevelObjectsToArrays(json);\n\n // Extract bufferView indices for images\n // (this extension needs to be invoked early in the normalization process)\n // TODO can this be handled by standard extension processing instead of called explicitly?\n KHR_binary_glTF.preprocess(gltf);\n\n // Convert object references from ids to indices\n this._convertObjectIdsToArrayIndices(json);\n\n this._updateObjects(json);\n\n this._updateMaterial(json);\n }\n\n // asset is now required, #642 https://github.com/KhronosGroup/glTF/issues/639\n _addAsset(json) {\n json.asset = json.asset || {};\n // We are normalizing to glTF v2, so change version to \"2.0\"\n json.asset.version = '2.0';\n json.asset.generator = json.asset.generator || 'Normalized to glTF 2.0 by loaders.gl';\n }\n\n _convertTopLevelObjectsToArrays(json) {\n // TODO check that all arrays are covered\n for (const arrayName in GLTF_ARRAYS) {\n this._convertTopLevelObjectToArray(json, arrayName);\n }\n }\n\n /** Convert one top level object to array */\n _convertTopLevelObjectToArray(json, mapName) {\n const objectMap = json[mapName];\n if (!objectMap || Array.isArray(objectMap)) {\n return;\n }\n\n // Rewrite the top-level field as an array\n json[mapName] = [];\n // Copy the map key into object.id\n for (const id in objectMap) {\n const object = objectMap[id];\n object.id = object.id || id; // Mutates the loaded object\n const index = json[mapName].length;\n json[mapName].push(object);\n this.idToIndexMap[mapName][id] = index;\n }\n }\n\n /** Go through all objects in all top-level arrays and replace ids with indices */\n _convertObjectIdsToArrayIndices(json) {\n for (const arrayName in GLTF_ARRAYS) {\n this._convertIdsToIndices(json, arrayName);\n }\n if ('scene' in json) {\n json.scene = this._convertIdToIndex(json.scene, 'scene');\n }\n\n // Convert any index references that are not using array names\n\n // texture.source (image)\n for (const texture of json.textures) {\n this._convertTextureIds(texture);\n }\n for (const mesh of json.meshes) {\n this._convertMeshIds(mesh);\n }\n for (const node of json.nodes) {\n this._convertNodeIds(node);\n }\n for (const node of json.scenes) {\n this._convertSceneIds(node);\n }\n }\n\n _convertTextureIds(texture) {\n if (texture.source) {\n texture.source = this._convertIdToIndex(texture.source, 'image');\n }\n }\n\n _convertMeshIds(mesh) {\n for (const primitive of mesh.primitives) {\n const {attributes, indices, material} = primitive;\n for (const attributeName in attributes) {\n attributes[attributeName] = this._convertIdToIndex(attributes[attributeName], 'accessor');\n }\n if (indices) {\n primitive.indices = this._convertIdToIndex(indices, 'accessor');\n }\n if (material) {\n primitive.material = this._convertIdToIndex(material, 'material');\n }\n }\n }\n\n _convertNodeIds(node) {\n if (node.children) {\n node.children = node.children.map((child) => this._convertIdToIndex(child, 'node'));\n }\n if (node.meshes) {\n node.meshes = node.meshes.map((mesh) => this._convertIdToIndex(mesh, 'mesh'));\n }\n }\n\n _convertSceneIds(scene) {\n if (scene.nodes) {\n scene.nodes = scene.nodes.map((node) => this._convertIdToIndex(node, 'node'));\n }\n }\n\n /** Go through all objects in a top-level array and replace ids with indices */\n _convertIdsToIndices(json, topLevelArrayName) {\n if (!json[topLevelArrayName]) {\n console.warn(`gltf v1: json doesn't contain attribute ${topLevelArrayName}`); // eslint-disable-line no-console, no-undef\n json[topLevelArrayName] = [];\n }\n for (const object of json[topLevelArrayName]) {\n for (const key in object) {\n const id = object[key];\n const index = this._convertIdToIndex(id, key);\n object[key] = index;\n }\n }\n }\n\n _convertIdToIndex(id, key) {\n const arrayName = GLTF_KEYS[key];\n if (arrayName in this.idToIndexMap) {\n const index = this.idToIndexMap[arrayName][id];\n if (!Number.isFinite(index)) {\n throw new Error(`gltf v1: failed to resolve ${key} with id ${id}`);\n }\n return index;\n }\n return id;\n }\n\n /**\n *\n * @param {*} json\n */\n _updateObjects(json) {\n for (const buffer of this.json.buffers) {\n // - [x] Removed buffer.type, #786, #629\n delete buffer.type;\n }\n }\n\n /**\n * Update material (set pbrMetallicRoughness)\n * @param {*} json\n */\n _updateMaterial(json) {\n for (const material of json.materials) {\n material.pbrMetallicRoughness = {\n baseColorFactor: [1, 1, 1, 1],\n metallicFactor: 1,\n roughnessFactor: 1\n };\n\n const textureId = material.values && material.values.tex;\n const textureIndex = json.textures.findIndex((texture) => texture.id === textureId);\n if (textureIndex !== -1) {\n material.pbrMetallicRoughness.baseColorTexture = {index: textureIndex};\n }\n }\n }\n}\n\nexport function normalizeGLTFV1(gltf, options = {}) {\n return new GLTFV1Normalizer().normalize(gltf, options);\n}\n"],"file":"normalize-gltf-v1.js"}
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/api/normalize-gltf-v1.js"],"names":["GLTF_ARRAYS","accessors","animations","buffers","bufferViews","images","materials","meshes","nodes","samplers","scenes","skins","textures","GLTF_KEYS","accessor","buffer","bufferView","image","material","mesh","node","sampler","scene","skin","texture","GLTFV1Normalizer","constructor","gltf","idToIndexMap","normalize","options","json","asset","version","undefined","console","warn","Error","_addAsset","_convertTopLevelObjectsToArrays","KHR_binary_glTF","preprocess","_convertObjectIdsToArrayIndices","_updateObjects","_updateMaterial","generator","arrayName","_convertTopLevelObjectToArray","mapName","objectMap","Array","isArray","id","object","index","length","push","_convertIdsToIndices","_convertIdToIndex","_convertTextureIds","_convertMeshIds","_convertNodeIds","_convertSceneIds","source","primitive","primitives","attributes","indices","attributeName","children","map","child","topLevelArrayName","key","Number","isFinite","type","pbrMetallicRoughness","baseColorFactor","metallicFactor","roughnessFactor","textureId","values","tex","textureIndex","findIndex","baseColorTexture","normalizeGLTFV1"],"mappings":"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","sourcesContent":["/* eslint-disable camelcase */\nimport * as KHR_binary_glTF from '../extensions/KHR_binary_gltf';\n\n// Binary format changes (mainly implemented by GLBLoader)\n// https://github.com/KhronosGroup/glTF/tree/master/extensions/1.0/Khronos/KHR_binary_glTF\n\n// JSON format changes:\n// https://github.com/khronosgroup/gltf/issues/605\n\n// - [x] Top-level JSON objects are arrays now\n// - [ ] Removed indirection from animation: sampler now refers directly to accessors, #712\n// - [ ] material.parameter.value and technique.parameter.value must be an array, #690\n// - [ ] Node can have only one mesh #821\n// - [ ] Added reqs on JSON encoding\n// - [ ] Added reqs on binary data alignment #802 (comment)\n\n// Additions:\n// - [ ] Added accessor.normalized, #691, #706\n// - [ ] Added glExtensionsUsed property and 5125 (UNSIGNED_INT) accessor.componentType value, #619\n// - [ ] Added extensionsRequired property, #720, #721\n// - [ ] Added \"STEP\" as valid animation.sampler.interpolation value, #712\n\n// Removals:\n// - [x] Removed buffer.type, #786, #629\n// - [ ] Removed revision number from profile.version, #709\n// - [ ] Removed technique.functions.scissor and removed 3089 (SCISSOR_TEST) as a valid value for technique.states.enable, #681\n// - [ ] Techniques, programs, and shaders were moved out to KHR_technique_webgl extension.\n\n// Other edits:\n// - [x] asset is now required, #642\n// - [ ] buffer.byteLength and bufferView.byteLength are now required, #560.\n// - [ ] accessor.min and accessor.max are now required, #593, and clarified that the JSON value and binary data must be the same, #628.\n// - [ ] Clarified animation.sampler and animation.channel restrictions, #712\n// - [ ] skin.inverseBindMatrices is now optional, #461.\n// - [ ] Attribute parameters can't have a value defined in the technique or parameter, #563 (comment).\n// - [ ] Only TEXCOORD and COLOR attribute semantics can be written in the form [semantic]_[set_index], #563 (comment).\n// - [ ] TEXCOORD and COLOR attribute semantics must be written in the form [semantic]_[set_index], e.g., just TEXCOORD should be TEXCOORD_0, and just COLOR should be COLOR_0, #649\n// - [ ] camera.perspective.aspectRatio and camera.perspective.yfov must now be > 0, not >= 0, #563 (comment).\n// - [ ] Application-specific parameter semantics must start with an underscore, e.g., _TEMPERATURE and _SIMULATION_TIME, #563 (comment).\n// - [ ] Properties in technique.parameters must be defined in technique.uniforms or technique.attributes,\n\n// #563 (comment).\n// - [ ] technique.parameter.count can only be defined when the semantic is JOINTMATRIX or an application-specific semantic is used. It can never be defined for attribute parameters; only uniforms, d2f6945\n// - [ ] technique.parameter.semantic is required when the parameter is an attribute, 28e113d\n// - [ ] Mesh-only models are allowed, e.g., without materials, #642\n// - [ ] Skeleton hierarchies (nodes containing jointName) must be separated from non-skeleton hierarchies., #647\n// - [ ] technique.states.functions.blendColor and technique.states.functions.depthRange parameters now must match WebGL function min/max, #707\n\nconst GLTF_ARRAYS = {\n accessors: 'accessor',\n animations: 'animation',\n buffers: 'buffer',\n bufferViews: 'bufferView',\n images: 'image',\n materials: 'material',\n meshes: 'mesh',\n nodes: 'node',\n samplers: 'sampler',\n scenes: 'scene',\n skins: 'skin',\n textures: 'texture'\n};\n\nconst GLTF_KEYS = {\n accessor: 'accessors',\n animations: 'animation',\n buffer: 'buffers',\n bufferView: 'bufferViews',\n image: 'images',\n material: 'materials',\n mesh: 'meshes',\n node: 'nodes',\n sampler: 'samplers',\n scene: 'scenes',\n skin: 'skins',\n texture: 'textures'\n};\n\n/**\n * Converts (normalizes) glTF v1 to v2\n */\nclass GLTFV1Normalizer {\n constructor(gltf) {\n this.idToIndexMap = {\n animations: {},\n accessors: {},\n buffers: {},\n bufferViews: {},\n images: {},\n materials: {},\n meshes: {},\n nodes: {},\n samplers: {},\n scenes: {},\n skins: {},\n textures: {}\n };\n }\n\n /**\n * Convert (normalize) glTF < 2.0 to glTF 2.0\n * @param gltf - object with json and binChunks\n * @param options\n * @param options normalize Whether to actually normalize\n */\n normalize(gltf, options) {\n this.json = gltf.json;\n const json = gltf.json;\n\n // Check version\n switch (json.asset && json.asset.version) {\n // We are converting to v2 format. Return if there is nothing to do\n case '2.0':\n return;\n\n // This class is written to convert 1.0\n case undefined:\n case '1.0':\n break;\n\n default:\n // eslint-disable-next-line no-undef, no-console\n console.warn(`glTF: Unknown version ${json.asset.version}`);\n return;\n }\n\n if (!options.normalize) {\n // We are still missing a few conversion tricks, remove once addressed\n throw new Error('glTF v1 is not supported.');\n }\n\n // eslint-disable-next-line no-undef, no-console\n console.warn('Converting glTF v1 to glTF v2 format. This is experimental and may fail.');\n\n this._addAsset(json);\n\n // In glTF2 top-level fields are Arrays not Object maps\n this._convertTopLevelObjectsToArrays(json);\n\n // Extract bufferView indices for images\n // (this extension needs to be invoked early in the normalization process)\n // TODO can this be handled by standard extension processing instead of called explicitly?\n KHR_binary_glTF.preprocess(gltf);\n\n // Convert object references from ids to indices\n this._convertObjectIdsToArrayIndices(json);\n\n this._updateObjects(json);\n\n this._updateMaterial(json);\n }\n\n // asset is now required, #642 https://github.com/KhronosGroup/glTF/issues/639\n _addAsset(json) {\n json.asset = json.asset || {};\n // We are normalizing to glTF v2, so change version to \"2.0\"\n json.asset.version = '2.0';\n json.asset.generator = json.asset.generator || 'Normalized to glTF 2.0 by loaders.gl';\n }\n\n _convertTopLevelObjectsToArrays(json) {\n // TODO check that all arrays are covered\n for (const arrayName in GLTF_ARRAYS) {\n this._convertTopLevelObjectToArray(json, arrayName);\n }\n }\n\n /** Convert one top level object to array */\n _convertTopLevelObjectToArray(json, mapName) {\n const objectMap = json[mapName];\n if (!objectMap || Array.isArray(objectMap)) {\n return;\n }\n\n // Rewrite the top-level field as an array\n json[mapName] = [];\n // Copy the map key into object.id\n for (const id in objectMap) {\n const object = objectMap[id];\n object.id = object.id || id; // Mutates the loaded object\n const index = json[mapName].length;\n json[mapName].push(object);\n this.idToIndexMap[mapName][id] = index;\n }\n }\n\n /** Go through all objects in all top-level arrays and replace ids with indices */\n _convertObjectIdsToArrayIndices(json) {\n for (const arrayName in GLTF_ARRAYS) {\n this._convertIdsToIndices(json, arrayName);\n }\n if ('scene' in json) {\n json.scene = this._convertIdToIndex(json.scene, 'scene');\n }\n\n // Convert any index references that are not using array names\n\n // texture.source (image)\n for (const texture of json.textures) {\n this._convertTextureIds(texture);\n }\n for (const mesh of json.meshes) {\n this._convertMeshIds(mesh);\n }\n for (const node of json.nodes) {\n this._convertNodeIds(node);\n }\n for (const node of json.scenes) {\n this._convertSceneIds(node);\n }\n }\n\n _convertTextureIds(texture) {\n if (texture.source) {\n texture.source = this._convertIdToIndex(texture.source, 'image');\n }\n }\n\n _convertMeshIds(mesh) {\n for (const primitive of mesh.primitives) {\n const {attributes, indices, material} = primitive;\n for (const attributeName in attributes) {\n attributes[attributeName] = this._convertIdToIndex(attributes[attributeName], 'accessor');\n }\n if (indices) {\n primitive.indices = this._convertIdToIndex(indices, 'accessor');\n }\n if (material) {\n primitive.material = this._convertIdToIndex(material, 'material');\n }\n }\n }\n\n _convertNodeIds(node) {\n if (node.children) {\n node.children = node.children.map((child) => this._convertIdToIndex(child, 'node'));\n }\n if (node.meshes) {\n node.meshes = node.meshes.map((mesh) => this._convertIdToIndex(mesh, 'mesh'));\n }\n }\n\n _convertSceneIds(scene) {\n if (scene.nodes) {\n scene.nodes = scene.nodes.map((node) => this._convertIdToIndex(node, 'node'));\n }\n }\n\n /** Go through all objects in a top-level array and replace ids with indices */\n _convertIdsToIndices(json, topLevelArrayName) {\n if (!json[topLevelArrayName]) {\n console.warn(`gltf v1: json doesn't contain attribute ${topLevelArrayName}`); // eslint-disable-line no-console, no-undef\n json[topLevelArrayName] = [];\n }\n for (const object of json[topLevelArrayName]) {\n for (const key in object) {\n const id = object[key];\n const index = this._convertIdToIndex(id, key);\n object[key] = index;\n }\n }\n }\n\n _convertIdToIndex(id, key) {\n const arrayName = GLTF_KEYS[key];\n if (arrayName in this.idToIndexMap) {\n const index = this.idToIndexMap[arrayName][id];\n if (!Number.isFinite(index)) {\n throw new Error(`gltf v1: failed to resolve ${key} with id ${id}`);\n }\n return index;\n }\n return id;\n }\n\n /**\n *\n * @param {*} json\n */\n _updateObjects(json) {\n for (const buffer of this.json.buffers) {\n // - [x] Removed buffer.type, #786, #629\n delete buffer.type;\n }\n }\n\n /**\n * Update material (set pbrMetallicRoughness)\n * @param {*} json\n */\n _updateMaterial(json) {\n for (const material of json.materials) {\n material.pbrMetallicRoughness = {\n baseColorFactor: [1, 1, 1, 1],\n metallicFactor: 1,\n roughnessFactor: 1\n };\n\n const textureId = material.values && material.values.tex;\n const textureIndex = json.textures.findIndex((texture) => texture.id === textureId);\n if (textureIndex !== -1) {\n material.pbrMetallicRoughness.baseColorTexture = {index: textureIndex};\n }\n }\n }\n}\n\nexport function normalizeGLTFV1(gltf, options = {}) {\n return new GLTFV1Normalizer().normalize(gltf, options);\n}\n"],"file":"normalize-gltf-v1.js"}
|