@dcl/sdk 7.1.7-4745039397.commit-a6aff2b → 7.1.7
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/composite-provider.js +7 -7
- package/package.json +6 -6
- package/src/composite-provider.ts +6 -6
- package/src/with-composite.ts +1 -1
- package/with-composite.js +2 -2
package/composite-provider.js
CHANGED
|
@@ -4,21 +4,21 @@ export async function createContentFetchCompositeProvider() {
|
|
|
4
4
|
const scene = await getSceneInfo({});
|
|
5
5
|
const compositesContent = scene.contents.filter((item) => {
|
|
6
6
|
const path = item.file.toLowerCase();
|
|
7
|
-
return path.endsWith('.composite') || path.endsWith('.composite.
|
|
7
|
+
return path.endsWith('.composite') || path.endsWith('.composite.bin');
|
|
8
8
|
});
|
|
9
9
|
async function fetchComposite(item) {
|
|
10
10
|
const src = item.file.toLowerCase();
|
|
11
11
|
const compositeUrl = `${scene.baseUrl}${item.hash}`;
|
|
12
12
|
try {
|
|
13
13
|
const response = await fetch(compositeUrl);
|
|
14
|
-
if (item.file.endsWith('.
|
|
15
|
-
const
|
|
16
|
-
const composite = Composite.
|
|
14
|
+
if (item.file.endsWith('.bin')) {
|
|
15
|
+
const compositeBinaryData = await response.arrayBuffer();
|
|
16
|
+
const composite = Composite.fromBinary(compositeBinaryData);
|
|
17
17
|
return { src, composite };
|
|
18
18
|
}
|
|
19
19
|
else {
|
|
20
|
-
const
|
|
21
|
-
const composite = Composite.
|
|
20
|
+
const compositeJson = await response.json();
|
|
21
|
+
const composite = Composite.fromJson(compositeJson);
|
|
22
22
|
return { src, composite };
|
|
23
23
|
}
|
|
24
24
|
}
|
|
@@ -35,4 +35,4 @@ export async function createContentFetchCompositeProvider() {
|
|
|
35
35
|
}
|
|
36
36
|
};
|
|
37
37
|
}
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcG9zaXRlLXByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic3JjL2NvbXBvc2l0ZS1wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sVUFBVSxDQUFBO0FBQ3BDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFHNUMsTUFBTSxDQUFDLEtBQUssVUFBVSxtQ0FBbUM7SUFDdkQsTUFBTSxLQUFLLEdBQUcsTUFBTSxZQUFZLENBQUMsRUFBRSxDQUFDLENBQUE7SUFDcEMsTUFBTSxpQkFBaUIsR0FBRyxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1FBQ3ZELE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUE7UUFDcEMsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQyxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtJQUN2RSxDQUFDLENBQUMsQ0FBQTtJQUVGLEtBQUssVUFBVSxjQUFjLENBQUMsSUFBb0M7UUFDaEUsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQTtRQUNuQyxNQUFNLFlBQVksR0FBRyxHQUFHLEtBQUssQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFBO1FBQ25ELElBQUk7WUFDRixNQUFNLFFBQVEsR0FBRyxNQUFNLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQTtZQUMxQyxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFO2dCQUM5QixNQUFNLG1CQUFtQixHQUFlLE1BQU8sUUFBZ0IsQ0FBQyxXQUFXLEVBQUUsQ0FBQTtnQkFDN0UsTUFBTSxTQUFTLEdBQUcsU0FBUyxDQUFDLFVBQVUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFBO2dCQUMzRCxPQUFPLEVBQUUsR0FBRyxFQUFFLFNBQVMsRUFBRSxDQUFBO2FBQzFCO2lCQUFNO2dCQUNMLE1BQU0sYUFBYSxHQUFHLE1BQU0sUUFBUSxDQUFDLElBQUksRUFBRSxDQUFBO2dCQUMzQyxNQUFNLFNBQVMsR0FBRyxTQUFTLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxDQUFBO2dCQUNuRCxPQUFPLEVBQUUsR0FBRyxFQUFFLFNBQVMsRUFBRSxDQUFBO2FBQzFCO1NBQ0Y7UUFBQyxPQUFPLEdBQUcsRUFBRTtZQUNaLE9BQU8sQ0FBQyxLQUFLLENBQUMsMkJBQTJCLFlBQVksS0FBTSxHQUFXLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFBO1lBQ3BGLE9BQU8sSUFBSSxDQUFBO1NBQ1o7SUFDSCxDQUFDO0lBRUQsTUFBTSxpQkFBaUIsR0FBRyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUE7SUFFL0QsTUFBTSxVQUFVLEdBQUcsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBeUIsQ0FBQTtJQUUxRyxPQUFPO1FBQ0wsa0JBQWtCLENBQUMsR0FBVyxFQUFFLFlBQXFCO1lBR25ELE9BQU8sVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLEdBQUcsS0FBSyxHQUFHLENBQUMsSUFBSSxJQUFJLENBQUE7UUFDNUQsQ0FBQztLQUNGLENBQUE7QUFDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29tcG9zaXRlIH0gZnJvbSAnQGRjbC9lY3MnXG5pbXBvcnQgeyBnZXRTY2VuZUluZm8gfSBmcm9tICd+c3lzdGVtL1NjZW5lJ1xuXG4vLyBAcHVibGljXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gY3JlYXRlQ29udGVudEZldGNoQ29tcG9zaXRlUHJvdmlkZXIoKTogUHJvbWlzZTxDb21wb3NpdGUuUHJvdmlkZXI+IHtcbiAgY29uc3Qgc2NlbmUgPSBhd2FpdCBnZXRTY2VuZUluZm8oe30pXG4gIGNvbnN0IGNvbXBvc2l0ZXNDb250ZW50ID0gc2NlbmUuY29udGVudHMuZmlsdGVyKChpdGVtKSA9PiB7XG4gICAgY29uc3QgcGF0aCA9IGl0ZW0uZmlsZS50b0xvd2VyQ2FzZSgpXG4gICAgcmV0dXJuIHBhdGguZW5kc1dpdGgoJy5jb21wb3NpdGUnKSB8fCBwYXRoLmVuZHNXaXRoKCcuY29tcG9zaXRlLmJpbicpXG4gIH0pXG5cbiAgYXN5bmMgZnVuY3Rpb24gZmV0Y2hDb21wb3NpdGUoaXRlbTogeyBoYXNoOiBzdHJpbmc7IGZpbGU6IHN0cmluZyB9KTogUHJvbWlzZTxDb21wb3NpdGUuUmVzb3VyY2UgfCBudWxsPiB7XG4gICAgY29uc3Qgc3JjID0gaXRlbS5maWxlLnRvTG93ZXJDYXNlKClcbiAgICBjb25zdCBjb21wb3NpdGVVcmwgPSBgJHtzY2VuZS5iYXNlVXJsfSR7aXRlbS5oYXNofWBcbiAgICB0cnkge1xuICAgICAgY29uc3QgcmVzcG9uc2UgPSBhd2FpdCBmZXRjaChjb21wb3NpdGVVcmwpXG4gICAgICBpZiAoaXRlbS5maWxlLmVuZHNXaXRoKCcuYmluJykpIHtcbiAgICAgICAgY29uc3QgY29tcG9zaXRlQmluYXJ5RGF0YTogVWludDhBcnJheSA9IGF3YWl0IChyZXNwb25zZSBhcyBhbnkpLmFycmF5QnVmZmVyKClcbiAgICAgICAgY29uc3QgY29tcG9zaXRlID0gQ29tcG9zaXRlLmZyb21CaW5hcnkoY29tcG9zaXRlQmluYXJ5RGF0YSlcbiAgICAgICAgcmV0dXJuIHsgc3JjLCBjb21wb3NpdGUgfVxuICAgICAgfSBlbHNlIHtcbiAgICAgICAgY29uc3QgY29tcG9zaXRlSnNvbiA9IGF3YWl0IHJlc3BvbnNlLmpzb24oKVxuICAgICAgICBjb25zdCBjb21wb3NpdGUgPSBDb21wb3NpdGUuZnJvbUpzb24oY29tcG9zaXRlSnNvbilcbiAgICAgICAgcmV0dXJuIHsgc3JjLCBjb21wb3NpdGUgfVxuICAgICAgfVxuICAgIH0gY2F0Y2ggKGVycikge1xuICAgICAgY29uc29sZS5lcnJvcihgRXJyb3IgbG9hZGluZyBjb21wb3NpdGUgJHtjb21wb3NpdGVVcmx9OiAkeyhlcnIgYXMgYW55KS50b1N0cmluZygpfWApXG4gICAgICByZXR1cm4gbnVsbFxuICAgIH1cbiAgfVxuXG4gIGNvbnN0IGNvbXBvc2l0ZVByb21pc2VzID0gY29tcG9zaXRlc0NvbnRlbnQubWFwKGZldGNoQ29tcG9zaXRlKVxuXG4gIGNvbnN0IGNvbXBvc2l0ZXMgPSAoYXdhaXQgUHJvbWlzZS5hbGwoY29tcG9zaXRlUHJvbWlzZXMpKS5maWx0ZXIoKGl0ZW0pID0+ICEhaXRlbSkgYXMgQ29tcG9zaXRlLlJlc291cmNlW11cblxuICByZXR1cm4ge1xuICAgIGdldENvbXBvc2l0ZU9yTnVsbChzcmM6IHN0cmluZywgX2N1cnJlbnRQYXRoPzogc3RyaW5nKSB7XG4gICAgICAvLyBUT0RPOiByZXNvbHZlIHBhdGggZnJvbSBzcmMgYW5kIGN1cnJlbnRQYXRoXG5cbiAgICAgIHJldHVybiBjb21wb3NpdGVzLmZpbmQoKGl0ZW0pID0+IGl0ZW0uc3JjID09PSBzcmMpIHx8IG51bGxcbiAgICB9XG4gIH1cbn1cbiJdfQ==
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/sdk",
|
|
3
3
|
"description": "",
|
|
4
|
-
"version": "7.1.7
|
|
4
|
+
"version": "7.1.7",
|
|
5
5
|
"author": "Decentraland",
|
|
6
6
|
"dependencies": {
|
|
7
|
-
"@dcl/ecs": "7.1.7
|
|
7
|
+
"@dcl/ecs": "7.1.7",
|
|
8
8
|
"@dcl/ecs-math": "2.0.1-20221129185242.commit-40495c1",
|
|
9
9
|
"@dcl/explorer": "1.0.103960-20230418125811.commit-3ee87bc",
|
|
10
|
-
"@dcl/js-runtime": "7.1.7
|
|
11
|
-
"@dcl/react-ecs": "7.1.7
|
|
12
|
-
"@dcl/sdk-commands": "7.1.7
|
|
10
|
+
"@dcl/js-runtime": "7.1.7",
|
|
11
|
+
"@dcl/react-ecs": "7.1.7",
|
|
12
|
+
"@dcl/sdk-commands": "7.1.7"
|
|
13
13
|
},
|
|
14
14
|
"keywords": [],
|
|
15
15
|
"license": "Apache-2.0",
|
|
@@ -30,5 +30,5 @@
|
|
|
30
30
|
},
|
|
31
31
|
"types": "./index.d.ts",
|
|
32
32
|
"typings": "./index.d.ts",
|
|
33
|
-
"commit": "
|
|
33
|
+
"commit": "00dea083dd792e14effb4dec74b29c0a192e0c24"
|
|
34
34
|
}
|
|
@@ -6,7 +6,7 @@ export async function createContentFetchCompositeProvider(): Promise<Composite.P
|
|
|
6
6
|
const scene = await getSceneInfo({})
|
|
7
7
|
const compositesContent = scene.contents.filter((item) => {
|
|
8
8
|
const path = item.file.toLowerCase()
|
|
9
|
-
return path.endsWith('.composite') || path.endsWith('.composite.
|
|
9
|
+
return path.endsWith('.composite') || path.endsWith('.composite.bin')
|
|
10
10
|
})
|
|
11
11
|
|
|
12
12
|
async function fetchComposite(item: { hash: string; file: string }): Promise<Composite.Resource | null> {
|
|
@@ -14,14 +14,14 @@ export async function createContentFetchCompositeProvider(): Promise<Composite.P
|
|
|
14
14
|
const compositeUrl = `${scene.baseUrl}${item.hash}`
|
|
15
15
|
try {
|
|
16
16
|
const response = await fetch(compositeUrl)
|
|
17
|
-
if (item.file.endsWith('.
|
|
18
|
-
const compositeJson = await response.json()
|
|
19
|
-
const composite = Composite.fromJson(compositeJson)
|
|
20
|
-
return { src, composite }
|
|
21
|
-
} else {
|
|
17
|
+
if (item.file.endsWith('.bin')) {
|
|
22
18
|
const compositeBinaryData: Uint8Array = await (response as any).arrayBuffer()
|
|
23
19
|
const composite = Composite.fromBinary(compositeBinaryData)
|
|
24
20
|
return { src, composite }
|
|
21
|
+
} else {
|
|
22
|
+
const compositeJson = await response.json()
|
|
23
|
+
const composite = Composite.fromJson(compositeJson)
|
|
24
|
+
return { src, composite }
|
|
25
25
|
}
|
|
26
26
|
} catch (err) {
|
|
27
27
|
console.error(`Error loading composite ${compositeUrl}: ${(err as any).toString()}`)
|
package/src/with-composite.ts
CHANGED
|
@@ -10,7 +10,7 @@ export const onUpdate = basicOnUpdate
|
|
|
10
10
|
*/
|
|
11
11
|
/* @__PURE__ */ export async function onStart() {
|
|
12
12
|
const compositeProvider = await createContentFetchCompositeProvider()
|
|
13
|
-
const mainComposite = compositeProvider.getCompositeOrNull('main.composite
|
|
13
|
+
const mainComposite = compositeProvider.getCompositeOrNull('main.composite')
|
|
14
14
|
if (mainComposite) {
|
|
15
15
|
Composite.instance(engine, mainComposite, compositeProvider)
|
|
16
16
|
}
|
package/with-composite.js
CHANGED
|
@@ -4,10 +4,10 @@ import { onStart as basicOnStart, onUpdate as basicOnUpdate } from './index';
|
|
|
4
4
|
export const onUpdate = basicOnUpdate;
|
|
5
5
|
export async function onStart() {
|
|
6
6
|
const compositeProvider = await createContentFetchCompositeProvider();
|
|
7
|
-
const mainComposite = compositeProvider.getCompositeOrNull('main.composite
|
|
7
|
+
const mainComposite = compositeProvider.getCompositeOrNull('main.composite');
|
|
8
8
|
if (mainComposite) {
|
|
9
9
|
Composite.instance(engine, mainComposite, compositeProvider);
|
|
10
10
|
}
|
|
11
11
|
await basicOnStart();
|
|
12
12
|
}
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2l0aC1jb21wb3NpdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzcmMvd2l0aC1jb21wb3NpdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxVQUFVLENBQUE7QUFDNUMsT0FBTyxFQUFFLG1DQUFtQyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDMUUsT0FBTyxFQUFFLE9BQU8sSUFBSSxZQUFZLEVBQUUsUUFBUSxJQUFJLGFBQWEsRUFBRSxNQUFNLFNBQVMsQ0FBQTtBQUU1RSxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsYUFBYSxDQUFBO0FBTXJCLE1BQU0sQ0FBQyxLQUFLLFVBQVUsT0FBTztJQUMzQyxNQUFNLGlCQUFpQixHQUFHLE1BQU0sbUNBQW1DLEVBQUUsQ0FBQTtJQUNyRSxNQUFNLGFBQWEsR0FBRyxpQkFBaUIsQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFBO0lBQzVFLElBQUksYUFBYSxFQUFFO1FBQ2pCLFNBQVMsQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLGFBQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFBO0tBQzdEO0lBRUQsTUFBTSxZQUFZLEVBQUUsQ0FBQTtBQUN0QixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZW5naW5lLCBDb21wb3NpdGUgfSBmcm9tICdAZGNsL2VjcydcbmltcG9ydCB7IGNyZWF0ZUNvbnRlbnRGZXRjaENvbXBvc2l0ZVByb3ZpZGVyIH0gZnJvbSAnLi9jb21wb3NpdGUtcHJvdmlkZXInXG5pbXBvcnQgeyBvblN0YXJ0IGFzIGJhc2ljT25TdGFydCwgb25VcGRhdGUgYXMgYmFzaWNPblVwZGF0ZSB9IGZyb20gJy4vaW5kZXgnXG5cbmV4cG9ydCBjb25zdCBvblVwZGF0ZSA9IGJhc2ljT25VcGRhdGVcblxuLyoqXG4gKiBAaW50ZXJuYWxcbiAqIEZ1bmN0aW9uIHRoYXQgaXMgY2FsbGVkIGJlZm9yZSB0aGUgZmlyc3QgdXBkYXRlIGFuZCBhZnRlciB0aGUgZXZhbHVhdGlvbiBvZiB0aGUgY29kZS5cbiAqL1xuLyogQF9fUFVSRV9fICovIGV4cG9ydCBhc3luYyBmdW5jdGlvbiBvblN0YXJ0KCkge1xuICBjb25zdCBjb21wb3NpdGVQcm92aWRlciA9IGF3YWl0IGNyZWF0ZUNvbnRlbnRGZXRjaENvbXBvc2l0ZVByb3ZpZGVyKClcbiAgY29uc3QgbWFpbkNvbXBvc2l0ZSA9IGNvbXBvc2l0ZVByb3ZpZGVyLmdldENvbXBvc2l0ZU9yTnVsbCgnbWFpbi5jb21wb3NpdGUnKVxuICBpZiAobWFpbkNvbXBvc2l0ZSkge1xuICAgIENvbXBvc2l0ZS5pbnN0YW5jZShlbmdpbmUsIG1haW5Db21wb3NpdGUsIGNvbXBvc2l0ZVByb3ZpZGVyKVxuICB9XG5cbiAgYXdhaXQgYmFzaWNPblN0YXJ0KClcbn1cbiJdfQ==
|