@flighthq/scene2d-resources 0.3.0 → 0.3.1-next.320.fe56fc2

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.
Files changed (5) hide show
  1. package/dist/loadScene2DImageResources.d.ts.map +1 -1
  2. package/dist/loadScene2DImageResources.js +7 -7
  3. package/dist/loadScene2DImageResources.js.map +1 -1
  4. package/package.json +11 -10
  5. package/src/loadScene2DImageResources.test.ts +9 -6
package/dist/loadScene2DImageResources.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"loadScene2DImageResources.d.ts","sourceRoot":"","sources":["../src/loadScene2DImageResources.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAIV,gCAAgC,EAChC,eAAe,EACf,qBAAqB,EACtB,MAAM,0BAA0B,CAAC;AAKlC,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,eAAe,EACzB,OAAO,CAAC,EAAE,QAAQ,CAAC,gCAAgC,CAAC,GACnD,OAAO,CAAC,qBAAqB,CAAC,CAkChC"}
1
+ {"version":3,"file":"loadScene2DImageResources.d.ts","sourceRoot":"","sources":["../src/loadScene2DImageResources.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAGV,gCAAgC,EAChC,eAAe,EACf,qBAAqB,EAEtB,MAAM,0BAA0B,CAAC;AAKlC,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,eAAe,EACzB,OAAO,CAAC,EAAE,QAAQ,CAAC,gCAAgC,CAAC,GACnD,OAAO,CAAC,qBAAqB,CAAC,CAkChC"}
package/dist/loadScene2DImageResources.js CHANGED
@@ -9,7 +9,7 @@ export async function loadScene2DImageResources(document, options) {
9
9
  const signal = options?.signal ?? new AbortController().signal;
10
10
  const fetch = options?.fetch ?? rejectExternalImageResource;
11
11
  let loaded = 0;
12
- const images = await Promise.all(selected.map(async (reference) => {
12
+ const sources = await Promise.all(selected.map(async (reference) => {
13
13
  try {
14
14
  return await resolveImageResourceReference(reference, fetch, signal);
15
15
  }
@@ -24,24 +24,24 @@ export async function loadScene2DImageResources(document, options) {
24
24
  const unresolved = [];
25
25
  for (let i = 0; i < selected.length; i++) {
26
26
  const reference = selected[i];
27
- const image = images[i];
28
- if (image === null) {
27
+ const source = sources[i];
28
+ if (source === null) {
29
29
  unresolved.push(reference);
30
30
  continue;
31
31
  }
32
- bindScene2DImageResourceTextures(reference, image);
32
+ bindScene2DImageResourceTextures(reference, source);
33
33
  resolved.push(reference);
34
34
  }
35
35
  return { document, resolved, unresolved };
36
36
  }
37
- // Fans one decoded image out to every Texture the reference names. setTextureSource bumps each texture's
37
+ // Fans one decoded source out to every Texture the reference names. setTextureSource bumps each texture's
38
38
  // version, so renderers holding GPU handles against these textures re-upload on their next draw.
39
- function bindScene2DImageResourceTextures(reference, image) {
39
+ function bindScene2DImageResourceTextures(reference, source) {
40
40
  const textures = reference.textures;
41
41
  if (textures === undefined)
42
42
  return;
43
43
  for (let i = 0; i < textures.length; i++)
44
- setTextureSource(textures[i], image);
44
+ setTextureSource(textures[i], source);
45
45
  }
46
46
  // A document with no external images never needs a fetch seam, so the default reports the miss rather than
47
47
  // making the caller supply a fetcher it has no use for.
package/dist/loadScene2DImageResources.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"loadScene2DImageResources.js","sourceRoot":"","sources":["../src/loadScene2DImageResources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAU9D,2GAA2G;AAC3G,4GAA4G;AAC5G,+DAA+D;AAC/D,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,QAAyB,EACzB,OAAoD;IAEpD,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc,CAAC,MAAM,CAC7C,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAC1E,CAAC;IACF,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC;IAC/D,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,2BAA2B,CAAC;IAC5D,IAAI,MAAM,GAAG,CAAC,CAAC;IAEf,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAyB,EAAE;QACtD,IAAI,CAAC;YACH,OAAO,MAAM,6BAA6B,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACvE,CAAC;gBAAS,CAAC;YACT,MAAM,EAAE,CAAC;YACT,IAAI,OAAO,EAAE,QAAQ,KAAK,SAAS,EAAE,CAAC;gBACpC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;YAC9E,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,QAAQ,GAA6B,EAAE,CAAC;IAC9C,MAAM,UAAU,GAA6B,EAAE,CAAC;IAChD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3B,SAAS;QACX,CAAC;QACD,gCAAgC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACnD,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;AAC5C,CAAC;AAED,yGAAyG;AACzG,iGAAiG;AACjG,SAAS,gCAAgC,CAAC,SAA2C,EAAE,KAAY;IACjG,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;IACpC,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO;IACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE;QAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AACjF,CAAC;AAED,2GAA2G;AAC3G,wDAAwD;AACxD,MAAM,2BAA2B,GAAuB,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
1
+ {"version":3,"file":"loadScene2DImageResources.js","sourceRoot":"","sources":["../src/loadScene2DImageResources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAU9D,2GAA2G;AAC3G,4GAA4G;AAC5G,+DAA+D;AAC/D,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,QAAyB,EACzB,OAAoD;IAEpD,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc,CAAC,MAAM,CAC7C,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAC1E,CAAC;IACF,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC;IAC/D,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,2BAA2B,CAAC;IAC5D,IAAI,MAAM,GAAG,CAAC,CAAC;IAEf,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAiC,EAAE;QAC9D,IAAI,CAAC;YACH,OAAO,MAAM,6BAA6B,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACvE,CAAC;gBAAS,CAAC;YACT,MAAM,EAAE,CAAC;YACT,IAAI,OAAO,EAAE,QAAQ,KAAK,SAAS,EAAE,CAAC;gBACpC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;YAC9E,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,QAAQ,GAA6B,EAAE,CAAC;IAC9C,MAAM,UAAU,GAA6B,EAAE,CAAC;IAChD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3B,SAAS;QACX,CAAC;QACD,gCAAgC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACpD,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;AAC5C,CAAC;AAED,0GAA0G;AAC1G,iGAAiG;AACjG,SAAS,gCAAgC,CAAC,SAA2C,EAAE,MAAqB;IAC1G,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;IACpC,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO;IACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE;QAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AAClF,CAAC;AAED,2GAA2G;AAC3G,wDAAwD;AACxD,MAAM,2BAA2B,GAAuB,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@flighthq/scene2d-resources",
3
- "version": "0.3.0",
3
+ "version": "0.3.1-next.320.fe56fc2",
4
4
  "author": "Joshua Granick and other contributors",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -38,17 +38,18 @@
38
38
  "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
39
39
  },
40
40
  "dependencies": {
41
- "@flighthq/audio": "0.3.0",
42
- "@flighthq/entity": "0.3.0",
43
- "@flighthq/image": "0.3.0",
44
- "@flighthq/node": "0.3.0",
45
- "@flighthq/scene2d": "0.3.0",
46
- "@flighthq/scene2d-formats": "0.3.0",
47
- "@flighthq/signals": "0.3.0",
48
- "@flighthq/texture": "0.3.0",
49
- "@flighthq/types": "0.3.0"
41
+ "@flighthq/audio": "0.3.1-next.320.fe56fc2",
42
+ "@flighthq/entity": "0.3.1-next.320.fe56fc2",
43
+ "@flighthq/image": "0.3.1-next.320.fe56fc2",
44
+ "@flighthq/node": "0.3.1-next.320.fe56fc2",
45
+ "@flighthq/scene2d": "0.3.1-next.320.fe56fc2",
46
+ "@flighthq/scene2d-formats": "0.3.1-next.320.fe56fc2",
47
+ "@flighthq/signals": "0.3.1-next.320.fe56fc2",
48
+ "@flighthq/texture": "0.3.1-next.320.fe56fc2",
49
+ "@flighthq/types": "0.3.1-next.320.fe56fc2"
50
50
  },
51
51
  "devDependencies": {
52
+ "@flighthq/image-codec": "*",
52
53
  "typescript": "^5.3.0"
53
54
  },
54
55
  "description": "Renderer-neutral Scene2D documents with explicit application slot and image resource resolution",
package/src/loadScene2DImageResources.test.ts CHANGED
@@ -1,10 +1,11 @@
1
+ import { clearImageDecoders, registerImageDecoder } from '@flighthq/image-codec/contract';
1
2
  // @vitest-environment jsdom
2
3
  import { createEmbeddedImageResourceReference, createExternalImageResourceReference } from '@flighthq/image/contract';
3
4
  import { createDisplayObject } from '@flighthq/scene2d/contract';
4
5
  import { connectSignal, createSignal } from '@flighthq/signals/contract';
5
6
  import { createTexture, getTextureSource } from '@flighthq/texture/contract';
6
7
  import type { Image, ImageResourceReference, Scene2DImageResourceLoadProgress } from '@flighthq/types/contract';
7
- import { ResourceResolutionState } from '@flighthq/types/contract';
8
+ import { BitmapTextureSourceKind, ResourceResolutionState } from '@flighthq/types/contract';
8
9
 
9
10
  import { loadScene2DImageResources } from './loadScene2DImageResources';
10
11
  import { createScene2DDocument } from './scene2DDocument';
@@ -15,14 +16,16 @@ function externalResource(uri: string): ImageResourceReference {
15
16
  return createExternalImageResourceReference(uri);
16
17
  }
17
18
 
18
- // The embedded path decodes through an HTMLImageElement, which is why this file runs under jsdom.
19
19
  beforeEach(() => {
20
- HTMLImageElement.prototype.decode = vi.fn().mockResolvedValue(undefined);
20
+ registerImageDecoder('image/png', async () => ({
21
+ data: new Uint8ClampedArray([0x11, 0x22, 0x33, 0xff]),
22
+ height: 1,
23
+ width: 1,
24
+ }));
21
25
  });
22
26
 
23
27
  afterEach(() => {
24
- vi.restoreAllMocks();
25
- delete (HTMLImageElement.prototype as Partial<HTMLImageElement>).decode;
28
+ clearImageDecoders();
26
29
  });
27
30
 
28
31
  describe('loadScene2DImageResources', () => {
@@ -112,6 +115,6 @@ describe('loadScene2DImageResources', () => {
112
115
  createScene2DDocument(createDisplayObject(), [], 'acme', null, [reference]),
113
116
  );
114
117
  expect(resources.resolved).toEqual([reference]);
115
- expect(getTextureSource(texture)).not.toBeNull();
118
+ expect(getTextureSource(texture)?.kind).toBe(BitmapTextureSourceKind);
116
119
  });
117
120
  });