@luma.gl/engine 9.3.0-alpha.4 → 9.3.0-alpha.6
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/animation-loop/animation-loop.d.ts +8 -4
- package/dist/animation-loop/animation-loop.d.ts.map +1 -1
- package/dist/animation-loop/animation-loop.js +70 -43
- package/dist/animation-loop/animation-loop.js.map +1 -1
- package/dist/animation-loop/make-animation-loop.js +7 -1
- package/dist/animation-loop/make-animation-loop.js.map +1 -1
- package/dist/animation-loop/request-animation-frame.d.ts.map +1 -1
- package/dist/animation-loop/request-animation-frame.js +23 -6
- package/dist/animation-loop/request-animation-frame.js.map +1 -1
- package/dist/dist.dev.js +679 -927
- package/dist/dist.min.js +39 -240
- package/dist/dynamic-texture/dynamic-texture.d.ts +3 -3
- package/dist/dynamic-texture/dynamic-texture.d.ts.map +1 -1
- package/dist/dynamic-texture/dynamic-texture.js +170 -52
- package/dist/dynamic-texture/dynamic-texture.js.map +1 -1
- package/dist/dynamic-texture/texture-data.d.ts +4 -0
- package/dist/dynamic-texture/texture-data.d.ts.map +1 -1
- package/dist/dynamic-texture/texture-data.js +8 -0
- package/dist/dynamic-texture/texture-data.js.map +1 -1
- package/dist/factories/pipeline-factory.d.ts +7 -5
- package/dist/factories/pipeline-factory.d.ts.map +1 -1
- package/dist/factories/pipeline-factory.js +71 -36
- package/dist/factories/pipeline-factory.js.map +1 -1
- package/dist/factories/shader-factory.d.ts +0 -3
- package/dist/factories/shader-factory.d.ts.map +1 -1
- package/dist/factories/shader-factory.js +13 -19
- package/dist/factories/shader-factory.js.map +1 -1
- package/dist/geometries/cone-geometry.d.ts +3 -1
- package/dist/geometries/cone-geometry.d.ts.map +1 -1
- package/dist/geometries/cone-geometry.js.map +1 -1
- package/dist/geometries/cylinder-geometry.d.ts +2 -1
- package/dist/geometries/cylinder-geometry.d.ts.map +1 -1
- package/dist/geometries/cylinder-geometry.js.map +1 -1
- package/dist/index.cjs +683 -922
- package/dist/index.cjs.map +4 -4
- package/dist/model/model.d.ts +3 -1
- package/dist/model/model.d.ts.map +1 -1
- package/dist/model/model.js +11 -9
- package/dist/model/model.js.map +1 -1
- package/dist/models/billboard-texture-model.d.ts.map +1 -1
- package/dist/models/billboard-texture-model.js +10 -8
- package/dist/models/billboard-texture-model.js.map +1 -1
- package/dist/models/clip-space.js +7 -7
- package/dist/modules/picking/index-picking.d.ts +1 -1
- package/dist/modules/picking/index-picking.d.ts.map +1 -1
- package/dist/modules/picking/index-picking.js +0 -6
- package/dist/modules/picking/index-picking.js.map +1 -1
- package/dist/passes/get-fragment-shader.js +11 -30
- package/dist/passes/get-fragment-shader.js.map +1 -1
- package/dist/passes/shader-pass-renderer.d.ts +0 -2
- package/dist/passes/shader-pass-renderer.d.ts.map +1 -1
- package/dist/passes/shader-pass-renderer.js +4 -31
- package/dist/passes/shader-pass-renderer.js.map +1 -1
- package/dist/scenegraph/group-node.d.ts +5 -0
- package/dist/scenegraph/group-node.d.ts.map +1 -1
- package/dist/scenegraph/group-node.js +12 -0
- package/dist/scenegraph/group-node.js.map +1 -1
- package/dist/scenegraph/model-node.d.ts +2 -2
- package/dist/scenegraph/model-node.d.ts.map +1 -1
- package/dist/scenegraph/model-node.js.map +1 -1
- package/dist/scenegraph/scenegraph-node.d.ts +1 -1
- package/dist/scenegraph/scenegraph-node.d.ts.map +1 -1
- package/dist/scenegraph/scenegraph-node.js +23 -15
- package/dist/scenegraph/scenegraph-node.js.map +1 -1
- package/package.json +2 -2
- package/src/animation-loop/animation-loop.ts +75 -46
- package/src/animation-loop/make-animation-loop.ts +13 -5
- package/src/animation-loop/request-animation-frame.ts +32 -6
- package/src/dynamic-texture/dynamic-texture.ts +226 -65
- package/src/dynamic-texture/texture-data.ts +14 -0
- package/src/factories/pipeline-factory.ts +87 -46
- package/src/factories/shader-factory.ts +16 -20
- package/src/geometries/cone-geometry.ts +6 -1
- package/src/geometries/cylinder-geometry.ts +5 -1
- package/src/model/model.ts +14 -10
- package/src/models/billboard-texture-model.ts +10 -8
- package/src/models/clip-space.ts +7 -7
- package/src/modules/picking/index-picking.ts +0 -6
- package/src/passes/get-fragment-shader.ts +11 -30
- package/src/passes/shader-pass-renderer.ts +4 -33
- package/src/scenegraph/group-node.ts +16 -0
- package/src/scenegraph/model-node.ts +2 -2
- package/src/scenegraph/scenegraph-node.ts +27 -16
- package/dist/dynamic-texture/mipmaps.d.ts +0 -6
- package/dist/dynamic-texture/mipmaps.d.ts.map +0 -1
- package/dist/dynamic-texture/mipmaps.js +0 -441
- package/dist/dynamic-texture/mipmaps.js.map +0 -1
- package/src/dynamic-texture/mipmaps.ts +0 -517
|
@@ -15,13 +15,11 @@ export class PipelineFactory {
|
|
|
15
15
|
return moduleData.defaultPipelineFactory;
|
|
16
16
|
}
|
|
17
17
|
device;
|
|
18
|
-
cachingEnabled;
|
|
19
|
-
destroyPolicy;
|
|
20
|
-
debug;
|
|
21
18
|
_hashCounter = 0;
|
|
22
19
|
_hashes = {};
|
|
23
20
|
_renderPipelineCache = {};
|
|
24
21
|
_computePipelineCache = {};
|
|
22
|
+
_sharedRenderPipelineCache = {};
|
|
25
23
|
get [Symbol.toStringTag]() {
|
|
26
24
|
return 'PipelineFactory';
|
|
27
25
|
}
|
|
@@ -30,68 +28,69 @@ export class PipelineFactory {
|
|
|
30
28
|
}
|
|
31
29
|
constructor(device) {
|
|
32
30
|
this.device = device;
|
|
33
|
-
this.cachingEnabled = device.props._cachePipelines;
|
|
34
|
-
this.destroyPolicy = device.props._cacheDestroyPolicy;
|
|
35
|
-
this.debug = device.props.debugFactories;
|
|
36
31
|
}
|
|
37
32
|
/** Return a RenderPipeline matching supplied props. Reuses an equivalent pipeline if already created. */
|
|
38
33
|
createRenderPipeline(props) {
|
|
39
|
-
if (!this.
|
|
34
|
+
if (!this.device.props._cachePipelines) {
|
|
40
35
|
return this.device.createRenderPipeline(props);
|
|
41
36
|
}
|
|
42
37
|
const allProps = { ...RenderPipeline.defaultProps, ...props };
|
|
43
38
|
const cache = this._renderPipelineCache;
|
|
44
39
|
const hash = this._hashRenderPipeline(allProps);
|
|
45
|
-
let pipeline = cache[hash]?.
|
|
40
|
+
let pipeline = cache[hash]?.resource;
|
|
46
41
|
if (!pipeline) {
|
|
42
|
+
const sharedRenderPipeline = this.device.type === 'webgl' && this.device.props._sharePipelines
|
|
43
|
+
? this.createSharedRenderPipeline(allProps)
|
|
44
|
+
: undefined;
|
|
47
45
|
pipeline = this.device.createRenderPipeline({
|
|
48
46
|
...allProps,
|
|
49
|
-
id: allProps.id ? `${allProps.id}-cached` : uid('unnamed-cached')
|
|
47
|
+
id: allProps.id ? `${allProps.id}-cached` : uid('unnamed-cached'),
|
|
48
|
+
_sharedRenderPipeline: sharedRenderPipeline
|
|
50
49
|
});
|
|
51
50
|
pipeline.hash = hash;
|
|
52
|
-
cache[hash] = { pipeline, useCount: 1 };
|
|
53
|
-
if (this.
|
|
51
|
+
cache[hash] = { resource: pipeline, useCount: 1 };
|
|
52
|
+
if (this.device.props.debugFactories) {
|
|
54
53
|
log.log(3, `${this}: ${pipeline} created, count=${cache[hash].useCount}`)();
|
|
55
54
|
}
|
|
56
55
|
}
|
|
57
56
|
else {
|
|
58
57
|
cache[hash].useCount++;
|
|
59
|
-
if (this.
|
|
60
|
-
log.log(3, `${this}: ${cache[hash].
|
|
58
|
+
if (this.device.props.debugFactories) {
|
|
59
|
+
log.log(3, `${this}: ${cache[hash].resource} reused, count=${cache[hash].useCount}, (id=${props.id})`)();
|
|
61
60
|
}
|
|
62
61
|
}
|
|
63
62
|
return pipeline;
|
|
64
63
|
}
|
|
65
64
|
/** Return a ComputePipeline matching supplied props. Reuses an equivalent pipeline if already created. */
|
|
66
65
|
createComputePipeline(props) {
|
|
67
|
-
if (!this.
|
|
66
|
+
if (!this.device.props._cachePipelines) {
|
|
68
67
|
return this.device.createComputePipeline(props);
|
|
69
68
|
}
|
|
70
69
|
const allProps = { ...ComputePipeline.defaultProps, ...props };
|
|
71
70
|
const cache = this._computePipelineCache;
|
|
72
71
|
const hash = this._hashComputePipeline(allProps);
|
|
73
|
-
let pipeline = cache[hash]?.
|
|
72
|
+
let pipeline = cache[hash]?.resource;
|
|
74
73
|
if (!pipeline) {
|
|
75
74
|
pipeline = this.device.createComputePipeline({
|
|
76
75
|
...allProps,
|
|
77
76
|
id: allProps.id ? `${allProps.id}-cached` : undefined
|
|
78
77
|
});
|
|
79
78
|
pipeline.hash = hash;
|
|
80
|
-
cache[hash] = { pipeline, useCount: 1 };
|
|
81
|
-
if (this.
|
|
79
|
+
cache[hash] = { resource: pipeline, useCount: 1 };
|
|
80
|
+
if (this.device.props.debugFactories) {
|
|
82
81
|
log.log(3, `${this}: ${pipeline} created, count=${cache[hash].useCount}`)();
|
|
83
82
|
}
|
|
84
83
|
}
|
|
85
84
|
else {
|
|
86
85
|
cache[hash].useCount++;
|
|
87
|
-
if (this.
|
|
88
|
-
log.log(3, `${this}: ${cache[hash].
|
|
86
|
+
if (this.device.props.debugFactories) {
|
|
87
|
+
log.log(3, `${this}: ${cache[hash].resource} reused, count=${cache[hash].useCount}, (id=${props.id})`)();
|
|
89
88
|
}
|
|
90
89
|
}
|
|
91
90
|
return pipeline;
|
|
92
91
|
}
|
|
93
92
|
release(pipeline) {
|
|
94
|
-
if (!this.
|
|
93
|
+
if (!this.device.props._cachePipelines) {
|
|
95
94
|
pipeline.destroy();
|
|
96
95
|
return;
|
|
97
96
|
}
|
|
@@ -100,7 +99,7 @@ export class PipelineFactory {
|
|
|
100
99
|
cache[hash].useCount--;
|
|
101
100
|
if (cache[hash].useCount === 0) {
|
|
102
101
|
this._destroyPipeline(pipeline);
|
|
103
|
-
if (this.
|
|
102
|
+
if (this.device.props.debugFactories) {
|
|
104
103
|
log.log(3, `${this}: ${pipeline} released and destroyed`)();
|
|
105
104
|
}
|
|
106
105
|
}
|
|
@@ -108,22 +107,49 @@ export class PipelineFactory {
|
|
|
108
107
|
log.error(`${this}: ${pipeline} released, useCount < 0, resetting`)();
|
|
109
108
|
cache[hash].useCount = 0;
|
|
110
109
|
}
|
|
111
|
-
else if (this.
|
|
110
|
+
else if (this.device.props.debugFactories) {
|
|
112
111
|
log.log(3, `${this}: ${pipeline} released, count=${cache[hash].useCount}`)();
|
|
113
112
|
}
|
|
114
113
|
}
|
|
114
|
+
createSharedRenderPipeline(props) {
|
|
115
|
+
const sharedPipelineHash = this._hashSharedRenderPipeline(props);
|
|
116
|
+
let sharedCacheItem = this._sharedRenderPipelineCache[sharedPipelineHash];
|
|
117
|
+
if (!sharedCacheItem) {
|
|
118
|
+
const sharedRenderPipeline = this.device._createSharedRenderPipelineWebGL(props);
|
|
119
|
+
sharedCacheItem = { resource: sharedRenderPipeline, useCount: 0 };
|
|
120
|
+
this._sharedRenderPipelineCache[sharedPipelineHash] = sharedCacheItem;
|
|
121
|
+
}
|
|
122
|
+
sharedCacheItem.useCount++;
|
|
123
|
+
return sharedCacheItem.resource;
|
|
124
|
+
}
|
|
125
|
+
releaseSharedRenderPipeline(pipeline) {
|
|
126
|
+
if (!pipeline.sharedRenderPipeline) {
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
const sharedPipelineHash = this._hashSharedRenderPipeline(pipeline.sharedRenderPipeline.props);
|
|
130
|
+
const sharedCacheItem = this._sharedRenderPipelineCache[sharedPipelineHash];
|
|
131
|
+
if (!sharedCacheItem) {
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
134
|
+
sharedCacheItem.useCount--;
|
|
135
|
+
if (sharedCacheItem.useCount === 0) {
|
|
136
|
+
sharedCacheItem.resource.destroy();
|
|
137
|
+
delete this._sharedRenderPipelineCache[sharedPipelineHash];
|
|
138
|
+
}
|
|
139
|
+
}
|
|
115
140
|
// PRIVATE
|
|
116
|
-
/** Destroy a cached pipeline, removing it from the cache
|
|
141
|
+
/** Destroy a cached pipeline, removing it from the cache if configured to do so. */
|
|
117
142
|
_destroyPipeline(pipeline) {
|
|
118
143
|
const cache = this._getCache(pipeline);
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
return false;
|
|
122
|
-
case 'unused':
|
|
123
|
-
delete cache[pipeline.hash];
|
|
124
|
-
pipeline.destroy();
|
|
125
|
-
return true;
|
|
144
|
+
if (!this.device.props._destroyPipelines) {
|
|
145
|
+
return false;
|
|
126
146
|
}
|
|
147
|
+
delete cache[pipeline.hash];
|
|
148
|
+
pipeline.destroy();
|
|
149
|
+
if (pipeline instanceof RenderPipeline) {
|
|
150
|
+
this.releaseSharedRenderPipeline(pipeline);
|
|
151
|
+
}
|
|
152
|
+
return true;
|
|
127
153
|
}
|
|
128
154
|
/** Get the appropriate cache for the type of pipeline */
|
|
129
155
|
_getCache(pipeline) {
|
|
@@ -152,16 +178,15 @@ export class PipelineFactory {
|
|
|
152
178
|
_hashRenderPipeline(props) {
|
|
153
179
|
const vsHash = props.vs ? this._getHash(props.vs.source) : 0;
|
|
154
180
|
const fsHash = props.fs ? this._getHash(props.fs.source) : 0;
|
|
155
|
-
|
|
156
|
-
// const {varyings = [], bufferMode = {}} = props;
|
|
157
|
-
// const varyingHashes = varyings.map((v) => this._getHash(v));
|
|
158
|
-
const varyingHash = '-'; // `${varyingHashes.join('/')}B${bufferMode}`
|
|
181
|
+
const varyingHash = this._getWebGLVaryingHash(props);
|
|
159
182
|
const bufferLayoutHash = this._getHash(JSON.stringify(props.bufferLayout));
|
|
160
183
|
const { type } = this.device;
|
|
161
184
|
switch (type) {
|
|
162
185
|
case 'webgl':
|
|
163
|
-
// WebGL
|
|
164
|
-
|
|
186
|
+
// WebGL wrappers preserve default topology and parameter semantics for direct
|
|
187
|
+
// callers, even though the underlying linked program may be shared separately.
|
|
188
|
+
const webglParameterHash = this._getHash(JSON.stringify(props.parameters));
|
|
189
|
+
return `${type}/R/${vsHash}/${fsHash}V${varyingHash}T${props.topology}P${webglParameterHash}BL${bufferLayoutHash}`;
|
|
165
190
|
case 'webgpu':
|
|
166
191
|
default:
|
|
167
192
|
// On WebGPU we need to rebuild the pipeline if topology, parameters or bufferLayout change
|
|
@@ -171,11 +196,21 @@ export class PipelineFactory {
|
|
|
171
196
|
return `${type}/R/${vsHash}/${fsHash}V${varyingHash}T${props.topology}P${parameterHash}BL${bufferLayoutHash}`;
|
|
172
197
|
}
|
|
173
198
|
}
|
|
199
|
+
_hashSharedRenderPipeline(props) {
|
|
200
|
+
const vsHash = props.vs ? this._getHash(props.vs.source) : 0;
|
|
201
|
+
const fsHash = props.fs ? this._getHash(props.fs.source) : 0;
|
|
202
|
+
const varyingHash = this._getWebGLVaryingHash(props);
|
|
203
|
+
return `webgl/S/${vsHash}/${fsHash}V${varyingHash}`;
|
|
204
|
+
}
|
|
174
205
|
_getHash(key) {
|
|
175
206
|
if (this._hashes[key] === undefined) {
|
|
176
207
|
this._hashes[key] = this._hashCounter++;
|
|
177
208
|
}
|
|
178
209
|
return this._hashes[key];
|
|
179
210
|
}
|
|
211
|
+
_getWebGLVaryingHash(props) {
|
|
212
|
+
const { varyings = [], bufferMode = null } = props;
|
|
213
|
+
return this._getHash(JSON.stringify({ varyings, bufferMode }));
|
|
214
|
+
}
|
|
180
215
|
}
|
|
181
216
|
//# sourceMappingURL=pipeline-factory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline-factory.js","sourceRoot":"","sources":["../../src/factories/pipeline-factory.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAS,cAAc,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"pipeline-factory.js","sourceRoot":"","sources":["../../src/factories/pipeline-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,6 @@ export declare class ShaderFactory {
|
|
|
5
5
|
/** Returns the default ShaderFactory for the given {@link Device}, creating one if necessary. */
|
|
6
6
|
static getDefaultShaderFactory(device: Device): ShaderFactory;
|
|
7
7
|
readonly device: Device;
|
|
8
|
-
readonly cachingEnabled: boolean;
|
|
9
|
-
readonly destroyPolicy: 'unused' | 'never';
|
|
10
|
-
readonly debug: boolean;
|
|
11
8
|
private readonly _cache;
|
|
12
9
|
get [Symbol.toStringTag](): string;
|
|
13
10
|
toString(): string;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAK/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;IAM7D,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;IAExD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;IAED,QAAQ,IAAI,MAAM;IAIlB,gBAAgB;gBACJ,MAAM,EAAE,MAAM;IAI1B,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"}
|
|
@@ -12,9 +12,6 @@ export class ShaderFactory {
|
|
|
12
12
|
return moduleData.defaultShaderFactory;
|
|
13
13
|
}
|
|
14
14
|
device;
|
|
15
|
-
cachingEnabled;
|
|
16
|
-
destroyPolicy;
|
|
17
|
-
debug;
|
|
18
15
|
_cache = {};
|
|
19
16
|
get [Symbol.toStringTag]() {
|
|
20
17
|
return 'ShaderFactory';
|
|
@@ -25,38 +22,35 @@ export class ShaderFactory {
|
|
|
25
22
|
/** @internal */
|
|
26
23
|
constructor(device) {
|
|
27
24
|
this.device = device;
|
|
28
|
-
this.cachingEnabled = device.props._cacheShaders;
|
|
29
|
-
this.destroyPolicy = device.props._cacheDestroyPolicy;
|
|
30
|
-
this.debug = true; // device.props.debugFactories;
|
|
31
25
|
}
|
|
32
26
|
/** Requests a {@link Shader} from the cache, creating a new Shader only if necessary. */
|
|
33
27
|
createShader(props) {
|
|
34
|
-
if (!this.
|
|
28
|
+
if (!this.device.props._cacheShaders) {
|
|
35
29
|
return this.device.createShader(props);
|
|
36
30
|
}
|
|
37
31
|
const key = this._hashShader(props);
|
|
38
32
|
let cacheEntry = this._cache[key];
|
|
39
33
|
if (!cacheEntry) {
|
|
40
|
-
const
|
|
34
|
+
const resource = this.device.createShader({
|
|
41
35
|
...props,
|
|
42
36
|
id: props.id ? `${props.id}-cached` : undefined
|
|
43
37
|
});
|
|
44
|
-
this._cache[key] = cacheEntry = {
|
|
45
|
-
if (this.
|
|
46
|
-
log.log(3, `${this}: Created new shader ${
|
|
38
|
+
this._cache[key] = cacheEntry = { resource, useCount: 1 };
|
|
39
|
+
if (this.device.props.debugFactories) {
|
|
40
|
+
log.log(3, `${this}: Created new shader ${resource.id}`)();
|
|
47
41
|
}
|
|
48
42
|
}
|
|
49
43
|
else {
|
|
50
44
|
cacheEntry.useCount++;
|
|
51
|
-
if (this.
|
|
52
|
-
log.log(3, `${this}: Reusing shader ${cacheEntry.
|
|
45
|
+
if (this.device.props.debugFactories) {
|
|
46
|
+
log.log(3, `${this}: Reusing shader ${cacheEntry.resource.id} count=${cacheEntry.useCount}`)();
|
|
53
47
|
}
|
|
54
48
|
}
|
|
55
|
-
return cacheEntry.
|
|
49
|
+
return cacheEntry.resource;
|
|
56
50
|
}
|
|
57
51
|
/** Releases a previously-requested {@link Shader}, destroying it if no users remain. */
|
|
58
52
|
release(shader) {
|
|
59
|
-
if (!this.
|
|
53
|
+
if (!this.device.props._cacheShaders) {
|
|
60
54
|
shader.destroy();
|
|
61
55
|
return;
|
|
62
56
|
}
|
|
@@ -65,10 +59,10 @@ export class ShaderFactory {
|
|
|
65
59
|
if (cacheEntry) {
|
|
66
60
|
cacheEntry.useCount--;
|
|
67
61
|
if (cacheEntry.useCount === 0) {
|
|
68
|
-
if (this.
|
|
62
|
+
if (this.device.props._destroyShaders) {
|
|
69
63
|
delete this._cache[key];
|
|
70
|
-
cacheEntry.
|
|
71
|
-
if (this.
|
|
64
|
+
cacheEntry.resource.destroy();
|
|
65
|
+
if (this.device.props.debugFactories) {
|
|
72
66
|
log.log(3, `${this}: Releasing shader ${shader.id}, destroyed`)();
|
|
73
67
|
}
|
|
74
68
|
}
|
|
@@ -76,7 +70,7 @@ export class ShaderFactory {
|
|
|
76
70
|
else if (cacheEntry.useCount < 0) {
|
|
77
71
|
throw new Error(`ShaderFactory: Shader ${shader.id} released too many times`);
|
|
78
72
|
}
|
|
79
|
-
else if (this.
|
|
73
|
+
else if (this.device.props.debugFactories) {
|
|
80
74
|
log.log(3, `${this}: Releasing shader ${shader.id} count=${cacheEntry.useCount}`)();
|
|
81
75
|
}
|
|
82
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shader-factory.js","sourceRoot":"","sources":["../../src/factories/shader-factory.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAS,MAAM,EAAe,GAAG,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"shader-factory.js","sourceRoot":"","sources":["../../src/factories/shader-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import type { TruncatedConeGeometryProps } from "./truncated-cone-geometry.js";
|
|
1
2
|
import { TruncatedConeGeometry } from "./truncated-cone-geometry.js";
|
|
2
|
-
export type ConeGeometryProps = {
|
|
3
|
+
export type ConeGeometryProps = Omit<TruncatedConeGeometryProps, 'topRadius' | 'bottomRadius' | 'topCap' | 'bottomCap'> & {
|
|
3
4
|
id?: string;
|
|
4
5
|
radius?: number;
|
|
5
6
|
cap?: boolean;
|
|
7
|
+
attributes?: any;
|
|
6
8
|
};
|
|
7
9
|
export declare class ConeGeometry extends TruncatedConeGeometry {
|
|
8
10
|
constructor(props?: ConeGeometryProps);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cone-geometry.d.ts","sourceRoot":"","sources":["../../src/geometries/cone-geometry.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,qBAAqB,EAAC,qCAAkC;AAGhE,MAAM,MAAM,iBAAiB,GAAG;
|
|
1
|
+
{"version":3,"file":"cone-geometry.d.ts","sourceRoot":"","sources":["../../src/geometries/cone-geometry.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,0BAA0B,EAAC,qCAAkC;AAC1E,OAAO,EAAC,qBAAqB,EAAC,qCAAkC;AAGhE,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,0BAA0B,EAC1B,WAAW,GAAG,cAAc,GAAG,QAAQ,GAAG,WAAW,CACtD,GAAG;IACF,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB,CAAC;AAEF,qBAAa,YAAa,SAAQ,qBAAqB;gBACzC,KAAK,GAAE,iBAAsB;CAW1C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cone-geometry.js","sourceRoot":"","sources":["../../src/geometries/cone-geometry.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;
|
|
1
|
+
{"version":3,"file":"cone-geometry.js","sourceRoot":"","sources":["../../src/geometries/cone-geometry.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,qBAAqB,EAAC,qCAAkC;AAChE,OAAO,EAAC,GAAG,EAAC,wBAAqB;AAYjC,MAAM,OAAO,YAAa,SAAQ,qBAAqB;IACrD,YAAY,QAA2B,EAAE;QACvC,MAAM,EAAC,EAAE,GAAG,GAAG,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI,EAAC,GAAG,KAAK,CAAC;QAClE,KAAK,CAAC;YACJ,GAAG,KAAK;YACR,EAAE;YACF,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC;YACpB,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC;YACvB,YAAY,EAAE,MAAM;SACrB,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import type { TruncatedConeGeometryProps } from "./truncated-cone-geometry.js";
|
|
1
2
|
import { TruncatedConeGeometry } from "./truncated-cone-geometry.js";
|
|
2
|
-
export type CylinderGeometryProps = {
|
|
3
|
+
export type CylinderGeometryProps = Omit<TruncatedConeGeometryProps, 'topRadius' | 'bottomRadius'> & {
|
|
3
4
|
id?: string;
|
|
4
5
|
radius?: number;
|
|
5
6
|
attributes?: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cylinder-geometry.d.ts","sourceRoot":"","sources":["../../src/geometries/cylinder-geometry.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,qBAAqB,EAAC,qCAAkC;AAGhE,MAAM,MAAM,qBAAqB,GAAG;
|
|
1
|
+
{"version":3,"file":"cylinder-geometry.d.ts","sourceRoot":"","sources":["../../src/geometries/cylinder-geometry.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,0BAA0B,EAAC,qCAAkC;AAC1E,OAAO,EAAC,qBAAqB,EAAC,qCAAkC;AAGhE,MAAM,MAAM,qBAAqB,GAAG,IAAI,CACtC,0BAA0B,EAC1B,WAAW,GAAG,cAAc,CAC7B,GAAG;IACF,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB,CAAC;AAEF,qBAAa,gBAAiB,SAAQ,qBAAqB;gBAC7C,KAAK,GAAE,qBAA0B;CAS9C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cylinder-geometry.js","sourceRoot":"","sources":["../../src/geometries/cylinder-geometry.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;
|
|
1
|
+
{"version":3,"file":"cylinder-geometry.js","sourceRoot":"","sources":["../../src/geometries/cylinder-geometry.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,qBAAqB,EAAC,qCAAkC;AAChE,OAAO,EAAC,GAAG,EAAC,wBAAqB;AAWjC,MAAM,OAAO,gBAAiB,SAAQ,qBAAqB;IACzD,YAAY,QAA+B,EAAE;QAC3C,MAAM,EAAC,EAAE,GAAG,GAAG,CAAC,mBAAmB,CAAC,EAAE,MAAM,GAAG,CAAC,EAAC,GAAG,KAAK,CAAC;QAC1D,KAAK,CAAC;YACJ,GAAG,KAAK;YACR,EAAE;YACF,YAAY,EAAE,MAAM;YACpB,SAAS,EAAE,MAAM;SAClB,CAAC,CAAC;IACL,CAAC;CACF"}
|