minerender 2.0.0-alpha.14 → 2.0.0-alpha.15
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.js +161 -132
- package/dist/bundle.js.map +4 -4
- package/dist/cjs/UVMapper.js +189 -204
- package/dist/cjs/UVMapper.js.map +1 -1
- package/dist/cjs/assets/AssetKey.js +7 -8
- package/dist/cjs/assets/AssetKey.js.map +1 -1
- package/dist/cjs/assets/AssetLoader.js +24 -37
- package/dist/cjs/assets/AssetLoader.js.map +1 -1
- package/dist/cjs/assets/Assets.js +4 -17
- package/dist/cjs/assets/Assets.js.map +1 -1
- package/dist/cjs/assets/BlockStates.js +29 -48
- package/dist/cjs/assets/BlockStates.js.map +1 -1
- package/dist/cjs/assets/Entities.js +46 -67
- package/dist/cjs/assets/Entities.js.map +1 -1
- package/dist/cjs/assets/ModelTextures.js +26 -43
- package/dist/cjs/assets/ModelTextures.js.map +1 -1
- package/dist/cjs/assets/Models.js +40 -61
- package/dist/cjs/assets/Models.js.map +1 -1
- package/dist/cjs/assets/source/HostedAssetSource.js +63 -79
- package/dist/cjs/assets/source/HostedAssetSource.js.map +1 -1
- package/dist/cjs/assets/source/archive/ArchiveAssetSource.js +74 -91
- package/dist/cjs/assets/source/archive/ArchiveAssetSource.js.map +1 -1
- package/dist/cjs/assets/source/archive/BrowserArchiveProxy.js +9 -20
- package/dist/cjs/assets/source/archive/BrowserArchiveProxy.js.map +1 -1
- package/dist/cjs/cache/CacheKey.js +1 -2
- package/dist/cjs/cache/CacheKey.js.map +1 -1
- package/dist/cjs/cache/PersistentCache.js +7 -18
- package/dist/cjs/cache/PersistentCache.js.map +1 -1
- package/dist/cjs/entity/scene/EntityObject.js +23 -37
- package/dist/cjs/entity/scene/EntityObject.js.map +1 -1
- package/dist/cjs/image/ImageLoader.js +85 -118
- package/dist/cjs/image/ImageLoader.js.map +1 -1
- package/dist/cjs/inspector/SceneInspector.js +1 -2
- package/dist/cjs/inspector/SceneInspector.js.map +1 -1
- package/dist/cjs/instance/InstanceManager.js +18 -31
- package/dist/cjs/instance/InstanceManager.js.map +1 -1
- package/dist/cjs/model/ModelMerger.js +23 -36
- package/dist/cjs/model/ModelMerger.js.map +1 -1
- package/dist/cjs/model/block/scene/BlockObject.js +211 -234
- package/dist/cjs/model/block/scene/BlockObject.js.map +1 -1
- package/dist/cjs/model/multiblock/SchematicParser.js +4 -15
- package/dist/cjs/model/multiblock/SchematicParser.js.map +1 -1
- package/dist/cjs/model/multiblock/StructureParser.js +28 -40
- package/dist/cjs/model/multiblock/StructureParser.js.map +1 -1
- package/dist/cjs/model/scene/ModelObject.js +10 -25
- package/dist/cjs/model/scene/ModelObject.js.map +1 -1
- package/dist/cjs/nbt/NBTHelper.js +4 -15
- package/dist/cjs/nbt/NBTHelper.js.map +1 -1
- package/dist/cjs/renderer/MineRenderScene.js +53 -75
- package/dist/cjs/renderer/MineRenderScene.js.map +1 -1
- package/dist/cjs/renderer/Renderer.js +5 -8
- package/dist/cjs/renderer/Renderer.js.map +1 -1
- package/dist/cjs/renderer/SceneObject.js +3 -15
- package/dist/cjs/renderer/SceneObject.js.map +1 -1
- package/dist/cjs/skin/SkinTextureCoordinates.js +115 -116
- package/dist/cjs/skin/SkinTextureCoordinates.js.map +1 -1
- package/dist/cjs/skin/Skins.js +112 -149
- package/dist/cjs/skin/Skins.js.map +1 -1
- package/dist/cjs/skin/scene/SkinObject.js +3 -14
- package/dist/cjs/skin/scene/SkinObject.js.map +1 -1
- package/dist/cjs/util/log.js +1 -1
- package/dist/cjs/util/log.js.map +1 -1
- package/dist/cjs/util/util.js +3 -14
- package/dist/cjs/util/util.js.map +1 -1
- package/dist/cjs/world/Chunk.js +56 -73
- package/dist/cjs/world/Chunk.js.map +1 -1
- package/dist/cjs/world/MineRenderWorld.js +34 -49
- package/dist/cjs/world/MineRenderWorld.js.map +1 -1
- package/dist/esm/UVMapper.js +189 -204
- package/dist/esm/UVMapper.js.map +1 -1
- package/dist/esm/assets/AssetKey.js +7 -8
- package/dist/esm/assets/AssetKey.js.map +1 -1
- package/dist/esm/assets/AssetLoader.js +24 -37
- package/dist/esm/assets/AssetLoader.js.map +1 -1
- package/dist/esm/assets/Assets.js +4 -17
- package/dist/esm/assets/Assets.js.map +1 -1
- package/dist/esm/assets/BlockStates.js +29 -48
- package/dist/esm/assets/BlockStates.js.map +1 -1
- package/dist/esm/assets/Entities.js +46 -67
- package/dist/esm/assets/Entities.js.map +1 -1
- package/dist/esm/assets/ModelTextures.js +26 -43
- package/dist/esm/assets/ModelTextures.js.map +1 -1
- package/dist/esm/assets/Models.js +40 -61
- package/dist/esm/assets/Models.js.map +1 -1
- package/dist/esm/assets/source/HostedAssetSource.js +63 -79
- package/dist/esm/assets/source/HostedAssetSource.js.map +1 -1
- package/dist/esm/assets/source/archive/ArchiveAssetSource.js +74 -91
- package/dist/esm/assets/source/archive/ArchiveAssetSource.js.map +1 -1
- package/dist/esm/assets/source/archive/BrowserArchiveProxy.js +9 -20
- package/dist/esm/assets/source/archive/BrowserArchiveProxy.js.map +1 -1
- package/dist/esm/cache/CacheKey.js +1 -2
- package/dist/esm/cache/CacheKey.js.map +1 -1
- package/dist/esm/cache/PersistentCache.js +7 -18
- package/dist/esm/cache/PersistentCache.js.map +1 -1
- package/dist/esm/entity/scene/EntityObject.js +23 -37
- package/dist/esm/entity/scene/EntityObject.js.map +1 -1
- package/dist/esm/image/ImageLoader.js +85 -118
- package/dist/esm/image/ImageLoader.js.map +1 -1
- package/dist/esm/inspector/SceneInspector.js +1 -2
- package/dist/esm/inspector/SceneInspector.js.map +1 -1
- package/dist/esm/instance/InstanceManager.js +18 -31
- package/dist/esm/instance/InstanceManager.js.map +1 -1
- package/dist/esm/model/ModelMerger.js +23 -36
- package/dist/esm/model/ModelMerger.js.map +1 -1
- package/dist/esm/model/block/scene/BlockObject.js +211 -234
- package/dist/esm/model/block/scene/BlockObject.js.map +1 -1
- package/dist/esm/model/multiblock/SchematicParser.js +4 -15
- package/dist/esm/model/multiblock/SchematicParser.js.map +1 -1
- package/dist/esm/model/multiblock/StructureParser.js +28 -40
- package/dist/esm/model/multiblock/StructureParser.js.map +1 -1
- package/dist/esm/model/scene/ModelObject.js +10 -25
- package/dist/esm/model/scene/ModelObject.js.map +1 -1
- package/dist/esm/nbt/NBTHelper.js +4 -15
- package/dist/esm/nbt/NBTHelper.js.map +1 -1
- package/dist/esm/renderer/MineRenderScene.js +53 -75
- package/dist/esm/renderer/MineRenderScene.js.map +1 -1
- package/dist/esm/renderer/Renderer.js +5 -8
- package/dist/esm/renderer/Renderer.js.map +1 -1
- package/dist/esm/renderer/SceneObject.js +3 -15
- package/dist/esm/renderer/SceneObject.js.map +1 -1
- package/dist/esm/skin/SkinTextureCoordinates.js +115 -116
- package/dist/esm/skin/SkinTextureCoordinates.js.map +1 -1
- package/dist/esm/skin/Skins.js +112 -149
- package/dist/esm/skin/Skins.js.map +1 -1
- package/dist/esm/skin/scene/SkinObject.js +3 -14
- package/dist/esm/skin/scene/SkinObject.js.map +1 -1
- package/dist/esm/util/log.js +1 -1
- package/dist/esm/util/log.js.map +1 -1
- package/dist/esm/util/util.js +3 -14
- package/dist/esm/util/util.js.map +1 -1
- package/dist/esm/world/Chunk.js +56 -73
- package/dist/esm/world/Chunk.js.map +1 -1
- package/dist/esm/world/MineRenderWorld.js +34 -49
- package/dist/esm/world/MineRenderWorld.js.map +1 -1
- package/package.json +5 -26
- package/src/model/scene/ModelObject.ts +0 -3
- package/src/nbt/NBTHelper.ts +1 -1
- package/src/renderer/Renderer.ts +2 -2
- package/src/skin/SkinTextureCoordinates.ts +129 -119
- package/src/world/Chunk.ts +0 -2
- package/tsconfig.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Models.js","sourceRoot":"src/","sources":["assets/Models.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Models.js","sourceRoot":"src/","sources":["assets/Models.ts"],"names":[],"mappings":";;;;;;;;;AACA,8CAA2C;AAG3C,sDAAmD;AACnD,+CAA4C;AAC5C,2DAA6C;AAC7C,qCAA2D;AAC3D,8DAA2D;AAC3D,yCAAsC;AAEtC,+DAA2D;AAE3D,MAAa,MAAM;IAKK,AAAb,MAAM,CAAC,KAAK,CAAC,WAAW;QAC3B,OAAO,yBAAW,CAAC,GAAG,CAAY,IAAI,mBAAQ,CAC1C,0BAAiB,EACjB,OAAO,EACP,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,OAAO,EACP,qBAAY,CACf,EAAE,0BAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,GAAa;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,SAAS,CAAC;SACpB;QACD,OAAO,yBAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAa;QACpC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;YAChB,GAAG,CAAC,SAAS,GAAG,QAAQ,CAAC;SAC5B;QACD,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;YAChB,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;SAC3B;QACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;QAC/B,6CAA6C;QAC7C,OAAO,iBAAO,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;YACzC,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;gBAChD,OAAO,yBAAW,CAAC,GAAG,CAAQ,GAAG,EAAE,0BAAW,CAAC,KAAK,CAAC,CAAC;YAC1D,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACZ,IAAI,KAAK,EAAE;gBACP,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;aACnB;YACD,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAa;QACvC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;YAChB,GAAG,CAAC,SAAS,GAAG,QAAQ,CAAC;SAC5B;QACD,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;YAChB,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;SAC3B;QACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;QAC/B,OAAO,iBAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;YAC5C,wBAAwB;YACxB,OAAO,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAa;QACjC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,UAAU;QAC1B,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;IACzC,CAAC;;AAhEc,uBAAgB,GAAG,iCAAe,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;AAGxD;IADnB,IAAA,4BAAO,GAAE;+BAWT;AAfL,wBAoEC"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -28,86 +19,81 @@ const DEFAULT_OPTIONS = {
|
|
|
28
19
|
retryDefaults: true
|
|
29
20
|
};
|
|
30
21
|
class HostedAssetSource extends _1.AssetSource {
|
|
31
|
-
loadOrRetryWithDefaults(key, parser) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
22
|
+
async loadOrRetryWithDefaults(key, parser) {
|
|
23
|
+
const direct = await this.load(key, parser);
|
|
24
|
+
if (typeof direct !== "undefined") {
|
|
25
|
+
return direct;
|
|
26
|
+
}
|
|
27
|
+
if (key.namespace !== Assets_1.DEFAULT_NAMESPACE) {
|
|
28
|
+
console.info(p, "Retrying", key, "with default namespace");
|
|
29
|
+
// Try on the same host but with default minecraft: namespace
|
|
30
|
+
const namespaceKey = new AssetKey_1.AssetKey(Assets_1.DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, key.root);
|
|
31
|
+
const namespaced = await this.load(namespaceKey, parser);
|
|
32
|
+
if (typeof namespaced !== "undefined") {
|
|
33
|
+
return namespaced;
|
|
36
34
|
}
|
|
37
|
-
if (key.
|
|
38
|
-
console.info(p, "Retrying", key, "with default namespace");
|
|
39
|
-
// Try
|
|
40
|
-
const
|
|
41
|
-
const
|
|
42
|
-
if (typeof
|
|
43
|
-
return
|
|
44
|
-
}
|
|
45
|
-
if ((typeof key.root !== "undefined" && key.root !== Assets_1.DEFAULT_ROOT) || (typeof this.root !== "undefined" && this.root !== Assets_1.DEFAULT_ROOT)) {
|
|
46
|
-
console.info(p, "Retrying", key, "with default root+namespace");
|
|
47
|
-
// Try both defaults
|
|
48
|
-
const namespacedRootedKey = new AssetKey_1.AssetKey(Assets_1.DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, Assets_1.DEFAULT_ROOT);
|
|
49
|
-
const namespacedRooted = yield this.load(namespacedRootedKey, parser);
|
|
50
|
-
if (typeof namespacedRooted !== "undefined") {
|
|
51
|
-
return namespacedRooted;
|
|
52
|
-
}
|
|
35
|
+
if ((typeof key.root !== "undefined" && key.root !== Assets_1.DEFAULT_ROOT) || (typeof this.root !== "undefined" && this.root !== Assets_1.DEFAULT_ROOT)) {
|
|
36
|
+
console.info(p, "Retrying", key, "with default root+namespace");
|
|
37
|
+
// Try both defaults
|
|
38
|
+
const namespacedRootedKey = new AssetKey_1.AssetKey(Assets_1.DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, Assets_1.DEFAULT_ROOT);
|
|
39
|
+
const namespacedRooted = await this.load(namespacedRootedKey, parser);
|
|
40
|
+
if (typeof namespacedRooted !== "undefined") {
|
|
41
|
+
return namespacedRooted;
|
|
53
42
|
}
|
|
54
43
|
}
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
44
|
+
}
|
|
45
|
+
else if ((typeof key.root !== "undefined" && key.root !== Assets_1.DEFAULT_ROOT) || (typeof this.root !== "undefined" && this.root !== Assets_1.DEFAULT_ROOT)) {
|
|
46
|
+
console.info(p, "Retrying", key, "with default root");
|
|
47
|
+
// Try on default root
|
|
48
|
+
const rootKey = new AssetKey_1.AssetKey(key.namespace, key.path, key.assetType, key.type, key.rootType, key.extension, Assets_1.DEFAULT_ROOT);
|
|
49
|
+
const rooted = await this.load(rootKey, parser);
|
|
50
|
+
if (typeof rooted !== "undefined") {
|
|
51
|
+
return rooted;
|
|
63
52
|
}
|
|
64
|
-
|
|
65
|
-
|
|
53
|
+
}
|
|
54
|
+
return undefined;
|
|
66
55
|
}
|
|
67
|
-
load(key, parser) {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
return parser.parse(response);
|
|
82
|
-
}
|
|
83
|
-
catch (e) {
|
|
84
|
-
console.warn("Parser failed to process response", response, e);
|
|
85
|
-
throw e;
|
|
86
|
-
}
|
|
56
|
+
async load(key, parser) {
|
|
57
|
+
console.info(p, "Loading", key);
|
|
58
|
+
const url = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
|
|
59
|
+
console.debug(p, url);
|
|
60
|
+
let req = {
|
|
61
|
+
url: url
|
|
62
|
+
};
|
|
63
|
+
parser.config(req);
|
|
64
|
+
// @ts-ignore
|
|
65
|
+
return await request_1.Requests.mcAssetRequest(req)
|
|
66
|
+
.then(response => {
|
|
67
|
+
if (response && response.data) {
|
|
68
|
+
try {
|
|
69
|
+
return parser.parse(response);
|
|
87
70
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
if (err.response) {
|
|
92
|
-
let response = err.response;
|
|
93
|
-
if (response.status === 404) {
|
|
94
|
-
console.debug(p, key, "not found");
|
|
95
|
-
return undefined;
|
|
96
|
-
}
|
|
71
|
+
catch (e) {
|
|
72
|
+
console.warn("Parser failed to process response", response, e);
|
|
73
|
+
throw e;
|
|
97
74
|
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
75
|
+
}
|
|
76
|
+
return undefined;
|
|
77
|
+
})
|
|
78
|
+
.catch(err => {
|
|
79
|
+
if (err.response) {
|
|
80
|
+
let response = err.response;
|
|
81
|
+
if (response.status === 404) {
|
|
82
|
+
console.debug(p, key, "not found");
|
|
83
|
+
return undefined;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
console.debug(p, "Failed to load", key, err?.message);
|
|
87
|
+
return undefined;
|
|
101
88
|
});
|
|
102
89
|
}
|
|
103
90
|
assetBasePath(key) {
|
|
104
|
-
|
|
105
|
-
return `${(_b = (_a = key.root) !== null && _a !== void 0 ? _a : this.root) !== null && _b !== void 0 ? _b : AssetLoader_1.AssetLoader.ROOT}/${key.rootType !== undefined ? key.rootType + '/' : ''}${key.namespace !== undefined ? key.namespace + '/' : ''}${key.assetType !== undefined ? key.assetType + '/' : ''}`;
|
|
91
|
+
return `${key.root ?? this.root ?? AssetLoader_1.AssetLoader.ROOT}/${key.rootType !== undefined ? key.rootType + '/' : ''}${key.namespace !== undefined ? key.namespace + '/' : ''}${key.assetType !== undefined ? key.assetType + '/' : ''}`;
|
|
106
92
|
}
|
|
107
93
|
constructor(root, options) {
|
|
108
94
|
super();
|
|
109
95
|
this._root = root;
|
|
110
|
-
this._options = (0, ts_deepmerge_1.default)({}, DEFAULT_OPTIONS, options
|
|
96
|
+
this._options = (0, ts_deepmerge_1.default)({}, DEFAULT_OPTIONS, options ?? {});
|
|
111
97
|
}
|
|
112
98
|
get root() {
|
|
113
99
|
return this._root;
|
|
@@ -158,10 +144,8 @@ HostedAssetSource.IMAGE = {
|
|
|
158
144
|
config(request) {
|
|
159
145
|
request.responseType = "arraybuffer";
|
|
160
146
|
},
|
|
161
|
-
parse(response) {
|
|
162
|
-
return
|
|
163
|
-
return yield image_1.ImageLoader.processResponse(response);
|
|
164
|
-
});
|
|
147
|
+
async parse(response) {
|
|
148
|
+
return await image_1.ImageLoader.processResponse(response);
|
|
165
149
|
}
|
|
166
150
|
};
|
|
167
151
|
HostedAssetSource.LIST = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HostedAssetSource.js","sourceRoot":"src/","sources":["assets/source/HostedAssetSource.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"HostedAssetSource.js","sourceRoot":"src/","sources":["assets/source/HostedAssetSource.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.ArchiveAssetSource = void 0;
|
|
13
4
|
const AssetSource_1 = require("../AssetSource");
|
|
@@ -25,97 +16,89 @@ class ArchiveAssetSource extends AssetSource_1.AssetSource {
|
|
|
25
16
|
static blob(blob) {
|
|
26
17
|
return new ArchiveAssetSource(new BrowserArchiveProxy_1.BrowserArchiveProxy(blob));
|
|
27
18
|
}
|
|
28
|
-
getEntries() {
|
|
29
|
-
return
|
|
30
|
-
return this._archiveProxy.getEntries();
|
|
31
|
-
});
|
|
19
|
+
async getEntries() {
|
|
20
|
+
return this._archiveProxy.getEntries();
|
|
32
21
|
}
|
|
33
|
-
getEntry(path) {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
return entries.find(e => e.filename === path);
|
|
37
|
-
});
|
|
22
|
+
async getEntry(path) {
|
|
23
|
+
const entries = await this.getEntries();
|
|
24
|
+
return entries.find(e => e.filename === path);
|
|
38
25
|
}
|
|
39
|
-
get(key, parser) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
return responseParser.parse(response);
|
|
63
|
-
}
|
|
64
|
-
catch (e) {
|
|
65
|
-
console.warn("Parser failed to process response", response, e);
|
|
66
|
-
throw e;
|
|
67
|
-
}
|
|
26
|
+
async get(key, parser) {
|
|
27
|
+
const responseParser = HostedAssetSource_1.HostedAssetSource.PARSER_MAP.get(parser);
|
|
28
|
+
console.log("ArchiveAssetSource.get", key, parser);
|
|
29
|
+
let entries = (await this.getEntries());
|
|
30
|
+
const path = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
|
|
31
|
+
console.log(path);
|
|
32
|
+
const entry = await this.getEntry(path);
|
|
33
|
+
console.log(entry);
|
|
34
|
+
if (!entry) {
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
37
|
+
let blob = await entry.getData();
|
|
38
|
+
const url = URL.createObjectURL(blob);
|
|
39
|
+
console.log(url);
|
|
40
|
+
let req = {
|
|
41
|
+
url: url,
|
|
42
|
+
};
|
|
43
|
+
responseParser.config(req);
|
|
44
|
+
return request_1.Requests.genericRequest(req)
|
|
45
|
+
.then(response => {
|
|
46
|
+
if (response && response.data) {
|
|
47
|
+
try {
|
|
48
|
+
return responseParser.parse(response);
|
|
68
49
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
50
|
+
catch (e) {
|
|
51
|
+
console.warn("Parser failed to process response", response, e);
|
|
52
|
+
throw e;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return undefined;
|
|
56
|
+
})
|
|
57
|
+
.catch(err => {
|
|
58
|
+
if (err.response) {
|
|
59
|
+
let response = err.response;
|
|
60
|
+
if (response.status === 404) {
|
|
61
|
+
console.debug(p, key, "not found");
|
|
62
|
+
return undefined;
|
|
78
63
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
64
|
+
}
|
|
65
|
+
console.debug(p, "Failed to load", key, err?.message);
|
|
66
|
+
return undefined;
|
|
82
67
|
});
|
|
83
68
|
}
|
|
84
69
|
//TODO: abstract this
|
|
85
|
-
load(key, parser) {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
throw e;
|
|
104
|
-
}
|
|
70
|
+
async load(key, parser) {
|
|
71
|
+
console.info(p, "Loading", key);
|
|
72
|
+
const url = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
|
|
73
|
+
console.debug(p, url);
|
|
74
|
+
let req = {
|
|
75
|
+
url: url
|
|
76
|
+
};
|
|
77
|
+
parser.config(req);
|
|
78
|
+
// @ts-ignore
|
|
79
|
+
return await request_1.Requests.genericRequest(req)
|
|
80
|
+
.then(response => {
|
|
81
|
+
if (response && response.data) {
|
|
82
|
+
try {
|
|
83
|
+
return parser.parse(response);
|
|
84
|
+
}
|
|
85
|
+
catch (e) {
|
|
86
|
+
console.warn("Parser failed to process response", response, e);
|
|
87
|
+
throw e;
|
|
105
88
|
}
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
89
|
+
}
|
|
90
|
+
return undefined;
|
|
91
|
+
})
|
|
92
|
+
.catch(err => {
|
|
93
|
+
if (err.response) {
|
|
94
|
+
let response = err.response;
|
|
95
|
+
if (response.status === 404) {
|
|
96
|
+
console.debug(p, key, "not found");
|
|
97
|
+
return undefined;
|
|
115
98
|
}
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
99
|
+
}
|
|
100
|
+
console.debug(p, "Failed to load", key, err?.message);
|
|
101
|
+
return undefined;
|
|
119
102
|
});
|
|
120
103
|
}
|
|
121
104
|
assetBasePath(key) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArchiveAssetSource.js","sourceRoot":"src/","sources":["assets/source/archive/ArchiveAssetSource.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ArchiveAssetSource.js","sourceRoot":"src/","sources":["assets/source/archive/ArchiveAssetSource.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.BrowserArchiveProxy = void 0;
|
|
13
4
|
const zip_js_1 = require("@zip.js/zip.js");
|
|
@@ -16,17 +7,15 @@ class BrowserArchiveProxy {
|
|
|
16
7
|
this._blob = blob;
|
|
17
8
|
this._reader = new zip_js_1.ZipReader(new zip_js_1.BlobReader(this._blob));
|
|
18
9
|
}
|
|
19
|
-
getEntries() {
|
|
20
|
-
return
|
|
21
|
-
return
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
getData()
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
};
|
|
29
|
-
});
|
|
10
|
+
async getEntries() {
|
|
11
|
+
return (await this._reader.getEntries()).map(e => {
|
|
12
|
+
return {
|
|
13
|
+
filename: e.filename,
|
|
14
|
+
directory: e.directory,
|
|
15
|
+
getData() {
|
|
16
|
+
return e.getData(new zip_js_1.BlobWriter());
|
|
17
|
+
}
|
|
18
|
+
};
|
|
30
19
|
});
|
|
31
20
|
}
|
|
32
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrowserArchiveProxy.js","sourceRoot":"src/","sources":["assets/source/archive/BrowserArchiveProxy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BrowserArchiveProxy.js","sourceRoot":"src/","sources":["assets/source/archive/BrowserArchiveProxy.ts"],"names":[],"mappings":";;;AACA,2CAAmE;AAGnE,MAAa,mBAAmB;IAK5B,YAAY,IAAU;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,IAAI,kBAAS,CAAC,IAAI,mBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,UAAU;QACnB,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC7C,OAAO;gBACH,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,SAAS,EAAE,CAAC,CAAC,SAAS;gBACtB,OAAO;oBACH,OAAO,CAAC,CAAC,OAAQ,CAAC,IAAI,mBAAU,EAAE,CAAC,CAAA;gBACvC,CAAC;aACJ,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;CAEJ;AAtBD,kDAsBC"}
|
|
@@ -7,8 +7,7 @@ function serializeImageKey(key) {
|
|
|
7
7
|
}
|
|
8
8
|
exports.serializeImageKey = serializeImageKey;
|
|
9
9
|
function serializeBoxGeometryKey(key) {
|
|
10
|
-
|
|
11
|
-
return (0, util_1.md5)([key.width, key.height, key.depth, (_a = key.uv) === null || _a === void 0 ? void 0 : _a.join(":")].join("_"));
|
|
10
|
+
return (0, util_1.md5)([key.width, key.height, key.depth, key.uv?.join(":")].join("_"));
|
|
12
11
|
}
|
|
13
12
|
exports.serializeBoxGeometryKey = serializeBoxGeometryKey;
|
|
14
13
|
function serializeTextureKey(key) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CacheKey.js","sourceRoot":"src/","sources":["cache/CacheKey.ts"],"names":[],"mappings":";;;AACA,uCAAmC;AAQnC,SAAgB,iBAAiB,CAAC,GAAgB;IAC9C,OAAO,IAAA,UAAG,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACxB,CAAC;AAFD,8CAEC;AAiBD,SAAgB,uBAAuB,CAAC,GAAmB
|
|
1
|
+
{"version":3,"file":"CacheKey.js","sourceRoot":"src/","sources":["cache/CacheKey.ts"],"names":[],"mappings":";;;AACA,uCAAmC;AAQnC,SAAgB,iBAAiB,CAAC,GAAgB;IAC9C,OAAO,IAAA,UAAG,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACxB,CAAC;AAFD,8CAEC;AAiBD,SAAgB,uBAAuB,CAAC,GAAmB;IACvD,OAAO,IAAA,UAAG,EAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAChF,CAAC;AAFD,0DAEC;AAoBD,SAAgB,mBAAmB,CAAC,GAAe;IAC/C,OAAO,IAAA,UAAG,EAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC9D,CAAC;AAFD,kDAEC;AAiBD,SAAgB,oBAAoB,CAAC,GAAgB;IACjD,OAAO,IAAA,UAAG,EAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC9E,CAAC;AAFD,oDAEC;AAUD,SAAgB,gBAAgB,CAAC,GAAY;IACzC,OAAO,IAAA,UAAG,EAAC,CAAC,uBAAuB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACtG,CAAC;AAFD,4CAEC;AAGD,GAAG"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -39,15 +30,13 @@ class PersistentCache {
|
|
|
39
30
|
constructor(backing) {
|
|
40
31
|
this.backing = backing;
|
|
41
32
|
}
|
|
42
|
-
getOrLoad(key, loader) {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
return v;
|
|
50
|
-
});
|
|
33
|
+
async getOrLoad(key, loader) {
|
|
34
|
+
let v = await this.get(key);
|
|
35
|
+
if (typeof v === "undefined" || v === null) {
|
|
36
|
+
v = await loader(key);
|
|
37
|
+
await this.put(key, v);
|
|
38
|
+
}
|
|
39
|
+
return v;
|
|
51
40
|
}
|
|
52
41
|
}
|
|
53
42
|
exports.PersistentCache = PersistentCache;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PersistentCache.js","sourceRoot":"src/","sources":["cache/PersistentCache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PersistentCache.js","sourceRoot":"src/","sources":["cache/PersistentCache.ts"],"names":[],"mappings":"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"}
|