@needle-tools/engine 4.4.0-ci.1 → 4.4.2
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/CHANGELOG.md +67 -0
- package/dist/assets/generateMeshBVH.worker-b7788939.js +25 -0
- package/dist/needle-engine.bundle.js +7043 -6766
- package/dist/needle-engine.bundle.light.js +7205 -6928
- package/dist/needle-engine.bundle.light.min.js +169 -139
- package/dist/needle-engine.bundle.light.umd.cjs +173 -143
- package/dist/needle-engine.bundle.min.js +169 -139
- package/dist/needle-engine.bundle.umd.cjs +172 -142
- package/dist/needle-engine.js +468 -467
- package/dist/needle-engine.light.js +468 -467
- package/dist/needle-engine.light.min.js +1 -1
- package/dist/needle-engine.light.umd.cjs +1 -1
- package/dist/needle-engine.min.js +1 -1
- package/dist/needle-engine.umd.cjs +1 -1
- package/dist/vendor.js +5108 -5122
- package/dist/vendor.light.js +5108 -5122
- package/dist/vendor.light.min.js +84 -84
- package/dist/vendor.light.umd.cjs +78 -78
- package/dist/vendor.min.js +84 -84
- package/dist/vendor.umd.cjs +78 -78
- package/lib/engine/codegen/register_types.js +2 -0
- package/lib/engine/codegen/register_types.js.map +1 -1
- package/lib/engine/engine_addressables.js.map +1 -1
- package/lib/engine/engine_components.js +3 -1
- package/lib/engine/engine_components.js.map +1 -1
- package/lib/engine/engine_context.d.ts +141 -14
- package/lib/engine/engine_context.js +164 -26
- package/lib/engine/engine_context.js.map +1 -1
- package/lib/engine/engine_element.js +12 -10
- package/lib/engine/engine_element.js.map +1 -1
- package/lib/engine/engine_gameobject.js +5 -0
- package/lib/engine/engine_gameobject.js.map +1 -1
- package/lib/engine/engine_license.d.ts +2 -0
- package/lib/engine/engine_license.js +103 -62
- package/lib/engine/engine_license.js.map +1 -1
- package/lib/engine/engine_networking_blob.js +40 -24
- package/lib/engine/engine_networking_blob.js.map +1 -1
- package/lib/engine/engine_physics_rapier.js +10 -9
- package/lib/engine/engine_physics_rapier.js.map +1 -1
- package/lib/engine/engine_serialization_core.js +6 -2
- package/lib/engine/engine_serialization_core.js.map +1 -1
- package/lib/engine/engine_utils_screenshot.js +1 -1
- package/lib/engine/engine_utils_screenshot.js.map +1 -1
- package/lib/engine/js-extensions/RGBAColor.d.ts +1 -0
- package/lib/engine/js-extensions/RGBAColor.js +56 -7
- package/lib/engine/js-extensions/RGBAColor.js.map +1 -1
- package/lib/engine/physics/workers/mesh-bvh/GenerateMeshBVHWorker.js +4 -3
- package/lib/engine/physics/workers/mesh-bvh/GenerateMeshBVHWorker.js.map +1 -1
- package/lib/engine/webcomponents/needle menu/needle-menu-spatial.js +6 -6
- package/lib/engine/webcomponents/needle menu/needle-menu-spatial.js.map +1 -1
- package/lib/engine/webcomponents/needle menu/needle-menu.d.ts +4 -0
- package/lib/engine/webcomponents/needle menu/needle-menu.js +13 -2
- package/lib/engine/webcomponents/needle menu/needle-menu.js.map +1 -1
- package/lib/engine/xr/NeedleXRController.js +2 -3
- package/lib/engine/xr/NeedleXRController.js.map +1 -1
- package/lib/engine/xr/NeedleXRSession.js +12 -12
- package/lib/engine/xr/NeedleXRSession.js.map +1 -1
- package/lib/engine-components/AudioSource.js +7 -0
- package/lib/engine-components/AudioSource.js.map +1 -1
- package/lib/engine-components/Camera.js +18 -12
- package/lib/engine-components/Camera.js.map +1 -1
- package/lib/engine-components/CameraUtils.js +8 -14
- package/lib/engine-components/CameraUtils.js.map +1 -1
- package/lib/engine-components/GroundProjection.js +1 -1
- package/lib/engine-components/GroundProjection.js.map +1 -1
- package/lib/engine-components/NeedleMenu.js +1 -1
- package/lib/engine-components/NeedleMenu.js.map +1 -1
- package/lib/engine-components/OrbitControls.js +3 -1
- package/lib/engine-components/OrbitControls.js.map +1 -1
- package/lib/engine-components/ReflectionProbe.d.ts +1 -0
- package/lib/engine-components/ReflectionProbe.js +16 -9
- package/lib/engine-components/ReflectionProbe.js.map +1 -1
- package/lib/engine-components/SceneSwitcher.js +28 -7
- package/lib/engine-components/SceneSwitcher.js.map +1 -1
- package/lib/engine-components/SyncedTransform.d.ts +6 -0
- package/lib/engine-components/SyncedTransform.js +10 -5
- package/lib/engine-components/SyncedTransform.js.map +1 -1
- package/lib/engine-components/codegen/components.d.ts +1 -0
- package/lib/engine-components/codegen/components.js +1 -0
- package/lib/engine-components/codegen/components.js.map +1 -1
- package/lib/engine-components/export/usdz/extensions/USDZUI.js +2 -1
- package/lib/engine-components/export/usdz/extensions/USDZUI.js.map +1 -1
- package/lib/engine-components/ui/BaseUIComponent.d.ts +0 -1
- package/lib/engine-components/ui/BaseUIComponent.js +1 -1
- package/lib/engine-components/ui/BaseUIComponent.js.map +1 -1
- package/lib/engine-components/ui/EventSystem.js +1 -1
- package/lib/engine-components/ui/EventSystem.js.map +1 -1
- package/lib/engine-components/ui/Graphic.js +1 -0
- package/lib/engine-components/ui/Graphic.js.map +1 -1
- package/lib/engine-components/ui/RaycastUtils.js +1 -1
- package/lib/engine-components/ui/RaycastUtils.js.map +1 -1
- package/lib/engine-components/ui/RectTransform.d.ts +2 -2
- package/lib/engine-components/ui/RectTransform.js +9 -6
- package/lib/engine-components/ui/RectTransform.js.map +1 -1
- package/lib/engine-components/ui/Symbols.d.ts +1 -0
- package/lib/engine-components/ui/Symbols.js +2 -0
- package/lib/engine-components/ui/Symbols.js.map +1 -0
- package/lib/engine-components/ui/Utils.js +1 -1
- package/lib/engine-components/ui/Utils.js.map +1 -1
- package/lib/engine-components/utils/EnvironmentScene.d.ts +1 -1
- package/lib/engine-components/utils/EnvironmentScene.js +1 -1
- package/lib/engine-components/utils/EnvironmentScene.js.map +1 -1
- package/package.json +3 -3
- package/plugins/common/license.js +115 -27
- package/plugins/types/userconfig.d.ts +8 -0
- package/plugins/vite/build-pipeline.js +1 -1
- package/plugins/vite/defines.js +3 -1
- package/plugins/vite/dependencies.js +23 -4
- package/plugins/vite/facebook-instant-games.js +7 -4
- package/plugins/vite/index.js +1 -1
- package/plugins/vite/license.js +2 -1
- package/src/engine/codegen/register_types.ts +2 -0
- package/src/engine/engine_addressables.ts +3 -2
- package/src/engine/engine_components.ts +2 -1
- package/src/engine/engine_context.ts +169 -33
- package/src/engine/engine_element.ts +10 -9
- package/src/engine/engine_gameobject.ts +7 -0
- package/src/engine/engine_license.ts +116 -67
- package/src/engine/engine_networking_blob.ts +47 -26
- package/src/engine/engine_physics_rapier.ts +10 -12
- package/src/engine/engine_serialization_core.ts +6 -1
- package/src/engine/engine_utils_screenshot.ts +1 -1
- package/src/engine/js-extensions/RGBAColor.ts +59 -8
- package/src/engine/physics/workers/mesh-bvh/GenerateMeshBVHWorker.js +6 -6
- package/src/engine/webcomponents/needle menu/needle-menu-spatial.ts +6 -6
- package/src/engine/webcomponents/needle menu/needle-menu.ts +13 -2
- package/src/engine/xr/NeedleXRController.ts +2 -3
- package/src/engine/xr/NeedleXRSession.ts +12 -12
- package/src/engine-components/AudioSource.ts +8 -3
- package/src/engine-components/Camera.ts +34 -22
- package/src/engine-components/CameraUtils.ts +8 -16
- package/src/engine-components/GroundProjection.ts +1 -1
- package/src/engine-components/NeedleMenu.ts +1 -1
- package/src/engine-components/OrbitControls.ts +2 -1
- package/src/engine-components/ReflectionProbe.ts +15 -8
- package/src/engine-components/SceneSwitcher.ts +28 -11
- package/src/engine-components/SyncedTransform.ts +11 -6
- package/src/engine-components/codegen/components.ts +1 -0
- package/src/engine-components/export/usdz/extensions/USDZUI.ts +2 -2
- package/src/engine-components/ui/BaseUIComponent.ts +1 -1
- package/src/engine-components/ui/EventSystem.ts +1 -1
- package/src/engine-components/ui/Graphic.ts +1 -1
- package/src/engine-components/ui/RaycastUtils.ts +1 -1
- package/src/engine-components/ui/RectTransform.ts +10 -7
- package/src/engine-components/ui/Symbols.ts +2 -0
- package/src/engine-components/ui/Utils.ts +2 -1
- package/src/engine-components/utils/EnvironmentScene.ts +1 -1
|
@@ -28,12 +28,20 @@ export function hasIndieLicense() {
|
|
|
28
28
|
return false;
|
|
29
29
|
}
|
|
30
30
|
/** @internal */
|
|
31
|
+
export function hasEduLicense() {
|
|
32
|
+
switch (NEEDLE_ENGINE_LICENSE_TYPE) {
|
|
33
|
+
case "edu":
|
|
34
|
+
return true;
|
|
35
|
+
}
|
|
36
|
+
return false;
|
|
37
|
+
}
|
|
38
|
+
/** @internal */
|
|
31
39
|
export function hasCommercialLicense() {
|
|
32
|
-
return hasProLicense() || hasIndieLicense();
|
|
40
|
+
return hasProLicense() || hasIndieLicense() || hasEduLicense();
|
|
33
41
|
}
|
|
34
42
|
/** @internal */
|
|
35
43
|
export function onLicenseCheckResultChanged(cb) {
|
|
36
|
-
if (hasProLicense() || hasIndieLicense())
|
|
44
|
+
if (hasProLicense() || hasIndieLicense() || hasEduLicense())
|
|
37
45
|
return cb(true);
|
|
38
46
|
_licenseCheckResultChangedCallbacks.push(cb);
|
|
39
47
|
}
|
|
@@ -77,15 +85,18 @@ async function checkLicense() {
|
|
|
77
85
|
invokeLicenseCheckResultChanged(true);
|
|
78
86
|
}
|
|
79
87
|
else if (res?.status === 403) {
|
|
88
|
+
invokeLicenseCheckResultChanged(false);
|
|
80
89
|
applicationIsForbidden = true;
|
|
81
90
|
applicationForbiddenText = await res.text();
|
|
82
91
|
}
|
|
83
92
|
else {
|
|
93
|
+
invokeLicenseCheckResultChanged(false);
|
|
84
94
|
if (debug)
|
|
85
95
|
console.log("License check failed with status " + res?.status);
|
|
86
96
|
}
|
|
87
97
|
}
|
|
88
98
|
catch (err) {
|
|
99
|
+
invokeLicenseCheckResultChanged(false);
|
|
89
100
|
if (debug)
|
|
90
101
|
console.error("License check failed", err);
|
|
91
102
|
}
|
|
@@ -164,8 +175,9 @@ async function handleForbidden(ctx) {
|
|
|
164
175
|
}
|
|
165
176
|
async function showLicenseInfo(ctx) {
|
|
166
177
|
try {
|
|
167
|
-
if (
|
|
178
|
+
if (!hasProLicense() && !hasIndieLicense()) {
|
|
168
179
|
return onNonCommercialVersionDetected(ctx);
|
|
180
|
+
}
|
|
169
181
|
}
|
|
170
182
|
catch (err) {
|
|
171
183
|
if (debug)
|
|
@@ -180,76 +192,105 @@ async function onNonCommercialVersionDetected(ctx) {
|
|
|
180
192
|
let isReady = false;
|
|
181
193
|
ctx.domElement.addEventListener("ready", () => isReady = true);
|
|
182
194
|
await runtimeLicenseCheckPromise?.catch(() => { });
|
|
183
|
-
if (
|
|
195
|
+
if (hasProLicense() || hasIndieLicense())
|
|
184
196
|
return;
|
|
185
|
-
|
|
197
|
+
if (hasCommercialLicense() === false)
|
|
198
|
+
logNonCommercialUse();
|
|
186
199
|
// check if the engine is already ready (meaning has finished loading)
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
200
|
+
if (isReady) {
|
|
201
|
+
insertNonCommercialUseHint(ctx);
|
|
202
|
+
}
|
|
203
|
+
else {
|
|
204
|
+
ctx.domElement.addEventListener("ready", () => {
|
|
205
|
+
insertNonCommercialUseHint(ctx);
|
|
206
|
+
});
|
|
207
|
+
}
|
|
195
208
|
}
|
|
196
209
|
// const licenseElementIdentifier = "needle-license-element";
|
|
197
210
|
// const licenseDuration = 10000;
|
|
198
211
|
// const licenseDelay = 1200;
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
//
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
212
|
+
function insertNonCommercialUseHint(ctx) {
|
|
213
|
+
const style = `
|
|
214
|
+
position: relative;
|
|
215
|
+
display: block;
|
|
216
|
+
background-size: 20px;
|
|
217
|
+
background-position: 10px 5px;
|
|
218
|
+
background-repeat:no-repeat;
|
|
219
|
+
background-image:url('${base64Logo}');
|
|
220
|
+
background-max-size: 40px;
|
|
221
|
+
padding: 10px;
|
|
222
|
+
padding-left: 30px;
|
|
223
|
+
`;
|
|
224
|
+
if (NEEDLE_ENGINE_LICENSE_TYPE === "edu") {
|
|
225
|
+
console.log("%c " + "Supported by Needle for Education – https://needle.tools", style);
|
|
226
|
+
}
|
|
227
|
+
else {
|
|
228
|
+
// if the user has a basic license we already show the logo in the menu and log a license message
|
|
229
|
+
return;
|
|
230
|
+
}
|
|
231
|
+
const banner = document.createElement("div");
|
|
232
|
+
banner.className = "needle-non-commercial-use";
|
|
233
|
+
banner.innerHTML = "Made with Needle for Education";
|
|
234
|
+
ctx.domElement.shadowRoot?.appendChild(banner);
|
|
235
|
+
let bannerStyle = `
|
|
236
|
+
position: absolute;
|
|
237
|
+
font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
|
|
238
|
+
font-size: 12px;
|
|
239
|
+
color: rgb(100, 100, 100);
|
|
240
|
+
/*mix-blend-mode: difference;*/
|
|
241
|
+
background-color: transparent;
|
|
242
|
+
z-index: 10000;
|
|
243
|
+
|
|
244
|
+
cursor: pointer;
|
|
245
|
+
user-select: none;
|
|
246
|
+
opacity: 0;
|
|
247
|
+
|
|
248
|
+
bottom: 6px;
|
|
249
|
+
right: 12px;
|
|
250
|
+
transform: translateY(0px);
|
|
251
|
+
transition: all .5s ease-in-out 1s;
|
|
252
|
+
`;
|
|
253
|
+
banner.style.cssText = bannerStyle;
|
|
254
|
+
banner.addEventListener("click", () => { window.open("https://needle.tools", "_blank"); });
|
|
255
|
+
let expectedBannerStyle = banner.style.cssText;
|
|
256
|
+
setTimeout(() => {
|
|
257
|
+
bannerStyle = bannerStyle.replace("opacity: 0", "opacity: 1");
|
|
258
|
+
bannerStyle = bannerStyle.replace("transform: translateY(10px)", "transform: translateY(0)");
|
|
259
|
+
banner.style.cssText = bannerStyle;
|
|
260
|
+
expectedBannerStyle = banner.style.cssText;
|
|
261
|
+
}, 100);
|
|
262
|
+
// ensure the banner is always visible
|
|
263
|
+
const interval = setInterval(() => {
|
|
264
|
+
const parent = ctx.domElement.shadowRoot || ctx.domElement;
|
|
265
|
+
if (banner.parentNode !== parent) {
|
|
266
|
+
parent.appendChild(banner);
|
|
267
|
+
}
|
|
268
|
+
if (expectedBannerStyle != banner.style.cssText) {
|
|
269
|
+
banner.style.cssText = bannerStyle;
|
|
270
|
+
expectedBannerStyle = banner.style.cssText;
|
|
271
|
+
}
|
|
272
|
+
}, 1000);
|
|
273
|
+
if (hasEduLicense()) {
|
|
274
|
+
const removeDelay = 20_000;
|
|
275
|
+
setTimeout(() => {
|
|
276
|
+
clearInterval(interval);
|
|
277
|
+
banner?.remove();
|
|
278
|
+
// show the logo every x minutes
|
|
279
|
+
const intervalInMinutes = 5;
|
|
280
|
+
setTimeout(() => {
|
|
281
|
+
if (ctx.domElement.parentNode)
|
|
282
|
+
insertNonCommercialUseHint(ctx);
|
|
283
|
+
}, 1000 * 60 * intervalInMinutes);
|
|
284
|
+
}, removeDelay);
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
const base64Logo = "data:image/webp;base64,UklGRrABAABXRUJQVlA4WAoAAAAQAAAAHwAAHwAAQUxQSKEAAAARN6CmbSM4WR7vdARON11EBDq3fLiNbVtVzpMCPlKAEzsx0Y/x+Ovuv4dn0EFE/ydAvz6YggXzgh5sVgXM/zOC/4sii7qgGvB5N7hmuQYwkvazWAu1JPW41FXSHq6pnaQWvqYH18Fc0j1hO/BFTtIeSBlJi5w6qIIO7IOrwhFsB2Yxukif0FTRLpXswHR8MxbslKe9VZsn/Ub5C7YFOpqSTABWUDgg6AAAAFAGAJ0BKiAAIAA+7VyoTqmkpCI3+qgBMB2JbACdMt69DwMIQBLhkTO6XwY00UEDK6cNIDnuNibPf0EgAP7Y1myuiQHLDsF/0h5unrGh6WAbv7aegg2ZMd3uRKfT/3SJztcaujYfTvMXspfCTmYcoO6a+vhC3ss4M8uM58t4siiu59I4aOl59e9Sr6xoxYlHf2v+NnBNpJYeJf8jABQAId/PXuBkLEFkiCucgSGEcfhvajql/j3reCGl0M5/9gQWy7ayNPs+wlvIxFnNfSlfuND4CZOCyxOHhRqOmHN4ULHo3tCSrUNvgAA=";
|
|
246
288
|
let lastLogTime = 0;
|
|
247
289
|
async function logNonCommercialUse(_logo) {
|
|
248
290
|
const now = Date.now();
|
|
249
291
|
if (now - lastLogTime < 2000)
|
|
250
292
|
return;
|
|
251
293
|
lastLogTime = now;
|
|
252
|
-
const logo = "data:image/webp;base64,UklGRrABAABXRUJQVlA4WAoAAAAQAAAAHwAAHwAAQUxQSKEAAAARN6CmbSM4WR7vdARON11EBDq3fLiNbVtVzpMCPlKAEzsx0Y/x+Ovuv4dn0EFE/ydAvz6YggXzgh5sVgXM/zOC/4sii7qgGvB5N7hmuQYwkvazWAu1JPW41FXSHq6pnaQWvqYH18Fc0j1hO/BFTtIeSBlJi5w6qIIO7IOrwhFsB2Yxukif0FTRLpXswHR8MxbslKe9VZsn/Ub5C7YFOpqSTABWUDgg6AAAAFAGAJ0BKiAAIAA+7VyoTqmkpCI3+qgBMB2JbACdMt69DwMIQBLhkTO6XwY00UEDK6cNIDnuNibPf0EgAP7Y1myuiQHLDsF/0h5unrGh6WAbv7aegg2ZMd3uRKfT/3SJztcaujYfTvMXspfCTmYcoO6a+vhC3ss4M8uM58t4siiu59I4aOl59e9Sr6xoxYlHf2v+NnBNpJYeJf8jABQAId/PXuBkLEFkiCucgSGEcfhvajql/j3reCGl0M5/9gQWy7ayNPs+wlvIxFnNfSlfuND4CZOCyxOHhRqOmHN4ULHo3tCSrUNvgAA=";
|
|
253
294
|
const style = `
|
|
254
295
|
position: relative;
|
|
255
296
|
display: block;
|
|
@@ -257,7 +298,7 @@ async function logNonCommercialUse(_logo) {
|
|
|
257
298
|
background-size: 20px;
|
|
258
299
|
background-position: 10px 5px;
|
|
259
300
|
background-repeat:no-repeat;
|
|
260
|
-
background-image:url('${
|
|
301
|
+
background-image:url('${base64Logo}');
|
|
261
302
|
background-max-size: 40px;
|
|
262
303
|
margin-bottom: 5px;
|
|
263
304
|
margin-top: .3em;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine_license.js","sourceRoot":"","sources":["../../src/engine/engine_license.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,KAAK,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC;AAEvC,MAAM,mCAAmC,GAAkC,EAAE,CAAC;AAE9E,4CAA4C;AAC5C,uBAAuB;AACvB,IAAI,0BAA0B,GAAW,OAAO,CAAC;AACjD,IAAI,KAAK;IACL,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,0BAA0B,CAAC,CAAA;AAE9D,gBAAgB;AAChB,MAAM,UAAU,aAAa;IACzB,QAAQ,0BAA0B,EAAE;QAChC,KAAK,KAAK,CAAC;QACX,KAAK,YAAY;YACb,OAAO,IAAI,CAAC;KACnB;IAAA,CAAC;IACF,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,gBAAgB;AAChB,MAAM,UAAU,eAAe;IAC3B,QAAQ,0BAA0B,EAAE;QAChC,KAAK,OAAO;YACR,OAAO,IAAI,CAAC;KACnB;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,gBAAgB;AAChB,MAAM,UAAU,oBAAoB;IAChC,OAAO,aAAa,EAAE,IAAI,eAAe,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"engine_license.js","sourceRoot":"","sources":["../../src/engine/engine_license.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,KAAK,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC;AAEvC,MAAM,mCAAmC,GAAkC,EAAE,CAAC;AAE9E,4CAA4C;AAC5C,uBAAuB;AACvB,IAAI,0BAA0B,GAAW,OAAO,CAAC;AACjD,IAAI,KAAK;IACL,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,0BAA0B,CAAC,CAAA;AAE9D,gBAAgB;AAChB,MAAM,UAAU,aAAa;IACzB,QAAQ,0BAA0B,EAAE;QAChC,KAAK,KAAK,CAAC;QACX,KAAK,YAAY;YACb,OAAO,IAAI,CAAC;KACnB;IAAA,CAAC;IACF,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,gBAAgB;AAChB,MAAM,UAAU,eAAe;IAC3B,QAAQ,0BAA0B,EAAE;QAChC,KAAK,OAAO;YACR,OAAO,IAAI,CAAC;KACnB;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,gBAAgB;AAChB,MAAM,UAAU,aAAa;IACzB,QAAQ,0BAA0B,EAAE;QAChC,KAAK,KAAK;YACN,OAAO,IAAI,CAAC;KACnB;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,gBAAgB;AAChB,MAAM,UAAU,oBAAoB;IAChC,OAAO,aAAa,EAAE,IAAI,eAAe,EAAE,IAAI,aAAa,EAAE,CAAC;AACnE,CAAC;AAGD,gBAAgB;AAChB,MAAM,UAAU,2BAA2B,CAAC,EAA6B;IACrE,IAAI,aAAa,EAAE,IAAI,eAAe,EAAE,IAAI,aAAa,EAAE;QACvD,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;IACpB,mCAAmC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,+BAA+B,CAAC,MAAe;IACpD,KAAK,MAAM,EAAE,IAAI,mCAAmC,EAAE;QAClD,IAAI;YACA,EAAE,CAAC,MAAM,CAAC,CAAC;SACd;QACD,MAAM;YACF,SAAS;SACZ;KACJ;AACL,CAAC;AAED,eAAe,CAAC,gBAAgB,CAAC,YAAY,CAAC,iBAAiB,EAAE,GAAG,CAAC,EAAE;IACnE,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7B,kCAAkC,EAAE,CAAC;IACrC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,IAAI,0BAA0B,GAA8B,SAAS,CAAC;AAC7E,IAAI,sBAAsB,GAAG,KAAK,CAAC;AACnC,IAAI,wBAAwB,GAAG,EAAE,CAAC;AAClC,KAAK,UAAU,YAAY;IACvB,8CAA8C;IAC9C,IAAI,0BAA0B;QAAE,OAAO,0BAA0B,CAAC;IAClE,IAAI,0BAA0B,KAAK,OAAO,EAAE;QACxC,IAAI;YACA,MAAM,UAAU,GAAG,uDAAuD,GAAG,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,WAAW,GAAG,OAAO,GAAG,aAAa,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAC9L,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,UAAU,EAAE;gBAChC,MAAM,EAAE,KAAK;aAChB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gBACZ,IAAI,KAAK;oBAAE,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC;gBACvD,OAAO,SAAS,CAAC;YACrB,CAAC,CAAC,CAAC;YACH,IAAI,GAAG,EAAE,MAAM,KAAK,GAAG,EAAE;gBACrB,sBAAsB,GAAG,KAAK,CAAC;gBAC/B,IAAI,KAAK;oBAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;gBAClD,0BAA0B,GAAG,KAAK,CAAC;gBACnC,+BAA+B,CAAC,IAAI,CAAC,CAAC;aACzC;iBACI,IAAI,GAAG,EAAE,MAAM,KAAK,GAAG,EAAE;gBAC1B,+BAA+B,CAAC,KAAK,CAAC,CAAC;gBACvC,sBAAsB,GAAG,IAAI,CAAC;gBAC9B,wBAAwB,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;aAC/C;iBACI;gBACD,+BAA+B,CAAC,KAAK,CAAC,CAAC;gBACvC,IAAI,KAAK;oBAAE,OAAO,CAAC,GAAG,CAAC,mCAAmC,GAAG,GAAG,EAAE,MAAM,CAAC,CAAC;aAC7E;SACJ;QACD,OAAO,GAAG,EAAE;YACR,+BAA+B,CAAC,KAAK,CAAC,CAAC;YACvC,IAAI,KAAK;gBAAE,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;SACzD;KACJ;SACI,IAAI,KAAK;QAAE,OAAO,CAAC,GAAG,CAAC,2EAA2E,GAAG,0BAA0B,GAAG,IAAI,CAAC,CAAC;AACjJ,CAAC;AACD,0BAA0B,GAAG,YAAY,EAAE,CAAC;AAE5C,KAAK,UAAU,eAAe,CAAC,GAAa;IACxC,SAAS,sBAAsB;QAC3B,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1C,GAAG,CAAC,SAAS,GAAG,kBAAkB,CAAC;QACnC,GAAG,CAAC,KAAK,CAAC,OAAO,GAAG;;;;;;;;;;;SAWnB,CAAC;QACF,MAAM,aAAa,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;QAExC,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC3C,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG;;;;;;;;;;;;;;;;;SAiBpB,CAAC;QACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;QAC7C,MAAM,aAAa,GAAG,wBAAwB,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,8KAA8K,CAAC;QACvQ,IAAI,CAAC,SAAS,GAAG,aAAa,CAAC;QAC/B,WAAW,CAAC,GAAG,EAAE;YACb,IAAI,IAAI,CAAC,SAAS,KAAK,aAAa;gBAAE,IAAI,CAAC,SAAS,GAAG,aAAa,CAAC;YACrE,IAAI,IAAI,CAAC,UAAU,KAAK,GAAG;gBAAE,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACnD,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,aAAa;gBAAE,GAAG,CAAC,KAAK,CAAC,OAAO,GAAG,aAAa,CAAC;YAC3E,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,KAAK,iBAAiB;gBAAE,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,iBAAiB,CAAC;QACzF,CAAC,EAAE,GAAG,CAAC,CAAA;QACP,OAAO,GAAG,CAAC;IACf,CAAC;IACD,IAAI,gBAAgB,GAAG,sBAAsB,EAAE,CAAC;IAChD,MAAM,WAAW,GAAG,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC;IACnD,WAAW,CAAC,GAAG,EAAE;QACb,IAAI,sBAAsB,KAAK,IAAI,EAAE;YACjC,IAAI,gBAAgB,CAAC,KAAK,CAAC,OAAO,KAAK,WAAW;gBAAE,gBAAgB,GAAG,sBAAsB,EAAE,CAAC;YAChG,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,EAAE;gBAC3B,IAAI,gBAAgB,CAAC,UAAU,KAAK,GAAG,CAAC,UAAU,CAAC,UAAU;oBACzD,GAAG,CAAC,UAAU,CAAC,UAAU,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAC;aAChE;iBACI,IAAI,gBAAgB,CAAC,UAAU,IAAI,QAAQ,CAAC,IAAI,EAAE;gBACnD,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;aAC/C;SACJ;IACL,CAAC,EAAE,GAAG,CAAC,CAAA;AACX,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,GAAa;IACxC,IAAI;QACA,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,eAAe,EAAE,EAAE;YACxC,OAAO,8BAA8B,CAAC,GAAG,CAAC,CAAC;SAC9C;KACJ;IACD,OAAO,GAAG,EAAE;QACR,IAAI,KAAK;YAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAA;QACnD,OAAO,8BAA8B,CAAC,GAAG,CAAC,CAAA;KAC7C;IACD,IAAI,KAAK;QAAE,8BAA8B,CAAC,GAAG,CAAC,CAAA;AAClD,CAAC;AAID,KAAK,UAAU,8BAA8B,CAAC,GAAa;IAEvD,6FAA6F;IAC7F,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAE/D,MAAM,0BAA0B,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAGnD,IAAI,aAAa,EAAE,IAAI,eAAe,EAAE;QAAE,OAAO;IACjD,IAAI,oBAAoB,EAAE,KAAK,KAAK;QAAE,mBAAmB,EAAE,CAAC;IAE5D,sEAAsE;IACtE,IAAI,OAAO,EAAE;QACT,0BAA0B,CAAC,GAAG,CAAC,CAAC;KACnC;SACI;QACD,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;YAC1C,0BAA0B,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;KACN;AACL,CAAC;AAED,6DAA6D;AAC7D,iCAAiC;AACjC,6BAA6B;AAC7B,SAAS,0BAA0B,CAAC,GAAa;IAE7C,MAAM,KAAK,GAAG;;;;;;gCAMc,UAAU;;;;KAIrC,CAAC;IACF,IAAI,0BAA0B,KAAK,KAAK,EAAE;QACtC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,0DAA0D,EAAE,KAAK,CAAC,CAAC;KAC1F;SACI;QACD,iGAAiG;QACjG,OAAO;KACV;IAED,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,CAAC,SAAS,GAAG,2BAA2B,CAAC;IAC/C,MAAM,CAAC,SAAS,GAAG,gCAAgC,CAAC;IACpD,GAAG,CAAC,UAAU,CAAC,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC/C,IAAI,WAAW,GAAG;;;;;;;;;;;;;;;;;KAiBjB,CAAC;IACF,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,WAAW,CAAC;IACnC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;IAC1F,IAAI,mBAAmB,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;IAC/C,UAAU,CAAC,GAAG,EAAE;QACZ,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAC9D,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,6BAA6B,EAAE,0BAA0B,CAAC,CAAC;QAC7F,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,WAAW,CAAC;QACnC,mBAAmB,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;IAC/C,CAAC,EAAE,GAAG,CAAC,CAAC;IAER,sCAAsC;IACtC,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;QAC9B,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,CAAC;QAC3D,IAAI,MAAM,CAAC,UAAU,KAAK,MAAM,EAAE;YAC9B,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SAC9B;QACD,IAAI,mBAAmB,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE;YAC7C,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,WAAW,CAAC;YACnC,mBAAmB,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;SAC9C;IACL,CAAC,EAAE,IAAI,CAAC,CAAC;IAET,IAAI,aAAa,EAAE,EAAE;QACjB,MAAM,WAAW,GAAG,MAAM,CAAC;QAC3B,UAAU,CAAC,GAAG,EAAE;YACZ,aAAa,CAAC,QAAQ,CAAC,CAAC;YACxB,MAAM,EAAE,MAAM,EAAE,CAAC;YACjB,gCAAgC;YAChC,MAAM,iBAAiB,GAAG,CAAC,CAAC;YAC5B,UAAU,CAAC,GAAG,EAAE;gBACZ,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU;oBACzB,0BAA0B,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC,EAAE,IAAI,GAAG,EAAE,GAAG,iBAAiB,CAAC,CAAA;QACrC,CAAC,EAAE,WAAW,CAAC,CAAC;KACnB;AAEL,CAAC;AAGD,MAAM,UAAU,GAAG,qmBAAqmB,CAAC;AAEznB,IAAI,WAAW,GAAG,CAAC,CAAC;AACpB,KAAK,UAAU,mBAAmB,CAAC,KAAc;IAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,IAAI,GAAG,GAAG,WAAW,GAAG,IAAI;QAAE,OAAO;IACrC,WAAW,GAAG,GAAG,CAAC;IAClB,MAAM,KAAK,GAAG;;;;;;;gCAOc,UAAU;;;;;;;;;KASrC,CAAC;IACF,0DAA0D;IAC1D,MAAM,OAAO,GAAG,OAAO,CAAC;IACxB,MAAM,WAAW,GAAG,qJAAqJ,OAAO,EAAE,CAAC;IACnL,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,EAAE;QACrB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;KAC5B;SACI;QACD,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,WAAW,EAAE,KAAK,CAAC,CAAC;KAC3C;AACL,CAAC;AAGD,KAAK,UAAU,kCAAkC;IAC7C,yDAAyD;IACzD,IAAI,MAAM,CAAC,mBAAmB;QAAE,OAAO;IAEvC,IAAI;QACA,MAAM,YAAY,GAAG,4DAA4D,CAAC;QAClF,IAAI,YAAY,EAAE;YACd,IAAI,KAAK;gBAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAC;YAE9D,2CAA2C;YAE3C,uCAAuC;YACvC,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAEtD,IAAI,QAAQ,GAAG,oBAAoB,CAAC;YACpC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAAE,QAAQ,GAAG,GAAG,GAAG,QAAQ,CAAC;YAC3D,MAAM,OAAO,GAAG,0BAA0B,CAAC;YAC3C,MAAM,QAAQ,GAAG,GAAG,YAAY,GAAG,QAAQ,EAAE,CAAC;YAC9C,IAAI,KAAK;gBAAE,OAAO,CAAC,GAAG,CAAC,2DAA2D,EAAE,QAAQ,CAAC,CAAC;YAE9F,MAAM,UAAU,GAAG;gBACf,OAAO;gBACP,GAAG,EAAE,UAAU;gBACf,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ;gBAClC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ;gBAClC,kCAAkC;gBAClC,8BAA8B;gBAC9B,OAAO,EAAE,OAAO;gBAChB,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,UAAU;gBACtB,UAAU,EAAE,UAAU;aACzB,CAAC;YACF,MAAM,GAAG,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;YACzE,IAAI,KAAK;gBAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;SACrD;KACJ;IACD,OAAO,GAAG,EAAE;QACR,IAAI,KAAK;YACL,OAAO,CAAC,GAAG,CAAC,kEAAkE,EAAE,GAAG,CAAC,CAAC;KAC5F;AACL,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// workaround for this is not a function when deployed
|
|
2
2
|
// see https://github.com/pvorb/node-md5/issues/52
|
|
3
3
|
import md5 from "md5";
|
|
4
|
+
import { FileLoader } from "three";
|
|
4
5
|
import { showBalloonWarning } from "./debug/index.js";
|
|
5
6
|
import { hasCommercialLicense } from "./engine_license.js";
|
|
6
7
|
import { delay } from "./engine_utils.js";
|
|
@@ -181,32 +182,47 @@ export var BlobStorage;
|
|
|
181
182
|
}
|
|
182
183
|
BlobStorage.getBlobUrlForKey = getBlobUrlForKey;
|
|
183
184
|
async function download(url, progressCallback) {
|
|
184
|
-
|
|
185
|
-
const
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
while (true) {
|
|
193
|
-
const { done, value } = await reader.read();
|
|
194
|
-
if (value) {
|
|
195
|
-
chunks.push(value);
|
|
196
|
-
received += value.length;
|
|
197
|
-
progressCallback?.call(null, new ProgressEvent('progress', { loaded: received, total: total }));
|
|
198
|
-
}
|
|
199
|
-
if (done) {
|
|
200
|
-
break;
|
|
185
|
+
// Using a FileLoader here instead of manually fetching so we're able to use the three.js cache system
|
|
186
|
+
const loader = new FileLoader();
|
|
187
|
+
loader.setResponseType('arraybuffer');
|
|
188
|
+
// loader.setRequestHeader( this.requestHeader );
|
|
189
|
+
// loader.setWithCredentials( this.withCredentials );
|
|
190
|
+
const res = await loader.loadAsync(url, prog => {
|
|
191
|
+
if (progressCallback) {
|
|
192
|
+
progressCallback.call(null, prog);
|
|
201
193
|
}
|
|
194
|
+
});
|
|
195
|
+
if (!(res instanceof ArrayBuffer)) {
|
|
196
|
+
console.error("Download failed, no arraybuffer returned");
|
|
197
|
+
return null;
|
|
202
198
|
}
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
return
|
|
199
|
+
return new Uint8Array(res);
|
|
200
|
+
// Old solution: this didn't re-use the three.js loading cache. Using a FileLoader the GLTFLoader under the hood is smart enough to NOT start a new download request
|
|
201
|
+
// const response = await fetch(url);
|
|
202
|
+
// const reader = response.body?.getReader();
|
|
203
|
+
// const contentLength = response.headers.get('Content-Length');
|
|
204
|
+
// const total = contentLength ? parseInt(contentLength) : 0;
|
|
205
|
+
// if (!reader) return null;
|
|
206
|
+
// let received: number = 0;
|
|
207
|
+
// const chunks: Uint8Array[] = [];
|
|
208
|
+
// while (true) {
|
|
209
|
+
// const { done, value } = await reader.read();
|
|
210
|
+
// if (value) {
|
|
211
|
+
// chunks.push(value);
|
|
212
|
+
// received += value.length;
|
|
213
|
+
// progressCallback?.call(null, new ProgressEvent('progress', { loaded: received, total: total }));
|
|
214
|
+
// }
|
|
215
|
+
// if (done) {
|
|
216
|
+
// break;
|
|
217
|
+
// }
|
|
218
|
+
// }
|
|
219
|
+
// const final = new Uint8Array(received);
|
|
220
|
+
// let position = 0;
|
|
221
|
+
// for (const chunk of chunks) {
|
|
222
|
+
// final.set(chunk, position);
|
|
223
|
+
// position += chunk.length;
|
|
224
|
+
// }
|
|
225
|
+
// return final;
|
|
210
226
|
}
|
|
211
227
|
BlobStorage.download = download;
|
|
212
228
|
})(BlobStorage || (BlobStorage = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine_networking_blob.js","sourceRoot":"","sources":["../../src/engine/engine_networking_blob.ts"],"names":[],"mappings":"AAAA,sDAAsD;AACtD,kDAAkD;AAClD,OAAO,GAAG,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"engine_networking_blob.js","sourceRoot":"","sources":["../../src/engine/engine_networking_blob.ts"],"names":[],"mappings":"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"}
|
|
@@ -522,12 +522,13 @@ export class RapierPhysics {
|
|
|
522
522
|
if (scale.z < 0)
|
|
523
523
|
scale.z = Math.abs(scale.z);
|
|
524
524
|
// prevent zero scale - seems normals are flipped otherwise
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
525
|
+
const minSize = 0.0000001;
|
|
526
|
+
if (scale.x < minSize)
|
|
527
|
+
scale.x = minSize;
|
|
528
|
+
if (scale.y < minSize)
|
|
529
|
+
scale.y = minSize;
|
|
530
|
+
if (scale.z < minSize)
|
|
531
|
+
scale.z = minSize;
|
|
531
532
|
const desc = MODULES.RAPIER_PHYSICS.MODULE.ColliderDesc.cuboid(scale.x, scale.y, scale.z);
|
|
532
533
|
// const objectLayerMask = collider.gameObject.layers.mask;
|
|
533
534
|
// const mask = objectLayerMask & ~2;
|
|
@@ -892,9 +893,9 @@ export class RapierPhysics {
|
|
|
892
893
|
const sc = col;
|
|
893
894
|
const obj = col.gameObject;
|
|
894
895
|
const scale = getWorldScale(obj, this._tempPosition);
|
|
895
|
-
const newX = sc.size.x * 0.5 * scale.x;
|
|
896
|
-
const newY = sc.size.y * 0.5 * scale.y;
|
|
897
|
-
const newZ = sc.size.z * 0.5 * scale.z;
|
|
896
|
+
const newX = Math.abs(sc.size.x * 0.5 * scale.x);
|
|
897
|
+
const newY = Math.abs(sc.size.y * 0.5 * scale.y);
|
|
898
|
+
const newZ = Math.abs(sc.size.z * 0.5 * scale.z);
|
|
898
899
|
sizeHasChanged = cuboid.halfExtents.x !== newX || cuboid.halfExtents.y !== newY || cuboid.halfExtents.z !== newZ;
|
|
899
900
|
cuboid.halfExtents.x = newX;
|
|
900
901
|
cuboid.halfExtents.y = newY;
|