@loaders.gl/tile-converter 3.2.12 → 3.2.13
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/3d-tiles-attributes-worker.js +1 -1
- package/dist/converter.min.js +1 -1
- package/dist/dist.min.js +9 -5
- package/dist/es5/3d-tiles-attributes-worker.js +1 -1
- package/dist/es5/i3s-attributes-worker.js +1 -1
- package/dist/es5/i3s-converter/json-templates/shared-resources.js +3 -3
- package/dist/es5/i3s-converter/json-templates/shared-resources.js.map +1 -1
- package/dist/es5/pgm-loader.js +1 -1
- package/dist/esm/3d-tiles-attributes-worker.js +1 -1
- package/dist/esm/i3s-attributes-worker.js +1 -1
- package/dist/esm/i3s-converter/json-templates/shared-resources.js +3 -3
- package/dist/esm/i3s-converter/json-templates/shared-resources.js.map +1 -1
- package/dist/esm/pgm-loader.js +1 -1
- package/dist/i3s-converter/json-templates/shared-resources.js +3 -3
- package/package.json +15 -15
- package/src/i3s-converter/json-templates/shared-resources.ts +3 -3
package/dist/dist.min.js
CHANGED
|
@@ -85473,15 +85473,15 @@ var MATERIAL_DEFINITION_INFO_PARAMS = () => ({
|
|
|
85473
85473
|
},
|
|
85474
85474
|
ambient: {
|
|
85475
85475
|
path: "ambient",
|
|
85476
|
-
default: [1, 1, 1
|
|
85476
|
+
default: [1, 1, 1]
|
|
85477
85477
|
},
|
|
85478
85478
|
diffuse: {
|
|
85479
85479
|
path: "diffuse",
|
|
85480
|
-
default: [1, 1, 1
|
|
85480
|
+
default: [1, 1, 1]
|
|
85481
85481
|
},
|
|
85482
85482
|
specular: {
|
|
85483
85483
|
path: "specular",
|
|
85484
|
-
default: [0, 0, 0
|
|
85484
|
+
default: [0, 0, 0]
|
|
85485
85485
|
},
|
|
85486
85486
|
useVertexColorAlpha: {
|
|
85487
85487
|
path: "useVertexColorAlpha",
|
|
@@ -86606,7 +86606,7 @@ function getConstructorForDataFormat(dataType) {
|
|
|
86606
86606
|
}
|
|
86607
86607
|
var GL_TYPE_MAP = {
|
|
86608
86608
|
UInt8: import_constants15.default.UNSIGNED_BYTE,
|
|
86609
|
-
UInt16: import_constants15.default.
|
|
86609
|
+
UInt16: import_constants15.default.UNSIGNED_SHORT,
|
|
86610
86610
|
Float32: import_constants15.default.FLOAT,
|
|
86611
86611
|
UInt32: import_constants15.default.UNSIGNED_INT,
|
|
86612
86612
|
UInt64: import_constants15.default.DOUBLE
|
|
@@ -86768,7 +86768,7 @@ async function parseI3SNodeGeometry(arrayBuffer, tile, tileset, options) {
|
|
|
86768
86768
|
normals: attributes.normal,
|
|
86769
86769
|
colors: normalizeAttribute(attributes.color),
|
|
86770
86770
|
texCoords: attributes.uv0,
|
|
86771
|
-
uvRegions: normalizeAttribute(attributes.uvRegion)
|
|
86771
|
+
uvRegions: normalizeAttribute(attributes.uvRegion || attributes.region)
|
|
86772
86772
|
};
|
|
86773
86773
|
content.indices = indices || null;
|
|
86774
86774
|
if (attributes.id && attributes.id.value) {
|
|
@@ -87308,6 +87308,7 @@ var VERSION14 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
|
|
|
87308
87308
|
var TILESET_REGEX = /layers\/[0-9]+$/;
|
|
87309
87309
|
var TILE_HEADER_REGEX = /nodes\/([0-9-]+|root)$/;
|
|
87310
87310
|
var SLPK_HEX = "504b0304";
|
|
87311
|
+
var POINT_CLOUD = "PointCloud";
|
|
87311
87312
|
var I3SLoader = {
|
|
87312
87313
|
name: "I3S (Indexed Scene Layers)",
|
|
87313
87314
|
id: "i3s",
|
|
@@ -87368,6 +87369,9 @@ async function parseTileContent(arrayBuffer, options) {
|
|
|
87368
87369
|
}
|
|
87369
87370
|
async function parseTileset2(data, options, context) {
|
|
87370
87371
|
const tilesetJson = JSON.parse(new TextDecoder().decode(data));
|
|
87372
|
+
if (tilesetJson?.layerType === POINT_CLOUD) {
|
|
87373
|
+
throw new Error("Point Cloud layers currently are not supported by I3SLoader");
|
|
87374
|
+
}
|
|
87371
87375
|
tilesetJson.loader = I3SLoader;
|
|
87372
87376
|
await normalizeTilesetData(tilesetJson, options, context);
|
|
87373
87377
|
return tilesetJson;
|
|
@@ -8,7 +8,7 @@ exports._typecheckI3SAttributesWorker = exports.Tile3dAttributesWorker = void 0;
|
|
|
8
8
|
|
|
9
9
|
var _workerUtils = require("@loaders.gl/worker-utils");
|
|
10
10
|
|
|
11
|
-
var VERSION = typeof "3.2.
|
|
11
|
+
var VERSION = typeof "3.2.13" !== 'undefined' ? "3.2.13" : 'latest';
|
|
12
12
|
var Tile3dAttributesWorker = {
|
|
13
13
|
id: '3d-tiles-attributes',
|
|
14
14
|
name: '3DTiles Attributes Worker',
|
|
@@ -8,7 +8,7 @@ exports._typecheckI3SAttributesWorker = exports.I3SAttributesWorker = void 0;
|
|
|
8
8
|
|
|
9
9
|
var _workerUtils = require("@loaders.gl/worker-utils");
|
|
10
10
|
|
|
11
|
-
var VERSION = typeof "3.2.
|
|
11
|
+
var VERSION = typeof "3.2.13" !== 'undefined' ? "3.2.13" : 'latest';
|
|
12
12
|
var I3SAttributesWorker = {
|
|
13
13
|
id: 'i3s-attributes',
|
|
14
14
|
name: 'I3S Attributes Worker',
|
|
@@ -33,15 +33,15 @@ var MATERIAL_DEFINITION_INFO_PARAMS = function MATERIAL_DEFINITION_INFO_PARAMS()
|
|
|
33
33
|
},
|
|
34
34
|
ambient: {
|
|
35
35
|
path: 'ambient',
|
|
36
|
-
default: [1, 1, 1
|
|
36
|
+
default: [1, 1, 1]
|
|
37
37
|
},
|
|
38
38
|
diffuse: {
|
|
39
39
|
path: 'diffuse',
|
|
40
|
-
default: [1, 1, 1
|
|
40
|
+
default: [1, 1, 1]
|
|
41
41
|
},
|
|
42
42
|
specular: {
|
|
43
43
|
path: 'specular',
|
|
44
|
-
default: [0, 0, 0
|
|
44
|
+
default: [0, 0, 0]
|
|
45
45
|
},
|
|
46
46
|
useVertexColorAlpha: {
|
|
47
47
|
path: 'useVertexColorAlpha',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/i3s-converter/json-templates/shared-resources.ts"],"names":["MATERIAL_DEFINITION_INFO_PARAMS","renderMode","path","default","shininess","reflectivity","ambient","diffuse","specular","useVertexColorAlpha","vertexRegions","vertexColors","MATERIAL_DEFINITION_INFO","name","type","params","transform","val","thisObject","originalObject","TEXTURE_DEFINITION_IMAGE","id","size","href","length","TEXTURE_DEFINITION_INFO","encoding","wrap","atlas","uvSet","channels","images","map","image","SHARED_RESOURCES","materialDefinitions","transfromMaterialDefinitions","textureDefinitions","transfromTextureDefinitions","materialDefinitionInfos","result","entries","index","materialDefinitionInfo","nodePath","textureDefinitionInfos","textureDefinitionInfo","imageIndex"],"mappings":";;;;;;;;;;;AAAA;;;;;;;;AAEA,IAAMA,+BAA+B,GAAG,SAAlCA,+BAAkC;AAAA,SAAO;AAC7CC,IAAAA,UAAU,EAAE;AACVC,MAAAA,IAAI,EAAE,YADI;AAEVC,MAAAA,OAAO,EAAE;AAFC,KADiC;AAK7CC,IAAAA,SAAS,EAAE;AACTF,MAAAA,IAAI,EAAE,WADG;AAETC,MAAAA,OAAO,EAAE;AAFA,KALkC;AAS7CE,IAAAA,YAAY,EAAE;AACZH,MAAAA,IAAI,EAAE,cADM;AAEZC,MAAAA,OAAO,EAAE;AAFG,KAT+B;AAa7CG,IAAAA,OAAO,EAAE;AACPJ,MAAAA,IAAI,EAAE,SADC;AAEPC,MAAAA,OAAO,EAAE,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP
|
|
1
|
+
{"version":3,"sources":["../../../../src/i3s-converter/json-templates/shared-resources.ts"],"names":["MATERIAL_DEFINITION_INFO_PARAMS","renderMode","path","default","shininess","reflectivity","ambient","diffuse","specular","useVertexColorAlpha","vertexRegions","vertexColors","MATERIAL_DEFINITION_INFO","name","type","params","transform","val","thisObject","originalObject","TEXTURE_DEFINITION_IMAGE","id","size","href","length","TEXTURE_DEFINITION_INFO","encoding","wrap","atlas","uvSet","channels","images","map","image","SHARED_RESOURCES","materialDefinitions","transfromMaterialDefinitions","textureDefinitions","transfromTextureDefinitions","materialDefinitionInfos","result","entries","index","materialDefinitionInfo","nodePath","textureDefinitionInfos","textureDefinitionInfo","imageIndex"],"mappings":"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","sourcesContent":["import transform from 'json-map-transform';\n\nconst MATERIAL_DEFINITION_INFO_PARAMS = () => ({\n renderMode: {\n path: 'renderMode',\n default: 'solid'\n },\n shininess: {\n path: 'shininess',\n default: 1\n },\n reflectivity: {\n path: 'reflectivity',\n default: 0\n },\n ambient: {\n path: 'ambient',\n default: [1, 1, 1]\n },\n diffuse: {\n path: 'diffuse',\n default: [1, 1, 1]\n },\n specular: {\n path: 'specular',\n default: [0, 0, 0]\n },\n useVertexColorAlpha: {\n path: 'useVertexColorAlpha',\n default: false\n },\n vertexRegions: {\n path: 'vertexRegions',\n default: false\n },\n vertexColors: {\n path: 'vertexColors',\n default: true\n }\n});\n\nconst MATERIAL_DEFINITION_INFO = () => ({\n name: {\n path: 'name',\n default: 'standard'\n },\n type: {\n path: 'type',\n default: 'standard'\n },\n params: {\n path: 'params',\n transform: (val, thisObject, originalObject) =>\n transform(originalObject, MATERIAL_DEFINITION_INFO_PARAMS())\n }\n});\n\nconst TEXTURE_DEFINITION_IMAGE = () => ({\n id: {\n path: 'id'\n },\n size: {\n path: 'size'\n },\n href: {\n path: 'href',\n default: ['../textures/0']\n },\n length: {\n path: 'length'\n }\n});\n\nconst TEXTURE_DEFINITION_INFO = () => ({\n encoding: {\n path: 'encoding'\n },\n wrap: {\n path: 'wrap',\n default: ['none']\n },\n atlas: {\n path: 'atlas',\n default: false\n },\n uvSet: {\n path: 'uvSet',\n default: 'uv0'\n },\n channels: {\n path: 'channels',\n default: 'rgb'\n },\n images: {\n path: 'images',\n transform: (val, thisObject, originalObject) =>\n val.map((image) => transform(image, TEXTURE_DEFINITION_IMAGE()))\n }\n});\n\nexport const SHARED_RESOURCES = () => ({\n materialDefinitions: {\n path: 'materialDefinitionInfos',\n transform: transfromMaterialDefinitions\n },\n textureDefinitions: {\n path: 'textureDefinitionInfos',\n transform: transfromTextureDefinitions\n }\n});\n\nfunction transfromMaterialDefinitions(materialDefinitionInfos, thisObject, originalObject) {\n const result = {};\n for (const [index, materialDefinitionInfo] of materialDefinitionInfos.entries()) {\n result[`Mat${originalObject.nodePath}${index}`] = transform(\n materialDefinitionInfo,\n MATERIAL_DEFINITION_INFO()\n );\n }\n return result;\n}\n\nfunction transfromTextureDefinitions(textureDefinitionInfos, thisObject, originalObject) {\n if (!textureDefinitionInfos) {\n return null;\n }\n const result = {};\n for (const [index, textureDefinitionInfo] of textureDefinitionInfos.entries()) {\n const imageIndex = `${originalObject.nodePath}${index}`;\n textureDefinitionInfo.imageIndex = imageIndex;\n result[imageIndex] = transform(textureDefinitionInfo, TEXTURE_DEFINITION_INFO());\n }\n return result;\n}\n"],"file":"shared-resources.js"}
|
package/dist/es5/pgm-loader.js
CHANGED
|
@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
|
|
|
13
13
|
|
|
14
14
|
var _geoid = require("@math.gl/geoid");
|
|
15
15
|
|
|
16
|
-
var VERSION = typeof "3.2.
|
|
16
|
+
var VERSION = typeof "3.2.13" !== 'undefined' ? "3.2.13" : 'latest';
|
|
17
17
|
var PGMLoader = {
|
|
18
18
|
name: 'PGM - Netpbm grayscale image format',
|
|
19
19
|
id: 'pgm',
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { processOnWorker } from '@loaders.gl/worker-utils';
|
|
2
|
-
const VERSION = typeof "3.2.
|
|
2
|
+
const VERSION = typeof "3.2.13" !== 'undefined' ? "3.2.13" : 'latest';
|
|
3
3
|
export const Tile3dAttributesWorker = {
|
|
4
4
|
id: '3d-tiles-attributes',
|
|
5
5
|
name: '3DTiles Attributes Worker',
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { processOnWorker } from '@loaders.gl/worker-utils';
|
|
2
|
-
const VERSION = typeof "3.2.
|
|
2
|
+
const VERSION = typeof "3.2.13" !== 'undefined' ? "3.2.13" : 'latest';
|
|
3
3
|
export const I3SAttributesWorker = {
|
|
4
4
|
id: 'i3s-attributes',
|
|
5
5
|
name: 'I3S Attributes Worker',
|
|
@@ -15,15 +15,15 @@ const MATERIAL_DEFINITION_INFO_PARAMS = () => ({
|
|
|
15
15
|
},
|
|
16
16
|
ambient: {
|
|
17
17
|
path: 'ambient',
|
|
18
|
-
default: [1, 1, 1
|
|
18
|
+
default: [1, 1, 1]
|
|
19
19
|
},
|
|
20
20
|
diffuse: {
|
|
21
21
|
path: 'diffuse',
|
|
22
|
-
default: [1, 1, 1
|
|
22
|
+
default: [1, 1, 1]
|
|
23
23
|
},
|
|
24
24
|
specular: {
|
|
25
25
|
path: 'specular',
|
|
26
|
-
default: [0, 0, 0
|
|
26
|
+
default: [0, 0, 0]
|
|
27
27
|
},
|
|
28
28
|
useVertexColorAlpha: {
|
|
29
29
|
path: 'useVertexColorAlpha',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/i3s-converter/json-templates/shared-resources.ts"],"names":["transform","MATERIAL_DEFINITION_INFO_PARAMS","renderMode","path","default","shininess","reflectivity","ambient","diffuse","specular","useVertexColorAlpha","vertexRegions","vertexColors","MATERIAL_DEFINITION_INFO","name","type","params","val","thisObject","originalObject","TEXTURE_DEFINITION_IMAGE","id","size","href","length","TEXTURE_DEFINITION_INFO","encoding","wrap","atlas","uvSet","channels","images","map","image","SHARED_RESOURCES","materialDefinitions","transfromMaterialDefinitions","textureDefinitions","transfromTextureDefinitions","materialDefinitionInfos","result","index","materialDefinitionInfo","entries","nodePath","textureDefinitionInfos","textureDefinitionInfo","imageIndex"],"mappings":"AAAA,OAAOA,SAAP,MAAsB,oBAAtB;;AAEA,MAAMC,+BAA+B,GAAG,OAAO;AAC7CC,EAAAA,UAAU,EAAE;AACVC,IAAAA,IAAI,EAAE,YADI;AAEVC,IAAAA,OAAO,EAAE;AAFC,GADiC;AAK7CC,EAAAA,SAAS,EAAE;AACTF,IAAAA,IAAI,EAAE,WADG;AAETC,IAAAA,OAAO,EAAE;AAFA,GALkC;AAS7CE,EAAAA,YAAY,EAAE;AACZH,IAAAA,IAAI,EAAE,cADM;AAEZC,IAAAA,OAAO,EAAE;AAFG,GAT+B;AAa7CG,EAAAA,OAAO,EAAE;AACPJ,IAAAA,IAAI,EAAE,SADC;AAEPC,IAAAA,OAAO,EAAE,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP
|
|
1
|
+
{"version":3,"sources":["../../../../src/i3s-converter/json-templates/shared-resources.ts"],"names":["transform","MATERIAL_DEFINITION_INFO_PARAMS","renderMode","path","default","shininess","reflectivity","ambient","diffuse","specular","useVertexColorAlpha","vertexRegions","vertexColors","MATERIAL_DEFINITION_INFO","name","type","params","val","thisObject","originalObject","TEXTURE_DEFINITION_IMAGE","id","size","href","length","TEXTURE_DEFINITION_INFO","encoding","wrap","atlas","uvSet","channels","images","map","image","SHARED_RESOURCES","materialDefinitions","transfromMaterialDefinitions","textureDefinitions","transfromTextureDefinitions","materialDefinitionInfos","result","index","materialDefinitionInfo","entries","nodePath","textureDefinitionInfos","textureDefinitionInfo","imageIndex"],"mappings":"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","sourcesContent":["import transform from 'json-map-transform';\n\nconst MATERIAL_DEFINITION_INFO_PARAMS = () => ({\n renderMode: {\n path: 'renderMode',\n default: 'solid'\n },\n shininess: {\n path: 'shininess',\n default: 1\n },\n reflectivity: {\n path: 'reflectivity',\n default: 0\n },\n ambient: {\n path: 'ambient',\n default: [1, 1, 1]\n },\n diffuse: {\n path: 'diffuse',\n default: [1, 1, 1]\n },\n specular: {\n path: 'specular',\n default: [0, 0, 0]\n },\n useVertexColorAlpha: {\n path: 'useVertexColorAlpha',\n default: false\n },\n vertexRegions: {\n path: 'vertexRegions',\n default: false\n },\n vertexColors: {\n path: 'vertexColors',\n default: true\n }\n});\n\nconst MATERIAL_DEFINITION_INFO = () => ({\n name: {\n path: 'name',\n default: 'standard'\n },\n type: {\n path: 'type',\n default: 'standard'\n },\n params: {\n path: 'params',\n transform: (val, thisObject, originalObject) =>\n transform(originalObject, MATERIAL_DEFINITION_INFO_PARAMS())\n }\n});\n\nconst TEXTURE_DEFINITION_IMAGE = () => ({\n id: {\n path: 'id'\n },\n size: {\n path: 'size'\n },\n href: {\n path: 'href',\n default: ['../textures/0']\n },\n length: {\n path: 'length'\n }\n});\n\nconst TEXTURE_DEFINITION_INFO = () => ({\n encoding: {\n path: 'encoding'\n },\n wrap: {\n path: 'wrap',\n default: ['none']\n },\n atlas: {\n path: 'atlas',\n default: false\n },\n uvSet: {\n path: 'uvSet',\n default: 'uv0'\n },\n channels: {\n path: 'channels',\n default: 'rgb'\n },\n images: {\n path: 'images',\n transform: (val, thisObject, originalObject) =>\n val.map((image) => transform(image, TEXTURE_DEFINITION_IMAGE()))\n }\n});\n\nexport const SHARED_RESOURCES = () => ({\n materialDefinitions: {\n path: 'materialDefinitionInfos',\n transform: transfromMaterialDefinitions\n },\n textureDefinitions: {\n path: 'textureDefinitionInfos',\n transform: transfromTextureDefinitions\n }\n});\n\nfunction transfromMaterialDefinitions(materialDefinitionInfos, thisObject, originalObject) {\n const result = {};\n for (const [index, materialDefinitionInfo] of materialDefinitionInfos.entries()) {\n result[`Mat${originalObject.nodePath}${index}`] = transform(\n materialDefinitionInfo,\n MATERIAL_DEFINITION_INFO()\n );\n }\n return result;\n}\n\nfunction transfromTextureDefinitions(textureDefinitionInfos, thisObject, originalObject) {\n if (!textureDefinitionInfos) {\n return null;\n }\n const result = {};\n for (const [index, textureDefinitionInfo] of textureDefinitionInfos.entries()) {\n const imageIndex = `${originalObject.nodePath}${index}`;\n textureDefinitionInfo.imageIndex = imageIndex;\n result[imageIndex] = transform(textureDefinitionInfo, TEXTURE_DEFINITION_INFO());\n }\n return result;\n}\n"],"file":"shared-resources.js"}
|
package/dist/esm/pgm-loader.js
CHANGED
|
@@ -20,15 +20,15 @@ const MATERIAL_DEFINITION_INFO_PARAMS = () => ({
|
|
|
20
20
|
},
|
|
21
21
|
ambient: {
|
|
22
22
|
path: 'ambient',
|
|
23
|
-
default: [1, 1, 1
|
|
23
|
+
default: [1, 1, 1]
|
|
24
24
|
},
|
|
25
25
|
diffuse: {
|
|
26
26
|
path: 'diffuse',
|
|
27
|
-
default: [1, 1, 1
|
|
27
|
+
default: [1, 1, 1]
|
|
28
28
|
},
|
|
29
29
|
specular: {
|
|
30
30
|
path: 'specular',
|
|
31
|
-
default: [0, 0, 0
|
|
31
|
+
default: [0, 0, 0]
|
|
32
32
|
},
|
|
33
33
|
useVertexColorAlpha: {
|
|
34
34
|
path: 'useVertexColorAlpha',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/tile-converter",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.13",
|
|
4
4
|
"description": "Converter",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -43,19 +43,19 @@
|
|
|
43
43
|
"build-3d-tiles-attributes-worker": "esbuild src/workers/3d-tiles-attributes-worker.ts --outfile=dist/3d-tiles-attributes-worker.js --platform=node --target=esnext,node12 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"@loaders.gl/3d-tiles": "3.2.
|
|
47
|
-
"@loaders.gl/crypto": "3.2.
|
|
48
|
-
"@loaders.gl/draco": "3.2.
|
|
49
|
-
"@loaders.gl/gltf": "3.2.
|
|
50
|
-
"@loaders.gl/i3s": "3.2.
|
|
51
|
-
"@loaders.gl/images": "3.2.
|
|
52
|
-
"@loaders.gl/loader-utils": "3.2.
|
|
53
|
-
"@loaders.gl/polyfills": "3.2.
|
|
54
|
-
"@loaders.gl/schema": "3.2.
|
|
55
|
-
"@loaders.gl/textures": "3.2.
|
|
56
|
-
"@loaders.gl/tiles": "3.2.
|
|
57
|
-
"@loaders.gl/worker-utils": "3.2.
|
|
58
|
-
"@loaders.gl/zip": "3.2.
|
|
46
|
+
"@loaders.gl/3d-tiles": "3.2.13",
|
|
47
|
+
"@loaders.gl/crypto": "3.2.13",
|
|
48
|
+
"@loaders.gl/draco": "3.2.13",
|
|
49
|
+
"@loaders.gl/gltf": "3.2.13",
|
|
50
|
+
"@loaders.gl/i3s": "3.2.13",
|
|
51
|
+
"@loaders.gl/images": "3.2.13",
|
|
52
|
+
"@loaders.gl/loader-utils": "3.2.13",
|
|
53
|
+
"@loaders.gl/polyfills": "3.2.13",
|
|
54
|
+
"@loaders.gl/schema": "3.2.13",
|
|
55
|
+
"@loaders.gl/textures": "3.2.13",
|
|
56
|
+
"@loaders.gl/tiles": "3.2.13",
|
|
57
|
+
"@loaders.gl/worker-utils": "3.2.13",
|
|
58
|
+
"@loaders.gl/zip": "3.2.13",
|
|
59
59
|
"@luma.gl/engine": "^8.5.4",
|
|
60
60
|
"@math.gl/core": "^3.5.1",
|
|
61
61
|
"@math.gl/culling": "^3.5.1",
|
|
@@ -75,5 +75,5 @@
|
|
|
75
75
|
"peerDependencies": {
|
|
76
76
|
"@loaders.gl/core": "^3.2.0"
|
|
77
77
|
},
|
|
78
|
-
"gitHead": "
|
|
78
|
+
"gitHead": "ad966d78d6480aaae21898074e824f576143d67f"
|
|
79
79
|
}
|
|
@@ -15,15 +15,15 @@ const MATERIAL_DEFINITION_INFO_PARAMS = () => ({
|
|
|
15
15
|
},
|
|
16
16
|
ambient: {
|
|
17
17
|
path: 'ambient',
|
|
18
|
-
default: [1, 1, 1
|
|
18
|
+
default: [1, 1, 1]
|
|
19
19
|
},
|
|
20
20
|
diffuse: {
|
|
21
21
|
path: 'diffuse',
|
|
22
|
-
default: [1, 1, 1
|
|
22
|
+
default: [1, 1, 1]
|
|
23
23
|
},
|
|
24
24
|
specular: {
|
|
25
25
|
path: 'specular',
|
|
26
|
-
default: [0, 0, 0
|
|
26
|
+
default: [0, 0, 0]
|
|
27
27
|
},
|
|
28
28
|
useVertexColorAlpha: {
|
|
29
29
|
path: 'useVertexColorAlpha',
|