@shapediver/viewer.data-engine.geometry-engine 2.7.10 → 2.8.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.
Files changed (38) hide show
  1. package/dist/GeometryEngine.d.ts +6 -1
  2. package/dist/GeometryEngine.d.ts.map +1 -1
  3. package/dist/GeometryEngine.js +89 -95
  4. package/dist/GeometryEngine.js.map +1 -1
  5. package/dist/gltfv1/GLTFLoader.d.ts.map +1 -1
  6. package/dist/gltfv1/GLTFLoader.js +27 -45
  7. package/dist/gltfv1/GLTFLoader.js.map +1 -1
  8. package/dist/gltfv1/SDGTFLoader.d.ts.map +1 -1
  9. package/dist/gltfv1/SDGTFLoader.js +8 -16
  10. package/dist/gltfv1/SDGTFLoader.js.map +1 -1
  11. package/dist/gltfv2/GLTFLoader.d.ts.map +1 -1
  12. package/dist/gltfv2/GLTFLoader.js +58 -71
  13. package/dist/gltfv2/GLTFLoader.js.map +1 -1
  14. package/dist/gltfv2/loaders/AccessorLoader.d.ts.map +1 -1
  15. package/dist/gltfv2/loaders/AccessorLoader.js +2 -3
  16. package/dist/gltfv2/loaders/AccessorLoader.js.map +1 -1
  17. package/dist/gltfv2/loaders/BufferLoader.d.ts.map +1 -1
  18. package/dist/gltfv2/loaders/BufferLoader.js +1 -2
  19. package/dist/gltfv2/loaders/BufferLoader.js.map +1 -1
  20. package/dist/gltfv2/loaders/GeometryLoader.d.ts.map +1 -1
  21. package/dist/gltfv2/loaders/GeometryLoader.js +27 -37
  22. package/dist/gltfv2/loaders/GeometryLoader.js.map +1 -1
  23. package/dist/gltfv2/loaders/MaterialLoader.d.ts.map +1 -1
  24. package/dist/gltfv2/loaders/MaterialLoader.js +2 -3
  25. package/dist/gltfv2/loaders/MaterialLoader.js.map +1 -1
  26. package/dist/gltfv2/loaders/TextureLoader.d.ts.map +1 -1
  27. package/dist/gltfv2/loaders/TextureLoader.js +4 -4
  28. package/dist/gltfv2/loaders/TextureLoader.js.map +1 -1
  29. package/package.json +12 -13
  30. package/src/GeometryEngine.ts +108 -92
  31. package/src/gltfv1/GLTFLoader.ts +28 -42
  32. package/src/gltfv1/SDGTFLoader.ts +9 -16
  33. package/src/gltfv2/GLTFLoader.ts +72 -83
  34. package/src/gltfv2/loaders/AccessorLoader.ts +4 -10
  35. package/src/gltfv2/loaders/BufferLoader.ts +1 -2
  36. package/src/gltfv2/loaders/GeometryLoader.ts +36 -43
  37. package/src/gltfv2/loaders/MaterialLoader.ts +2 -3
  38. package/src/gltfv2/loaders/TextureLoader.ts +4 -4
package/src/gltfv2/loaders/MaterialLoader.ts CHANGED
@@ -1,5 +1,4 @@
1
1
  import { Converter, HttpClient } from '@shapediver/viewer.shared.services'
2
- import { container } from 'tsyringe'
3
2
  import {
4
3
  IGLTF_v2,
5
4
  IGLTF_v2_Material,
@@ -29,8 +28,8 @@ import { TextureLoader } from './TextureLoader'
29
28
  export class MaterialLoader {
30
29
  // #region Properties (4)
31
30
 
32
- private readonly _converter: Converter = <Converter>container.resolve(Converter);
33
- private readonly _materialEngine: MaterialEngine = <MaterialEngine>container.resolve(MaterialEngine);
31
+ private readonly _converter: Converter = Converter.instance;
32
+ private readonly _materialEngine: MaterialEngine = MaterialEngine.instance;
34
33
 
35
34
  private _loaded: { [key: string]: IMaterialAbstractData } = {};
36
35
 
package/src/gltfv2/loaders/TextureLoader.ts CHANGED
@@ -1,14 +1,13 @@
1
1
  import { IGLTF_v2 } from '@shapediver/viewer.data-engine.shared-types'
2
2
  import { Converter, HttpClient, HttpResponse } from '@shapediver/viewer.shared.services'
3
- import { container } from 'tsyringe'
4
3
 
5
4
  import { BufferViewLoader } from './BufferViewLoader'
6
5
 
7
6
  export class TextureLoader {
8
7
  // #region Properties (4)
9
8
 
10
- private readonly _converter: Converter = <Converter>container.resolve(Converter);
11
- private readonly _httpClient: HttpClient = <HttpClient>container.resolve(HttpClient);
9
+ private readonly _converter: Converter = Converter.instance;
10
+ private readonly _httpClient: HttpClient = HttpClient.instance;
12
11
 
13
12
  private _loaded: {
14
13
  [key: string]: HTMLImageElement
@@ -52,7 +51,7 @@ export class TextureLoader {
52
51
  array[i] = dataView.getUint8(i);
53
52
 
54
53
  const blob = new Blob([new Uint8Array(array)], { type: image.mimeType });
55
- const dataUri = window.URL.createObjectURL(blob);
54
+ const dataUri = URL.createObjectURL(blob);
56
55
 
57
56
  promises.push(
58
57
  new Promise<void>(resolve => {
@@ -60,6 +59,7 @@ export class TextureLoader {
60
59
  .then(response => {
61
60
  this._converter.responseToImage(response).then(img => {
62
61
  this._loaded[textureId] = img;
62
+ URL.revokeObjectURL(dataUri)
63
63
  resolve()
64
64
  });
65
65
  })