Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #12150 #12806

Merged
merged 1 commit into from
Jul 28, 2022
Merged

Fix #12150 #12806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 84 additions & 1 deletion packages/dev/core/src/Materials/Node/Blocks/Vertex/lightInformationBlock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,17 @@ import type { Mesh } from "../../../../Meshes/mesh";
import type { Light } from "../../../../Lights/light";
import { PointLight } from "../../../../Lights/pointLight";
import type { AbstractMesh } from "../../../../Meshes/abstractMesh";
import type { ShadowGenerator } from "../../../../Lights/Shadows/shadowGenerator";
import type { ShadowLight } from "../../../../Lights";

/**
* Block used to get data information from a light
*/
export class LightInformationBlock extends NodeMaterialBlock {
private _lightDataUniformName: string;
private _lightColorUniformName: string;
private _lightShadowUniformName: string;
private _lightShadowExtraUniformName: string;
private _lightTypeDefineName: string;
private _forcePrepareDefines: boolean;

Expand All @@ -37,6 +42,10 @@ export class LightInformationBlock extends NodeMaterialBlock {
this.registerOutput("direction", NodeMaterialBlockConnectionPointTypes.Vector3);
this.registerOutput("color", NodeMaterialBlockConnectionPointTypes.Color3);
this.registerOutput("intensity", NodeMaterialBlockConnectionPointTypes.Float);
this.registerOutput("shadowBias", NodeMaterialBlockConnectionPointTypes.Float);
this.registerOutput("shadowNormalBias", NodeMaterialBlockConnectionPointTypes.Float);
this.registerOutput("shadowDepthScale", NodeMaterialBlockConnectionPointTypes.Float);
this.registerOutput("shadowDepthRange", NodeMaterialBlockConnectionPointTypes.Vector2);
}

/**
Expand Down Expand Up @@ -75,12 +84,40 @@ export class LightInformationBlock extends NodeMaterialBlock {
return this._outputs[2];
}

/**
* Gets the shadow bias output component
*/
public get shadowBias(): NodeMaterialConnectionPoint {
return this._outputs[3];
}

/**
* Gets the shadow normal bias output component
*/
public get shadowNormalBias(): NodeMaterialConnectionPoint {
return this._outputs[4];
}

/**
* Gets the shadow depth scale component
*/
public get shadowDepthScale(): NodeMaterialConnectionPoint {
return this._outputs[5];
}

/**
* Gets the shadow depth range component
*/
public get shadowDepthRange(): NodeMaterialConnectionPoint {
return this._outputs[6];
}

public bind(effect: Effect, nodeMaterial: NodeMaterial, mesh?: Mesh) {
if (!mesh) {
return;
}

if (this.light && this.light.isDisposed) {
if (this.light && this.light.isDisposed()) {
this.light = null;
}

Expand All @@ -101,6 +138,28 @@ export class LightInformationBlock extends NodeMaterialBlock {
light.transferToNodeMaterialEffect(effect, this._lightDataUniformName);

effect.setColor4(this._lightColorUniformName, light.diffuse, light.intensity);

const generator = light.getShadowGenerator() as ShadowGenerator;
if (this.shadowBias.hasEndpoints || this.shadowNormalBias.hasEndpoints || this.shadowDepthScale.hasEndpoints) {
if (generator) {
effect.setFloat3(this._lightShadowUniformName, generator.bias, generator.normalBias, generator.depthScale);
} else {
effect.setFloat3(this._lightShadowUniformName, 0, 0, 0);
}
}

if (this.shadowDepthRange) {
if (generator && scene.activeCamera) {
const shadowLight = light as ShadowLight;
effect.setFloat2(
this._lightShadowExtraUniformName,
shadowLight.getDepthMinZ(scene.activeCamera),
shadowLight.getDepthMinZ(scene.activeCamera) + shadowLight.getDepthMaxZ(scene.activeCamera)
);
} else {
effect.setFloat2(this._lightShadowExtraUniformName, 0, 0);
}
}
}

public prepareDefines(mesh: AbstractMesh, nodeMaterial: NodeMaterial, defines: NodeMaterialDefines) {
Expand All @@ -123,9 +182,15 @@ export class LightInformationBlock extends NodeMaterialBlock {
const direction = this.direction;
const color = this.color;
const intensity = this.intensity;
const shadowBias = this.shadowBias;
const shadowNormalBias = this.shadowNormalBias;
const shadowDepthScale = this.shadowDepthScale;
const shadowDepthRange = this.shadowDepthRange;

this._lightDataUniformName = state._getFreeVariableName("lightData");
this._lightColorUniformName = state._getFreeVariableName("lightColor");
this._lightShadowUniformName = state._getFreeVariableName("shadowData");
this._lightShadowExtraUniformName = state._getFreeVariableName("shadowExtraData");
this._lightTypeDefineName = state._getFreeDefineName("LIGHTPOINTTYPE");

state._emitUniformFromString(this._lightDataUniformName, "vec3");
Expand All @@ -140,6 +205,24 @@ export class LightInformationBlock extends NodeMaterialBlock {
state.compilationString += this._declareOutput(color, state) + ` = ${this._lightColorUniformName}.rgb;\r\n`;
state.compilationString += this._declareOutput(intensity, state) + ` = ${this._lightColorUniformName}.a;\r\n`;

if (shadowBias.hasEndpoints || shadowNormalBias.hasEndpoints || shadowDepthScale.hasEndpoints) {
state._emitUniformFromString(this._lightShadowUniformName, "vec3");
if (shadowBias.hasEndpoints) {
state.compilationString += this._declareOutput(shadowBias, state) + ` = ${this._lightShadowUniformName}.x;\r\n`;
}
if (shadowNormalBias.hasEndpoints) {
state.compilationString += this._declareOutput(shadowNormalBias, state) + ` = ${this._lightShadowUniformName}.y;\r\n`;
}
if (shadowDepthScale.hasEndpoints) {
state.compilationString += this._declareOutput(shadowDepthScale, state) + ` = ${this._lightShadowUniformName}.z;\r\n`;
}
}

if (shadowDepthRange.hasEndpoints) {
state._emitUniformFromString(this._lightShadowExtraUniformName, "vec2");
state.compilationString += this._declareOutput(shadowDepthRange, state) + ` = ${this._lightShadowUniformName};\r\n`;
}

return this;
}

Expand Down
14 changes: 14 additions & 0 deletions packages/dev/core/src/Materials/Node/nodeMaterial.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ import { TrigonometryBlock, TrigonometryBlockOperations } from "./Blocks/trigono
import { NodeMaterialSystemValues } from "./Enums/nodeMaterialSystemValues";
import type { ImageSourceBlock } from "./Blocks/Dual/imageSourceBlock";
import { EngineStore } from "../../Engines/engineStore";
import type { Material } from "../material";

const onCreatedEffectParameters = { effect: null as unknown as Effect, subMesh: null as unknown as Nullable<SubMesh> };

Expand Down Expand Up @@ -1143,6 +1144,19 @@ export class NodeMaterial extends PushMaterial {
this._createEffectForParticles(particleSystem, BaseParticleSystem.BLENDMODE_MULTIPLY, onCompiled, onError);
}

/**
* Use this material as the shadow depth wrapper of a target material
* @param targetMaterial defines the target material
*/
public createAsShadowDepthWrapper(targetMaterial: Material) {
if (this.mode !== NodeMaterialModes.Material) {
console.log("Incompatible material mode");
return;
}

targetMaterial.shadowDepthWrapper = new BABYLON.ShadowDepthWrapper(this, this.getScene());
}

private _processDefines(
mesh: AbstractMesh,
defines: NodeMaterialDefines,
Expand Down