@luma.gl/engine 9.2.5 → 9.3.0-alpha.10

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 (186) hide show
  1. package/dist/animation-loop/animation-loop.d.ts +11 -5
  2. package/dist/animation-loop/animation-loop.d.ts.map +1 -1
  3. package/dist/animation-loop/animation-loop.js +83 -47
  4. package/dist/animation-loop/animation-loop.js.map +1 -1
  5. package/dist/animation-loop/make-animation-loop.js +7 -1
  6. package/dist/animation-loop/make-animation-loop.js.map +1 -1
  7. package/dist/animation-loop/request-animation-frame.d.ts.map +1 -1
  8. package/dist/animation-loop/request-animation-frame.js +23 -6
  9. package/dist/animation-loop/request-animation-frame.js.map +1 -1
  10. package/dist/compute/computation.d.ts +3 -7
  11. package/dist/compute/computation.d.ts.map +1 -1
  12. package/dist/compute/computation.js +16 -13
  13. package/dist/compute/computation.js.map +1 -1
  14. package/dist/compute/swap.d.ts +2 -0
  15. package/dist/compute/swap.d.ts.map +1 -1
  16. package/dist/compute/swap.js +10 -5
  17. package/dist/compute/swap.js.map +1 -1
  18. package/dist/dist.dev.js +2639 -1290
  19. package/dist/dist.min.js +325 -210
  20. package/dist/dynamic-texture/dynamic-texture.d.ts +102 -0
  21. package/dist/dynamic-texture/dynamic-texture.d.ts.map +1 -0
  22. package/dist/dynamic-texture/dynamic-texture.js +556 -0
  23. package/dist/dynamic-texture/dynamic-texture.js.map +1 -0
  24. package/dist/dynamic-texture/texture-data.d.ts +144 -0
  25. package/dist/dynamic-texture/texture-data.d.ts.map +1 -0
  26. package/dist/dynamic-texture/texture-data.js +208 -0
  27. package/dist/dynamic-texture/texture-data.js.map +1 -0
  28. package/dist/geometries/cone-geometry.d.ts +3 -1
  29. package/dist/geometries/cone-geometry.d.ts.map +1 -1
  30. package/dist/geometries/cone-geometry.js.map +1 -1
  31. package/dist/geometries/cylinder-geometry.d.ts +2 -1
  32. package/dist/geometries/cylinder-geometry.d.ts.map +1 -1
  33. package/dist/geometries/cylinder-geometry.js.map +1 -1
  34. package/dist/geometry/gpu-geometry.d.ts.map +1 -1
  35. package/dist/geometry/gpu-geometry.js +8 -3
  36. package/dist/geometry/gpu-geometry.js.map +1 -1
  37. package/dist/index.cjs +2497 -1212
  38. package/dist/index.cjs.map +4 -4
  39. package/dist/index.d.ts +20 -6
  40. package/dist/index.d.ts.map +1 -1
  41. package/dist/index.js +12 -4
  42. package/dist/index.js.map +1 -1
  43. package/dist/material/material-factory.d.ts +73 -0
  44. package/dist/material/material-factory.d.ts.map +1 -0
  45. package/dist/material/material-factory.js +111 -0
  46. package/dist/material/material-factory.js.map +1 -0
  47. package/dist/material/material.d.ts +84 -0
  48. package/dist/material/material.d.ts.map +1 -0
  49. package/dist/material/material.js +176 -0
  50. package/dist/material/material.js.map +1 -0
  51. package/dist/model/model.d.ts +47 -16
  52. package/dist/model/model.d.ts.map +1 -1
  53. package/dist/model/model.js +113 -47
  54. package/dist/model/model.js.map +1 -1
  55. package/dist/model/split-uniforms-and-bindings.d.ts +4 -3
  56. package/dist/model/split-uniforms-and-bindings.d.ts.map +1 -1
  57. package/dist/model/split-uniforms-and-bindings.js +2 -2
  58. package/dist/model/split-uniforms-and-bindings.js.map +1 -1
  59. package/dist/models/billboard-texture-model.d.ts +8 -5
  60. package/dist/models/billboard-texture-model.d.ts.map +1 -1
  61. package/dist/models/billboard-texture-model.js +77 -23
  62. package/dist/models/billboard-texture-model.js.map +1 -1
  63. package/dist/models/billboard-texture-module.d.ts +1 -1
  64. package/dist/models/billboard-texture-module.js +1 -1
  65. package/dist/models/clip-space.js +7 -7
  66. package/dist/models/directional-light-model.d.ts +7 -0
  67. package/dist/models/directional-light-model.d.ts.map +1 -0
  68. package/dist/models/directional-light-model.js +23 -0
  69. package/dist/models/directional-light-model.js.map +1 -0
  70. package/dist/models/light-model-utils.d.ts +69 -0
  71. package/dist/models/light-model-utils.d.ts.map +1 -0
  72. package/dist/models/light-model-utils.js +395 -0
  73. package/dist/models/light-model-utils.js.map +1 -0
  74. package/dist/models/point-light-model.d.ts +7 -0
  75. package/dist/models/point-light-model.d.ts.map +1 -0
  76. package/dist/models/point-light-model.js +22 -0
  77. package/dist/models/point-light-model.js.map +1 -0
  78. package/dist/models/spot-light-model.d.ts +7 -0
  79. package/dist/models/spot-light-model.d.ts.map +1 -0
  80. package/dist/models/spot-light-model.js +23 -0
  81. package/dist/models/spot-light-model.js.map +1 -0
  82. package/dist/modules/picking/color-picking.d.ts +5 -9
  83. package/dist/modules/picking/color-picking.d.ts.map +1 -1
  84. package/dist/modules/picking/color-picking.js +122 -115
  85. package/dist/modules/picking/color-picking.js.map +1 -1
  86. package/dist/modules/picking/index-picking.d.ts +4 -4
  87. package/dist/modules/picking/index-picking.d.ts.map +1 -1
  88. package/dist/modules/picking/index-picking.js +36 -16
  89. package/dist/modules/picking/index-picking.js.map +1 -1
  90. package/dist/modules/picking/legacy-color-picking.d.ts +26 -0
  91. package/dist/modules/picking/legacy-color-picking.d.ts.map +1 -0
  92. package/dist/modules/picking/legacy-color-picking.js +7 -0
  93. package/dist/modules/picking/legacy-color-picking.js.map +1 -0
  94. package/dist/modules/picking/picking-manager.d.ts +29 -3
  95. package/dist/modules/picking/picking-manager.d.ts.map +1 -1
  96. package/dist/modules/picking/picking-manager.js +188 -41
  97. package/dist/modules/picking/picking-manager.js.map +1 -1
  98. package/dist/modules/picking/picking-uniforms.d.ts +13 -12
  99. package/dist/modules/picking/picking-uniforms.d.ts.map +1 -1
  100. package/dist/modules/picking/picking-uniforms.js +27 -14
  101. package/dist/modules/picking/picking-uniforms.js.map +1 -1
  102. package/dist/modules/picking/picking.d.ts +25 -0
  103. package/dist/modules/picking/picking.d.ts.map +1 -0
  104. package/dist/modules/picking/picking.js +18 -0
  105. package/dist/modules/picking/picking.js.map +1 -0
  106. package/dist/passes/get-fragment-shader.js +12 -27
  107. package/dist/passes/get-fragment-shader.js.map +1 -1
  108. package/dist/passes/shader-pass-renderer.d.ts +5 -7
  109. package/dist/passes/shader-pass-renderer.d.ts.map +1 -1
  110. package/dist/passes/shader-pass-renderer.js +16 -42
  111. package/dist/passes/shader-pass-renderer.js.map +1 -1
  112. package/dist/scenegraph/group-node.d.ts +5 -0
  113. package/dist/scenegraph/group-node.d.ts.map +1 -1
  114. package/dist/scenegraph/group-node.js +12 -0
  115. package/dist/scenegraph/group-node.js.map +1 -1
  116. package/dist/scenegraph/model-node.d.ts +2 -2
  117. package/dist/scenegraph/model-node.d.ts.map +1 -1
  118. package/dist/scenegraph/model-node.js.map +1 -1
  119. package/dist/scenegraph/scenegraph-node.d.ts +1 -1
  120. package/dist/scenegraph/scenegraph-node.d.ts.map +1 -1
  121. package/dist/scenegraph/scenegraph-node.js +23 -15
  122. package/dist/scenegraph/scenegraph-node.js.map +1 -1
  123. package/dist/shader-inputs.d.ts +9 -7
  124. package/dist/shader-inputs.d.ts.map +1 -1
  125. package/dist/shader-inputs.js +84 -4
  126. package/dist/shader-inputs.js.map +1 -1
  127. package/dist/utils/buffer-layout-order.d.ts.map +1 -1
  128. package/dist/utils/buffer-layout-order.js +12 -2
  129. package/dist/utils/buffer-layout-order.js.map +1 -1
  130. package/dist/utils/shader-module-utils.d.ts +7 -0
  131. package/dist/utils/shader-module-utils.d.ts.map +1 -0
  132. package/dist/utils/shader-module-utils.js +46 -0
  133. package/dist/utils/shader-module-utils.js.map +1 -0
  134. package/package.json +6 -6
  135. package/src/animation-loop/animation-loop.ts +89 -50
  136. package/src/animation-loop/make-animation-loop.ts +13 -5
  137. package/src/animation-loop/request-animation-frame.ts +32 -6
  138. package/src/compute/computation.ts +32 -17
  139. package/src/compute/swap.ts +13 -7
  140. package/src/dynamic-texture/dynamic-texture.ts +732 -0
  141. package/src/dynamic-texture/texture-data.ts +336 -0
  142. package/src/geometries/cone-geometry.ts +6 -1
  143. package/src/geometries/cylinder-geometry.ts +5 -1
  144. package/src/geometry/gpu-geometry.ts +8 -3
  145. package/src/index.ts +38 -8
  146. package/src/material/material-factory.ts +157 -0
  147. package/src/material/material.ts +254 -0
  148. package/src/model/model.ts +158 -67
  149. package/src/model/split-uniforms-and-bindings.ts +8 -6
  150. package/src/models/billboard-texture-model.ts +88 -27
  151. package/src/models/billboard-texture-module.ts +1 -1
  152. package/src/models/clip-space.ts +7 -7
  153. package/src/models/directional-light-model.ts +32 -0
  154. package/src/models/light-model-utils.ts +587 -0
  155. package/src/models/point-light-model.ts +31 -0
  156. package/src/models/spot-light-model.ts +32 -0
  157. package/src/modules/picking/color-picking.ts +123 -122
  158. package/src/modules/picking/index-picking.ts +36 -16
  159. package/src/modules/picking/legacy-color-picking.ts +8 -0
  160. package/src/modules/picking/picking-manager.ts +252 -50
  161. package/src/modules/picking/picking-uniforms.ts +39 -24
  162. package/src/modules/picking/picking.ts +22 -0
  163. package/src/passes/get-fragment-shader.ts +12 -27
  164. package/src/passes/shader-pass-renderer.ts +25 -48
  165. package/src/scenegraph/group-node.ts +16 -0
  166. package/src/scenegraph/model-node.ts +2 -2
  167. package/src/scenegraph/scenegraph-node.ts +27 -16
  168. package/src/shader-inputs.ts +165 -15
  169. package/src/utils/buffer-layout-order.ts +18 -2
  170. package/src/utils/shader-module-utils.ts +65 -0
  171. package/dist/async-texture/async-texture.d.ts +0 -166
  172. package/dist/async-texture/async-texture.d.ts.map +0 -1
  173. package/dist/async-texture/async-texture.js +0 -386
  174. package/dist/async-texture/async-texture.js.map +0 -1
  175. package/dist/factories/pipeline-factory.d.ts +0 -37
  176. package/dist/factories/pipeline-factory.d.ts.map +0 -1
  177. package/dist/factories/pipeline-factory.js +0 -181
  178. package/dist/factories/pipeline-factory.js.map +0 -1
  179. package/dist/factories/shader-factory.d.ts +0 -22
  180. package/dist/factories/shader-factory.d.ts.map +0 -1
  181. package/dist/factories/shader-factory.js +0 -88
  182. package/dist/factories/shader-factory.js.map +0 -1
  183. package/src/async-texture/async-texture.ts +0 -551
  184. package/src/factories/pipeline-factory.ts +0 -224
  185. package/src/factories/shader-factory.ts +0 -103
  186. /package/src/{async-texture/texture-setters.ts.disabled → dynamic-texture/texture-data.ts.disabled} +0 -0
@@ -1,181 +0,0 @@
1
- // luma.gl
2
- // SPDX-License-Identifier: MIT
3
- // Copyright (c) vis.gl contributors
4
- import { RenderPipeline, ComputePipeline, log } from '@luma.gl/core';
5
- import { uid } from "../utils/uid.js";
6
- /**
7
- * Efficiently creates / caches pipelines
8
- */
9
- export class PipelineFactory {
10
- static defaultProps = { ...RenderPipeline.defaultProps };
11
- /** Get the singleton default pipeline factory for the specified device */
12
- static getDefaultPipelineFactory(device) {
13
- device._lumaData['defaultPipelineFactory'] =
14
- device._lumaData['defaultPipelineFactory'] || new PipelineFactory(device);
15
- return device._lumaData['defaultPipelineFactory'];
16
- }
17
- device;
18
- cachingEnabled;
19
- destroyPolicy;
20
- debug;
21
- _hashCounter = 0;
22
- _hashes = {};
23
- _renderPipelineCache = {};
24
- _computePipelineCache = {};
25
- get [Symbol.toStringTag]() {
26
- return 'PipelineFactory';
27
- }
28
- toString() {
29
- return `PipelineFactory(${this.device.id})`;
30
- }
31
- constructor(device) {
32
- this.device = device;
33
- this.cachingEnabled = device.props._cachePipelines;
34
- this.destroyPolicy = device.props._cacheDestroyPolicy;
35
- this.debug = device.props.debugFactories;
36
- }
37
- /** Return a RenderPipeline matching supplied props. Reuses an equivalent pipeline if already created. */
38
- createRenderPipeline(props) {
39
- if (!this.cachingEnabled) {
40
- return this.device.createRenderPipeline(props);
41
- }
42
- const allProps = { ...RenderPipeline.defaultProps, ...props };
43
- const cache = this._renderPipelineCache;
44
- const hash = this._hashRenderPipeline(allProps);
45
- let pipeline = cache[hash]?.pipeline;
46
- if (!pipeline) {
47
- pipeline = this.device.createRenderPipeline({
48
- ...allProps,
49
- id: allProps.id ? `${allProps.id}-cached` : uid('unnamed-cached')
50
- });
51
- pipeline.hash = hash;
52
- cache[hash] = { pipeline, useCount: 1 };
53
- if (this.debug) {
54
- log.log(3, `${this}: ${pipeline} created, count=${cache[hash].useCount}`)();
55
- }
56
- }
57
- else {
58
- cache[hash].useCount++;
59
- if (this.debug) {
60
- log.log(3, `${this}: ${cache[hash].pipeline} reused, count=${cache[hash].useCount}, (id=${props.id})`)();
61
- }
62
- }
63
- return pipeline;
64
- }
65
- /** Return a ComputePipeline matching supplied props. Reuses an equivalent pipeline if already created. */
66
- createComputePipeline(props) {
67
- if (!this.cachingEnabled) {
68
- return this.device.createComputePipeline(props);
69
- }
70
- const allProps = { ...ComputePipeline.defaultProps, ...props };
71
- const cache = this._computePipelineCache;
72
- const hash = this._hashComputePipeline(allProps);
73
- let pipeline = cache[hash]?.pipeline;
74
- if (!pipeline) {
75
- pipeline = this.device.createComputePipeline({
76
- ...allProps,
77
- id: allProps.id ? `${allProps.id}-cached` : undefined
78
- });
79
- pipeline.hash = hash;
80
- cache[hash] = { pipeline, useCount: 1 };
81
- if (this.debug) {
82
- log.log(3, `${this}: ${pipeline} created, count=${cache[hash].useCount}`)();
83
- }
84
- }
85
- else {
86
- cache[hash].useCount++;
87
- if (this.debug) {
88
- log.log(3, `${this}: ${cache[hash].pipeline} reused, count=${cache[hash].useCount}, (id=${props.id})`)();
89
- }
90
- }
91
- return pipeline;
92
- }
93
- release(pipeline) {
94
- if (!this.cachingEnabled) {
95
- pipeline.destroy();
96
- return;
97
- }
98
- const cache = this._getCache(pipeline);
99
- const hash = pipeline.hash;
100
- cache[hash].useCount--;
101
- if (cache[hash].useCount === 0) {
102
- this._destroyPipeline(pipeline);
103
- if (this.debug) {
104
- log.log(3, `${this}: ${pipeline} released and destroyed`)();
105
- }
106
- }
107
- else if (cache[hash].useCount < 0) {
108
- log.error(`${this}: ${pipeline} released, useCount < 0, resetting`)();
109
- cache[hash].useCount = 0;
110
- }
111
- else if (this.debug) {
112
- log.log(3, `${this}: ${pipeline} released, count=${cache[hash].useCount}`)();
113
- }
114
- }
115
- // PRIVATE
116
- /** Destroy a cached pipeline, removing it from the cache (depending on destroy policy) */
117
- _destroyPipeline(pipeline) {
118
- const cache = this._getCache(pipeline);
119
- switch (this.destroyPolicy) {
120
- case 'never':
121
- return false;
122
- case 'unused':
123
- delete cache[pipeline.hash];
124
- pipeline.destroy();
125
- return true;
126
- }
127
- }
128
- /** Get the appropriate cache for the type of pipeline */
129
- _getCache(pipeline) {
130
- let cache;
131
- if (pipeline instanceof ComputePipeline) {
132
- cache = this._computePipelineCache;
133
- }
134
- if (pipeline instanceof RenderPipeline) {
135
- cache = this._renderPipelineCache;
136
- }
137
- if (!cache) {
138
- throw new Error(`${this}`);
139
- }
140
- if (!cache[pipeline.hash]) {
141
- throw new Error(`${this}: ${pipeline} matched incorrect entry`);
142
- }
143
- return cache;
144
- }
145
- /** Calculate a hash based on all the inputs for a compute pipeline */
146
- _hashComputePipeline(props) {
147
- const { type } = this.device;
148
- const shaderHash = this._getHash(props.shader.source);
149
- return `${type}/C/${shaderHash}`;
150
- }
151
- /** Calculate a hash based on all the inputs for a render pipeline */
152
- _hashRenderPipeline(props) {
153
- const vsHash = props.vs ? this._getHash(props.vs.source) : 0;
154
- const fsHash = props.fs ? this._getHash(props.fs.source) : 0;
155
- // WebGL specific
156
- // const {varyings = [], bufferMode = {}} = props;
157
- // const varyingHashes = varyings.map((v) => this._getHash(v));
158
- const varyingHash = '-'; // `${varyingHashes.join('/')}B${bufferMode}`
159
- const bufferLayoutHash = this._getHash(JSON.stringify(props.bufferLayout));
160
- const { type } = this.device;
161
- switch (type) {
162
- case 'webgl':
163
- // WebGL is more dynamic
164
- return `${type}/R/${vsHash}/${fsHash}V${varyingHash}BL${bufferLayoutHash}`;
165
- case 'webgpu':
166
- default:
167
- // On WebGPU we need to rebuild the pipeline if topology, parameters or bufferLayout change
168
- const parameterHash = this._getHash(JSON.stringify(props.parameters));
169
- // TODO - Can json.stringify() generate different strings for equivalent objects if order of params is different?
170
- // create a deepHash() to deduplicate?
171
- return `${type}/R/${vsHash}/${fsHash}V${varyingHash}T${props.topology}P${parameterHash}BL${bufferLayoutHash}`;
172
- }
173
- }
174
- _getHash(key) {
175
- if (this._hashes[key] === undefined) {
176
- this._hashes[key] = this._hashCounter++;
177
- }
178
- return this._hashes[key];
179
- }
180
- }
181
- //# sourceMappingURL=pipeline-factory.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"pipeline-factory.js","sourceRoot":"","sources":["../../src/factories/pipeline-factory.ts"],"names":[],"mappings":"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"}
@@ -1,22 +0,0 @@
1
- import { Device, Shader, ShaderProps } from '@luma.gl/core';
2
- /** Manages a cached pool of Shaders for reuse. */
3
- export declare class ShaderFactory {
4
- static readonly defaultProps: Required<ShaderProps>;
5
- /** Returns the default ShaderFactory for the given {@link Device}, creating one if necessary. */
6
- static getDefaultShaderFactory(device: Device): ShaderFactory;
7
- readonly device: Device;
8
- readonly cachingEnabled: boolean;
9
- readonly destroyPolicy: 'unused' | 'never';
10
- readonly debug: boolean;
11
- private readonly _cache;
12
- get [Symbol.toStringTag](): string;
13
- toString(): string;
14
- /** @internal */
15
- constructor(device: Device);
16
- /** Requests a {@link Shader} from the cache, creating a new Shader only if necessary. */
17
- createShader(props: ShaderProps): Shader;
18
- /** Releases a previously-requested {@link Shader}, destroying it if no users remain. */
19
- release(shader: Shader): void;
20
- protected _hashShader(value: Shader | ShaderProps): string;
21
- }
22
- //# sourceMappingURL=shader-factory.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"shader-factory.d.ts","sourceRoot":"","sources":["../../src/factories/shader-factory.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAM,MAAM,eAAe,CAAC;AAE/D,kDAAkD;AAClD,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,CAA4B;IAE/E,iGAAiG;IACjG,MAAM,CAAC,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAK7D,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,aAAa,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC3C,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAExB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0D;IAEjF,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;IAED,QAAQ,IAAI,MAAM;IAIlB,gBAAgB;gBACJ,MAAM,EAAE,MAAM;IAO1B,yFAAyF;IACzF,YAAY,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM;IA8BxC,wFAAwF;IACxF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IA4B7B,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM;CAG3D"}
@@ -1,88 +0,0 @@
1
- // luma.gl
2
- // SPDX-License-Identifier: MIT
3
- // Copyright (c) vis.gl contributors
4
- import { Shader, log } from '@luma.gl/core';
5
- /** Manages a cached pool of Shaders for reuse. */
6
- export class ShaderFactory {
7
- static defaultProps = { ...Shader.defaultProps };
8
- /** Returns the default ShaderFactory for the given {@link Device}, creating one if necessary. */
9
- static getDefaultShaderFactory(device) {
10
- device._lumaData['defaultShaderFactory'] ||= new ShaderFactory(device);
11
- return device._lumaData['defaultShaderFactory'];
12
- }
13
- device;
14
- cachingEnabled;
15
- destroyPolicy;
16
- debug;
17
- _cache = {};
18
- get [Symbol.toStringTag]() {
19
- return 'ShaderFactory';
20
- }
21
- toString() {
22
- return `${this[Symbol.toStringTag]}(${this.device.id})`;
23
- }
24
- /** @internal */
25
- constructor(device) {
26
- this.device = device;
27
- this.cachingEnabled = device.props._cacheShaders;
28
- this.destroyPolicy = device.props._cacheDestroyPolicy;
29
- this.debug = true; // device.props.debugFactories;
30
- }
31
- /** Requests a {@link Shader} from the cache, creating a new Shader only if necessary. */
32
- createShader(props) {
33
- if (!this.cachingEnabled) {
34
- return this.device.createShader(props);
35
- }
36
- const key = this._hashShader(props);
37
- let cacheEntry = this._cache[key];
38
- if (!cacheEntry) {
39
- const shader = this.device.createShader({
40
- ...props,
41
- id: props.id ? `${props.id}-cached` : undefined
42
- });
43
- this._cache[key] = cacheEntry = { shader, useCount: 1 };
44
- if (this.debug) {
45
- log.log(3, `${this}: Created new shader ${shader.id}`)();
46
- }
47
- }
48
- else {
49
- cacheEntry.useCount++;
50
- if (this.debug) {
51
- log.log(3, `${this}: Reusing shader ${cacheEntry.shader.id} count=${cacheEntry.useCount}`)();
52
- }
53
- }
54
- return cacheEntry.shader;
55
- }
56
- /** Releases a previously-requested {@link Shader}, destroying it if no users remain. */
57
- release(shader) {
58
- if (!this.cachingEnabled) {
59
- shader.destroy();
60
- return;
61
- }
62
- const key = this._hashShader(shader);
63
- const cacheEntry = this._cache[key];
64
- if (cacheEntry) {
65
- cacheEntry.useCount--;
66
- if (cacheEntry.useCount === 0) {
67
- if (this.destroyPolicy === 'unused') {
68
- delete this._cache[key];
69
- cacheEntry.shader.destroy();
70
- if (this.debug) {
71
- log.log(3, `${this}: Releasing shader ${shader.id}, destroyed`)();
72
- }
73
- }
74
- }
75
- else if (cacheEntry.useCount < 0) {
76
- throw new Error(`ShaderFactory: Shader ${shader.id} released too many times`);
77
- }
78
- else if (this.debug) {
79
- log.log(3, `${this}: Releasing shader ${shader.id} count=${cacheEntry.useCount}`)();
80
- }
81
- }
82
- }
83
- // PRIVATE
84
- _hashShader(value) {
85
- return `${value.stage}:${value.source}`;
86
- }
87
- }
88
- //# sourceMappingURL=shader-factory.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"shader-factory.js","sourceRoot":"","sources":["../../src/factories/shader-factory.ts"],"names":[],"mappings":"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"}