minerender 2.0.0-alpha.12 → 2.0.0-alpha.14
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 +47 -7
- package/dist/bundle.js.map +2 -2
- package/dist/cjs/Materials.d.ts +2 -2
- package/dist/cjs/renderer/Renderer.js +2 -0
- package/dist/cjs/renderer/Renderer.js.map +1 -1
- package/dist/cjs/request/Requests.d.ts +1 -0
- package/dist/cjs/request/Requests.js +6 -1
- package/dist/cjs/request/Requests.js.map +1 -1
- package/dist/cjs/skin/Skins.d.ts +7 -1
- package/dist/cjs/skin/Skins.js +36 -3
- package/dist/cjs/skin/Skins.js.map +1 -1
- package/dist/esm/Materials.d.ts +2 -2
- package/dist/esm/renderer/Renderer.js +3 -1
- package/dist/esm/renderer/Renderer.js.map +1 -1
- package/dist/esm/request/Requests.d.ts +1 -0
- package/dist/esm/request/Requests.js +6 -1
- package/dist/esm/request/Requests.js.map +1 -1
- package/dist/esm/skin/Skins.d.ts +7 -1
- package/dist/esm/skin/Skins.js +36 -3
- package/dist/esm/skin/Skins.js.map +1 -1
- package/package.json +2 -2
- package/src/Materials.ts +1 -1
- package/src/renderer/Renderer.ts +5 -3
- package/src/request/Requests.ts +7 -1
- package/src/skin/Skins.ts +38 -3
- package/yarn-error.log +33 -707
package/dist/cjs/Materials.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { MaterialKey } from "./cache/CacheKey";
|
|
2
|
-
import { Material
|
|
2
|
+
import { Material } from "three";
|
|
3
3
|
export declare class Materials {
|
|
4
4
|
static readonly MISSING_TEXTURE: Material;
|
|
5
|
-
static createImage(key: MaterialKey):
|
|
5
|
+
static createImage(key: MaterialKey): Material;
|
|
6
6
|
static createBasicCanvasMaterial(canvas: HTMLCanvasElement, transparent?: boolean, shade?: boolean): Material;
|
|
7
7
|
static createShadedCanvasMaterial(canvas: HTMLCanvasElement, transparent?: boolean, shade?: boolean): Material;
|
|
8
8
|
static getImage(key: MaterialKey): Material;
|
|
@@ -55,6 +55,8 @@ class Renderer {
|
|
|
55
55
|
renderer.setClearColor(0x000000, 0);
|
|
56
56
|
renderer.shadowMap.enabled = true;
|
|
57
57
|
renderer.shadowMap.type = three_1.PCFSoftShadowMap;
|
|
58
|
+
// supposedly the default is already LinearEncoding, but not doing this renders the scene way too bright
|
|
59
|
+
renderer.outputEncoding = three_1.LinearEncoding;
|
|
58
60
|
// renderer.setPixelRatio(window.devicePixelRatio);
|
|
59
61
|
renderer.setSize(this.viewWidth, this.viewHeight);
|
|
60
62
|
return renderer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Renderer.js","sourceRoot":"src/","sources":["renderer/Renderer.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"Renderer.js","sourceRoot":"src/","sources":["renderer/Renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { AxiosRequestConfig, AxiosResponse } from "axios";
|
|
|
2
2
|
export declare class Requests {
|
|
3
3
|
private static axiosInstance;
|
|
4
4
|
private static mcAssetInstance;
|
|
5
|
+
private static genericQueue;
|
|
5
6
|
private static mcAssetRequestQueue;
|
|
6
7
|
static genericRequest(request: AxiosRequestConfig): Promise<AxiosResponse>;
|
|
7
8
|
static mcAssetRequest(request: AxiosRequestConfig): Promise<AxiosResponse>;
|
|
@@ -14,7 +14,11 @@ if (typeof window === "undefined") {
|
|
|
14
14
|
}
|
|
15
15
|
class Requests {
|
|
16
16
|
static genericRequest(request) {
|
|
17
|
-
return this.axiosInstance.request(request);
|
|
17
|
+
// return this.axiosInstance.request(request);
|
|
18
|
+
return this.genericQueue.add(request).catch(e => {
|
|
19
|
+
console.debug(p, "generic catch " + e);
|
|
20
|
+
throw e;
|
|
21
|
+
});
|
|
18
22
|
}
|
|
19
23
|
static mcAssetRequest(request) {
|
|
20
24
|
return this.mcAssetRequestQueue.add(request).catch(e => {
|
|
@@ -39,5 +43,6 @@ Requests.axiosInstance = axios_1.default.create({
|
|
|
39
43
|
Requests.mcAssetInstance = axios_1.default.create({
|
|
40
44
|
timeout: 5000
|
|
41
45
|
});
|
|
46
|
+
Requests.genericQueue = new jobqu_1.JobQueue(request => Requests.axiosInstance.request(request), time_1.Time.millis(10));
|
|
42
47
|
Requests.mcAssetRequestQueue = new jobqu_1.JobQueue(request => Requests.mcAssetInstance.request(request), time_1.Time.millis(10));
|
|
43
48
|
//# sourceMappingURL=Requests.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Requests.js","sourceRoot":"src/","sources":["request/Requests.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAgF;AAChF,iCAAiC;AACjC,gDAA6C;AAC7C,qCAAqC;AAErC,MAAM,CAAC,GAAG,IAAA,YAAM,EAAC,UAAU,CAAC,CAAC;AAE7B,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IAC/B,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;CACvD;AAED,MAAa,QAAQ;
|
|
1
|
+
{"version":3,"file":"Requests.js","sourceRoot":"src/","sources":["request/Requests.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAgF;AAChF,iCAAiC;AACjC,gDAA6C;AAC7C,qCAAqC;AAErC,MAAM,CAAC,GAAG,IAAA,YAAM,EAAC,UAAU,CAAC,CAAC;AAE7B,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IAC/B,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;CACvD;AAED,MAAa,QAAQ;IAeV,MAAM,CAAC,cAAc,CAAC,OAA2B;QACpD,8CAA8C;QAC9C,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA,EAAE;YAC3C,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,GAAG,CAAC,CAAC,CAAC;YACvC,MAAM,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,OAA2B;QACpD,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA,EAAE;YAClD,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,uBAAuB,GAAG,CAAC,CAAC,CAAC;YAC9C,MAAM,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;QACH,mDAAmD;IACvD,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,IAAY;QACrC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC;IACjD,CAAC;IAEM,MAAM,KAAK,UAAU;QACxB,OAAO;YACH,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI;SACzC,CAAA;IACL,CAAC;;AAvCL,4BAyCC;AAvCkB,sBAAa,GAAkB,eAAK,CAAC,MAAM,CAAC;IACvD,OAAO,EAAE,IAAI;CAChB,CAAC,CAAC;AAEY,wBAAe,GAAkB,eAAK,CAAC,MAAM,CAAC;IACzD,OAAO,EAAE,IAAI;CAChB,CAAC,CAAA;AAEa,qBAAY,GACrB,IAAI,gBAAQ,CAAoC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5G,4BAAmB,GAC5B,IAAI,gBAAQ,CAAoC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC"}
|
package/dist/cjs/skin/Skins.d.ts
CHANGED
|
@@ -9,9 +9,15 @@ export declare class Skins {
|
|
|
9
9
|
static capeFromUsername(username: string): Promise<Maybe<string>>;
|
|
10
10
|
static capeFromCapesDev(uuid: string, capeType?: string): Promise<Maybe<string>>;
|
|
11
11
|
private static usernameToUuid;
|
|
12
|
-
private static
|
|
12
|
+
private static usernameToUuidSkinProxy;
|
|
13
|
+
private static usernameToUuidMineTools;
|
|
14
|
+
private static getProfileFromMinetools;
|
|
13
15
|
private static getMineSkin;
|
|
14
16
|
private static getCapesDev;
|
|
15
17
|
private static getCrafatarSkinUrl;
|
|
16
18
|
private static getCrafatarCapeUrl;
|
|
19
|
+
private static getMcHeadsSkinUrl;
|
|
20
|
+
private static getMineSkinPlayerSkinUrl;
|
|
21
|
+
private static getSkinProxySkinUrl;
|
|
22
|
+
private static getSkinProxyCapeUrl;
|
|
17
23
|
}
|
package/dist/cjs/skin/Skins.js
CHANGED
|
@@ -30,7 +30,7 @@ class Skins {
|
|
|
30
30
|
// }
|
|
31
31
|
// return undefined;
|
|
32
32
|
// })
|
|
33
|
-
return this.
|
|
33
|
+
return this.getSkinProxySkinUrl(uuid);
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
36
|
static fromUsername(username) {
|
|
@@ -71,7 +71,7 @@ class Skins {
|
|
|
71
71
|
// }
|
|
72
72
|
// return undefined;
|
|
73
73
|
// })
|
|
74
|
-
return this.
|
|
74
|
+
return this.getSkinProxyCapeUrl(uuid);
|
|
75
75
|
});
|
|
76
76
|
}
|
|
77
77
|
static capeFromUsername(username) {
|
|
@@ -98,6 +98,27 @@ class Skins {
|
|
|
98
98
|
//</editor-fold>
|
|
99
99
|
//<editor-fold desc="Helpers">
|
|
100
100
|
static usernameToUuid(username) {
|
|
101
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
102
|
+
return this.usernameToUuidSkinProxy(username);
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
static usernameToUuidSkinProxy(username) {
|
|
106
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
107
|
+
return Requests_1.Requests.genericRequest({
|
|
108
|
+
baseURL: 'https://minecraft-skin-proxy.inventive.workers.dev',
|
|
109
|
+
url: '/uuid/' + username
|
|
110
|
+
}).then(res => {
|
|
111
|
+
if (res.status === 200) {
|
|
112
|
+
return res.data["id"];
|
|
113
|
+
}
|
|
114
|
+
return undefined;
|
|
115
|
+
}).catch(err => {
|
|
116
|
+
console.warn(err);
|
|
117
|
+
return undefined;
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
static usernameToUuidMineTools(username) {
|
|
101
122
|
return __awaiter(this, void 0, void 0, function* () {
|
|
102
123
|
return Requests_1.Requests.genericRequest({
|
|
103
124
|
baseURL: 'https://api.minetools.eu',
|
|
@@ -113,7 +134,7 @@ class Skins {
|
|
|
113
134
|
});
|
|
114
135
|
});
|
|
115
136
|
}
|
|
116
|
-
static
|
|
137
|
+
static getProfileFromMinetools(uuid) {
|
|
117
138
|
return __awaiter(this, void 0, void 0, function* () {
|
|
118
139
|
return Requests_1.Requests.genericRequest({
|
|
119
140
|
baseURL: 'https://api.minetools.eu',
|
|
@@ -163,6 +184,18 @@ class Skins {
|
|
|
163
184
|
static getCrafatarCapeUrl(uuid) {
|
|
164
185
|
return "https://crafatar.com/capes/" + uuid;
|
|
165
186
|
}
|
|
187
|
+
static getMcHeadsSkinUrl(uuid) {
|
|
188
|
+
return "https://mc-heads.net/skin/" + uuid;
|
|
189
|
+
}
|
|
190
|
+
static getMineSkinPlayerSkinUrl(uuid) {
|
|
191
|
+
return "https://mineskin.org/skin/player/" + uuid;
|
|
192
|
+
}
|
|
193
|
+
static getSkinProxySkinUrl(uuid) {
|
|
194
|
+
return "https://minecraft-skin-proxy.inventive.workers.dev/skin/" + uuid;
|
|
195
|
+
}
|
|
196
|
+
static getSkinProxyCapeUrl(uuid) {
|
|
197
|
+
return "https://minecraft-skin-proxy.inventive.workers.dev/cape/" + uuid;
|
|
198
|
+
}
|
|
166
199
|
}
|
|
167
200
|
exports.Skins = Skins;
|
|
168
201
|
//# sourceMappingURL=Skins.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Skins.js","sourceRoot":"src/","sources":["skin/Skins.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA+C;AAG/C,mBAAmB;AACnB,MAAa,KAAK;IAGd,4BAA4B;IAE5B,MAAM,CAAO,kBAAkB,CAAC,cAAsB;;YAClD,IAAI,cAAc,CAAC,MAAM,KAAK,EAAE,IAAI,cAAc,CAAC,MAAM,KAAK,EAAE,EAAE;gBAC9D,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;aACxC;YACD,OAAO,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QAC7C,CAAC;KAAA;IAED,MAAM,CAAO,QAAQ,CAAC,IAAY;;YAC9B,iDAAiD;YACjD,qBAAqB;YACrB,qDAAqD;YACrD,QAAQ;YACR,wBAAwB;YACxB,KAAK;YACL,OAAO,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"Skins.js","sourceRoot":"src/","sources":["skin/Skins.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/Materials.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { MaterialKey } from "./cache/CacheKey";
|
|
2
|
-
import { Material
|
|
2
|
+
import { Material } from "three";
|
|
3
3
|
export declare class Materials {
|
|
4
4
|
static readonly MISSING_TEXTURE: Material;
|
|
5
|
-
static createImage(key: MaterialKey):
|
|
5
|
+
static createImage(key: MaterialKey): Material;
|
|
6
6
|
static createBasicCanvasMaterial(canvas: HTMLCanvasElement, transparent?: boolean, shade?: boolean): Material;
|
|
7
7
|
static createShadedCanvasMaterial(canvas: HTMLCanvasElement, transparent?: boolean, shade?: boolean): Material;
|
|
8
8
|
static getImage(key: MaterialKey): Material;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AxesHelper, GridHelper, OrthographicCamera, PCFSoftShadowMap, PerspectiveCamera, Vector3, WebGLRenderer } from "three";
|
|
1
|
+
import { AxesHelper, GridHelper, LinearEncoding, OrthographicCamera, PCFSoftShadowMap, PerspectiveCamera, Vector3, WebGLRenderer } from "three";
|
|
2
2
|
import { MineRenderScene } from "./MineRenderScene";
|
|
3
3
|
import merge from "ts-deepmerge";
|
|
4
4
|
import Stats from "stats.js";
|
|
@@ -49,6 +49,8 @@ export class Renderer {
|
|
|
49
49
|
renderer.setClearColor(0x000000, 0);
|
|
50
50
|
renderer.shadowMap.enabled = true;
|
|
51
51
|
renderer.shadowMap.type = PCFSoftShadowMap;
|
|
52
|
+
// supposedly the default is already LinearEncoding, but not doing this renders the scene way too bright
|
|
53
|
+
renderer.outputEncoding = LinearEncoding;
|
|
52
54
|
// renderer.setPixelRatio(window.devicePixelRatio);
|
|
53
55
|
renderer.setSize(this.viewWidth, this.viewHeight);
|
|
54
56
|
return renderer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Renderer.js","sourceRoot":"src/","sources":["renderer/Renderer.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"Renderer.js","sourceRoot":"src/","sources":["renderer/Renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { AxiosRequestConfig, AxiosResponse } from "axios";
|
|
|
2
2
|
export declare class Requests {
|
|
3
3
|
private static axiosInstance;
|
|
4
4
|
private static mcAssetInstance;
|
|
5
|
+
private static genericQueue;
|
|
5
6
|
private static mcAssetRequestQueue;
|
|
6
7
|
static genericRequest(request: AxiosRequestConfig): Promise<AxiosResponse>;
|
|
7
8
|
static mcAssetRequest(request: AxiosRequestConfig): Promise<AxiosResponse>;
|
|
@@ -8,7 +8,11 @@ if (typeof window === "undefined") {
|
|
|
8
8
|
}
|
|
9
9
|
export class Requests {
|
|
10
10
|
static genericRequest(request) {
|
|
11
|
-
return this.axiosInstance.request(request);
|
|
11
|
+
// return this.axiosInstance.request(request);
|
|
12
|
+
return this.genericQueue.add(request).catch(e => {
|
|
13
|
+
console.debug(p, "generic catch " + e);
|
|
14
|
+
throw e;
|
|
15
|
+
});
|
|
12
16
|
}
|
|
13
17
|
static mcAssetRequest(request) {
|
|
14
18
|
return this.mcAssetRequestQueue.add(request).catch(e => {
|
|
@@ -32,5 +36,6 @@ Requests.axiosInstance = axios.create({
|
|
|
32
36
|
Requests.mcAssetInstance = axios.create({
|
|
33
37
|
timeout: 5000
|
|
34
38
|
});
|
|
39
|
+
Requests.genericQueue = new JobQueue(request => Requests.axiosInstance.request(request), Time.millis(10));
|
|
35
40
|
Requests.mcAssetRequestQueue = new JobQueue(request => Requests.mcAssetInstance.request(request), Time.millis(10));
|
|
36
41
|
//# sourceMappingURL=Requests.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Requests.js","sourceRoot":"src/","sources":["request/Requests.ts"],"names":[],"mappings":"AAAA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAE7B,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IAC/B,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;CACvD;AAED,MAAM,OAAO,QAAQ;
|
|
1
|
+
{"version":3,"file":"Requests.js","sourceRoot":"src/","sources":["request/Requests.ts"],"names":[],"mappings":"AAAA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAE7B,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IAC/B,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;CACvD;AAED,MAAM,OAAO,QAAQ;IAeV,MAAM,CAAC,cAAc,CAAC,OAA2B;QACpD,8CAA8C;QAC9C,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA,EAAE;YAC3C,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,GAAG,CAAC,CAAC,CAAC;YACvC,MAAM,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,OAA2B;QACpD,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA,EAAE;YAClD,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,uBAAuB,GAAG,CAAC,CAAC,CAAC;YAC9C,MAAM,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;QACH,mDAAmD;IACvD,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,IAAY;QACrC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC;IACjD,CAAC;IAEM,MAAM,KAAK,UAAU;QACxB,OAAO;YACH,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI;SACzC,CAAA;IACL,CAAC;;AArCc,sBAAa,GAAkB,KAAK,CAAC,MAAM,CAAC;IACvD,OAAO,EAAE,IAAI;CAChB,CAAC,CAAC;AAEY,wBAAe,GAAkB,KAAK,CAAC,MAAM,CAAC;IACzD,OAAO,EAAE,IAAI;CAChB,CAAC,CAAA;AAEa,qBAAY,GACrB,IAAI,QAAQ,CAAoC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5G,4BAAmB,GAC5B,IAAI,QAAQ,CAAoC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC"}
|
package/dist/esm/skin/Skins.d.ts
CHANGED
|
@@ -9,9 +9,15 @@ export declare class Skins {
|
|
|
9
9
|
static capeFromUsername(username: string): Promise<Maybe<string>>;
|
|
10
10
|
static capeFromCapesDev(uuid: string, capeType?: string): Promise<Maybe<string>>;
|
|
11
11
|
private static usernameToUuid;
|
|
12
|
-
private static
|
|
12
|
+
private static usernameToUuidSkinProxy;
|
|
13
|
+
private static usernameToUuidMineTools;
|
|
14
|
+
private static getProfileFromMinetools;
|
|
13
15
|
private static getMineSkin;
|
|
14
16
|
private static getCapesDev;
|
|
15
17
|
private static getCrafatarSkinUrl;
|
|
16
18
|
private static getCrafatarCapeUrl;
|
|
19
|
+
private static getMcHeadsSkinUrl;
|
|
20
|
+
private static getMineSkinPlayerSkinUrl;
|
|
21
|
+
private static getSkinProxySkinUrl;
|
|
22
|
+
private static getSkinProxyCapeUrl;
|
|
17
23
|
}
|
package/dist/esm/skin/Skins.js
CHANGED
|
@@ -27,7 +27,7 @@ export class Skins {
|
|
|
27
27
|
// }
|
|
28
28
|
// return undefined;
|
|
29
29
|
// })
|
|
30
|
-
return this.
|
|
30
|
+
return this.getSkinProxySkinUrl(uuid);
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
33
|
static fromUsername(username) {
|
|
@@ -68,7 +68,7 @@ export class Skins {
|
|
|
68
68
|
// }
|
|
69
69
|
// return undefined;
|
|
70
70
|
// })
|
|
71
|
-
return this.
|
|
71
|
+
return this.getSkinProxyCapeUrl(uuid);
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
74
|
static capeFromUsername(username) {
|
|
@@ -95,6 +95,27 @@ export class Skins {
|
|
|
95
95
|
//</editor-fold>
|
|
96
96
|
//<editor-fold desc="Helpers">
|
|
97
97
|
static usernameToUuid(username) {
|
|
98
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
99
|
+
return this.usernameToUuidSkinProxy(username);
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
static usernameToUuidSkinProxy(username) {
|
|
103
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
104
|
+
return Requests.genericRequest({
|
|
105
|
+
baseURL: 'https://minecraft-skin-proxy.inventive.workers.dev',
|
|
106
|
+
url: '/uuid/' + username
|
|
107
|
+
}).then(res => {
|
|
108
|
+
if (res.status === 200) {
|
|
109
|
+
return res.data["id"];
|
|
110
|
+
}
|
|
111
|
+
return undefined;
|
|
112
|
+
}).catch(err => {
|
|
113
|
+
console.warn(err);
|
|
114
|
+
return undefined;
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
static usernameToUuidMineTools(username) {
|
|
98
119
|
return __awaiter(this, void 0, void 0, function* () {
|
|
99
120
|
return Requests.genericRequest({
|
|
100
121
|
baseURL: 'https://api.minetools.eu',
|
|
@@ -110,7 +131,7 @@ export class Skins {
|
|
|
110
131
|
});
|
|
111
132
|
});
|
|
112
133
|
}
|
|
113
|
-
static
|
|
134
|
+
static getProfileFromMinetools(uuid) {
|
|
114
135
|
return __awaiter(this, void 0, void 0, function* () {
|
|
115
136
|
return Requests.genericRequest({
|
|
116
137
|
baseURL: 'https://api.minetools.eu',
|
|
@@ -160,5 +181,17 @@ export class Skins {
|
|
|
160
181
|
static getCrafatarCapeUrl(uuid) {
|
|
161
182
|
return "https://crafatar.com/capes/" + uuid;
|
|
162
183
|
}
|
|
184
|
+
static getMcHeadsSkinUrl(uuid) {
|
|
185
|
+
return "https://mc-heads.net/skin/" + uuid;
|
|
186
|
+
}
|
|
187
|
+
static getMineSkinPlayerSkinUrl(uuid) {
|
|
188
|
+
return "https://mineskin.org/skin/player/" + uuid;
|
|
189
|
+
}
|
|
190
|
+
static getSkinProxySkinUrl(uuid) {
|
|
191
|
+
return "https://minecraft-skin-proxy.inventive.workers.dev/skin/" + uuid;
|
|
192
|
+
}
|
|
193
|
+
static getSkinProxyCapeUrl(uuid) {
|
|
194
|
+
return "https://minecraft-skin-proxy.inventive.workers.dev/cape/" + uuid;
|
|
195
|
+
}
|
|
163
196
|
}
|
|
164
197
|
//# sourceMappingURL=Skins.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Skins.js","sourceRoot":"src/","sources":["skin/Skins.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAG/C,mBAAmB;AACnB,MAAM,OAAO,KAAK;IAGd,4BAA4B;IAE5B,MAAM,CAAO,kBAAkB,CAAC,cAAsB;;YAClD,IAAI,cAAc,CAAC,MAAM,KAAK,EAAE,IAAI,cAAc,CAAC,MAAM,KAAK,EAAE,EAAE;gBAC9D,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;aACxC;YACD,OAAO,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QAC7C,CAAC;KAAA;IAED,MAAM,CAAO,QAAQ,CAAC,IAAY;;YAC9B,iDAAiD;YACjD,qBAAqB;YACrB,qDAAqD;YACrD,QAAQ;YACR,wBAAwB;YACxB,KAAK;YACL,OAAO,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"Skins.js","sourceRoot":"src/","sources":["skin/Skins.ts"],"names":[],"mappings":"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"}
|
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.14",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./dist/cjs/index.js",
|
|
6
6
|
"types": "./dist/cjs/index.d.ts",
|
|
@@ -41,6 +41,7 @@
|
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"@inventivetalent/loading-cache": "^0.4.3",
|
|
43
43
|
"@inventivetalent/time": "^1.0.0",
|
|
44
|
+
"@zip.js/zip.js": "^2.7.31",
|
|
44
45
|
"assert": "^2.0.0",
|
|
45
46
|
"axios": "^0.21.1",
|
|
46
47
|
"browser-or-node": "^1.3.0",
|
|
@@ -81,7 +82,6 @@
|
|
|
81
82
|
"@types/node": "^14.14.31",
|
|
82
83
|
"@types/node-persist": "^3.1.1",
|
|
83
84
|
"@types/three": "^0.125.2",
|
|
84
|
-
"@zip.js/zip.js": "^2.7.30",
|
|
85
85
|
"ava": "^5.3.1",
|
|
86
86
|
"browserify-fs": "^1.0.0",
|
|
87
87
|
"browserify-incremental": "^3.1.1",
|
package/src/Materials.ts
CHANGED
|
@@ -8,7 +8,7 @@ export class Materials {
|
|
|
8
8
|
|
|
9
9
|
public static readonly MISSING_TEXTURE = Materials.getImage({ texture: { src: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQMAAACQp+OdAAAABlBMVEX/AP8AAACfphTyAAAAFUlEQVQoz2MIhQKGVVAwKjIqQrwIAHRz/wFI17TEAAAAAElFTkSuQmCC" } });
|
|
10
10
|
|
|
11
|
-
public static createImage(key: MaterialKey):
|
|
11
|
+
public static createImage(key: MaterialKey): Material {
|
|
12
12
|
//TODO: type from key
|
|
13
13
|
const transparent = key.transparent || false;
|
|
14
14
|
return new MeshBasicMaterial({
|
package/src/renderer/Renderer.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {AxesHelper, Camera, EventDispatcher, GridHelper, OrthographicCamera, PCFSoftShadowMap, PerspectiveCamera, Scene, Vector3, warn, WebGLRenderer} from "three";
|
|
1
|
+
import { AxesHelper, Camera, EventDispatcher, GridHelper, LinearEncoding, OrthographicCamera, PCFSoftShadowMap, PerspectiveCamera, Scene, sRGBEncoding, TextureEncoding, Vector3, warn, WebGLRenderer } from "three";
|
|
2
2
|
import {MineRenderScene} from "./MineRenderScene";
|
|
3
3
|
import merge from "ts-deepmerge";
|
|
4
4
|
import Stats from "stats.js";
|
|
5
|
-
import { BloomEffect, EffectComposer,
|
|
5
|
+
import { BloomEffect, EffectComposer, RenderPass, SSAOEffect, } from "postprocessing";
|
|
6
6
|
import {DeepPartial, isVector3, Maybe} from "../util/util";
|
|
7
7
|
import {isTripleArray, TripleArray} from "../model/Model";
|
|
8
8
|
import {isOrthographicCamera, isPerspectiveCamera} from "../util/three";
|
|
@@ -125,6 +125,9 @@ export class Renderer {
|
|
|
125
125
|
renderer.shadowMap.enabled = true;
|
|
126
126
|
renderer.shadowMap.type = PCFSoftShadowMap;
|
|
127
127
|
|
|
128
|
+
// supposedly the default is already LinearEncoding, but not doing this renders the scene way too bright
|
|
129
|
+
renderer.outputEncoding = LinearEncoding;
|
|
130
|
+
|
|
128
131
|
// renderer.setPixelRatio(window.devicePixelRatio);
|
|
129
132
|
renderer.setSize(this.viewWidth, this.viewHeight);
|
|
130
133
|
|
|
@@ -169,7 +172,6 @@ export class Renderer {
|
|
|
169
172
|
// shaderPass1.renderToScreen = true;
|
|
170
173
|
// composer.addPass(shaderPass1);
|
|
171
174
|
|
|
172
|
-
|
|
173
175
|
return composer;
|
|
174
176
|
}
|
|
175
177
|
|
package/src/request/Requests.ts
CHANGED
|
@@ -19,11 +19,17 @@ export class Requests {
|
|
|
19
19
|
timeout: 5000
|
|
20
20
|
})
|
|
21
21
|
|
|
22
|
+
private static genericQueue: JobQueue<AxiosRequestConfig, AxiosResponse>
|
|
23
|
+
= new JobQueue<AxiosRequestConfig, AxiosResponse>(request => Requests.axiosInstance.request(request), Time.millis(10));
|
|
22
24
|
private static mcAssetRequestQueue: JobQueue<AxiosRequestConfig, AxiosResponse>
|
|
23
25
|
= new JobQueue<AxiosRequestConfig, AxiosResponse>(request => Requests.mcAssetInstance.request(request), Time.millis(10));
|
|
24
26
|
|
|
25
27
|
public static genericRequest(request: AxiosRequestConfig): Promise<AxiosResponse> {
|
|
26
|
-
return this.axiosInstance.request(request);
|
|
28
|
+
// return this.axiosInstance.request(request);
|
|
29
|
+
return this.genericQueue.add(request).catch(e=>{
|
|
30
|
+
console.debug(p, "generic catch " + e);
|
|
31
|
+
throw e;
|
|
32
|
+
});
|
|
27
33
|
}
|
|
28
34
|
|
|
29
35
|
public static mcAssetRequest(request: AxiosRequestConfig): Promise<AxiosResponse> {
|
package/src/skin/Skins.ts
CHANGED
|
@@ -21,7 +21,7 @@ export class Skins {
|
|
|
21
21
|
// }
|
|
22
22
|
// return undefined;
|
|
23
23
|
// })
|
|
24
|
-
return this.
|
|
24
|
+
return this.getSkinProxySkinUrl(uuid);
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
static async fromUsername(username: string): Promise<Maybe<string>> {
|
|
@@ -61,7 +61,7 @@ export class Skins {
|
|
|
61
61
|
// }
|
|
62
62
|
// return undefined;
|
|
63
63
|
// })
|
|
64
|
-
return this.
|
|
64
|
+
return this.getSkinProxyCapeUrl(uuid);
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
static async capeFromUsername(username: string): Promise<Maybe<string>> {
|
|
@@ -89,6 +89,25 @@ export class Skins {
|
|
|
89
89
|
//<editor-fold desc="Helpers">
|
|
90
90
|
|
|
91
91
|
private static async usernameToUuid(username: string): Promise<Maybe<string>> {
|
|
92
|
+
return this.usernameToUuidSkinProxy(username);
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
private static async usernameToUuidSkinProxy(username: string): Promise<Maybe<string>> {
|
|
96
|
+
return Requests.genericRequest({
|
|
97
|
+
baseURL: 'https://minecraft-skin-proxy.inventive.workers.dev',
|
|
98
|
+
url: '/uuid/' + username
|
|
99
|
+
}).then(res => {
|
|
100
|
+
if (res.status === 200) {
|
|
101
|
+
return res.data["id"];
|
|
102
|
+
}
|
|
103
|
+
return undefined;
|
|
104
|
+
}).catch(err => {
|
|
105
|
+
console.warn(err);
|
|
106
|
+
return undefined;
|
|
107
|
+
})
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
private static async usernameToUuidMineTools(username: string): Promise<Maybe<string>> {
|
|
92
111
|
return Requests.genericRequest({
|
|
93
112
|
baseURL: 'https://api.minetools.eu',
|
|
94
113
|
url: '/uuid/' + username
|
|
@@ -103,7 +122,7 @@ export class Skins {
|
|
|
103
122
|
})
|
|
104
123
|
}
|
|
105
124
|
|
|
106
|
-
private static async
|
|
125
|
+
private static async getProfileFromMinetools(uuid: string): Promise<Maybe<any>> {
|
|
107
126
|
return Requests.genericRequest({
|
|
108
127
|
baseURL: 'https://api.minetools.eu',
|
|
109
128
|
url: '/profile/' + uuid
|
|
@@ -152,6 +171,22 @@ export class Skins {
|
|
|
152
171
|
return "https://crafatar.com/capes/" + uuid;
|
|
153
172
|
}
|
|
154
173
|
|
|
174
|
+
private static getMcHeadsSkinUrl(uuid: string): string {
|
|
175
|
+
return "https://mc-heads.net/skin/" + uuid;
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
private static getMineSkinPlayerSkinUrl(uuid: string): string {
|
|
179
|
+
return "https://mineskin.org/skin/player/" + uuid;
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
private static getSkinProxySkinUrl(uuid: string): string {
|
|
183
|
+
return "https://minecraft-skin-proxy.inventive.workers.dev/skin/" + uuid;
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
private static getSkinProxyCapeUrl(uuid: string): string {
|
|
187
|
+
return "https://minecraft-skin-proxy.inventive.workers.dev/cape/" + uuid;
|
|
188
|
+
}
|
|
189
|
+
|
|
155
190
|
//</editor-fold>
|
|
156
191
|
|
|
157
192
|
|