|
@@ -80077,9 +80077,9 @@ var NodeMaterialBlock = /** @class */ (function () {
|
|
NodeMaterialBlock.prototype._deserialize = function (serializationObject, scene, rootUrl) {
|
|
NodeMaterialBlock.prototype._deserialize = function (serializationObject, scene, rootUrl) {
|
|
this.name = serializationObject.name;
|
|
this.name = serializationObject.name;
|
|
this.comments = serializationObject.comments;
|
|
this.comments = serializationObject.comments;
|
|
- this._deserializePortDisplayNames(serializationObject);
|
|
|
|
|
|
+ this._deserializePortDisplayNamesAndExposedOnFrame(serializationObject);
|
|
};
|
|
};
|
|
- NodeMaterialBlock.prototype._deserializePortDisplayNames = function (serializationObject) {
|
|
|
|
|
|
+ NodeMaterialBlock.prototype._deserializePortDisplayNamesAndExposedOnFrame = function (serializationObject) {
|
|
var _this = this;
|
|
var _this = this;
|
|
var serializedInputs = serializationObject.inputs;
|
|
var serializedInputs = serializationObject.inputs;
|
|
var serializedOutputs = serializationObject.outputs;
|
|
var serializedOutputs = serializationObject.outputs;
|
|
@@ -80088,6 +80088,9 @@ var NodeMaterialBlock = /** @class */ (function () {
|
|
if (port.displayName) {
|
|
if (port.displayName) {
|
|
_this.inputs[i].displayName = port.displayName;
|
|
_this.inputs[i].displayName = port.displayName;
|
|
}
|
|
}
|
|
|
|
+ if (port.isExposedOnFrame) {
|
|
|
|
+ _this.inputs[i].isExposedOnFrame = port.isExposedOnFrame;
|
|
|
|
+ }
|
|
});
|
|
});
|
|
}
|
|
}
|
|
if (serializedOutputs) {
|
|
if (serializedOutputs) {
|
|
@@ -80095,6 +80098,9 @@ var NodeMaterialBlock = /** @class */ (function () {
|
|
if (port.displayName) {
|
|
if (port.displayName) {
|
|
_this.outputs[i].displayName = port.displayName;
|
|
_this.outputs[i].displayName = port.displayName;
|
|
}
|
|
}
|
|
|
|
+ if (port.isExposedOnFrame) {
|
|
|
|
+ _this.outputs[i].isExposedOnFrame = port.isExposedOnFrame;
|
|
|
|
+ }
|
|
});
|
|
});
|
|
}
|
|
}
|
|
};
|
|
};
|
|
@@ -80193,6 +80199,10 @@ var NodeMaterialConnectionPoint = /** @class */ (function () {
|
|
* Observable triggered when this point is connected
|
|
* Observable triggered when this point is connected
|
|
*/
|
|
*/
|
|
this.onConnectionObservable = new _Misc_observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]();
|
|
this.onConnectionObservable = new _Misc_observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]();
|
|
|
|
+ /**
|
|
|
|
+ * Gets or sets a boolean indicating that this connection point is exposed on a frame
|
|
|
|
+ */
|
|
|
|
+ this.isExposedOnFrame = false;
|
|
/** @hidden */
|
|
/** @hidden */
|
|
this._prioritizeVertex = false;
|
|
this._prioritizeVertex = false;
|
|
this._target = _Enums_nodeMaterialBlockTargets__WEBPACK_IMPORTED_MODULE_1__["NodeMaterialBlockTargets"].VertexAndFragment;
|
|
this._target = _Enums_nodeMaterialBlockTargets__WEBPACK_IMPORTED_MODULE_1__["NodeMaterialBlockTargets"].VertexAndFragment;
|
|
@@ -80559,6 +80569,9 @@ var NodeMaterialConnectionPoint = /** @class */ (function () {
|
|
serializationObject.targetBlockId = this.connectedPoint.ownerBlock.uniqueId;
|
|
serializationObject.targetBlockId = this.connectedPoint.ownerBlock.uniqueId;
|
|
serializationObject.targetConnectionName = this.connectedPoint.name;
|
|
serializationObject.targetConnectionName = this.connectedPoint.name;
|
|
}
|
|
}
|
|
|
|
+ if (this.isExposedOnFrame) {
|
|
|
|
+ serializationObject.isExposedOnFrame = this.isExposedOnFrame;
|
|
|
|
+ }
|
|
return serializationObject;
|
|
return serializationObject;
|
|
};
|
|
};
|
|
/**
|
|
/**
|
|
@@ -81674,7 +81687,7 @@ var PBRMaterialDefines = /** @class */ (function (_super) {
|
|
function PBRMaterialDefines() {
|
|
function PBRMaterialDefines() {
|
|
var _this = _super.call(this) || this;
|
|
var _this = _super.call(this) || this;
|
|
_this.PBR = true;
|
|
_this.PBR = true;
|
|
- _this.NUM_SAMPLES = "0u";
|
|
|
|
|
|
+ _this.NUM_SAMPLES = "0";
|
|
_this.REALTIME_FILTERING = false;
|
|
_this.REALTIME_FILTERING = false;
|
|
_this.MAINUV1 = false;
|
|
_this.MAINUV1 = false;
|
|
_this.MAINUV2 = false;
|
|
_this.MAINUV2 = false;
|
|
@@ -98583,30 +98596,16 @@ var Material = /** @class */ (function () {
|
|
var allDone = true, lastError = null;
|
|
var allDone = true, lastError = null;
|
|
if (mesh.subMeshes) {
|
|
if (mesh.subMeshes) {
|
|
var tempSubMesh = new _Meshes_subMesh__WEBPACK_IMPORTED_MODULE_5__["SubMesh"](0, 0, 0, 0, 0, mesh, undefined, false, false);
|
|
var tempSubMesh = new _Meshes_subMesh__WEBPACK_IMPORTED_MODULE_5__["SubMesh"](0, 0, 0, 0, 0, mesh, undefined, false, false);
|
|
- if (_this._storeEffectOnSubMeshes) {
|
|
|
|
- if (tempSubMesh._materialDefines) {
|
|
|
|
- tempSubMesh._materialDefines._renderId = -1;
|
|
|
|
- }
|
|
|
|
- if (!_this.isReadyForSubMesh(mesh, tempSubMesh, localOptions.useInstances)) {
|
|
|
|
- if (tempSubMesh.effect && tempSubMesh.effect.getCompilationError() && tempSubMesh.effect.allFallbacksProcessed()) {
|
|
|
|
- lastError = tempSubMesh.effect.getCompilationError();
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- allDone = false;
|
|
|
|
- setTimeout(checkReady, 16);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ if (tempSubMesh._materialDefines) {
|
|
|
|
+ tempSubMesh._materialDefines._renderId = -1;
|
|
}
|
|
}
|
|
- else {
|
|
|
|
- tempSubMesh._renderId = -1;
|
|
|
|
- if (!_this.isReady(mesh, localOptions.useInstances)) {
|
|
|
|
- if (_this.getEffect() && _this.getEffect().getCompilationError() && _this.getEffect().allFallbacksProcessed()) {
|
|
|
|
- lastError = _this.getEffect().getCompilationError();
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- allDone = false;
|
|
|
|
- setTimeout(checkReady, 16);
|
|
|
|
- }
|
|
|
|
|
|
+ if (!_this.isReadyForSubMesh(mesh, tempSubMesh, localOptions.useInstances)) {
|
|
|
|
+ if (tempSubMesh.effect && tempSubMesh.effect.getCompilationError() && tempSubMesh.effect.allFallbacksProcessed()) {
|
|
|
|
+ lastError = tempSubMesh.effect.getCompilationError();
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
|
|
+ allDone = false;
|
|
|
|
+ setTimeout(checkReady, 16);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|