@solidtv/renderer 1.1.0 → 1.1.1
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/src/core/CoreTextureManager.js +82 -24
- package/dist/src/core/CoreTextureManager.js.map +1 -1
- package/dist/src/core/TextureError.d.ts +2 -1
- package/dist/src/core/TextureError.js +2 -0
- package/dist/src/core/TextureError.js.map +1 -1
- package/dist/src/core/lib/ImageWorker.d.ts +1 -1
- package/dist/src/core/lib/ImageWorker.js +46 -26
- package/dist/src/core/lib/ImageWorker.js.map +1 -1
- package/dist/src/core/textures/ColorTexture.js +3 -1
- package/dist/src/core/textures/ColorTexture.js.map +1 -1
- package/dist/src/core/textures/ImageTexture.js +24 -16
- package/dist/src/core/textures/ImageTexture.js.map +1 -1
- package/dist/tsconfig.dist.tsbuildinfo +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/core/CoreTextureManager.ts +101 -22
- package/src/core/TextureError.ts +2 -0
- package/src/core/lib/ImageWorker.ts +50 -27
- package/src/core/textures/ColorTexture.ts +3 -1
- package/src/core/textures/ImageTexture.ts +29 -20
|
@@ -101,10 +101,18 @@ export class CoreTextureManager extends EventEmitter {
|
|
|
101
101
|
this.imageWorkerManager = new ImageWorkerManager(this.numImageWorkers, support);
|
|
102
102
|
}
|
|
103
103
|
else {
|
|
104
|
-
console.warn('[Lightning]
|
|
104
|
+
console.warn('[Lightning] Image worker count is 0 or workers are not supported on this browser. Image loading will be slower.');
|
|
105
105
|
}
|
|
106
106
|
this.initialized = true;
|
|
107
107
|
this.emit('initialized');
|
|
108
|
+
// Anything that arrived before initialization completed is now safe to
|
|
109
|
+
// process. Without this, queued textures would sit until the next frame
|
|
110
|
+
// tick happens to call processSome().
|
|
111
|
+
if (this.uploadTextureQueue.size > 0) {
|
|
112
|
+
this.processSome(Infinity).catch((err) => {
|
|
113
|
+
console.error('Failed to drain pre-init texture queue:', err);
|
|
114
|
+
});
|
|
115
|
+
}
|
|
108
116
|
}
|
|
109
117
|
/**
|
|
110
118
|
* Enqueue a texture for uploading to the GPU.
|
|
@@ -112,6 +120,9 @@ export class CoreTextureManager extends EventEmitter {
|
|
|
112
120
|
* @param texture - The texture to upload
|
|
113
121
|
*/
|
|
114
122
|
enqueueUploadTexture(texture) {
|
|
123
|
+
if (texture.state === 'failed' || texture.state === 'freed') {
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
115
126
|
this.uploadTextureQueue.add(texture);
|
|
116
127
|
}
|
|
117
128
|
/**
|
|
@@ -121,24 +132,26 @@ export class CoreTextureManager extends EventEmitter {
|
|
|
121
132
|
* @param props - The properties to use for the texture
|
|
122
133
|
*/
|
|
123
134
|
createTexture(textureType, props) {
|
|
124
|
-
let texture;
|
|
125
135
|
const TextureClass = this.txConstructors[textureType];
|
|
126
136
|
if (!TextureClass) {
|
|
127
137
|
throw new TextureError(TextureErrorCode.TEXTURE_TYPE_NOT_REGISTERED, `Texture type "${textureType}" is not registered`);
|
|
128
138
|
}
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
texture = new TextureClass(this, resolvedProps);
|
|
138
|
-
if (cacheKey) {
|
|
139
|
-
this.initTextureToCache(texture, cacheKey);
|
|
139
|
+
// Cache key is computed from raw props (each Texture's makeCacheKey
|
|
140
|
+
// inlines its own defaults) so we can skip the resolveDefaults
|
|
141
|
+
// allocation on a cache hit.
|
|
142
|
+
const cacheKey = TextureClass.makeCacheKey(props);
|
|
143
|
+
if (cacheKey) {
|
|
144
|
+
const cached = this.keyCache.get(cacheKey);
|
|
145
|
+
if (cached) {
|
|
146
|
+
return cached;
|
|
140
147
|
}
|
|
141
148
|
}
|
|
149
|
+
const resolvedProps = TextureClass.resolveDefaults(props);
|
|
150
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
|
|
151
|
+
const texture = new TextureClass(this, resolvedProps);
|
|
152
|
+
if (cacheKey) {
|
|
153
|
+
this.initTextureToCache(texture, cacheKey);
|
|
154
|
+
}
|
|
142
155
|
return texture;
|
|
143
156
|
}
|
|
144
157
|
/**
|
|
@@ -177,7 +190,7 @@ export class CoreTextureManager extends EventEmitter {
|
|
|
177
190
|
if (shouldUploadImmediately === true) {
|
|
178
191
|
await this.uploadTexture(texture).catch((err) => {
|
|
179
192
|
console.error(`Failed to upload texture:`, err);
|
|
180
|
-
texture.setState('failed', new TextureError(TextureErrorCode.
|
|
193
|
+
texture.setState('failed', new TextureError(TextureErrorCode.TEXTURE_UPLOAD_FAILED, err instanceof Error ? err.message : undefined));
|
|
181
194
|
});
|
|
182
195
|
return;
|
|
183
196
|
}
|
|
@@ -210,7 +223,7 @@ export class CoreTextureManager extends EventEmitter {
|
|
|
210
223
|
return;
|
|
211
224
|
}
|
|
212
225
|
const coreContext = texture.loadCtxTexture();
|
|
213
|
-
if (coreContext
|
|
226
|
+
if (coreContext.state === 'loaded') {
|
|
214
227
|
texture.setState('loaded');
|
|
215
228
|
return;
|
|
216
229
|
}
|
|
@@ -233,24 +246,69 @@ export class CoreTextureManager extends EventEmitter {
|
|
|
233
246
|
}
|
|
234
247
|
const platform = this.platform;
|
|
235
248
|
const startTime = platform.getTimeStamp();
|
|
236
|
-
//
|
|
237
|
-
while
|
|
249
|
+
// Decode / fetch ("getTextureData") is IO-bound and parallelisable across
|
|
250
|
+
// image workers, while GPU upload is effectively serial. Keep a small
|
|
251
|
+
// sliding window of in-flight data fetches so the next decode runs while
|
|
252
|
+
// we're uploading the current one.
|
|
253
|
+
const prefetchLimit = Math.max(1, this.numImageWorkers);
|
|
254
|
+
const pending = [];
|
|
255
|
+
// Helper avoids TS narrowing `texture.state` permanently after the first
|
|
256
|
+
// discriminated check — the property is mutable and can transition across
|
|
257
|
+
// awaits, so we need to re-read it freshly each time.
|
|
258
|
+
const isDead = (texture) => texture.state === 'failed' || texture.state === 'freed';
|
|
259
|
+
const fillPrefetch = () => {
|
|
260
|
+
while (pending.length < prefetchLimit &&
|
|
261
|
+
this.uploadTextureQueue.size > 0) {
|
|
262
|
+
const [texture] = this.uploadTextureQueue;
|
|
263
|
+
if (!texture)
|
|
264
|
+
break;
|
|
265
|
+
this.uploadTextureQueue.delete(texture);
|
|
266
|
+
if (isDead(texture)) {
|
|
267
|
+
continue;
|
|
268
|
+
}
|
|
269
|
+
// Swallow the rejection here so an early failure doesn't surface as
|
|
270
|
+
// an unhandled promise rejection while it sits in the prefetch
|
|
271
|
+
// window; we re-check state after awaiting.
|
|
272
|
+
const data = texture.textureData === null
|
|
273
|
+
? texture.getTextureData().catch((err) => {
|
|
274
|
+
console.error('Failed to fetch texture data:', err);
|
|
275
|
+
return null;
|
|
276
|
+
})
|
|
277
|
+
: Promise.resolve(texture.textureData);
|
|
278
|
+
pending.push({ texture, data });
|
|
279
|
+
}
|
|
280
|
+
};
|
|
281
|
+
fillPrefetch();
|
|
282
|
+
while (pending.length > 0 &&
|
|
238
283
|
platform.getTimeStamp() - startTime < maxProcessingTime) {
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
this.
|
|
284
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
285
|
+
const next = pending.shift();
|
|
286
|
+
// Top up the prefetch window before awaiting — the next decode starts
|
|
287
|
+
// now and overlaps with this upload.
|
|
288
|
+
fillPrefetch();
|
|
289
|
+
if (isDead(next.texture)) {
|
|
290
|
+
continue;
|
|
291
|
+
}
|
|
243
292
|
try {
|
|
244
|
-
|
|
245
|
-
|
|
293
|
+
await next.data;
|
|
294
|
+
if (isDead(next.texture)) {
|
|
295
|
+
continue;
|
|
246
296
|
}
|
|
247
|
-
await this.uploadTexture(texture);
|
|
297
|
+
await this.uploadTexture(next.texture);
|
|
248
298
|
}
|
|
249
299
|
catch (error) {
|
|
250
300
|
console.error('Failed to upload texture:', error);
|
|
251
301
|
// Continue with next texture instead of stopping entire queue
|
|
252
302
|
}
|
|
253
303
|
}
|
|
304
|
+
// Time ran out before we got to these. Put them back so we don't lose
|
|
305
|
+
// them — their getTextureData() is already in flight and will populate
|
|
306
|
+
// `textureData` for the next tick.
|
|
307
|
+
for (const { texture } of pending) {
|
|
308
|
+
if (!isDead(texture)) {
|
|
309
|
+
this.uploadTextureQueue.add(texture);
|
|
310
|
+
}
|
|
311
|
+
}
|
|
254
312
|
}
|
|
255
313
|
hasUpdates() {
|
|
256
314
|
return this.uploadTextureQueue.size > 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoreTextureManager.js","sourceRoot":"","sources":["../../../src/core/CoreTextureManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CoreTextureManager.js","sourceRoot":"","sources":["../../../src/core/CoreTextureManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
export declare enum TextureErrorCode {
|
|
2
2
|
MEMORY_THRESHOLD_EXCEEDED = "MEMORY_THRESHOLD_EXCEEDED",
|
|
3
3
|
TEXTURE_DATA_NULL = "TEXTURE_DATA_NULL",
|
|
4
|
-
TEXTURE_TYPE_NOT_REGISTERED = "TEXTURE_TYPE_NOT_REGISTERED"
|
|
4
|
+
TEXTURE_TYPE_NOT_REGISTERED = "TEXTURE_TYPE_NOT_REGISTERED",
|
|
5
|
+
TEXTURE_UPLOAD_FAILED = "TEXTURE_UPLOAD_FAILED"
|
|
5
6
|
}
|
|
6
7
|
export declare class TextureError extends Error {
|
|
7
8
|
code?: TextureErrorCode;
|
|
@@ -3,11 +3,13 @@ export var TextureErrorCode;
|
|
|
3
3
|
TextureErrorCode["MEMORY_THRESHOLD_EXCEEDED"] = "MEMORY_THRESHOLD_EXCEEDED";
|
|
4
4
|
TextureErrorCode["TEXTURE_DATA_NULL"] = "TEXTURE_DATA_NULL";
|
|
5
5
|
TextureErrorCode["TEXTURE_TYPE_NOT_REGISTERED"] = "TEXTURE_TYPE_NOT_REGISTERED";
|
|
6
|
+
TextureErrorCode["TEXTURE_UPLOAD_FAILED"] = "TEXTURE_UPLOAD_FAILED";
|
|
6
7
|
})(TextureErrorCode || (TextureErrorCode = {}));
|
|
7
8
|
const defaultMessages = {
|
|
8
9
|
[TextureErrorCode.MEMORY_THRESHOLD_EXCEEDED]: 'Memory threshold exceeded',
|
|
9
10
|
[TextureErrorCode.TEXTURE_DATA_NULL]: 'Texture data is null',
|
|
10
11
|
[TextureErrorCode.TEXTURE_TYPE_NOT_REGISTERED]: 'Texture type is not registered',
|
|
12
|
+
[TextureErrorCode.TEXTURE_UPLOAD_FAILED]: 'Texture upload failed',
|
|
11
13
|
};
|
|
12
14
|
export class TextureError extends Error {
|
|
13
15
|
code;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextureError.js","sourceRoot":"","sources":["../../../src/core/TextureError.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"TextureError.js","sourceRoot":"","sources":["../../../src/core/TextureError.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,2EAAuD,CAAA;IACvD,2DAAuC,CAAA;IACvC,+EAA2D,CAAA;IAC3D,mEAA+C,CAAA;AACjD,CAAC,EALW,gBAAgB,KAAhB,gBAAgB,QAK3B;AAED,MAAM,eAAe,GAAqC;IACxD,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,EAAE,2BAA2B;IACzE,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAE,sBAAsB;IAC5D,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,EAC5C,gCAAgC;IAClC,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,EAAE,uBAAuB;CAClE,CAAC;AAEF,MAAM,OAAO,YAAa,SAAQ,KAAK;IACrC,IAAI,CAAoB;IAIxB,YAAY,aAAwC,EAAE,YAAqB;QACzE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CACrD,aAAiC,CAClC,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAE,aAAkC,CAAC,CAAC,CAAC,SAAS,CAAC;QACtE,IAAI,OAAe,CAAC;QACpB,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACnB,OAAO,GAAG,YAAY,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;QAClC,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;QAC5B,IAAI,IAAI;YAAE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAC7B,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAAC,GAAY;IACzC,OAAO,CACL,GAAG,YAAY,YAAY;QAC3B,CAAC,OAAO,GAAG,KAAK,QAAQ;YACtB,GAAG,KAAK,IAAI;YACX,GAA0B,CAAC,IAAI,KAAK,cAAc;YACnD,OAAQ,GAA0B,CAAC,IAAI,KAAK,QAAQ,CAAC,CACxD,CAAC;AACJ,CAAC"}
|
|
@@ -2,13 +2,13 @@ import type { CreateImageBitmapSupport } from '../lib/validateImageBitmap.js';
|
|
|
2
2
|
import { type TextureData } from '../textures/Texture.js';
|
|
3
3
|
type MessageCallback = [(value: any) => void, (reason: any) => void];
|
|
4
4
|
export declare class ImageWorkerManager {
|
|
5
|
-
imageWorkersEnabled: boolean;
|
|
6
5
|
messageManager: Record<number, MessageCallback>;
|
|
7
6
|
workers: Worker[];
|
|
8
7
|
workerLoad: number[];
|
|
9
8
|
nextId: number;
|
|
10
9
|
constructor(numImageWorkers: number, createImageBitmapSupport: CreateImageBitmapSupport);
|
|
11
10
|
private handleMessage;
|
|
11
|
+
private handleWorkerError;
|
|
12
12
|
private createWorkers;
|
|
13
13
|
private getNextWorkerIndex;
|
|
14
14
|
getImage(src: string, premultiplyAlpha: boolean | null, sx: number | null, sy: number | null, sw: number | null, sh: number | null): Promise<TextureData>;
|
|
@@ -25,7 +25,7 @@ function createImageWorker() {
|
|
|
25
25
|
return reject(new Error(`Image loading failed. HTTP status code: ${xhr.status || 'N/A'}. URL: ${src}`));
|
|
26
26
|
}
|
|
27
27
|
var blob = xhr.response;
|
|
28
|
-
var withAlphaChannel = premultiplyAlpha !== undefined
|
|
28
|
+
var withAlphaChannel = premultiplyAlpha !== undefined && premultiplyAlpha !== null
|
|
29
29
|
? premultiplyAlpha
|
|
30
30
|
: hasAlphaChannel(blob.type);
|
|
31
31
|
// createImageBitmap with crop and options
|
|
@@ -38,7 +38,7 @@ function createImageWorker() {
|
|
|
38
38
|
imageOrientation: 'none',
|
|
39
39
|
})
|
|
40
40
|
.then(function (data) {
|
|
41
|
-
resolve({ data, premultiplyAlpha:
|
|
41
|
+
resolve({ data: data, premultiplyAlpha: withAlphaChannel });
|
|
42
42
|
})
|
|
43
43
|
.catch(function (error) {
|
|
44
44
|
reject(error);
|
|
@@ -46,12 +46,12 @@ function createImageWorker() {
|
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
48
48
|
else if (supportsOptionsCreateImageBitmap === false &&
|
|
49
|
-
|
|
49
|
+
supportsFullCreateImageBitmap === false) {
|
|
50
50
|
// Fallback for browsers that do not support createImageBitmap with options
|
|
51
51
|
// this is supported for Chrome v50 to v52/54 that doesn't support options
|
|
52
52
|
createImageBitmap(blob)
|
|
53
53
|
.then(function (data) {
|
|
54
|
-
resolve({ data, premultiplyAlpha:
|
|
54
|
+
resolve({ data: data, premultiplyAlpha: withAlphaChannel });
|
|
55
55
|
})
|
|
56
56
|
.catch(function (error) {
|
|
57
57
|
reject(error);
|
|
@@ -64,7 +64,7 @@ function createImageWorker() {
|
|
|
64
64
|
imageOrientation: 'none',
|
|
65
65
|
})
|
|
66
66
|
.then(function (data) {
|
|
67
|
-
resolve({ data, premultiplyAlpha:
|
|
67
|
+
resolve({ data: data, premultiplyAlpha: withAlphaChannel });
|
|
68
68
|
})
|
|
69
69
|
.catch(function (error) {
|
|
70
70
|
reject(error);
|
|
@@ -103,7 +103,6 @@ function createImageWorker() {
|
|
|
103
103
|
}
|
|
104
104
|
/* eslint-enable */
|
|
105
105
|
export class ImageWorkerManager {
|
|
106
|
-
imageWorkersEnabled = true;
|
|
107
106
|
messageManager = {};
|
|
108
107
|
workers = [];
|
|
109
108
|
workerLoad = [];
|
|
@@ -112,6 +111,8 @@ export class ImageWorkerManager {
|
|
|
112
111
|
this.workers = this.createWorkers(numImageWorkers, createImageBitmapSupport);
|
|
113
112
|
this.workers.forEach((worker, index) => {
|
|
114
113
|
worker.onmessage = (event) => this.handleMessage(event, index);
|
|
114
|
+
worker.onerror = (event) => this.handleWorkerError(event, index);
|
|
115
|
+
worker.onmessageerror = (event) => this.handleWorkerError(event, index);
|
|
115
116
|
});
|
|
116
117
|
}
|
|
117
118
|
handleMessage(event, workerIndex) {
|
|
@@ -131,6 +132,22 @@ export class ImageWorkerManager {
|
|
|
131
132
|
}
|
|
132
133
|
}
|
|
133
134
|
}
|
|
135
|
+
handleWorkerError(event, workerIndex) {
|
|
136
|
+
const message = event instanceof ErrorEvent && event.message
|
|
137
|
+
? event.message
|
|
138
|
+
: 'Image worker encountered an unrecoverable error';
|
|
139
|
+
// Reject all pending requests; we cannot map a worker-level crash to a
|
|
140
|
+
// specific message id, so fail everything outstanding to avoid hangs.
|
|
141
|
+
for (const id in this.messageManager) {
|
|
142
|
+
const msg = this.messageManager[id];
|
|
143
|
+
if (msg) {
|
|
144
|
+
const [, reject] = msg;
|
|
145
|
+
delete this.messageManager[id];
|
|
146
|
+
reject(new Error(message));
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
this.workerLoad[workerIndex] = 0;
|
|
150
|
+
}
|
|
134
151
|
createWorkers(numWorkers = 1, createImageBitmapSupport) {
|
|
135
152
|
let workerCode = `(${createImageWorker.toString()})()`;
|
|
136
153
|
// Replace placeholders with actual initialization values
|
|
@@ -145,18 +162,21 @@ export class ImageWorkerManager {
|
|
|
145
162
|
const blob = new Blob([workerCode], {
|
|
146
163
|
type: 'application/javascript',
|
|
147
164
|
});
|
|
148
|
-
const
|
|
165
|
+
const urlFactory = self.URL ? URL : webkitURL;
|
|
166
|
+
const blobURL = urlFactory.createObjectURL(blob);
|
|
149
167
|
const workers = [];
|
|
150
168
|
for (let i = 0; i < numWorkers; i++) {
|
|
151
169
|
workers.push(new Worker(blobURL));
|
|
152
170
|
this.workerLoad.push(0);
|
|
153
171
|
}
|
|
172
|
+
// Workers retain the script; the URL itself is no longer needed.
|
|
173
|
+
urlFactory.revokeObjectURL(blobURL);
|
|
154
174
|
return workers;
|
|
155
175
|
}
|
|
156
176
|
getNextWorkerIndex() {
|
|
157
177
|
if (this.workers.length === 0)
|
|
158
178
|
return -1;
|
|
159
|
-
let minLoad =
|
|
179
|
+
let minLoad = Infinity;
|
|
160
180
|
let workerIndex = 0;
|
|
161
181
|
for (let i = 0; i < this.workers.length; i++) {
|
|
162
182
|
const load = this.workerLoad[i] || 0;
|
|
@@ -173,25 +193,25 @@ export class ImageWorkerManager {
|
|
|
173
193
|
getImage(src, premultiplyAlpha, sx, sy, sw, sh) {
|
|
174
194
|
return new Promise((resolve, reject) => {
|
|
175
195
|
try {
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
if (nextWorkerIndex !== -1) {
|
|
181
|
-
const worker = this.workers[nextWorkerIndex];
|
|
182
|
-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
183
|
-
this.workerLoad[nextWorkerIndex]++;
|
|
184
|
-
worker.postMessage({
|
|
185
|
-
id,
|
|
186
|
-
src: src,
|
|
187
|
-
premultiplyAlpha,
|
|
188
|
-
sx,
|
|
189
|
-
sy,
|
|
190
|
-
sw,
|
|
191
|
-
sh,
|
|
192
|
-
});
|
|
193
|
-
}
|
|
196
|
+
const nextWorkerIndex = this.getNextWorkerIndex();
|
|
197
|
+
if (nextWorkerIndex === -1) {
|
|
198
|
+
reject(new Error('No image workers available'));
|
|
199
|
+
return;
|
|
194
200
|
}
|
|
201
|
+
const id = this.nextId++;
|
|
202
|
+
this.messageManager[id] = [resolve, reject];
|
|
203
|
+
const worker = this.workers[nextWorkerIndex];
|
|
204
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
205
|
+
this.workerLoad[nextWorkerIndex]++;
|
|
206
|
+
worker.postMessage({
|
|
207
|
+
id,
|
|
208
|
+
src: src,
|
|
209
|
+
premultiplyAlpha,
|
|
210
|
+
sx,
|
|
211
|
+
sy,
|
|
212
|
+
sw,
|
|
213
|
+
sh,
|
|
214
|
+
});
|
|
195
215
|
}
|
|
196
216
|
catch (error) {
|
|
197
217
|
reject(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImageWorker.js","sourceRoot":"","sources":["../../../../src/core/lib/ImageWorker.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,MAAM,wBAAwB,CAAC;AAmB1D;;;;;;;GAOG;AAEH,oBAAoB;AACpB,SAAS,iBAAiB;IACxB,SAAS,eAAe,CAAC,QAAgB;QACvC,OAAO,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,SAAS,QAAQ,CACf,GAAW,EACX,gBAAgC,EAChC,CAAgB,EAChB,CAAgB,EAChB,KAAoB,EACpB,MAAqB,EACrB,OAGC;QAED,OAAO,IAAI,OAAO,CAAC,UAAU,OAAO,EAAE,MAAM;YAC1C,IAAI,gCAAgC,GAClC,OAAO,CAAC,gCAAgC,CAAC;YAC3C,IAAI,6BAA6B,GAAG,OAAO,CAAC,6BAA6B,CAAC;YAC1E,IAAI,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;YAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAC3B,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC;YAE1B,GAAG,CAAC,MAAM,GAAG;gBACX,uGAAuG;gBACvG,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC3C,OAAO,MAAM,CACX,IAAI,KAAK,CACP,2CACE,GAAG,CAAC,MAAM,IAAI,KAChB,UAAU,GAAG,EAAE,CAChB,CACF,CAAC;gBACJ,CAAC;gBAED,IAAI,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC;gBACxB,IAAI,gBAAgB,GAClB,gBAAgB,KAAK,SAAS;
|
|
1
|
+
{"version":3,"file":"ImageWorker.js","sourceRoot":"","sources":["../../../../src/core/lib/ImageWorker.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,9 @@ export class ColorTexture extends Texture {
|
|
|
45
45
|
};
|
|
46
46
|
}
|
|
47
47
|
static makeCacheKey(props) {
|
|
48
|
-
|
|
48
|
+
// Mirror the default from resolveDefaults so the key is stable whether
|
|
49
|
+
// or not the caller has run defaults first.
|
|
50
|
+
return `ColorTexture,${props.color || 0xffffffff}`;
|
|
49
51
|
}
|
|
50
52
|
static resolveDefaults(props) {
|
|
51
53
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColorTexture.js","sourceRoot":"","sources":["../../../../src/core/textures/ColorTexture.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAoB,MAAM,cAAc,CAAC;AActE;;;;;;;;;;;GAWG;AACH,MAAM,OAAO,YAAa,SAAQ,OAAO;IACvB,IAAI,GAAgB,WAAW,CAAC,KAAK,CAAC;IAEtD,KAAK,CAA8B;IAEnC,YACE,SAA6B,EAC7B,KAAkC;QAElC,KAAK,CAAC,SAAS,CAAC,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IAC1B,CAAC;IAED,IAAI,KAAK,CAAC,KAAa;QACrB,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;IAC3B,CAAC;IAEQ,KAAK,CAAC,gBAAgB;QAC7B,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;QAEpC,IAAI,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YAC9B,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YACnB,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YACnB,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YACnB,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;QACrB,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM;YAChD,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,QAAQ;YACjD,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,OAAO;YACzC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,QAAQ;QACrD,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAEzC,OAAO;YACL,IAAI,EAAE,SAAS;YACf,gBAAgB,EAAE,IAAI;SACvB,CAAC;IACJ,CAAC;IAED,MAAM,CAAU,YAAY,CAAC,KAAwB;QACnD,OAAO,gBAAgB,KAAK,CAAC,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"ColorTexture.js","sourceRoot":"","sources":["../../../../src/core/textures/ColorTexture.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAoB,MAAM,cAAc,CAAC;AActE;;;;;;;;;;;GAWG;AACH,MAAM,OAAO,YAAa,SAAQ,OAAO;IACvB,IAAI,GAAgB,WAAW,CAAC,KAAK,CAAC;IAEtD,KAAK,CAA8B;IAEnC,YACE,SAA6B,EAC7B,KAAkC;QAElC,KAAK,CAAC,SAAS,CAAC,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IAC1B,CAAC;IAED,IAAI,KAAK,CAAC,KAAa;QACrB,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;IAC3B,CAAC;IAEQ,KAAK,CAAC,gBAAgB;QAC7B,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;QAEpC,IAAI,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YAC9B,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YACnB,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YACnB,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YACnB,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;QACrB,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM;YAChD,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,QAAQ;YACjD,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,OAAO;YACzC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,QAAQ;QACrD,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAEzC,OAAO;YACL,IAAI,EAAE,SAAS;YACf,gBAAgB,EAAE,IAAI;SACvB,CAAC;IACJ,CAAC;IAED,MAAM,CAAU,YAAY,CAAC,KAAwB;QACnD,uEAAuE;QACvE,4CAA4C;QAC5C,OAAO,gBAAgB,KAAK,CAAC,KAAK,IAAI,UAAU,EAAE,CAAC;IACrD,CAAC;IAED,MAAM,CAAU,eAAe,CAC7B,KAAwB;QAExB,OAAO;YACL,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,UAAU;SACjC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,eAAe,CAAoB;CAC3C"}
|
|
@@ -37,10 +37,19 @@ export class ImageTexture extends Texture {
|
|
|
37
37
|
img.crossOrigin = 'anonymous';
|
|
38
38
|
}
|
|
39
39
|
return new Promise((resolve, reject) => {
|
|
40
|
+
let objectUrl = null;
|
|
41
|
+
const cleanup = () => {
|
|
42
|
+
if (objectUrl !== null) {
|
|
43
|
+
URL.revokeObjectURL(objectUrl);
|
|
44
|
+
objectUrl = null;
|
|
45
|
+
}
|
|
46
|
+
};
|
|
40
47
|
img.onload = () => {
|
|
48
|
+
cleanup();
|
|
41
49
|
resolve({ data: img, premultiplyAlpha: hasAlpha });
|
|
42
50
|
};
|
|
43
51
|
img.onerror = (err) => {
|
|
52
|
+
cleanup();
|
|
44
53
|
const errorMessage = err instanceof Error
|
|
45
54
|
? err.message
|
|
46
55
|
: err instanceof Event
|
|
@@ -49,7 +58,8 @@ export class ImageTexture extends Texture {
|
|
|
49
58
|
reject(new Error(`Image loading failed: ${errorMessage}`));
|
|
50
59
|
};
|
|
51
60
|
if (src instanceof Blob) {
|
|
52
|
-
|
|
61
|
+
objectUrl = URL.createObjectURL(src);
|
|
62
|
+
img.src = objectUrl;
|
|
53
63
|
}
|
|
54
64
|
else {
|
|
55
65
|
img.src = src;
|
|
@@ -86,19 +96,16 @@ export class ImageTexture extends Texture {
|
|
|
86
96
|
}
|
|
87
97
|
async loadImage(src) {
|
|
88
98
|
const { premultiplyAlpha, sx, sy, sw, sh } = this.props;
|
|
99
|
+
const isBase64 = isBase64Image(src);
|
|
89
100
|
if (this.txManager.hasCreateImageBitmap === true) {
|
|
90
|
-
if (
|
|
101
|
+
if (isBase64 === false &&
|
|
91
102
|
this.txManager.hasWorker === true &&
|
|
92
103
|
this.txManager.imageWorkerManager !== null) {
|
|
93
104
|
return this.txManager.imageWorkerManager.getImage(src, premultiplyAlpha, sx, sy, sw, sh);
|
|
94
105
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
}
|
|
99
|
-
else {
|
|
100
|
-
blob = await fetchJson(src, 'blob').then((response) => response);
|
|
101
|
-
}
|
|
106
|
+
const blob = isBase64
|
|
107
|
+
? dataURIToBlob(src)
|
|
108
|
+
: (await fetchJson(src, 'blob'));
|
|
102
109
|
return this.createImageBitmap(blob, premultiplyAlpha, sx, sy, sw, sh);
|
|
103
110
|
}
|
|
104
111
|
return this.loadImageFallback(src, premultiplyAlpha ?? true);
|
|
@@ -181,13 +188,14 @@ export class ImageTexture extends Texture {
|
|
|
181
188
|
if (typeof key !== 'string') {
|
|
182
189
|
return false;
|
|
183
190
|
}
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
+
// Inline default values so the key is stable whether or not the caller
|
|
192
|
+
// has run them through resolveDefaults first. Must mirror the defaults
|
|
193
|
+
// in resolveDefaults below.
|
|
194
|
+
const premultiplyAlpha = props.premultiplyAlpha ?? true;
|
|
195
|
+
const maxRetryCount = props.maxRetryCount ?? 5;
|
|
196
|
+
let cacheKey = `ImageTexture,${key},${premultiplyAlpha},${maxRetryCount}`;
|
|
197
|
+
if (props.sh != null && props.sw != null) {
|
|
198
|
+
cacheKey += `,${props.sx ?? ''},${props.sy ?? ''},${props.sw || ''},${props.sh || ''}`;
|
|
191
199
|
}
|
|
192
200
|
return cacheKey;
|
|
193
201
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImageTexture.js","sourceRoot":"","sources":["../../../../src/core/textures/ImageTexture.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAoB,MAAM,cAAc,CAAC;AACtE,OAAO,EACL,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EACL,0BAA0B,EAC1B,uBAAuB,GACxB,MAAM,gBAAgB,CAAC;AAsFxB;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAO,YAAa,SAAQ,OAAO;IAC/B,QAAQ,CAAW;IAEpB,KAAK,CAA8B;IAC1B,IAAI,GAAgB,WAAW,CAAC,KAAK,CAAC;IAEtD,YACE,SAA6B,EAC7B,KAAkC;QAElC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEjB,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,aAAuB,CAAC;IACrD,CAAC;IAED,eAAe,CAAC,QAAgB;QAC9B,OAAO,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,GAAkB,EAAE,QAAiB;QAC3D,MAAM,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;QAExB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC;YAC5D,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC;QAChC,CAAC;QAED,OAAO,IAAI,OAAO,CAGf,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrB,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE;gBAChB,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC;YACrD,CAAC,CAAC;YAEF,GAAG,CAAC,OAAO,GAAG,CAAC,GAAG,EAAE,EAAE;gBACpB,MAAM,YAAY,GAChB,GAAG,YAAY,KAAK;oBAClB,CAAC,CAAC,GAAG,CAAC,OAAO;oBACb,CAAC,CAAC,GAAG,YAAY,KAAK;wBACtB,CAAC,CAAC,4BAA4B,GAAG,CAAC,GAAG,EAAE;wBACvC,CAAC,CAAC,6BAA6B,CAAC;gBACpC,MAAM,CAAC,IAAI,KAAK,CAAC,yBAAyB,YAAY,EAAE,CAAC,CAAC,CAAC;YAC7D,CAAC,CAAC;YAEF,IAAI,GAAG,YAAY,IAAI,EAAE,CAAC;gBACxB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"ImageTexture.js","sourceRoot":"","sources":["../../../../src/core/textures/ImageTexture.ts"],"names":[],"mappings":"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"}
|