minerender 2.0.0-alpha.14 → 2.0.0-alpha.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundle.js +161 -132
- package/dist/bundle.js.map +4 -4
- package/dist/cjs/UVMapper.js +189 -204
- package/dist/cjs/UVMapper.js.map +1 -1
- package/dist/cjs/assets/AssetKey.js +7 -8
- package/dist/cjs/assets/AssetKey.js.map +1 -1
- package/dist/cjs/assets/AssetLoader.js +24 -37
- package/dist/cjs/assets/AssetLoader.js.map +1 -1
- package/dist/cjs/assets/Assets.js +4 -17
- package/dist/cjs/assets/Assets.js.map +1 -1
- package/dist/cjs/assets/BlockStates.js +29 -48
- package/dist/cjs/assets/BlockStates.js.map +1 -1
- package/dist/cjs/assets/Entities.js +46 -67
- package/dist/cjs/assets/Entities.js.map +1 -1
- package/dist/cjs/assets/ModelTextures.js +26 -43
- package/dist/cjs/assets/ModelTextures.js.map +1 -1
- package/dist/cjs/assets/Models.js +40 -61
- package/dist/cjs/assets/Models.js.map +1 -1
- package/dist/cjs/assets/source/HostedAssetSource.js +63 -79
- package/dist/cjs/assets/source/HostedAssetSource.js.map +1 -1
- package/dist/cjs/assets/source/archive/ArchiveAssetSource.js +74 -91
- package/dist/cjs/assets/source/archive/ArchiveAssetSource.js.map +1 -1
- package/dist/cjs/assets/source/archive/BrowserArchiveProxy.js +9 -20
- package/dist/cjs/assets/source/archive/BrowserArchiveProxy.js.map +1 -1
- package/dist/cjs/cache/CacheKey.js +1 -2
- package/dist/cjs/cache/CacheKey.js.map +1 -1
- package/dist/cjs/cache/PersistentCache.js +7 -18
- package/dist/cjs/cache/PersistentCache.js.map +1 -1
- package/dist/cjs/entity/scene/EntityObject.js +23 -37
- package/dist/cjs/entity/scene/EntityObject.js.map +1 -1
- package/dist/cjs/image/ImageLoader.js +85 -118
- package/dist/cjs/image/ImageLoader.js.map +1 -1
- package/dist/cjs/inspector/SceneInspector.js +1 -2
- package/dist/cjs/inspector/SceneInspector.js.map +1 -1
- package/dist/cjs/instance/InstanceManager.js +18 -31
- package/dist/cjs/instance/InstanceManager.js.map +1 -1
- package/dist/cjs/model/ModelMerger.js +23 -36
- package/dist/cjs/model/ModelMerger.js.map +1 -1
- package/dist/cjs/model/block/scene/BlockObject.js +211 -234
- package/dist/cjs/model/block/scene/BlockObject.js.map +1 -1
- package/dist/cjs/model/multiblock/SchematicParser.js +4 -15
- package/dist/cjs/model/multiblock/SchematicParser.js.map +1 -1
- package/dist/cjs/model/multiblock/StructureParser.js +28 -40
- package/dist/cjs/model/multiblock/StructureParser.js.map +1 -1
- package/dist/cjs/model/scene/ModelObject.js +10 -25
- package/dist/cjs/model/scene/ModelObject.js.map +1 -1
- package/dist/cjs/nbt/NBTHelper.js +4 -15
- package/dist/cjs/nbt/NBTHelper.js.map +1 -1
- package/dist/cjs/renderer/MineRenderScene.js +53 -75
- package/dist/cjs/renderer/MineRenderScene.js.map +1 -1
- package/dist/cjs/renderer/Renderer.js +5 -8
- package/dist/cjs/renderer/Renderer.js.map +1 -1
- package/dist/cjs/renderer/SceneObject.js +3 -15
- package/dist/cjs/renderer/SceneObject.js.map +1 -1
- package/dist/cjs/skin/SkinTextureCoordinates.js +115 -116
- package/dist/cjs/skin/SkinTextureCoordinates.js.map +1 -1
- package/dist/cjs/skin/Skins.js +112 -149
- package/dist/cjs/skin/Skins.js.map +1 -1
- package/dist/cjs/skin/scene/SkinObject.js +3 -14
- package/dist/cjs/skin/scene/SkinObject.js.map +1 -1
- package/dist/cjs/util/log.js +1 -1
- package/dist/cjs/util/log.js.map +1 -1
- package/dist/cjs/util/util.js +3 -14
- package/dist/cjs/util/util.js.map +1 -1
- package/dist/cjs/world/Chunk.js +56 -73
- package/dist/cjs/world/Chunk.js.map +1 -1
- package/dist/cjs/world/MineRenderWorld.js +34 -49
- package/dist/cjs/world/MineRenderWorld.js.map +1 -1
- package/dist/esm/UVMapper.js +189 -204
- package/dist/esm/UVMapper.js.map +1 -1
- package/dist/esm/assets/AssetKey.js +7 -8
- package/dist/esm/assets/AssetKey.js.map +1 -1
- package/dist/esm/assets/AssetLoader.js +24 -37
- package/dist/esm/assets/AssetLoader.js.map +1 -1
- package/dist/esm/assets/Assets.js +4 -17
- package/dist/esm/assets/Assets.js.map +1 -1
- package/dist/esm/assets/BlockStates.js +29 -48
- package/dist/esm/assets/BlockStates.js.map +1 -1
- package/dist/esm/assets/Entities.js +46 -67
- package/dist/esm/assets/Entities.js.map +1 -1
- package/dist/esm/assets/ModelTextures.js +26 -43
- package/dist/esm/assets/ModelTextures.js.map +1 -1
- package/dist/esm/assets/Models.js +40 -61
- package/dist/esm/assets/Models.js.map +1 -1
- package/dist/esm/assets/source/HostedAssetSource.js +63 -79
- package/dist/esm/assets/source/HostedAssetSource.js.map +1 -1
- package/dist/esm/assets/source/archive/ArchiveAssetSource.js +74 -91
- package/dist/esm/assets/source/archive/ArchiveAssetSource.js.map +1 -1
- package/dist/esm/assets/source/archive/BrowserArchiveProxy.js +9 -20
- package/dist/esm/assets/source/archive/BrowserArchiveProxy.js.map +1 -1
- package/dist/esm/cache/CacheKey.js +1 -2
- package/dist/esm/cache/CacheKey.js.map +1 -1
- package/dist/esm/cache/PersistentCache.js +7 -18
- package/dist/esm/cache/PersistentCache.js.map +1 -1
- package/dist/esm/entity/scene/EntityObject.js +23 -37
- package/dist/esm/entity/scene/EntityObject.js.map +1 -1
- package/dist/esm/image/ImageLoader.js +85 -118
- package/dist/esm/image/ImageLoader.js.map +1 -1
- package/dist/esm/inspector/SceneInspector.js +1 -2
- package/dist/esm/inspector/SceneInspector.js.map +1 -1
- package/dist/esm/instance/InstanceManager.js +18 -31
- package/dist/esm/instance/InstanceManager.js.map +1 -1
- package/dist/esm/model/ModelMerger.js +23 -36
- package/dist/esm/model/ModelMerger.js.map +1 -1
- package/dist/esm/model/block/scene/BlockObject.js +211 -234
- package/dist/esm/model/block/scene/BlockObject.js.map +1 -1
- package/dist/esm/model/multiblock/SchematicParser.js +4 -15
- package/dist/esm/model/multiblock/SchematicParser.js.map +1 -1
- package/dist/esm/model/multiblock/StructureParser.js +28 -40
- package/dist/esm/model/multiblock/StructureParser.js.map +1 -1
- package/dist/esm/model/scene/ModelObject.js +10 -25
- package/dist/esm/model/scene/ModelObject.js.map +1 -1
- package/dist/esm/nbt/NBTHelper.js +4 -15
- package/dist/esm/nbt/NBTHelper.js.map +1 -1
- package/dist/esm/renderer/MineRenderScene.js +53 -75
- package/dist/esm/renderer/MineRenderScene.js.map +1 -1
- package/dist/esm/renderer/Renderer.js +5 -8
- package/dist/esm/renderer/Renderer.js.map +1 -1
- package/dist/esm/renderer/SceneObject.js +3 -15
- package/dist/esm/renderer/SceneObject.js.map +1 -1
- package/dist/esm/skin/SkinTextureCoordinates.js +115 -116
- package/dist/esm/skin/SkinTextureCoordinates.js.map +1 -1
- package/dist/esm/skin/Skins.js +112 -149
- package/dist/esm/skin/Skins.js.map +1 -1
- package/dist/esm/skin/scene/SkinObject.js +3 -14
- package/dist/esm/skin/scene/SkinObject.js.map +1 -1
- package/dist/esm/util/log.js +1 -1
- package/dist/esm/util/log.js.map +1 -1
- package/dist/esm/util/util.js +3 -14
- package/dist/esm/util/util.js.map +1 -1
- package/dist/esm/world/Chunk.js +56 -73
- package/dist/esm/world/Chunk.js.map +1 -1
- package/dist/esm/world/MineRenderWorld.js +34 -49
- package/dist/esm/world/MineRenderWorld.js.map +1 -1
- package/package.json +5 -26
- package/src/model/scene/ModelObject.ts +0 -3
- package/src/nbt/NBTHelper.ts +1 -1
- package/src/renderer/Renderer.ts +2 -2
- package/src/skin/SkinTextureCoordinates.ts +129 -119
- package/src/world/Chunk.ts +0 -2
- package/tsconfig.json +2 -2
package/dist/esm/skin/Skins.js
CHANGED
|
@@ -1,178 +1,141 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { Requests } from "../request/Requests";
|
|
11
2
|
//TODO: cache stuff
|
|
12
3
|
export class Skins {
|
|
13
4
|
//<editor-fold desc="Skins">
|
|
14
|
-
static fromUuidOrUsername(uuidOrUsername) {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
5
|
+
static async fromUuidOrUsername(uuidOrUsername) {
|
|
6
|
+
if (uuidOrUsername.length === 32 || uuidOrUsername.length === 36) {
|
|
7
|
+
return this.fromUuid(uuidOrUsername);
|
|
8
|
+
}
|
|
9
|
+
return this.fromUsername(uuidOrUsername);
|
|
10
|
+
}
|
|
11
|
+
static async fromUuid(uuid) {
|
|
12
|
+
// return this.getProfile(uuid).then(profile => {
|
|
13
|
+
// if (profile) {
|
|
14
|
+
// return profile.decoded.textures.SKIN?.url;
|
|
15
|
+
// }
|
|
16
|
+
// return undefined;
|
|
17
|
+
// })
|
|
18
|
+
return this.getSkinProxySkinUrl(uuid);
|
|
19
|
+
}
|
|
20
|
+
static async fromUsername(username) {
|
|
21
|
+
return this.usernameToUuid(username).then(uuid => {
|
|
22
|
+
if (uuid) {
|
|
23
|
+
return this.fromUuid(uuid);
|
|
18
24
|
}
|
|
19
|
-
return
|
|
25
|
+
return undefined;
|
|
20
26
|
});
|
|
21
27
|
}
|
|
22
|
-
static
|
|
23
|
-
return
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
// return undefined;
|
|
29
|
-
// })
|
|
30
|
-
return this.getSkinProxySkinUrl(uuid);
|
|
31
|
-
});
|
|
32
|
-
}
|
|
33
|
-
static fromUsername(username) {
|
|
34
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
35
|
-
return this.usernameToUuid(username).then(uuid => {
|
|
36
|
-
if (uuid) {
|
|
37
|
-
return this.fromUuid(uuid);
|
|
38
|
-
}
|
|
39
|
-
return undefined;
|
|
40
|
-
});
|
|
41
|
-
});
|
|
42
|
-
}
|
|
43
|
-
static fromMineSkin(mineskinId) {
|
|
44
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
45
|
-
return this.getMineSkin(mineskinId).then(mineskin => {
|
|
46
|
-
if (mineskin) {
|
|
47
|
-
return mineskin["data"]["texture"]["value"]["urls"]["skins"];
|
|
48
|
-
}
|
|
49
|
-
return undefined;
|
|
50
|
-
});
|
|
28
|
+
static async fromMineSkin(mineskinId) {
|
|
29
|
+
return this.getMineSkin(mineskinId).then(mineskin => {
|
|
30
|
+
if (mineskin) {
|
|
31
|
+
return mineskin["data"]["texture"]["value"]["urls"]["skins"];
|
|
32
|
+
}
|
|
33
|
+
return undefined;
|
|
51
34
|
});
|
|
52
35
|
}
|
|
53
36
|
//</editor-fold>
|
|
54
37
|
//<editor-fold desc="Capes">
|
|
55
|
-
static capeFromUuidOrUsername(uuidOrUsername) {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
38
|
+
static async capeFromUuidOrUsername(uuidOrUsername) {
|
|
39
|
+
if (uuidOrUsername.length === 32 || uuidOrUsername.length === 36) {
|
|
40
|
+
return this.capeFromUuid(uuidOrUsername);
|
|
41
|
+
}
|
|
42
|
+
return this.capeFromUsername(uuidOrUsername);
|
|
43
|
+
}
|
|
44
|
+
static async capeFromUuid(uuid) {
|
|
45
|
+
// return this.getProfile(uuid).then(profile => {
|
|
46
|
+
// if (profile) {
|
|
47
|
+
// return profile.decoded.textures.CAPE?.url;
|
|
48
|
+
// }
|
|
49
|
+
// return undefined;
|
|
50
|
+
// })
|
|
51
|
+
return this.getSkinProxyCapeUrl(uuid);
|
|
52
|
+
}
|
|
53
|
+
static async capeFromUsername(username) {
|
|
54
|
+
return this.usernameToUuid(username).then(uuid => {
|
|
55
|
+
if (uuid) {
|
|
56
|
+
return this.capeFromUuid(uuid);
|
|
59
57
|
}
|
|
60
|
-
return
|
|
61
|
-
});
|
|
62
|
-
}
|
|
63
|
-
static capeFromUuid(uuid) {
|
|
64
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
65
|
-
// return this.getProfile(uuid).then(profile => {
|
|
66
|
-
// if (profile) {
|
|
67
|
-
// return profile.decoded.textures.CAPE?.url;
|
|
68
|
-
// }
|
|
69
|
-
// return undefined;
|
|
70
|
-
// })
|
|
71
|
-
return this.getSkinProxyCapeUrl(uuid);
|
|
72
|
-
});
|
|
73
|
-
}
|
|
74
|
-
static capeFromUsername(username) {
|
|
75
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
76
|
-
return this.usernameToUuid(username).then(uuid => {
|
|
77
|
-
if (uuid) {
|
|
78
|
-
return this.capeFromUuid(uuid);
|
|
79
|
-
}
|
|
80
|
-
return undefined;
|
|
81
|
-
});
|
|
58
|
+
return undefined;
|
|
82
59
|
});
|
|
83
60
|
}
|
|
84
|
-
static capeFromCapesDev(uuid, capeType = "minecraft") {
|
|
85
|
-
return
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
return undefined;
|
|
92
|
-
});
|
|
61
|
+
static async capeFromCapesDev(uuid, capeType = "minecraft") {
|
|
62
|
+
return this.getCapesDev(uuid, capeType).then(cape => {
|
|
63
|
+
if (cape) {
|
|
64
|
+
//TODO: support for animated
|
|
65
|
+
return cape?.stillImageUrl;
|
|
66
|
+
}
|
|
67
|
+
return undefined;
|
|
93
68
|
});
|
|
94
69
|
}
|
|
95
70
|
//</editor-fold>
|
|
96
71
|
//<editor-fold desc="Helpers">
|
|
97
|
-
static usernameToUuid(username) {
|
|
98
|
-
return
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
}).catch(err => {
|
|
113
|
-
console.warn(err);
|
|
114
|
-
return undefined;
|
|
115
|
-
});
|
|
72
|
+
static async usernameToUuid(username) {
|
|
73
|
+
return this.usernameToUuidSkinProxy(username);
|
|
74
|
+
}
|
|
75
|
+
static async usernameToUuidSkinProxy(username) {
|
|
76
|
+
return Requests.genericRequest({
|
|
77
|
+
baseURL: 'https://minecraft-skin-proxy.inventive.workers.dev',
|
|
78
|
+
url: '/uuid/' + username
|
|
79
|
+
}).then(res => {
|
|
80
|
+
if (res.status === 200) {
|
|
81
|
+
return res.data["id"];
|
|
82
|
+
}
|
|
83
|
+
return undefined;
|
|
84
|
+
}).catch(err => {
|
|
85
|
+
console.warn(err);
|
|
86
|
+
return undefined;
|
|
116
87
|
});
|
|
117
88
|
}
|
|
118
|
-
static usernameToUuidMineTools(username) {
|
|
119
|
-
return
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
return undefined;
|
|
131
|
-
});
|
|
89
|
+
static async usernameToUuidMineTools(username) {
|
|
90
|
+
return Requests.genericRequest({
|
|
91
|
+
baseURL: 'https://api.minetools.eu',
|
|
92
|
+
url: '/uuid/' + username
|
|
93
|
+
}).then(res => {
|
|
94
|
+
if (res.status === 200) {
|
|
95
|
+
return res.data["id"];
|
|
96
|
+
}
|
|
97
|
+
return undefined;
|
|
98
|
+
}).catch(err => {
|
|
99
|
+
console.warn(err);
|
|
100
|
+
return undefined;
|
|
132
101
|
});
|
|
133
102
|
}
|
|
134
|
-
static getProfileFromMinetools(uuid) {
|
|
135
|
-
return
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
}
|
|
143
|
-
});
|
|
103
|
+
static async getProfileFromMinetools(uuid) {
|
|
104
|
+
return Requests.genericRequest({
|
|
105
|
+
baseURL: 'https://api.minetools.eu',
|
|
106
|
+
url: '/profile/' + uuid
|
|
107
|
+
}).then(res => {
|
|
108
|
+
if (res.status === 200) {
|
|
109
|
+
return res.data;
|
|
110
|
+
}
|
|
144
111
|
});
|
|
145
112
|
}
|
|
146
|
-
static getMineSkin(mineskinId) {
|
|
147
|
-
return
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
return undefined;
|
|
159
|
-
});
|
|
113
|
+
static async getMineSkin(mineskinId) {
|
|
114
|
+
return Requests.genericRequest({
|
|
115
|
+
baseURL: 'https://api.mineskin.org',
|
|
116
|
+
url: '/get/uuid/' + mineskinId
|
|
117
|
+
}).then(res => {
|
|
118
|
+
if (res.status === 200) {
|
|
119
|
+
return res.data;
|
|
120
|
+
}
|
|
121
|
+
return undefined;
|
|
122
|
+
}).catch(err => {
|
|
123
|
+
console.warn(err);
|
|
124
|
+
return undefined;
|
|
160
125
|
});
|
|
161
126
|
}
|
|
162
|
-
static getCapesDev(uuid, type = 'all') {
|
|
163
|
-
return
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
return undefined;
|
|
175
|
-
});
|
|
127
|
+
static async getCapesDev(uuid, type = 'all') {
|
|
128
|
+
return Requests.genericRequest({
|
|
129
|
+
baseURL: 'https://api.capes.dev',
|
|
130
|
+
url: '/load/' + uuid + '/' + type
|
|
131
|
+
}).then(res => {
|
|
132
|
+
if (res.status === 200) {
|
|
133
|
+
return res.data;
|
|
134
|
+
}
|
|
135
|
+
return undefined;
|
|
136
|
+
}).catch(err => {
|
|
137
|
+
console.warn(err);
|
|
138
|
+
return undefined;
|
|
176
139
|
});
|
|
177
140
|
}
|
|
178
141
|
static getCrafatarSkinUrl(uuid) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Skins.js","sourceRoot":"src/","sources":["skin/Skins.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Skins.js","sourceRoot":"src/","sources":["skin/Skins.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { SceneObject } from "../../renderer/SceneObject";
|
|
11
2
|
import { SKIN_PARTS, SkinPart } from "../SkinPart";
|
|
12
3
|
import { classicSkinTextureCoordinates, slimSkinTextureCoordinates } from "../SkinTextureCoordinates";
|
|
@@ -20,12 +11,10 @@ export class SkinObject extends SceneObject {
|
|
|
20
11
|
this.slim = false;
|
|
21
12
|
this.skinTextureWidth = 64;
|
|
22
13
|
this.skinTextureHeight = 64;
|
|
23
|
-
this.options = merge({}, SceneObject.DEFAULT_OPTIONS, options
|
|
14
|
+
this.options = merge({}, SceneObject.DEFAULT_OPTIONS, options ?? {});
|
|
24
15
|
}
|
|
25
|
-
init() {
|
|
26
|
-
|
|
27
|
-
this.createMeshes();
|
|
28
|
-
});
|
|
16
|
+
async init() {
|
|
17
|
+
this.createMeshes();
|
|
29
18
|
}
|
|
30
19
|
createMeshes() {
|
|
31
20
|
const mat = Materials.MISSING_TEXTURE;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SkinObject.js","sourceRoot":"src/","sources":["skin/scene/SkinObject.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SkinObject.js","sourceRoot":"src/","sources":["skin/scene/SkinObject.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/util/log.js
CHANGED
|
@@ -23,6 +23,6 @@ const BgMagenta = "\x1b[45m";
|
|
|
23
23
|
const BgCyan = "\x1b[46m";
|
|
24
24
|
const BgWhite = "\x1b[47m";
|
|
25
25
|
export function prefix(prefix) {
|
|
26
|
-
return `${FgGreen}MR${BgBlack}${prefix
|
|
26
|
+
return `${FgGreen}MR${BgBlack}${prefix ?? ''}${Reset}`;
|
|
27
27
|
}
|
|
28
28
|
//# sourceMappingURL=log.js.map
|
package/dist/esm/util/log.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"src/","sources":["util/log.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,MAAM,KAAK,GAAG,SAAS,CAAA;AACvB,MAAM,MAAM,GAAG,SAAS,CAAA;AACxB,MAAM,GAAG,GAAG,SAAS,CAAA;AACrB,MAAM,UAAU,GAAG,SAAS,CAAA;AAC5B,MAAM,KAAK,GAAG,SAAS,CAAA;AACvB,MAAM,OAAO,GAAG,SAAS,CAAA;AACzB,MAAM,MAAM,GAAG,SAAS,CAAA;AAExB,MAAM,OAAO,GAAG,UAAU,CAAA;AAC1B,MAAM,KAAK,GAAG,UAAU,CAAA;AACxB,MAAM,OAAO,GAAG,UAAU,CAAA;AAC1B,MAAM,QAAQ,GAAG,UAAU,CAAA;AAC3B,MAAM,MAAM,GAAG,UAAU,CAAA;AACzB,MAAM,SAAS,GAAG,UAAU,CAAA;AAC5B,MAAM,MAAM,GAAG,UAAU,CAAA;AACzB,MAAM,OAAO,GAAG,UAAU,CAAA;AAE1B,MAAM,OAAO,GAAG,UAAU,CAAA;AAC1B,MAAM,KAAK,GAAG,UAAU,CAAA;AACxB,MAAM,OAAO,GAAG,UAAU,CAAA;AAC1B,MAAM,QAAQ,GAAG,UAAU,CAAA;AAC3B,MAAM,MAAM,GAAG,UAAU,CAAA;AACzB,MAAM,SAAS,GAAG,UAAU,CAAA;AAC5B,MAAM,MAAM,GAAG,UAAU,CAAA;AACzB,MAAM,OAAO,GAAG,UAAU,CAAA;AAE1B,MAAM,UAAU,MAAM,CAAC,MAAe;IAClC,OAAO,GAAI,OAAQ,KAAM,OAAQ,GAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"src/","sources":["util/log.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,MAAM,KAAK,GAAG,SAAS,CAAA;AACvB,MAAM,MAAM,GAAG,SAAS,CAAA;AACxB,MAAM,GAAG,GAAG,SAAS,CAAA;AACrB,MAAM,UAAU,GAAG,SAAS,CAAA;AAC5B,MAAM,KAAK,GAAG,SAAS,CAAA;AACvB,MAAM,OAAO,GAAG,SAAS,CAAA;AACzB,MAAM,MAAM,GAAG,SAAS,CAAA;AAExB,MAAM,OAAO,GAAG,UAAU,CAAA;AAC1B,MAAM,KAAK,GAAG,UAAU,CAAA;AACxB,MAAM,OAAO,GAAG,UAAU,CAAA;AAC1B,MAAM,QAAQ,GAAG,UAAU,CAAA;AAC3B,MAAM,MAAM,GAAG,UAAU,CAAA;AACzB,MAAM,SAAS,GAAG,UAAU,CAAA;AAC5B,MAAM,MAAM,GAAG,UAAU,CAAA;AACzB,MAAM,OAAO,GAAG,UAAU,CAAA;AAE1B,MAAM,OAAO,GAAG,UAAU,CAAA;AAC1B,MAAM,KAAK,GAAG,UAAU,CAAA;AACxB,MAAM,OAAO,GAAG,UAAU,CAAA;AAC1B,MAAM,QAAQ,GAAG,UAAU,CAAA;AAC3B,MAAM,MAAM,GAAG,UAAU,CAAA;AACzB,MAAM,SAAS,GAAG,UAAU,CAAA;AAC5B,MAAM,MAAM,GAAG,UAAU,CAAA;AACzB,MAAM,OAAO,GAAG,UAAU,CAAA;AAE1B,MAAM,UAAU,MAAM,CAAC,MAAe;IAClC,OAAO,GAAI,OAAQ,KAAM,OAAQ,GAAI,MAAM,IAAI,EAAG,GAAI,KAAM,EAAE,CAAA;AAClE,CAAC"}
|
package/dist/esm/util/util.js
CHANGED
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import crypto from "crypto";
|
|
11
2
|
import * as browserCrypto from "crypto-js";
|
|
12
3
|
import CryptoJS from "crypto-js/core";
|
|
@@ -53,11 +44,9 @@ export function toRadians(degrees) {
|
|
|
53
44
|
export function toDegrees(radians) {
|
|
54
45
|
return radians * 180 / Math.PI;
|
|
55
46
|
}
|
|
56
|
-
export function sleep(timeout) {
|
|
57
|
-
return
|
|
58
|
-
|
|
59
|
-
setTimeout(() => resolve(), timeout);
|
|
60
|
-
});
|
|
47
|
+
export async function sleep(timeout) {
|
|
48
|
+
return new Promise(resolve => {
|
|
49
|
+
setTimeout(() => resolve(), timeout);
|
|
61
50
|
});
|
|
62
51
|
}
|
|
63
52
|
export function clampRotationDegrees(deg) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"src/","sources":["util/util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"src/","sources":["util/util.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/world/Chunk.js
CHANGED
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { Box3, Object3D, Vector3 } from "three";
|
|
11
2
|
import { BlockStates } from "../assets/BlockStates";
|
|
12
3
|
import { AssetKey } from "../assets/AssetKey";
|
|
@@ -40,80 +31,72 @@ export class Chunk {
|
|
|
40
31
|
const index = Chunk.chunkPosToBlockIndex(pos);
|
|
41
32
|
return this._blocks[index];
|
|
42
33
|
}
|
|
43
|
-
setBlockAt(posOrX, yOrBlock, z, block) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
return this.setBlockInChunkAt(pos, block, worldPos);
|
|
55
|
-
});
|
|
34
|
+
async setBlockAt(posOrX, yOrBlock, z, block) {
|
|
35
|
+
if (typeof posOrX == "number") {
|
|
36
|
+
return this.setBlockAt(new Vector3(posOrX, yOrBlock, z), block);
|
|
37
|
+
}
|
|
38
|
+
if (isTripleArray(posOrX)) {
|
|
39
|
+
return this.setBlockAt(new Vector3(posOrX[0], posOrX[1], posOrX[2]), yOrBlock);
|
|
40
|
+
}
|
|
41
|
+
const worldPos = posOrX;
|
|
42
|
+
const pos = this.worldPosToChunkPos(worldPos);
|
|
43
|
+
block = yOrBlock;
|
|
44
|
+
return this.setBlockInChunkAt(pos, block, worldPos);
|
|
56
45
|
}
|
|
57
46
|
/**
|
|
58
47
|
* Set block at a _chunk_ position (0-16)
|
|
59
48
|
*/
|
|
60
|
-
setBlockInChunkAt(pos, block, worldPos) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
yield blockObject.setState(block.properties);
|
|
85
|
-
}
|
|
86
|
-
const scenePos = MineRenderWorld.worldToScenePosition(worldPos);
|
|
87
|
-
blockObject.setPosition(scenePos);
|
|
88
|
-
this._blocks[index] = {
|
|
89
|
-
block: block,
|
|
90
|
-
object: blockObject
|
|
91
|
-
};
|
|
92
|
-
return this._blocks[index];
|
|
49
|
+
async setBlockInChunkAt(pos, block, worldPos) {
|
|
50
|
+
if (typeof worldPos === "undefined") {
|
|
51
|
+
worldPos = this.chunkPosToWorldPos(pos);
|
|
52
|
+
}
|
|
53
|
+
const index = Chunk.chunkPosToBlockIndex(pos);
|
|
54
|
+
const current = this._blocks[index];
|
|
55
|
+
if (typeof current !== "undefined") {
|
|
56
|
+
console.debug(p, "deleting existing block at", pos, worldPos, index);
|
|
57
|
+
// current.object.setScale(new Vector3(0, 0, 0));//TODO
|
|
58
|
+
current.object.removeFromScene();
|
|
59
|
+
delete this._blocks[index];
|
|
60
|
+
}
|
|
61
|
+
if (typeof block === "undefined" || typeof block.type === "undefined" || block.type === "air")
|
|
62
|
+
return undefined; // only delete block
|
|
63
|
+
const blockState = await BlockStates.get(AssetKey.parse("blockstates", block.type));
|
|
64
|
+
if (blockState) {
|
|
65
|
+
const blockObject = await this.scene.addBlock(blockState, {
|
|
66
|
+
mergeMeshes: true,
|
|
67
|
+
instanceMeshes: true,
|
|
68
|
+
wireframe: true,
|
|
69
|
+
maxInstanceCount: 2000 //TODO: setting this to high kills FPS; increase on demand somehow?
|
|
70
|
+
}); //TODO
|
|
71
|
+
if (block.properties) {
|
|
72
|
+
await blockObject.setState(block.properties);
|
|
93
73
|
}
|
|
94
|
-
|
|
95
|
-
|
|
74
|
+
const scenePos = MineRenderWorld.worldToScenePosition(worldPos);
|
|
75
|
+
blockObject.setPosition(scenePos);
|
|
76
|
+
this._blocks[index] = {
|
|
77
|
+
block: block,
|
|
78
|
+
object: blockObject
|
|
79
|
+
};
|
|
80
|
+
return this._blocks[index];
|
|
81
|
+
}
|
|
82
|
+
return undefined;
|
|
96
83
|
}
|
|
97
|
-
clear() {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
for (let
|
|
102
|
-
for (let
|
|
103
|
-
|
|
104
|
-
promises.push(this.setBlockInChunkAt(pos.set(x, y, z), undefined));
|
|
105
|
-
}
|
|
84
|
+
async clear() {
|
|
85
|
+
let promises = [];
|
|
86
|
+
let pos = new Vector3();
|
|
87
|
+
for (let x = 0; x < 16; x++) {
|
|
88
|
+
for (let z = 0; z < 16; z++) {
|
|
89
|
+
for (let y = 0; y < 16; y++) {
|
|
90
|
+
promises.push(this.setBlockInChunkAt(pos.set(x, y, z), undefined));
|
|
106
91
|
}
|
|
107
92
|
}
|
|
108
|
-
|
|
109
|
-
|
|
93
|
+
}
|
|
94
|
+
return Promise.all(promises).then(ignored => {
|
|
110
95
|
});
|
|
111
96
|
}
|
|
112
|
-
dispose() {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
this.scene.remove(this._anchor);
|
|
116
|
-
});
|
|
97
|
+
async dispose() {
|
|
98
|
+
await this.clear();
|
|
99
|
+
this.scene.remove(this._anchor);
|
|
117
100
|
}
|
|
118
101
|
static chunkPosToBlockIndex(pos) {
|
|
119
102
|
return (pos.y * 16 * 16) + (pos.z * 16) + pos.x;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Chunk.js","sourceRoot":"src/","sources":["world/Chunk.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Chunk.js","sourceRoot":"src/","sources":["world/Chunk.ts"],"names":[],"mappings":"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"}
|