@next2d/render-queue 3.11.1 → 3.12.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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@next2d/render-queue",
3
- "version": "3.11.1",
3
+ "version": "3.12.1",
4
4
  "description": "Next2D Renderer Queue Package",
5
5
  "author": "Toshiyuki Ienaga<ienaga@next2d.app> (https://github.com/ienaga/)",
6
6
  "license": "MIT",
@@ -1,6 +1,10 @@
1
1
  declare class RenderQueue {
2
2
  buffer: Float32Array;
3
3
  offset: number;
4
+ private _lowUsageFrames;
5
+ private _trimDelay;
6
+ private _trimmedLength;
7
+ private _framesSinceTrim;
4
8
  constructor();
5
9
  push(...args: number[]): void;
6
10
  push1(a: number): void;
@@ -21,6 +25,8 @@ declare class RenderQueue {
21
25
  pushVideoBuffer(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number, n: number, o: number, p: number, q: number, r: number, s: number, t: number, u: number, v: number, w: number, x: number, y: number, z: number, a1: number): void;
22
26
  set(array: Float32Array | Uint8Array): void;
23
27
  setUint8(array: Uint8Array): void;
28
+ trim(): void;
29
+ private _resizeForAppend;
24
30
  resize(length: number): void;
25
31
  }
26
32
  export declare const renderQueue: RenderQueue;
@@ -13,6 +13,30 @@ class RenderQueue {
13
13
  writable: true,
14
14
  value: void 0
15
15
  });
16
+ Object.defineProperty(this, "_lowUsageFrames", {
17
+ enumerable: true,
18
+ configurable: true,
19
+ writable: true,
20
+ value: 0
21
+ });
22
+ Object.defineProperty(this, "_trimDelay", {
23
+ enumerable: true,
24
+ configurable: true,
25
+ writable: true,
26
+ value: 120
27
+ });
28
+ Object.defineProperty(this, "_trimmedLength", {
29
+ enumerable: true,
30
+ configurable: true,
31
+ writable: true,
32
+ value: 0
33
+ });
34
+ Object.defineProperty(this, "_framesSinceTrim", {
35
+ enumerable: true,
36
+ configurable: true,
37
+ writable: true,
38
+ value: 0
39
+ });
16
40
  this.buffer = new Float32Array(256);
17
41
  this.offset = 0;
18
42
  }
@@ -227,28 +251,31 @@ class RenderQueue {
227
251
  if (this.buffer.length < this.offset + 22) {
228
252
  this.resize(22);
229
253
  }
230
- this.buffer[this.offset++] = a;
231
- this.buffer[this.offset++] = b;
232
- this.buffer[this.offset++] = c;
233
- this.buffer[this.offset++] = d;
234
- this.buffer[this.offset++] = e;
235
- this.buffer[this.offset++] = f;
236
- this.buffer[this.offset++] = g;
237
- this.buffer[this.offset++] = h;
238
- this.buffer[this.offset++] = i;
239
- this.buffer[this.offset++] = j;
240
- this.buffer[this.offset++] = k;
241
- this.buffer[this.offset++] = l;
242
- this.buffer[this.offset++] = m;
243
- this.buffer[this.offset++] = n;
244
- this.buffer[this.offset++] = o;
245
- this.buffer[this.offset++] = p;
246
- this.buffer[this.offset++] = q;
247
- this.buffer[this.offset++] = r;
248
- this.buffer[this.offset++] = s;
249
- this.buffer[this.offset++] = t;
250
- this.buffer[this.offset++] = u;
251
- this.buffer[this.offset++] = v;
254
+ const buffer = this.buffer;
255
+ const offset = this.offset;
256
+ buffer[offset] = a;
257
+ buffer[offset + 1] = b;
258
+ buffer[offset + 2] = c;
259
+ buffer[offset + 3] = d;
260
+ buffer[offset + 4] = e;
261
+ buffer[offset + 5] = f;
262
+ buffer[offset + 6] = g;
263
+ buffer[offset + 7] = h;
264
+ buffer[offset + 8] = i;
265
+ buffer[offset + 9] = j;
266
+ buffer[offset + 10] = k;
267
+ buffer[offset + 11] = l;
268
+ buffer[offset + 12] = m;
269
+ buffer[offset + 13] = n;
270
+ buffer[offset + 14] = o;
271
+ buffer[offset + 15] = p;
272
+ buffer[offset + 16] = q;
273
+ buffer[offset + 17] = r;
274
+ buffer[offset + 18] = s;
275
+ buffer[offset + 19] = t;
276
+ buffer[offset + 20] = u;
277
+ buffer[offset + 21] = v;
278
+ this.offset = offset + 22;
252
279
  }
253
280
  pushInstanceBuffer(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) {
254
281
  if (this.buffer.length < this.offset + 24) {
@@ -283,38 +310,41 @@ class RenderQueue {
283
310
  if (this.buffer.length < this.offset + 32) {
284
311
  this.resize(32);
285
312
  }
286
- this.buffer[this.offset++] = a;
287
- this.buffer[this.offset++] = b;
288
- this.buffer[this.offset++] = c;
289
- this.buffer[this.offset++] = d;
290
- this.buffer[this.offset++] = e;
291
- this.buffer[this.offset++] = f;
292
- this.buffer[this.offset++] = g;
293
- this.buffer[this.offset++] = h;
294
- this.buffer[this.offset++] = i;
295
- this.buffer[this.offset++] = j;
296
- this.buffer[this.offset++] = k;
297
- this.buffer[this.offset++] = l;
298
- this.buffer[this.offset++] = m;
299
- this.buffer[this.offset++] = n;
300
- this.buffer[this.offset++] = o;
301
- this.buffer[this.offset++] = p;
302
- this.buffer[this.offset++] = q;
303
- this.buffer[this.offset++] = r;
304
- this.buffer[this.offset++] = s;
305
- this.buffer[this.offset++] = t;
306
- this.buffer[this.offset++] = u;
307
- this.buffer[this.offset++] = v;
308
- this.buffer[this.offset++] = w;
309
- this.buffer[this.offset++] = x;
310
- this.buffer[this.offset++] = y;
311
- this.buffer[this.offset++] = z;
312
- this.buffer[this.offset++] = a1;
313
- this.buffer[this.offset++] = b1;
314
- this.buffer[this.offset++] = c1;
315
- this.buffer[this.offset++] = d1;
316
- this.buffer[this.offset++] = e1;
317
- this.buffer[this.offset++] = f1;
313
+ const buffer = this.buffer;
314
+ const offset = this.offset;
315
+ buffer[offset] = a;
316
+ buffer[offset + 1] = b;
317
+ buffer[offset + 2] = c;
318
+ buffer[offset + 3] = d;
319
+ buffer[offset + 4] = e;
320
+ buffer[offset + 5] = f;
321
+ buffer[offset + 6] = g;
322
+ buffer[offset + 7] = h;
323
+ buffer[offset + 8] = i;
324
+ buffer[offset + 9] = j;
325
+ buffer[offset + 10] = k;
326
+ buffer[offset + 11] = l;
327
+ buffer[offset + 12] = m;
328
+ buffer[offset + 13] = n;
329
+ buffer[offset + 14] = o;
330
+ buffer[offset + 15] = p;
331
+ buffer[offset + 16] = q;
332
+ buffer[offset + 17] = r;
333
+ buffer[offset + 18] = s;
334
+ buffer[offset + 19] = t;
335
+ buffer[offset + 20] = u;
336
+ buffer[offset + 21] = v;
337
+ buffer[offset + 22] = w;
338
+ buffer[offset + 23] = x;
339
+ buffer[offset + 24] = y;
340
+ buffer[offset + 25] = z;
341
+ buffer[offset + 26] = a1;
342
+ buffer[offset + 27] = b1;
343
+ buffer[offset + 28] = c1;
344
+ buffer[offset + 29] = d1;
345
+ buffer[offset + 30] = e1;
346
+ buffer[offset + 31] = f1;
347
+ this.offset = offset + 32;
318
348
  }
319
349
  pushTextFieldBuffer(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, a1, b1, c1, d1) {
320
350
  if (this.buffer.length < this.offset + 30) {
@@ -385,7 +415,7 @@ class RenderQueue {
385
415
  }
386
416
  set(array) {
387
417
  if (this.buffer.length < this.offset + array.length) {
388
- this.resize(array.length);
418
+ this._resizeForAppend(array.length);
389
419
  }
390
420
  this.buffer.set(array, this.offset);
391
421
  this.offset += array.length;
@@ -397,11 +427,56 @@ class RenderQueue {
397
427
  // float. The reader reconstructs the bytes with a Uint8Array view.
398
428
  const words = Math.ceil(array.length / 4);
399
429
  if (this.buffer.length < this.offset + words) {
400
- this.resize(words);
430
+ this._resizeForAppend(words);
401
431
  }
402
432
  new Uint8Array(this.buffer.buffer, this.buffer.byteOffset + this.offset * 4, array.length).set(array);
403
433
  this.offset += words;
404
434
  }
435
+ trim() {
436
+ const length = this.buffer.length;
437
+ if (!this.offset || this.offset > length) {
438
+ return;
439
+ }
440
+ // A quick regrowth (including a larger returned capture buffer) backs
441
+ // off the next trim. A stable interval restores the normal delay.
442
+ if (this._trimmedLength) {
443
+ if (length > this._trimmedLength) {
444
+ this._trimDelay = Math.min(this._trimDelay * 2, 1920);
445
+ this._trimmedLength = 0;
446
+ this._lowUsageFrames = 0;
447
+ }
448
+ else if (++this._framesSinceTrim >= this._trimDelay) {
449
+ this._trimDelay = 120;
450
+ this._trimmedLength = 0;
451
+ }
452
+ }
453
+ if (this.offset >= length / 4) {
454
+ this._lowUsageFrames = 0;
455
+ return;
456
+ }
457
+ if (++this._lowUsageFrames < this._trimDelay) {
458
+ return;
459
+ }
460
+ this._lowUsageFrames = 0;
461
+ const target = Math.max(256, $upperPowerOfTwo(this.offset * 2));
462
+ if (target >= length) {
463
+ return;
464
+ }
465
+ const buffer = new Float32Array(target);
466
+ new Uint8Array(buffer.buffer, 0, this.offset * 4).set(new Uint8Array(this.buffer.buffer, this.buffer.byteOffset, this.offset * 4));
467
+ this.buffer = buffer;
468
+ this._trimmedLength = target;
469
+ this._framesSinceTrim = 0;
470
+ }
471
+ _resizeForAppend(length) {
472
+ const buffer = new Float32Array($upperPowerOfTwo(this.offset + length));
473
+ // The following bulk append overwrites the unused suffix. Keep the
474
+ // public resize method's full-buffer preservation contract unchanged.
475
+ if (this.buffer.length && this.offset) {
476
+ buffer.set(this.buffer.subarray(0, this.offset));
477
+ }
478
+ this.buffer = buffer;
479
+ }
405
480
  resize(length) {
406
481
  const newBuffer = new Float32Array($upperPowerOfTwo(this.offset + length));
407
482
  if (this.buffer.length) {
@@ -0,0 +1,35 @@
1
+ interface ITextDataCodecFormat {
2
+ font: string | null;
3
+ size: number | null;
4
+ color: number | null;
5
+ bold: boolean | null;
6
+ italic: boolean | null;
7
+ underline: boolean | null;
8
+ align: "center" | "left" | "right" | null;
9
+ leftMargin: number | null;
10
+ rightMargin: number | null;
11
+ leading: number | null;
12
+ letterSpacing: number | null;
13
+ }
14
+ interface ITextDataCodecObject {
15
+ mode: "break" | "wrap" | "image" | "text";
16
+ text: string;
17
+ x: number;
18
+ y: number;
19
+ w: number;
20
+ h: number;
21
+ line: number;
22
+ textFormat: ITextDataCodecFormat;
23
+ }
24
+ export interface ITextDataCodecData {
25
+ textTable: ITextDataCodecObject[];
26
+ lineTable: ITextDataCodecObject[];
27
+ ascentTable: number[];
28
+ heightTable: number[];
29
+ widthTable: number[];
30
+ }
31
+ /** Encode renderer text values without changing Main's independently editable formats. */
32
+ export declare const encodeTextData: (data: ITextDataCodecData | null) => string;
33
+ /** Decode the internal versioned wire format, also accepting legacy object/null JSON. */
34
+ export declare const decodeTextData: (json: string) => ITextDataCodecData | null;
35
+ export {};
@@ -0,0 +1,59 @@
1
+ /** Encode renderer text values without changing Main's independently editable formats. */
2
+ export const encodeTextData = (data) => {
3
+ if (!data) {
4
+ return "null";
5
+ }
6
+ const formats = [];
7
+ let previous = null;
8
+ const encode = (object) => {
9
+ // JSON converts sparse array entries to null; preserve that existing behavior.
10
+ if (!object) {
11
+ return object;
12
+ }
13
+ const format = object.textFormat;
14
+ if (!previous
15
+ || previous.font !== format.font || previous.size !== format.size
16
+ || previous.color !== format.color || previous.bold !== format.bold
17
+ || previous.italic !== format.italic || previous.underline !== format.underline
18
+ || previous.align !== format.align || previous.leftMargin !== format.leftMargin
19
+ || previous.rightMargin !== format.rightMargin || previous.leading !== format.leading
20
+ || previous.letterSpacing !== format.letterSpacing) {
21
+ formats.push(format);
22
+ previous = format;
23
+ }
24
+ return [object.mode, object.text, object.x, object.y, object.w, object.h, object.line, formats.length - 1];
25
+ };
26
+ const packed = {
27
+ ...data,
28
+ "textTable": data.textTable.map(encode),
29
+ "lineTable": data.lineTable.map(encode)
30
+ };
31
+ const wire = [1, formats, packed];
32
+ return JSON.stringify(wire);
33
+ };
34
+ /** Decode the internal versioned wire format, also accepting legacy object/null JSON. */
35
+ export const decodeTextData = (json) => {
36
+ const value = JSON.parse(json);
37
+ if (!Array.isArray(value)) {
38
+ return value;
39
+ }
40
+ const [version, formats, packed] = value;
41
+ if (version !== 1) {
42
+ throw new Error("Unsupported renderer text data version.");
43
+ }
44
+ const decode = (values) => {
45
+ if (!values) {
46
+ return values;
47
+ }
48
+ return {
49
+ "mode": values[0], "text": values[1],
50
+ "x": values[2], "y": values[3], "w": values[4], "h": values[5],
51
+ "line": values[6], "textFormat": formats[values[7]]
52
+ };
53
+ };
54
+ return {
55
+ ...packed,
56
+ "textTable": packed.textTable.map(decode),
57
+ "lineTable": packed.lineTable.map(decode)
58
+ };
59
+ };
package/src/index.d.ts CHANGED
@@ -1 +1,2 @@
1
1
  export * from "./RenderQueue";
2
+ export { encodeTextData, decodeTextData } from "./TextDataCodec";
package/src/index.js CHANGED
@@ -1 +1,2 @@
1
1
  export * from "./RenderQueue";
2
+ export { encodeTextData, decodeTextData } from "./TextDataCodec";