@luma.gl/engine 9.0.0-beta.9 → 9.0.3
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/dist.dev.js +9 -12
- package/dist/dist.min.js +7 -7
- package/dist/index.cjs +9 -12
- package/dist/index.cjs.map +2 -2
- package/dist/model/model.d.ts +6 -4
- package/dist/model/model.d.ts.map +1 -1
- package/dist/model/model.js +9 -13
- package/package.json +4 -4
- package/src/model/model.ts +17 -20
package/dist/dist.dev.js
CHANGED
|
@@ -7229,15 +7229,12 @@ void main() {
|
|
|
7229
7229
|
if (props.instanceCount) {
|
|
7230
7230
|
this.setInstanceCount(props.instanceCount);
|
|
7231
7231
|
}
|
|
7232
|
-
if (props.indices) {
|
|
7233
|
-
throw new Error("Model.props.indices removed. Use props.indexBuffer");
|
|
7234
|
-
}
|
|
7235
7232
|
if (props.indexBuffer) {
|
|
7236
7233
|
this.setIndexBuffer(props.indexBuffer);
|
|
7237
7234
|
}
|
|
7238
7235
|
if (props.attributes) {
|
|
7239
7236
|
this.setAttributes(props.attributes, {
|
|
7240
|
-
|
|
7237
|
+
disableWarnings: props.disableWarnings
|
|
7241
7238
|
});
|
|
7242
7239
|
}
|
|
7243
7240
|
if (props.constantAttributes) {
|
|
@@ -7294,7 +7291,7 @@ void main() {
|
|
|
7294
7291
|
try {
|
|
7295
7292
|
this._logDrawCallStart();
|
|
7296
7293
|
this.pipeline = this._updatePipeline();
|
|
7297
|
-
this.pipeline.setBindings(this.bindings);
|
|
7294
|
+
this.pipeline.setBindings(this.bindings, { disableWarnings: this.props.disableWarnings });
|
|
7298
7295
|
if (!(0, import_core11.isObjectEmpty)(this.uniforms)) {
|
|
7299
7296
|
this.pipeline.setUniformsWebGL(this.uniforms);
|
|
7300
7297
|
}
|
|
@@ -7453,7 +7450,7 @@ void main() {
|
|
|
7453
7450
|
set = true;
|
|
7454
7451
|
}
|
|
7455
7452
|
}
|
|
7456
|
-
if (!set && (options?.
|
|
7453
|
+
if (!set && !(options?.disableWarnings || this.props.disableWarnings)) {
|
|
7457
7454
|
import_core11.log.warn(
|
|
7458
7455
|
`Model(${this.id}): Ignoring buffer "${buffer.id}" for unknown attribute "${bufferName}"`
|
|
7459
7456
|
)();
|
|
@@ -7469,12 +7466,12 @@ void main() {
|
|
|
7469
7466
|
* is read from the context's global constant value for that attribute location.
|
|
7470
7467
|
* @param constantAttributes
|
|
7471
7468
|
*/
|
|
7472
|
-
setConstantAttributes(attributes) {
|
|
7469
|
+
setConstantAttributes(attributes, options) {
|
|
7473
7470
|
for (const [attributeName, value] of Object.entries(attributes)) {
|
|
7474
7471
|
const attributeInfo = this._attributeInfos[attributeName];
|
|
7475
7472
|
if (attributeInfo) {
|
|
7476
7473
|
this.vertexArray.setConstantWebGL(attributeInfo.location, value);
|
|
7477
|
-
} else {
|
|
7474
|
+
} else if (!(options?.disableWarnings || this.props.disableWarnings)) {
|
|
7478
7475
|
import_core11.log.warn(
|
|
7479
7476
|
`Model "${this.id}: Ignoring constant supplied for unknown attribute "${attributeName}"`
|
|
7480
7477
|
)();
|
|
@@ -7533,9 +7530,9 @@ void main() {
|
|
|
7533
7530
|
}
|
|
7534
7531
|
}
|
|
7535
7532
|
this.vertexCount = gpuGeometry.vertexCount;
|
|
7536
|
-
this.setIndexBuffer(gpuGeometry.indices);
|
|
7537
|
-
this.setAttributes(gpuGeometry.attributes, {
|
|
7538
|
-
this.setAttributes(attributes, {
|
|
7533
|
+
this.setIndexBuffer(gpuGeometry.indices || null);
|
|
7534
|
+
this.setAttributes(gpuGeometry.attributes, { disableWarnings: true });
|
|
7535
|
+
this.setAttributes(attributes, { disableWarnings: this.props.disableWarnings });
|
|
7539
7536
|
this.setNeedsRedraw("geometry attributes");
|
|
7540
7537
|
}
|
|
7541
7538
|
/** Mark pipeline as needing update */
|
|
@@ -7686,7 +7683,7 @@ void main() {
|
|
|
7686
7683
|
transformFeedback: void 0,
|
|
7687
7684
|
shaderAssembler: ShaderAssembler.getDefaultShaderAssembler(),
|
|
7688
7685
|
debugShaders: void 0,
|
|
7689
|
-
|
|
7686
|
+
disableWarnings: void 0
|
|
7690
7687
|
});
|
|
7691
7688
|
function mergeBufferLayouts(layouts1, layouts2) {
|
|
7692
7689
|
const layouts = [...layouts1];
|