minerender 2.0.0-alpha.7 → 2.0.0-alpha.9
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/ava.config.js +10 -0
- package/build.mjs +2 -2
- package/dist/bundle.js +12824 -2556
- package/dist/bundle.js.map +4 -5
- package/dist/cjs/UVMapper.js +6 -2
- package/dist/cjs/UVMapper.js.map +1 -1
- package/dist/cjs/assets/AssetKey.js.map +1 -1
- package/dist/cjs/assets/AssetLoader.d.ts +6 -20
- package/dist/cjs/assets/AssetLoader.js +34 -123
- package/dist/cjs/assets/AssetLoader.js.map +1 -1
- package/dist/cjs/assets/BlockStates.d.ts +1 -0
- package/dist/cjs/assets/BlockStates.js +8 -4
- package/dist/cjs/assets/BlockStates.js.map +1 -1
- package/dist/cjs/assets/ModelTextures.js +3 -2
- package/dist/cjs/assets/ModelTextures.js.map +1 -1
- package/dist/cjs/assets/Models.js +3 -4
- package/dist/cjs/assets/Models.js.map +1 -1
- package/dist/cjs/assets/index.d.ts +1 -0
- package/dist/cjs/assets/index.js +1 -0
- package/dist/cjs/assets/index.js.map +1 -1
- package/dist/cjs/assets/source/AssetSource.d.ts +8 -0
- package/dist/cjs/assets/source/AssetSource.js +9 -0
- package/dist/cjs/assets/source/AssetSource.js.map +1 -0
- package/dist/cjs/assets/source/HostedAssetSource.d.ts +33 -0
- package/dist/cjs/assets/source/HostedAssetSource.js +190 -0
- package/dist/cjs/assets/source/HostedAssetSource.js.map +1 -0
- package/dist/cjs/assets/source/archive/ArchiveAssetSource.d.ts +17 -0
- package/dist/cjs/assets/source/archive/ArchiveAssetSource.js +126 -0
- package/dist/cjs/assets/source/archive/ArchiveAssetSource.js.map +1 -0
- package/dist/cjs/assets/source/archive/ArchiveEntry.d.ts +5 -0
- package/dist/cjs/assets/source/archive/ArchiveEntry.js +3 -0
- package/dist/cjs/assets/source/archive/ArchiveEntry.js.map +1 -0
- package/dist/cjs/assets/source/archive/ArchiveProxy.d.ts +4 -0
- package/dist/cjs/assets/source/archive/ArchiveProxy.js +3 -0
- package/dist/cjs/assets/source/archive/ArchiveProxy.js.map +1 -0
- package/dist/cjs/assets/source/archive/BrowserArchiveProxy.d.ts +9 -0
- package/dist/cjs/assets/source/archive/BrowserArchiveProxy.js +34 -0
- package/dist/cjs/assets/source/archive/BrowserArchiveProxy.js.map +1 -0
- package/dist/cjs/assets/source/archive/index.d.ts +4 -0
- package/dist/cjs/assets/source/archive/index.js +21 -0
- package/dist/cjs/assets/source/archive/index.js.map +1 -0
- package/dist/cjs/assets/source/index.d.ts +4 -0
- package/dist/cjs/assets/source/index.js +22 -0
- package/dist/cjs/assets/source/index.js.map +1 -0
- package/dist/cjs/assets/source/parser/AssetParsers.d.ts +9 -0
- package/dist/cjs/assets/source/parser/AssetParsers.js +14 -0
- package/dist/cjs/assets/source/parser/AssetParsers.js.map +1 -0
- package/dist/cjs/assets/source/parser/ResponseParser.d.ts +7 -0
- package/dist/cjs/assets/source/parser/ResponseParser.js +3 -0
- package/dist/cjs/assets/source/parser/ResponseParser.js.map +1 -0
- package/dist/cjs/assets/source/parser/index.d.ts +2 -0
- package/dist/cjs/assets/source/parser/index.js +20 -0
- package/dist/cjs/assets/source/parser/index.js.map +1 -0
- package/dist/cjs/cache/Caching.js +9 -0
- package/dist/cjs/cache/Caching.js.map +1 -1
- package/dist/cjs/index.d.ts +2 -0
- package/dist/cjs/index.js +2 -0
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/model/scene/ModelObject.js +1 -1
- package/dist/cjs/model/scene/ModelObject.js.map +1 -1
- package/dist/cjs/renderer/MineRenderScene.d.ts +1 -1
- package/dist/cjs/renderer/MineRenderScene.js +5 -6
- package/dist/cjs/renderer/MineRenderScene.js.map +1 -1
- package/dist/cjs/renderer/SceneObject.js +1 -0
- package/dist/cjs/renderer/SceneObject.js.map +1 -1
- package/dist/cjs/three/index.d.ts +0 -2
- package/dist/cjs/three/index.js +0 -2
- package/dist/cjs/three/index.js.map +1 -1
- package/dist/esm/UVMapper.js +6 -2
- package/dist/esm/UVMapper.js.map +1 -1
- package/dist/esm/assets/AssetKey.js.map +1 -1
- package/dist/esm/assets/AssetLoader.d.ts +6 -20
- package/dist/esm/assets/AssetLoader.js +35 -124
- package/dist/esm/assets/AssetLoader.js.map +1 -1
- package/dist/esm/assets/BlockStates.d.ts +1 -0
- package/dist/esm/assets/BlockStates.js +8 -4
- package/dist/esm/assets/BlockStates.js.map +1 -1
- package/dist/esm/assets/ModelTextures.js +3 -2
- package/dist/esm/assets/ModelTextures.js.map +1 -1
- package/dist/esm/assets/Models.js +3 -4
- package/dist/esm/assets/Models.js.map +1 -1
- package/dist/esm/assets/index.d.ts +1 -0
- package/dist/esm/assets/index.js +1 -0
- package/dist/esm/assets/index.js.map +1 -1
- package/dist/esm/assets/source/AssetSource.d.ts +8 -0
- package/dist/esm/assets/source/AssetSource.js +5 -0
- package/dist/esm/assets/source/AssetSource.js.map +1 -0
- package/dist/esm/assets/source/HostedAssetSource.d.ts +33 -0
- package/dist/esm/assets/source/HostedAssetSource.js +183 -0
- package/dist/esm/assets/source/HostedAssetSource.js.map +1 -0
- package/dist/esm/assets/source/archive/ArchiveAssetSource.d.ts +17 -0
- package/dist/esm/assets/source/archive/ArchiveAssetSource.js +122 -0
- package/dist/esm/assets/source/archive/ArchiveAssetSource.js.map +1 -0
- package/dist/esm/assets/source/archive/ArchiveEntry.d.ts +5 -0
- package/dist/esm/assets/source/archive/ArchiveEntry.js +2 -0
- package/dist/esm/assets/source/archive/ArchiveEntry.js.map +1 -0
- package/dist/esm/assets/source/archive/ArchiveProxy.d.ts +4 -0
- package/dist/esm/assets/source/archive/ArchiveProxy.js +2 -0
- package/dist/esm/assets/source/archive/ArchiveProxy.js.map +1 -0
- package/dist/esm/assets/source/archive/BrowserArchiveProxy.d.ts +9 -0
- package/dist/esm/assets/source/archive/BrowserArchiveProxy.js +30 -0
- package/dist/esm/assets/source/archive/BrowserArchiveProxy.js.map +1 -0
- package/dist/esm/assets/source/archive/index.d.ts +4 -0
- package/dist/esm/assets/source/archive/index.js +5 -0
- package/dist/esm/assets/source/archive/index.js.map +1 -0
- package/dist/esm/assets/source/index.d.ts +4 -0
- package/dist/esm/assets/source/index.js +6 -0
- package/dist/esm/assets/source/index.js.map +1 -0
- package/dist/esm/assets/source/parser/AssetParsers.d.ts +9 -0
- package/dist/esm/assets/source/parser/AssetParsers.js +11 -0
- package/dist/esm/assets/source/parser/AssetParsers.js.map +1 -0
- package/dist/esm/assets/source/parser/ResponseParser.d.ts +7 -0
- package/dist/esm/assets/source/parser/ResponseParser.js +2 -0
- package/dist/esm/assets/source/parser/ResponseParser.js.map +1 -0
- package/dist/esm/assets/source/parser/index.d.ts +2 -0
- package/dist/esm/assets/source/parser/index.js +4 -0
- package/dist/esm/assets/source/parser/index.js.map +1 -0
- package/dist/esm/cache/Caching.js +9 -0
- package/dist/esm/cache/Caching.js.map +1 -1
- package/dist/esm/index.d.ts +2 -0
- package/dist/esm/index.js +2 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/model/scene/ModelObject.js +1 -1
- package/dist/esm/model/scene/ModelObject.js.map +1 -1
- package/dist/esm/renderer/MineRenderScene.d.ts +1 -1
- package/dist/esm/renderer/MineRenderScene.js +5 -6
- package/dist/esm/renderer/MineRenderScene.js.map +1 -1
- package/dist/esm/renderer/SceneObject.js +1 -0
- package/dist/esm/renderer/SceneObject.js.map +1 -1
- package/dist/esm/three/index.d.ts +0 -2
- package/dist/esm/three/index.js +0 -2
- package/dist/esm/three/index.js.map +1 -1
- package/package.json +11 -5
- package/src/UVMapper.ts +10 -6
- package/src/assets/AssetKey.ts +0 -1
- package/src/assets/AssetLoader.ts +42 -119
- package/src/assets/BlockStates.ts +9 -5
- package/src/assets/ModelTextures.ts +3 -2
- package/src/assets/Models.ts +5 -5
- package/src/assets/index.ts +9 -8
- package/src/assets/source/AssetSource.ts +13 -0
- package/src/assets/source/HostedAssetSource.ts +191 -0
- package/src/assets/source/archive/ArchiveAssetSource.ts +124 -0
- package/src/assets/source/archive/ArchiveEntry.ts +5 -0
- package/src/assets/source/archive/ArchiveProxy.ts +7 -0
- package/src/assets/source/archive/BrowserArchiveProxy.ts +27 -0
- package/src/assets/source/archive/index.ts +4 -0
- package/src/assets/source/index.ts +5 -0
- package/src/assets/source/parser/AssetParsers.ts +11 -0
- package/src/assets/source/parser/ResponseParser.ts +9 -0
- package/src/assets/source/parser/index.ts +3 -0
- package/src/cache/Caching.ts +9 -0
- package/src/index.ts +68 -66
- package/src/model/scene/ModelObject.ts +1 -1
- package/src/renderer/MineRenderScene.ts +4 -5
- package/src/renderer/SceneObject.ts +1 -0
- package/src/three/index.ts +3 -5
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export var AssetParser;
|
|
2
|
+
(function (AssetParser) {
|
|
3
|
+
AssetParser["MODEL"] = "model";
|
|
4
|
+
AssetParser["BLOCKSTATE"] = "blockstate";
|
|
5
|
+
AssetParser["META"] = "meta";
|
|
6
|
+
AssetParser["NBT"] = "nbt";
|
|
7
|
+
AssetParser["IMAGE"] = "image";
|
|
8
|
+
AssetParser["LIST"] = "list";
|
|
9
|
+
AssetParser["JSON"] = "json";
|
|
10
|
+
})(AssetParser || (AssetParser = {}));
|
|
11
|
+
//# sourceMappingURL=AssetParsers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AssetParsers.js","sourceRoot":"src/","sources":["assets/source/parser/AssetParsers.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,WAUX;AAVD,WAAY,WAAW;IAEnB,8BAAe,CAAA;IACf,wCAAyB,CAAA;IACzB,4BAAa,CAAA;IACb,0BAAW,CAAA;IACX,8BAAe,CAAA;IACf,4BAAa,CAAA;IACb,4BAAa,CAAA;AAEjB,CAAC,EAVW,WAAW,KAAX,WAAW,QAUtB"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { AxiosRequestConfig, AxiosResponse } from "axios";
|
|
2
|
+
import { Maybe } from "../../../util";
|
|
3
|
+
import { MinecraftAsset } from "../../../MinecraftAsset";
|
|
4
|
+
export interface ResponseParser<T extends MinecraftAsset> {
|
|
5
|
+
config(request: AxiosRequestConfig): any;
|
|
6
|
+
parse(response: AxiosResponse): Maybe<T> | Promise<Maybe<T>>;
|
|
7
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ResponseParser.js","sourceRoot":"src/","sources":["assets/source/parser/ResponseParser.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["assets/source/parser/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC"}
|
|
@@ -4,6 +4,15 @@ export class Caching {
|
|
|
4
4
|
static clear() {
|
|
5
5
|
this.rawImageCache.invalidateAll();
|
|
6
6
|
this.textureCache.invalidateAll();
|
|
7
|
+
this.imageDataCache.invalidateAll();
|
|
8
|
+
this.wrappedImageCache.invalidateAll();
|
|
9
|
+
this.canvasImageDataCache.invalidateAll();
|
|
10
|
+
this.materialCache.invalidateAll();
|
|
11
|
+
this.modelTextureAtlasCache.invalidateAll();
|
|
12
|
+
this.textureAssetCache.invalidateAll();
|
|
13
|
+
//TODO: add all
|
|
14
|
+
this.rawModelCache.invalidateAll();
|
|
15
|
+
this.mergedModelCache.invalidateAll();
|
|
7
16
|
}
|
|
8
17
|
static end() {
|
|
9
18
|
this.clear();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Caching.js","sourceRoot":"src/","sources":["cache/Caching.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,MAAM,EAAqC,MAAM,gCAAgC,CAAC;AAE9G,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAa7C,MAAM,OAAO,OAAO;IAiFT,MAAM,CAAC,KAAK;QACf,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;QACnC,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Caching.js","sourceRoot":"src/","sources":["cache/Caching.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/index.d.ts
CHANGED
|
@@ -38,6 +38,8 @@ export * from './three';
|
|
|
38
38
|
export * from './util';
|
|
39
39
|
export * from './world';
|
|
40
40
|
export * from './assets';
|
|
41
|
+
export * from './assets/source';
|
|
42
|
+
export * from './assets/source/parser';
|
|
41
43
|
export * from './bedrock';
|
|
42
44
|
export * from './cache';
|
|
43
45
|
export * from './canvas';
|
package/dist/esm/index.js
CHANGED
|
@@ -39,6 +39,8 @@ export * from './three';
|
|
|
39
39
|
export * from './util';
|
|
40
40
|
export * from './world';
|
|
41
41
|
export * from './assets';
|
|
42
|
+
export * from './assets/source';
|
|
43
|
+
export * from './assets/source/parser';
|
|
42
44
|
export * from './bedrock';
|
|
43
45
|
export * from './cache';
|
|
44
46
|
export * from './canvas';
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,cAAc,oBAAoB,CAAC;AACnC,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,OAAO,CAAC;AACtB,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,cAAc,oBAAoB,CAAC;AACnC,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,OAAO,CAAC;AACtB,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}
|
|
@@ -25,7 +25,7 @@ export class ModelObject extends SceneObject {
|
|
|
25
25
|
this.isModelObject = true;
|
|
26
26
|
this.meshesCreated = false;
|
|
27
27
|
this.options = merge({}, ModelObject.DEFAULT_OPTIONS, options !== null && options !== void 0 ? options : {});
|
|
28
|
-
console.log(this.options);
|
|
28
|
+
console.log("ModelObject options", this.options);
|
|
29
29
|
}
|
|
30
30
|
init() {
|
|
31
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelObject.js","sourceRoot":"src/","sources":["model/scene/ModelObject.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,WAAW,EAA8F,OAAO,EAA2B,MAAM,OAAO,CAAC;AAClK,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAExE,OAAO,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC5H,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,cAAc,CAAC;AAGjC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAGxC,MAAM,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAEhC,0GAA0G;AAC1G,MAAM,OAAO,WAAY,SAAQ,WAAW;IAaxC,YAAqB,aAAoB,EAAE,OAAqC;QAC5E,KAAK,CAAC,OAAO,CAAC,CAAC;QADE,kBAAa,GAAb,aAAa,CAAO;QAXzB,kBAAa,GAAS,IAAI,CAAC;QASnC,kBAAa,GAAY,KAAK,CAAC;QAInC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE,EAAE,WAAW,CAAC,eAAe,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ModelObject.js","sourceRoot":"src/","sources":["model/scene/ModelObject.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ export declare class MineRenderScene extends Scene {
|
|
|
24
24
|
add(...object: any[]): this;
|
|
25
25
|
remove(...object: any[]): this;
|
|
26
26
|
initAndAdd(...object: SceneObject[]): Promise<this>;
|
|
27
|
-
addSceneObject<A extends BasicMinecraftAsset, T extends SceneObject, O extends SceneObjectOptions>(asset: A, objectSupplier: () => T | Promise<T>,
|
|
27
|
+
addSceneObject<A extends BasicMinecraftAsset, T extends SceneObject, O extends SceneObjectOptions>(asset: A, objectSupplier: () => T | Promise<T>, _options?: Partial<O>, parent?: Object3D): Promise<T | InstanceReference<T>>;
|
|
28
28
|
addModel(model: Model, options?: Partial<ModelObjectOptions>, parent?: Object3D): Promise<ModelObject | InstanceReference<ModelObject>>;
|
|
29
29
|
addBlock(blockState: BlockState, options?: Partial<BlockObjectOptions>, parent?: Object3D): Promise<BlockObject | InstanceReference<BlockObject>>;
|
|
30
30
|
addSkin(skin?: string, options?: Partial<SkinObjectOptions>, parent?: Object3D): Promise<SkinObject>;
|
|
@@ -54,19 +54,19 @@ export class MineRenderScene extends Scene {
|
|
|
54
54
|
return this.add(...object);
|
|
55
55
|
});
|
|
56
56
|
}
|
|
57
|
-
addSceneObject(asset, objectSupplier,
|
|
58
|
-
var _a;
|
|
57
|
+
addSceneObject(asset, objectSupplier, _options, parent = this) {
|
|
58
|
+
var _a, _b;
|
|
59
59
|
return __awaiter(this, void 0, void 0, function* () {
|
|
60
|
-
console.log("addSceneObject");
|
|
60
|
+
console.log("addSceneObject", asset);
|
|
61
61
|
console.log("parent", parent);
|
|
62
62
|
this.dirty = true;
|
|
63
63
|
// console.log(this.instanceCache)
|
|
64
|
-
|
|
64
|
+
const obj = yield objectSupplier();
|
|
65
|
+
if (((_a = obj === null || obj === void 0 ? void 0 : obj.options) === null || _a === void 0 ? void 0 : _a.instanceMeshes) && asset.key && ((_b = asset.key) === null || _b === void 0 ? void 0 : _b.assetType) === "models" /*TODO*/) {
|
|
65
66
|
// console.log("instanceMeshes + key")
|
|
66
67
|
// check for existing instances
|
|
67
68
|
const key = asset.key.serialize();
|
|
68
69
|
return this.instanceManager.getOrCreate(key, () => __awaiter(this, void 0, void 0, function* () {
|
|
69
|
-
const obj = yield objectSupplier();
|
|
70
70
|
obj.scene = this;
|
|
71
71
|
yield obj.init();
|
|
72
72
|
parent.add(obj);
|
|
@@ -76,7 +76,6 @@ export class MineRenderScene extends Scene {
|
|
|
76
76
|
}
|
|
77
77
|
else {
|
|
78
78
|
// console.log("!instanceMeshes | !key")
|
|
79
|
-
const obj = yield objectSupplier();
|
|
80
79
|
obj.scene = this;
|
|
81
80
|
// await this.initAndAdd(obj);
|
|
82
81
|
yield obj.init();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MineRenderScene.js","sourceRoot":"src/","sources":["renderer/MineRenderScene.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAY,KAAK,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAC,aAAa,EAAc,MAAM,eAAe,CAAC;AACzD,OAAO,KAAK,MAAM,cAAc,CAAC;AAEjC,OAAO,EAAE,WAAW,EAAsB,MAAM,4BAA4B,CAAC;AAE7E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,EAAE,WAAW,EAAsB,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAClG,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EAAE,UAAU,EAAqB,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAuB,MAAM,8BAA8B,CAAC;AAIjF,MAAM,OAAO,eAAgB,SAAQ,KAAK;IAYtC,YAAY,OAA6C;QACrD,KAAK,EAAE,CAAC;QAXI,sBAAiB,GAAS,IAAI,CAAC;QAKtC,UAAK,GAAe,IAAI,UAAU,EAAE,CAAC;QAC3B,oBAAe,GAAoB,IAAI,eAAe,EAAE,CAAC;QAErE,UAAK,GAAY,IAAI,CAAC;QAIzB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,GAAG,CAAC,GAAG,MAAM;QACT,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC;QACxC,KAAK,IAAI,GAAG,IAAI,MAAM,EAAE;YACpB,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;aACjC;YACD,wCAAwC;YACxC,yBAAyB;YACzB,MAAM;YACN,GAAG,CAAC,gBAAgB,CAAC,QAAQ,EAAC,KAAK,CAAA,EAAE;gBACjC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YACtB,CAAC,CAAC,CAAC;SACN;QACD,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,GAAG,MAAM;QACZ,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC;IACnC,CAAC;IAEY,UAAU,CAAC,GAAG,MAAqB;;YAC5C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,KAAK,IAAI,GAAG,IAAI,MAAM,EAAE;gBACpB,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;aACpB;YACD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;QAC/B,CAAC;KAAA;IAEK,cAAc,CAAqF,KAAQ,EAAE,cAAoC,EAAE,
|
|
1
|
+
{"version":3,"file":"MineRenderScene.js","sourceRoot":"src/","sources":["renderer/MineRenderScene.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAY,KAAK,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAC,aAAa,EAAc,MAAM,eAAe,CAAC;AACzD,OAAO,KAAK,MAAM,cAAc,CAAC;AAEjC,OAAO,EAAE,WAAW,EAAsB,MAAM,4BAA4B,CAAC;AAE7E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,EAAE,WAAW,EAAsB,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAClG,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EAAE,UAAU,EAAqB,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAuB,MAAM,8BAA8B,CAAC;AAIjF,MAAM,OAAO,eAAgB,SAAQ,KAAK;IAYtC,YAAY,OAA6C;QACrD,KAAK,EAAE,CAAC;QAXI,sBAAiB,GAAS,IAAI,CAAC;QAKtC,UAAK,GAAe,IAAI,UAAU,EAAE,CAAC;QAC3B,oBAAe,GAAoB,IAAI,eAAe,EAAE,CAAC;QAErE,UAAK,GAAY,IAAI,CAAC;QAIzB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,GAAG,CAAC,GAAG,MAAM;QACT,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC;QACxC,KAAK,IAAI,GAAG,IAAI,MAAM,EAAE;YACpB,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;aACjC;YACD,wCAAwC;YACxC,yBAAyB;YACzB,MAAM;YACN,GAAG,CAAC,gBAAgB,CAAC,QAAQ,EAAC,KAAK,CAAA,EAAE;gBACjC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YACtB,CAAC,CAAC,CAAC;SACN;QACD,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,GAAG,MAAM;QACZ,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC;IACnC,CAAC;IAEY,UAAU,CAAC,GAAG,MAAqB;;YAC5C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,KAAK,IAAI,GAAG,IAAI,MAAM,EAAE;gBACpB,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;aACpB;YACD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;QAC/B,CAAC;KAAA;IAEK,cAAc,CAAqF,KAAQ,EAAE,cAAoC,EAAE,QAAqB,EAAE,SAAmB,IAAI;;;YACnM,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;YACpC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YAC7B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,kCAAkC;YAClC,MAAM,GAAG,GAAG,MAAM,cAAc,EAAE,CAAC;YACnC,IAAI,CAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,0CAAE,cAAc,KAAI,KAAK,CAAC,GAAG,IAAK,CAAA,MAAW,KAAK,CAAC,GAAI,0CAAE,SAAS,MAAK,QAAQ,CAAA,QAAQ,EAAE;gBACrG,sCAAsC;gBACtC,+BAA+B;gBAC/B,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;gBAClC,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,GAAG,EAAE,GAAS,EAAE;oBACpD,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC;oBACjB,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;oBACjB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAChB,yBAAyB;oBACzB,OAAO,GAAG,CAAC;gBACf,CAAC,CAAA,CAAC,CAAC;aACN;iBAAM;gBACH,wCAAwC;gBACxC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC;gBACjB,8BAA8B;gBAC9B,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;gBACjB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,6EAA6E;oBACpG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBACnB;gBACD,yBAAyB;gBACzB,OAAO,GAAG,CAAC;aACd;;KACJ;IAEY,QAAQ,CAAC,KAAY,EAAE,OAAqC,EAAE,SAAmB,IAAI;;YAC9F,OAAO,IAAI,CAAC,cAAc,CAAyC,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACtI,CAAC;KAAA;IAEY,QAAQ,CAAC,UAAsB,EAAE,OAAqC,EAAE,SAAmB,IAAI;;YACxG,OAAO,IAAI,CAAC,cAAc,CAA8C,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACrJ,CAAC;KAAA;IAEY,OAAO,CAAC,IAAa,EAAE,OAAoC,EAAE,SAAmB,IAAI;;YAC7F,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;YACpC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC;YACjB,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,IAAI,EAAE;gBACN,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;aAC5B;YACD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAChB,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAEY,SAAS,CAAC,MAAmB,EAAE,OAAsC,EAAE,SAAmB,IAAI;;YACvG,OAAO,IAAI,CAAC,cAAc,CAAgD,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAChJ,CAAC;KAAA;;AA/FsB,+BAAe,GAA2B,KAAK,CAAC,EAAE,EAA0B,EAAE,CAAC,CAAC;AAwG3G,MAAM,UAAU,iBAAiB,CAAC,GAAQ;IACtC,OAAyB,GAAI,CAAC,iBAAiB,CAAC;AACpD,CAAC"}
|
|
@@ -27,6 +27,7 @@ export class SceneObject extends Object3D {
|
|
|
27
27
|
this._isInstanced = false;
|
|
28
28
|
this._instanceCounter = 0;
|
|
29
29
|
this.options = merge({}, SceneObject.DEFAULT_OPTIONS, options !== null && options !== void 0 ? options : {});
|
|
30
|
+
console.log("SceneObject options", this.options);
|
|
30
31
|
}
|
|
31
32
|
set scene(scene) {
|
|
32
33
|
if (!!this._scene)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SceneObject.js","sourceRoot":"src/","sources":["renderer/SceneObject.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SceneObject.js","sourceRoot":"src/","sources":["renderer/SceneObject.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/three/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["three/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["three/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "minerender",
|
|
3
|
-
"version": "2.0.0-alpha.
|
|
3
|
+
"version": "2.0.0-alpha.9",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./dist/cjs/index.js",
|
|
6
6
|
"types": "./dist/cjs/index.d.ts",
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
"bundle": "node ./build.mjs",
|
|
14
14
|
"bundle:w": "TODO",
|
|
15
15
|
"build": "yarn run clean && npm run compile && npm run bundle",
|
|
16
|
+
"test": "ava",
|
|
16
17
|
"doc": "typedoc --out docs src",
|
|
17
18
|
"publish:alpha": "npm version prerelease --force --preid=alpha && npm publish --tag=alpha"
|
|
18
19
|
},
|
|
@@ -72,10 +73,7 @@
|
|
|
72
73
|
"util": "^0.12.3"
|
|
73
74
|
},
|
|
74
75
|
"devDependencies": {
|
|
75
|
-
"
|
|
76
|
-
"browserify-incremental": "^3.1.1",
|
|
77
|
-
"browserify-shim": "^3.8.14",
|
|
78
|
-
"browserify-zlib": "^0.2.0",
|
|
76
|
+
"@ava/typescript": "^4.1.0",
|
|
79
77
|
"@mapbox/node-pre-gyp": "^1.0.0",
|
|
80
78
|
"@types/browser-or-node": "^1.3.0",
|
|
81
79
|
"@types/crypto-js": "^4.0.1",
|
|
@@ -83,12 +81,20 @@
|
|
|
83
81
|
"@types/node": "^14.14.31",
|
|
84
82
|
"@types/node-persist": "^3.1.1",
|
|
85
83
|
"@types/three": "^0.125.2",
|
|
84
|
+
"@zip.js/zip.js": "^2.7.30",
|
|
85
|
+
"ava": "^5.3.1",
|
|
86
|
+
"browserify-fs": "^1.0.0",
|
|
87
|
+
"browserify-incremental": "^3.1.1",
|
|
88
|
+
"browserify-shim": "^3.8.14",
|
|
89
|
+
"browserify-zlib": "^0.2.0",
|
|
86
90
|
"clean-webpack-plugin": "^3.0.0",
|
|
87
91
|
"esbuild": "^0.19.5",
|
|
88
92
|
"esbuild-plugin-polyfill-node": "^0.3.0",
|
|
93
|
+
"esbuild-runner": "^2.2.2",
|
|
89
94
|
"event-stream": "^4.0.1",
|
|
90
95
|
"glob": "^7.1.6",
|
|
91
96
|
"progress-stream": "^2.0.0",
|
|
97
|
+
"typedoc": "^0.25.3",
|
|
92
98
|
"typescript": "^4.1.5"
|
|
93
99
|
}
|
|
94
100
|
}
|
package/src/UVMapper.ts
CHANGED
|
@@ -242,7 +242,7 @@ export class UVMapper {
|
|
|
242
242
|
public static async createAtlas(originalModel: Model): Promise<Maybe<TextureAtlas>> {
|
|
243
243
|
const textureMap: { [key: string]: Maybe<WrappedImage>; } = {};
|
|
244
244
|
const metaMap: { [key: string]: Maybe<MinecraftTextureMeta>; } = {};
|
|
245
|
-
const model = {
|
|
245
|
+
const model = {...originalModel};
|
|
246
246
|
const isItemModel = !("elements" in model);
|
|
247
247
|
|
|
248
248
|
console.debug(p, "Creating Atlas for", model.key);
|
|
@@ -259,7 +259,11 @@ export class UVMapper {
|
|
|
259
259
|
uniqueTextureNames.push(textureKey);
|
|
260
260
|
const assetKey = AssetKey.parse("textures", textureValue, model.key);
|
|
261
261
|
promises.push(ModelTextures.get(assetKey).then(asset => {
|
|
262
|
-
|
|
262
|
+
if (!asset) {
|
|
263
|
+
console.warn(p, "Missing texture", assetKey)
|
|
264
|
+
return;
|
|
265
|
+
}
|
|
266
|
+
textureMap[textureKey] = new WrappedImage(asset);
|
|
263
267
|
}));
|
|
264
268
|
promises.push(ModelTextures.getMeta(assetKey).then(meta => {
|
|
265
269
|
metaMap[textureKey] = meta;
|
|
@@ -292,7 +296,7 @@ export class UVMapper {
|
|
|
292
296
|
}
|
|
293
297
|
this.fillMissingTextureKeys(model.textures, sizes);
|
|
294
298
|
|
|
295
|
-
// console.log(sizes);
|
|
299
|
+
// console.log("sizes", sizes);
|
|
296
300
|
|
|
297
301
|
const s = (Math.ceil(Math.sqrt(textureCount + 1))); // +1 for transparency
|
|
298
302
|
const size = Math.ceil(s * maxWidth)
|
|
@@ -373,11 +377,11 @@ export class UVMapper {
|
|
|
373
377
|
}
|
|
374
378
|
}
|
|
375
379
|
const atlasImageData = image.toDataURL();
|
|
376
|
-
console.log(p,"Atlas Image for", model.key, atlasImageData);
|
|
380
|
+
console.log(p, "Atlas Image for", model.key, atlasImageData);
|
|
377
381
|
|
|
378
382
|
this.fillMissingTextureKeys(model.textures, positions);
|
|
379
383
|
|
|
380
|
-
// console.log(positions);
|
|
384
|
+
// console.log("positions", positions);
|
|
381
385
|
|
|
382
386
|
if (isItemModel) {
|
|
383
387
|
console.debug(p, "Generating item model for", model);
|
|
@@ -388,7 +392,7 @@ export class UVMapper {
|
|
|
388
392
|
model.elements.push(...ModelGenerator.generateItemModel(textureImage.data, layerName))
|
|
389
393
|
}
|
|
390
394
|
}
|
|
391
|
-
console.debug(p,"Item model elements",model.elements)
|
|
395
|
+
console.debug(p, "Item model elements", model.elements)
|
|
392
396
|
}
|
|
393
397
|
|
|
394
398
|
if (!model.elements) {
|
package/src/assets/AssetKey.ts
CHANGED
|
@@ -11,142 +11,65 @@ import { ListAsset } from "../ListAsset";
|
|
|
11
11
|
import { AssetKey } from "./AssetKey";
|
|
12
12
|
import { NBTAsset, NBTHelper } from "../nbt/NBTHelper";
|
|
13
13
|
import { prefix } from "../util/log";
|
|
14
|
+
import { AssetSource } from "./source/AssetSource";
|
|
15
|
+
import { AssetParser } from "./source/parser/AssetParsers";
|
|
16
|
+
import { HostedAssetSource } from "./source";
|
|
14
17
|
|
|
15
18
|
const p = prefix("AssetLoader");
|
|
16
19
|
|
|
17
|
-
export interface ResponseParser<T extends MinecraftAsset> {
|
|
18
|
-
config(request: AxiosRequestConfig);
|
|
19
|
-
|
|
20
|
-
parse(response: AxiosResponse): Maybe<T> | Promise<Maybe<T>>;
|
|
21
|
-
}
|
|
22
20
|
|
|
23
21
|
export class AssetLoader {
|
|
24
22
|
|
|
25
|
-
static readonly MODEL: ResponseParser<Model> = {
|
|
26
|
-
config(request: AxiosRequestConfig) {
|
|
27
|
-
},
|
|
28
|
-
parse(response: AxiosResponse): Maybe<Model> {
|
|
29
|
-
return response.data as Model;
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
static readonly BLOCKSTATE: ResponseParser<BlockState> = {
|
|
33
|
-
config(request: AxiosRequestConfig) {
|
|
34
|
-
},
|
|
35
|
-
parse(response: AxiosResponse): Maybe<BlockState> {
|
|
36
|
-
return response.data as BlockState;
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
static readonly META: ResponseParser<MinecraftTextureMeta> = {
|
|
40
|
-
config(request: AxiosRequestConfig) {
|
|
41
|
-
// request.responseType = "arraybuffer";
|
|
42
|
-
},
|
|
43
|
-
parse(response: AxiosResponse): Maybe<MinecraftTextureMeta> {
|
|
44
|
-
return response.data as MinecraftTextureMeta;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
static readonly NBT: ResponseParser<NBTAsset> = {
|
|
48
|
-
config(request: AxiosRequestConfig) {
|
|
49
|
-
request.responseType = "arraybuffer";
|
|
50
|
-
},
|
|
51
|
-
parse(response: AxiosResponse): Promise<Maybe<NBTAsset>> {
|
|
52
|
-
return NBTHelper.fromBuffer(Buffer.from(response.data));
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
static readonly IMAGE: ResponseParser<TextureAsset> = {
|
|
56
|
-
config(request: AxiosRequestConfig) {
|
|
57
|
-
request.responseType = "arraybuffer";
|
|
58
|
-
},
|
|
59
|
-
async parse(response: AxiosResponse): Promise<Maybe<TextureAsset>> {
|
|
60
|
-
return await ImageLoader.processResponse(response) as TextureAsset;
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
static readonly LIST: ResponseParser<ListAsset> = {
|
|
64
|
-
config(request: AxiosRequestConfig) {
|
|
65
|
-
},
|
|
66
|
-
parse(response: AxiosResponse): Maybe<ListAsset> {
|
|
67
|
-
return response.data as ListAsset;
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
static readonly JSON: ResponseParser<any> = {
|
|
71
|
-
config(request: AxiosRequestConfig) {
|
|
72
|
-
},
|
|
73
|
-
parse(response: AxiosResponse): Maybe<any> {
|
|
74
|
-
return response.data;
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
|
|
78
23
|
static ROOT: string = DEFAULT_ROOT;
|
|
79
24
|
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
// Try on the same host but with default minecraft: namespace
|
|
88
|
-
const namespaceKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, key.root);
|
|
89
|
-
const namespaced = await this.load<T>(namespaceKey, parser);
|
|
90
|
-
if (typeof namespaced !== "undefined") {
|
|
91
|
-
return namespaced;
|
|
92
|
-
}
|
|
93
|
-
if ((typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT) || (typeof this.ROOT !== "undefined" && this.ROOT !== DEFAULT_ROOT)) {
|
|
94
|
-
console.info(p, "Retrying", key, "with default root+namespace");
|
|
95
|
-
// Try both defaults
|
|
96
|
-
const namespacedRootedKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
|
|
97
|
-
const namespacedRooted = await this.load<T>(namespacedRootedKey, parser);
|
|
98
|
-
if (typeof namespacedRooted !== "undefined") {
|
|
99
|
-
return namespacedRooted;
|
|
100
|
-
}
|
|
25
|
+
private static _SOURCES: AssetSourceReference[] = [];
|
|
26
|
+
|
|
27
|
+
public static addSource(key: string, source: AssetSource, override: boolean = true) {
|
|
28
|
+
if (override) {
|
|
29
|
+
const existing = this.removeSource(key);
|
|
30
|
+
if (existing) {
|
|
31
|
+
console.log(p, "Removed existing AssetSource", key);
|
|
101
32
|
}
|
|
102
|
-
}
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
this._SOURCES.unshift({key, source});
|
|
36
|
+
console.log(p, "Added AssetSource", key);
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
public static removeSource(key: string): Maybe<AssetSource> {
|
|
40
|
+
const index = this._SOURCES.findIndex(s => s.key === key);
|
|
41
|
+
if (index != -1) {
|
|
42
|
+
const spliced = this._SOURCES.splice(index, 1);
|
|
43
|
+
if (spliced.length > 0) {
|
|
44
|
+
return spliced[0].source;
|
|
109
45
|
}
|
|
110
46
|
}
|
|
111
47
|
return undefined;
|
|
112
48
|
}
|
|
113
49
|
|
|
50
|
+
static {
|
|
51
|
+
this.addSource("mcassets", new HostedAssetSource(DEFAULT_ROOT));
|
|
52
|
+
}
|
|
114
53
|
|
|
115
|
-
|
|
116
|
-
console.
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
if (response && response.data) {
|
|
126
|
-
try {
|
|
127
|
-
return parser.parse(response);
|
|
128
|
-
} catch (e) {
|
|
129
|
-
console.warn("Parser failed to process response", response, e);
|
|
130
|
-
throw e;
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
return undefined;
|
|
134
|
-
})
|
|
135
|
-
.catch(err => {
|
|
136
|
-
if (err.response) {
|
|
137
|
-
let response = err.response as AxiosResponse;
|
|
138
|
-
if (response.status === 404) {
|
|
139
|
-
console.debug(p, key, "not found");
|
|
140
|
-
return undefined;
|
|
141
|
-
}
|
|
54
|
+
public static async get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<Maybe<T>> {
|
|
55
|
+
console.log(this._SOURCES)
|
|
56
|
+
let promises: Promise<Maybe<T>>[] = [];
|
|
57
|
+
for (const source of this._SOURCES) {
|
|
58
|
+
promises.push(source.source.get<T>(key, parser));
|
|
59
|
+
}
|
|
60
|
+
return Promise.all(promises).then(results => {
|
|
61
|
+
for (const result of results) {
|
|
62
|
+
if (result) {
|
|
63
|
+
return result;
|
|
142
64
|
}
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
65
|
+
}
|
|
66
|
+
return undefined;
|
|
67
|
+
});
|
|
146
68
|
}
|
|
147
69
|
|
|
148
|
-
|
|
149
|
-
return `${ key.root ?? this.ROOT }/${ key.rootType !== undefined ? key.rootType + '/' : '' }${ key.namespace !== undefined ? key.namespace + '/' : '' }${ key.assetType !== undefined ? key.assetType + '/' : '' }`;
|
|
150
|
-
}
|
|
70
|
+
}
|
|
151
71
|
|
|
72
|
+
interface AssetSourceReference {
|
|
73
|
+
key: string;
|
|
74
|
+
source: AssetSource;
|
|
152
75
|
}
|