minerender 2.0.0-alpha.8 → 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/build.mjs +2 -2
- package/dist/bundle.js +11958 -2504
- 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/AssetLoader.d.ts +2 -1
- package/dist/cjs/assets/AssetLoader.js +28 -6
- package/dist/cjs/assets/AssetLoader.js.map +1 -1
- 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 +1 -0
- package/dist/cjs/assets/source/index.js +1 -0
- package/dist/cjs/assets/source/index.js.map +1 -1
- package/dist/cjs/cache/Caching.js +9 -0
- package/dist/cjs/cache/Caching.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/esm/UVMapper.js +6 -2
- package/dist/esm/UVMapper.js.map +1 -1
- package/dist/esm/assets/AssetLoader.d.ts +2 -1
- package/dist/esm/assets/AssetLoader.js +28 -6
- package/dist/esm/assets/AssetLoader.js.map +1 -1
- 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 +1 -0
- package/dist/esm/assets/source/index.js +1 -0
- package/dist/esm/assets/source/index.js.map +1 -1
- package/dist/esm/cache/Caching.js +9 -0
- package/dist/esm/cache/Caching.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/package.json +3 -1
- package/src/UVMapper.ts +10 -6
- package/src/assets/AssetLoader.ts +30 -6
- 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 +2 -1
- package/src/cache/Caching.ts +9 -0
- package/src/model/scene/ModelObject.ts +1 -1
- package/src/renderer/MineRenderScene.ts +4 -5
- package/src/renderer/SceneObject.ts +1 -0
package/dist/cjs/UVMapper.js
CHANGED
|
@@ -228,6 +228,10 @@ class UVMapper {
|
|
|
228
228
|
uniqueTextureNames.push(textureKey);
|
|
229
229
|
const assetKey = AssetKey_1.AssetKey.parse("textures", textureValue, model.key);
|
|
230
230
|
promises.push(ModelTextures_1.ModelTextures.get(assetKey).then(asset => {
|
|
231
|
+
if (!asset) {
|
|
232
|
+
console.warn(p, "Missing texture", assetKey);
|
|
233
|
+
return;
|
|
234
|
+
}
|
|
231
235
|
textureMap[textureKey] = new WrappedImage_1.WrappedImage(asset);
|
|
232
236
|
}));
|
|
233
237
|
promises.push(ModelTextures_1.ModelTextures.getMeta(assetKey).then(meta => {
|
|
@@ -258,7 +262,7 @@ class UVMapper {
|
|
|
258
262
|
}
|
|
259
263
|
}
|
|
260
264
|
this.fillMissingTextureKeys(model.textures, sizes);
|
|
261
|
-
// console.log(sizes);
|
|
265
|
+
// console.log("sizes", sizes);
|
|
262
266
|
const s = (Math.ceil(Math.sqrt(textureCount + 1))); // +1 for transparency
|
|
263
267
|
const size = Math.ceil(s * maxWidth);
|
|
264
268
|
console.debug(p, "Atlas size:", size);
|
|
@@ -327,7 +331,7 @@ class UVMapper {
|
|
|
327
331
|
const atlasImageData = image.toDataURL();
|
|
328
332
|
console.log(p, "Atlas Image for", model.key, atlasImageData);
|
|
329
333
|
this.fillMissingTextureKeys(model.textures, positions);
|
|
330
|
-
// console.log(positions);
|
|
334
|
+
// console.log("positions", positions);
|
|
331
335
|
if (isItemModel) {
|
|
332
336
|
console.debug(p, "Generating item model for", model);
|
|
333
337
|
model.elements = [];
|
package/dist/cjs/UVMapper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UVMapper.js","sourceRoot":"src/","sources":["UVMapper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"UVMapper.js","sourceRoot":"src/","sources":["UVMapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { AssetParser } from "./source/parser/AssetParsers";
|
|
|
6
6
|
export declare class AssetLoader {
|
|
7
7
|
static ROOT: string;
|
|
8
8
|
private static _SOURCES;
|
|
9
|
-
static addSource(key: string, source: AssetSource): void;
|
|
9
|
+
static addSource(key: string, source: AssetSource, override?: boolean): void;
|
|
10
|
+
static removeSource(key: string): Maybe<AssetSource>;
|
|
10
11
|
static get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<Maybe<T>>;
|
|
11
12
|
}
|
|
@@ -16,19 +16,41 @@ const log_1 = require("../util/log");
|
|
|
16
16
|
const source_1 = require("./source");
|
|
17
17
|
const p = (0, log_1.prefix)("AssetLoader");
|
|
18
18
|
class AssetLoader {
|
|
19
|
-
static addSource(key, source) {
|
|
19
|
+
static addSource(key, source, override = true) {
|
|
20
|
+
if (override) {
|
|
21
|
+
const existing = this.removeSource(key);
|
|
22
|
+
if (existing) {
|
|
23
|
+
console.log(p, "Removed existing AssetSource", key);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
20
26
|
this._SOURCES.unshift({ key, source });
|
|
21
27
|
console.log(p, "Added AssetSource", key);
|
|
22
28
|
}
|
|
29
|
+
static removeSource(key) {
|
|
30
|
+
const index = this._SOURCES.findIndex(s => s.key === key);
|
|
31
|
+
if (index != -1) {
|
|
32
|
+
const spliced = this._SOURCES.splice(index, 1);
|
|
33
|
+
if (spliced.length > 0) {
|
|
34
|
+
return spliced[0].source;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
23
39
|
static get(key, parser) {
|
|
24
40
|
return __awaiter(this, void 0, void 0, function* () {
|
|
41
|
+
console.log(this._SOURCES);
|
|
42
|
+
let promises = [];
|
|
25
43
|
for (const source of this._SOURCES) {
|
|
26
|
-
|
|
27
|
-
if (result) {
|
|
28
|
-
return result;
|
|
29
|
-
}
|
|
44
|
+
promises.push(source.source.get(key, parser));
|
|
30
45
|
}
|
|
31
|
-
return
|
|
46
|
+
return Promise.all(promises).then(results => {
|
|
47
|
+
for (const result of results) {
|
|
48
|
+
if (result) {
|
|
49
|
+
return result;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return undefined;
|
|
53
|
+
});
|
|
32
54
|
});
|
|
33
55
|
}
|
|
34
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssetLoader.js","sourceRoot":"src/","sources":["assets/AssetLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAQA,qCAA2D;AAI3D,qCAAqC;AAGrC,qCAA6C;AAE7C,MAAM,CAAC,GAAG,IAAA,YAAM,EAAC,aAAa,CAAC,CAAC;AAGhC,MAAa,WAAW;IAMb,MAAM,CAAC,SAAS,CAAC,GAAW,EAAE,MAAmB;
|
|
1
|
+
{"version":3,"file":"AssetLoader.js","sourceRoot":"src/","sources":["assets/AssetLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAQA,qCAA2D;AAI3D,qCAAqC;AAGrC,qCAA6C;AAE7C,MAAM,CAAC,GAAG,IAAA,YAAM,EAAC,aAAa,CAAC,CAAC;AAGhC,MAAa,WAAW;IAMb,MAAM,CAAC,SAAS,CAAC,GAAW,EAAE,MAAmB,EAAE,WAAoB,IAAI;QAC9E,IAAI,QAAQ,EAAE;YACV,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACxC,IAAI,QAAQ,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,8BAA8B,EAAE,GAAG,CAAC,CAAC;aACvD;SACJ;QAED,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC,GAAG,EAAE,MAAM,EAAC,CAAC,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,mBAAmB,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,GAAW;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;QAC1D,IAAI,KAAK,IAAI,CAAC,CAAC,EAAE;YACb,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC/C,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;gBACpB,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;aAC5B;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAMM,MAAM,CAAO,GAAG,CAA2B,GAAa,EAAE,MAA4B;;YACzF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC1B,IAAI,QAAQ,GAAwB,EAAE,CAAC;YACvC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAChC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAI,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;aACpD;YACD,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBACxC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;oBAC1B,IAAI,MAAM,EAAE;wBACR,OAAO,MAAM,CAAC;qBACjB;iBACJ;gBACD,OAAO,SAAS,CAAC;YACrB,CAAC,CAAC,CAAC;QACP,CAAC;KAAA;;AA/CL,kCAiDC;;AA/CU,gBAAI,GAAW,qBAAY,CAAC;AAEpB,oBAAQ,GAA2B,EAAE,CAAC;AAyBrD;IACI,EAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,0BAAiB,CAAC,qBAAY,CAAC,CAAC,CAAC;AACpE,CAAC,GAAA,CAAA"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { AssetSource } from "../AssetSource";
|
|
2
|
+
import { ArchiveProxy } from "./ArchiveProxy";
|
|
3
|
+
import { ArchiveEntry } from "./ArchiveEntry";
|
|
4
|
+
import { MinecraftAsset } from "../../../MinecraftAsset";
|
|
5
|
+
import { AssetKey } from "../../AssetKey";
|
|
6
|
+
import { AssetParser, ResponseParser } from "../parser";
|
|
7
|
+
import { Maybe } from "../../../util";
|
|
8
|
+
export declare class ArchiveAssetSource extends AssetSource implements ArchiveProxy {
|
|
9
|
+
readonly _archiveProxy: ArchiveProxy;
|
|
10
|
+
constructor(archiveProxy: ArchiveProxy);
|
|
11
|
+
static blob(blob: Blob): ArchiveAssetSource;
|
|
12
|
+
getEntries(): Promise<ArchiveEntry[]>;
|
|
13
|
+
getEntry(path: string): Promise<Maybe<ArchiveEntry>>;
|
|
14
|
+
get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<Maybe<T>>;
|
|
15
|
+
protected load<T extends MinecraftAsset>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>>;
|
|
16
|
+
assetBasePath(key: AssetKey): string;
|
|
17
|
+
}
|
|
@@ -0,0 +1,126 @@
|
|
|
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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.ArchiveAssetSource = void 0;
|
|
13
|
+
const AssetSource_1 = require("../AssetSource");
|
|
14
|
+
const util_1 = require("../../../util");
|
|
15
|
+
const request_1 = require("../../../request");
|
|
16
|
+
const HostedAssetSource_1 = require("../HostedAssetSource");
|
|
17
|
+
const BrowserArchiveProxy_1 = require("./BrowserArchiveProxy");
|
|
18
|
+
const p = (0, util_1.prefix)("ArchiveAssetSource");
|
|
19
|
+
class ArchiveAssetSource extends AssetSource_1.AssetSource {
|
|
20
|
+
constructor(archiveProxy) {
|
|
21
|
+
super();
|
|
22
|
+
console.log(archiveProxy);
|
|
23
|
+
this._archiveProxy = archiveProxy;
|
|
24
|
+
}
|
|
25
|
+
static blob(blob) {
|
|
26
|
+
return new ArchiveAssetSource(new BrowserArchiveProxy_1.BrowserArchiveProxy(blob));
|
|
27
|
+
}
|
|
28
|
+
getEntries() {
|
|
29
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
30
|
+
return this._archiveProxy.getEntries();
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
getEntry(path) {
|
|
34
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
35
|
+
const entries = yield this.getEntries();
|
|
36
|
+
return entries.find(e => e.filename === path);
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
get(key, parser) {
|
|
40
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
41
|
+
const responseParser = HostedAssetSource_1.HostedAssetSource.PARSER_MAP.get(parser);
|
|
42
|
+
console.log("ArchiveAssetSource.get", key, parser);
|
|
43
|
+
let entries = (yield this.getEntries());
|
|
44
|
+
const path = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
|
|
45
|
+
console.log(path);
|
|
46
|
+
const entry = yield this.getEntry(path);
|
|
47
|
+
console.log(entry);
|
|
48
|
+
if (!entry) {
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
let blob = yield entry.getData();
|
|
52
|
+
const url = URL.createObjectURL(blob);
|
|
53
|
+
console.log(url);
|
|
54
|
+
let req = {
|
|
55
|
+
url: url,
|
|
56
|
+
};
|
|
57
|
+
responseParser.config(req);
|
|
58
|
+
return request_1.Requests.genericRequest(req)
|
|
59
|
+
.then(response => {
|
|
60
|
+
if (response && response.data) {
|
|
61
|
+
try {
|
|
62
|
+
return responseParser.parse(response);
|
|
63
|
+
}
|
|
64
|
+
catch (e) {
|
|
65
|
+
console.warn("Parser failed to process response", response, e);
|
|
66
|
+
throw e;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return undefined;
|
|
70
|
+
})
|
|
71
|
+
.catch(err => {
|
|
72
|
+
if (err.response) {
|
|
73
|
+
let response = err.response;
|
|
74
|
+
if (response.status === 404) {
|
|
75
|
+
console.debug(p, key, "not found");
|
|
76
|
+
return undefined;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
console.debug(p, "Failed to load", key, err === null || err === void 0 ? void 0 : err.message);
|
|
80
|
+
return undefined;
|
|
81
|
+
});
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
//TODO: abstract this
|
|
85
|
+
load(key, parser) {
|
|
86
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
87
|
+
console.info(p, "Loading", key);
|
|
88
|
+
const url = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
|
|
89
|
+
console.debug(p, url);
|
|
90
|
+
let req = {
|
|
91
|
+
url: url
|
|
92
|
+
};
|
|
93
|
+
parser.config(req);
|
|
94
|
+
// @ts-ignore
|
|
95
|
+
return yield request_1.Requests.genericRequest(req)
|
|
96
|
+
.then(response => {
|
|
97
|
+
if (response && response.data) {
|
|
98
|
+
try {
|
|
99
|
+
return parser.parse(response);
|
|
100
|
+
}
|
|
101
|
+
catch (e) {
|
|
102
|
+
console.warn("Parser failed to process response", response, e);
|
|
103
|
+
throw e;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
return undefined;
|
|
107
|
+
})
|
|
108
|
+
.catch(err => {
|
|
109
|
+
if (err.response) {
|
|
110
|
+
let response = err.response;
|
|
111
|
+
if (response.status === 404) {
|
|
112
|
+
console.debug(p, key, "not found");
|
|
113
|
+
return undefined;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
console.debug(p, "Failed to load", key, err === null || err === void 0 ? void 0 : err.message);
|
|
117
|
+
return undefined;
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
assetBasePath(key) {
|
|
122
|
+
return `${key.rootType !== undefined ? key.rootType + '/' : ''}${key.namespace !== undefined ? key.namespace + '/' : ''}${key.assetType !== undefined ? key.assetType + '/' : ''}`;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
exports.ArchiveAssetSource = ArchiveAssetSource;
|
|
126
|
+
//# sourceMappingURL=ArchiveAssetSource.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ArchiveAssetSource.js","sourceRoot":"src/","sources":["assets/source/archive/ArchiveAssetSource.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ArchiveEntry.js","sourceRoot":"src/","sources":["assets/source/archive/ArchiveEntry.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ArchiveProxy.js","sourceRoot":"src/","sources":["assets/source/archive/ArchiveProxy.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { ArchiveProxy } from "./ArchiveProxy";
|
|
2
|
+
import { ZipReader } from "@zip.js/zip.js";
|
|
3
|
+
import { ArchiveEntry } from "./ArchiveEntry";
|
|
4
|
+
export declare class BrowserArchiveProxy implements ArchiveProxy {
|
|
5
|
+
readonly _blob: Blob;
|
|
6
|
+
readonly _reader: ZipReader<Blob>;
|
|
7
|
+
constructor(blob: Blob);
|
|
8
|
+
getEntries(): Promise<ArchiveEntry[]>;
|
|
9
|
+
}
|
|
@@ -0,0 +1,34 @@
|
|
|
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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.BrowserArchiveProxy = void 0;
|
|
13
|
+
const zip_js_1 = require("@zip.js/zip.js");
|
|
14
|
+
class BrowserArchiveProxy {
|
|
15
|
+
constructor(blob) {
|
|
16
|
+
this._blob = blob;
|
|
17
|
+
this._reader = new zip_js_1.ZipReader(new zip_js_1.BlobReader(this._blob));
|
|
18
|
+
}
|
|
19
|
+
getEntries() {
|
|
20
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
return (yield this._reader.getEntries()).map(e => {
|
|
22
|
+
return {
|
|
23
|
+
filename: e.filename,
|
|
24
|
+
directory: e.directory,
|
|
25
|
+
getData() {
|
|
26
|
+
return e.getData(new zip_js_1.BlobWriter());
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
exports.BrowserArchiveProxy = BrowserArchiveProxy;
|
|
34
|
+
//# sourceMappingURL=BrowserArchiveProxy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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;IAEY,UAAU;;YACnB,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBAC7C,OAAO;oBACH,QAAQ,EAAE,CAAC,CAAC,QAAQ;oBACpB,SAAS,EAAE,CAAC,CAAC,SAAS;oBACtB,OAAO;wBACH,OAAO,CAAC,CAAC,OAAQ,CAAC,IAAI,mBAAU,EAAE,CAAC,CAAA;oBACvC,CAAC;iBACJ,CAAA;YACL,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;CAEJ;AAtBD,kDAsBC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./ArchiveEntry"), exports);
|
|
18
|
+
__exportStar(require("./ArchiveProxy"), exports);
|
|
19
|
+
__exportStar(require("./BrowserArchiveProxy"), exports);
|
|
20
|
+
__exportStar(require("./ArchiveAssetSource"), exports);
|
|
21
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["assets/source/archive/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,iDAA+B;AAC/B,wDAAsC;AACtC,uDAAqC"}
|
|
@@ -18,4 +18,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
__exportStar(require("./AssetSource"), exports);
|
|
19
19
|
__exportStar(require("./HostedAssetSource"), exports);
|
|
20
20
|
__exportStar(require("./parser"), exports);
|
|
21
|
+
__exportStar(require("./archive"), exports);
|
|
21
22
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["assets/source/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gBAAgB;AAChB,gDAA8B;AAC9B,sDAAoC;AACpC,2CAAyB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["assets/source/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gBAAgB;AAChB,gDAA8B;AAC9B,sDAAoC;AACpC,2CAAyB;AACzB,4CAA0B"}
|
|
@@ -7,6 +7,15 @@ class Caching {
|
|
|
7
7
|
static clear() {
|
|
8
8
|
this.rawImageCache.invalidateAll();
|
|
9
9
|
this.textureCache.invalidateAll();
|
|
10
|
+
this.imageDataCache.invalidateAll();
|
|
11
|
+
this.wrappedImageCache.invalidateAll();
|
|
12
|
+
this.canvasImageDataCache.invalidateAll();
|
|
13
|
+
this.materialCache.invalidateAll();
|
|
14
|
+
this.modelTextureAtlasCache.invalidateAll();
|
|
15
|
+
this.textureAssetCache.invalidateAll();
|
|
16
|
+
//TODO: add all
|
|
17
|
+
this.rawModelCache.invalidateAll();
|
|
18
|
+
this.mergedModelCache.invalidateAll();
|
|
10
19
|
}
|
|
11
20
|
static end() {
|
|
12
21
|
this.clear();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Caching.js","sourceRoot":"src/","sources":["cache/Caching.ts"],"names":[],"mappings":";;;AAAA,kEAA8G;AAE9G,gDAA6C;AAa7C,MAAa,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":";;;AAAA,kEAA8G;AAE9G,gDAA6C;AAa7C,MAAa,OAAO;IAiFT,MAAM,CAAC,KAAK;QACf,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;QACnC,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;QAClC,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QACpC,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC;QACvC,IAAI,CAAC,oBAAoB,CAAC,aAAa,EAAE,CAAC;QAC1C,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;QACnC,IAAI,CAAC,sBAAsB,CAAC,aAAa,EAAE,CAAC;QAC5C,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC;QACvC,eAAe;QACf,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;QACnC,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,CAAC;IAC1C,CAAC;IAEM,MAAM,CAAC,GAAG;QACb,IAAI,CAAC,KAAK,EAAE,CAAC;QAEb,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;IAC5B,CAAC;IAEM,MAAM,KAAK,UAAU;QACxB,OAAO;QACH,MAAM;SACT,CAAA;IACL,CAAC;;AA1GL,0BA4GC;AA1GmB,qBAAa,GAA2C,sBAAM,CAAC,OAAO,EAAE;KACnF,gBAAgB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAClC,iBAAiB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAClC,kBAAkB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KACnC,UAAU,EAAuB,CAAC;AACvB,sBAAc,GAA2C,sBAAM,CAAC,OAAO,EAAE;KACpF,gBAAgB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAClC,iBAAiB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAClC,kBAAkB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACpC,UAAU,EAAuB,CAAC;AACvB,4BAAoB,GAAsD,sBAAM,CAAC,OAAO,EAAE;KACrG,gBAAgB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAClC,iBAAiB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAClC,kBAAkB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACpC,UAAU,EAAkC,CAAC;AAClC,yBAAiB,GAA8C,sBAAM,CAAC,OAAO,EAAE;KAC1F,gBAAgB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAClC,iBAAiB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAClC,kBAAkB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACpC,UAAU,EAA0B,CAAC;AAE1B,wBAAgB,GAAuC,sBAAM,CAAC,OAAO,EAAE;KAClF,gBAAgB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAClC,iBAAiB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAClC,kBAAkB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACpC,KAAK,EAAyB,CAAC;AAEpB,oBAAY,GAAmC,sBAAM,CAAC,OAAO,EAAE;KAC1E,gBAAgB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAClC,iBAAiB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAClC,kBAAkB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACpC,KAAK,EAAqB,CAAC;AAEhB,qBAAa,GAAoC,sBAAM,CAAC,OAAO,EAAE;KAC5E,gBAAgB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAClC,iBAAiB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAClC,kBAAkB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACpC,KAAK,EAAsB,CAAC;AAEjB,oBAAY,GAAgC,sBAAM,CAAC,OAAO,EAAE;KACvE,gBAAgB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAClC,iBAAiB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAClC,kBAAkB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACpC,KAAK,EAAkB,CAAC;AAEb,yBAAiB,GAA8C,sBAAM,CAAC,OAAO,EAAE;KAC1F,gBAAgB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAClC,iBAAiB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAClC,kBAAkB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACpC,UAAU,EAA0B,CAAC;AAC1B,wBAAgB,GAAsD,sBAAM,CAAC,OAAO,EAAE;KACjG,gBAAgB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAClC,iBAAiB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAClC,kBAAkB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACpC,UAAU,EAAkC,CAAC;AAElC,qBAAa,GAAuC,sBAAM,CAAC,OAAO,EAAE;KAC/E,gBAAgB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAClC,iBAAiB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAClC,kBAAkB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACpC,UAAU,EAAmB,CAAC;AACnB,wBAAgB,GAAuC,sBAAM,CAAC,OAAO,EAAE;KAClF,gBAAgB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAClC,iBAAiB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAClC,kBAAkB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACpC,UAAU,EAAmB,CAAC;AACnB,8BAAsB,GAA8C,sBAAM,CAAC,OAAO,EAAE;KAC/F,gBAAgB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAClC,iBAAiB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAClC,kBAAkB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACpC,UAAU,EAA0B,CAAC;AAE1B,uBAAe,GAA4C,sBAAM,CAAC,OAAO,EAAE;KACtF,gBAAgB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KAClC,iBAAiB,CAAC,WAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAClC,kBAAkB,CAAC,WAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACpC,UAAU,EAAwB,CAAC"}
|
|
@@ -31,7 +31,7 @@ class ModelObject extends SceneObject_1.SceneObject {
|
|
|
31
31
|
this.isModelObject = true;
|
|
32
32
|
this.meshesCreated = false;
|
|
33
33
|
this.options = (0, ts_deepmerge_1.default)({}, ModelObject.DEFAULT_OPTIONS, options !== null && options !== void 0 ? options : {});
|
|
34
|
-
console.log(this.options);
|
|
34
|
+
console.log("ModelObject options", this.options);
|
|
35
35
|
}
|
|
36
36
|
init() {
|
|
37
37
|
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,4DAAyD;AAEzD,+CAA4C;AAK5C,6CAA0C;AAE1C,iCAAkK;AAClK,yEAAwE;AAExE,4CAA4H;AAC5H,yCAAsC;AACtC,gEAAiC;AAGjC,wCAAwC;AAGxC,MAAM,CAAC,GAAG,IAAA,YAAM,EAAC,aAAa,CAAC,CAAC;AAEhC,0GAA0G;AAC1G,MAAa,WAAY,SAAQ,yBAAW;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,IAAA,sBAAK,EAAC,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>;
|
|
@@ -60,19 +60,19 @@ class MineRenderScene extends three_1.Scene {
|
|
|
60
60
|
return this.add(...object);
|
|
61
61
|
});
|
|
62
62
|
}
|
|
63
|
-
addSceneObject(asset, objectSupplier,
|
|
64
|
-
var _a;
|
|
63
|
+
addSceneObject(asset, objectSupplier, _options, parent = this) {
|
|
64
|
+
var _a, _b;
|
|
65
65
|
return __awaiter(this, void 0, void 0, function* () {
|
|
66
|
-
console.log("addSceneObject");
|
|
66
|
+
console.log("addSceneObject", asset);
|
|
67
67
|
console.log("parent", parent);
|
|
68
68
|
this.dirty = true;
|
|
69
69
|
// console.log(this.instanceCache)
|
|
70
|
-
|
|
70
|
+
const obj = yield objectSupplier();
|
|
71
|
+
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*/) {
|
|
71
72
|
// console.log("instanceMeshes + key")
|
|
72
73
|
// check for existing instances
|
|
73
74
|
const key = asset.key.serialize();
|
|
74
75
|
return this.instanceManager.getOrCreate(key, () => __awaiter(this, void 0, void 0, function* () {
|
|
75
|
-
const obj = yield objectSupplier();
|
|
76
76
|
obj.scene = this;
|
|
77
77
|
yield obj.init();
|
|
78
78
|
parent.add(obj);
|
|
@@ -82,7 +82,6 @@ class MineRenderScene extends three_1.Scene {
|
|
|
82
82
|
}
|
|
83
83
|
else {
|
|
84
84
|
// console.log("!instanceMeshes | !key")
|
|
85
|
-
const obj = yield objectSupplier();
|
|
86
85
|
obj.scene = this;
|
|
87
86
|
// await this.initAndAdd(obj);
|
|
88
87
|
yield obj.init();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MineRenderScene.js","sourceRoot":"src/","sources":["renderer/MineRenderScene.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iCAAwC;AACxC,+CAAyD;AACzD,gEAAiC;AAEjC,4DAA6E;AAE7E,8CAA2C;AAK3C,kEAAkG;AAClG,iEAA8D;AAE9D,yDAAyE;AACzE,+DAAiF;AAIjF,MAAa,eAAgB,SAAQ,aAAK;IAYtC,YAAY,OAA6C;QACrD,KAAK,EAAE,CAAC;QAXI,sBAAiB,GAAS,IAAI,CAAC;QAKtC,UAAK,GAAe,IAAI,uBAAU,EAAE,CAAC;QAC3B,oBAAe,GAAoB,IAAI,iCAAe,EAAE,CAAC;QAErE,UAAK,GAAY,IAAI,CAAC;QAIzB,IAAI,CAAC,OAAO,GAAG,IAAA,sBAAK,EAAC,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,IAAA,2BAAa,EAAC,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":"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"}
|
|
@@ -33,6 +33,7 @@ class SceneObject extends three_1.Object3D {
|
|
|
33
33
|
this._isInstanced = false;
|
|
34
34
|
this._instanceCounter = 0;
|
|
35
35
|
this.options = (0, ts_deepmerge_1.default)({}, SceneObject.DEFAULT_OPTIONS, options !== null && options !== void 0 ? options : {});
|
|
36
|
+
console.log("SceneObject options", this.options);
|
|
36
37
|
}
|
|
37
38
|
set scene(scene) {
|
|
38
39
|
if (!!this._scene)
|