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

Make position morph binding as optional in renderers + enable other attrib type morph #16024

Merged
merged 11 commits into from
Dec 31, 2024
Merged

Make position morph binding as optional in renderers + enable other attrib type morph #16024

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1beca1f
use MorphTargetManager._bind for support texture based morphing
noname0310 Dec 21, 2024
dcd1a5a
Unify formatting
noname0310 Dec 21, 2024
7b46ef0
make position morph as optional in shaders + enable other attrib type…
noname0310 Dec 21, 2024
f020db6
fix uv morph enable condition
noname0310 Dec 21, 2024
fd9eafb
apply request changes
noname0310 Dec 21, 2024
c3e175f
simplify preprocessor conditions
noname0310 Dec 21, 2024
4743c45
apply request changes
noname0310 Dec 24, 2024
b7475e8
lint
noname0310 Dec 24, 2024
a02ce71
lint
noname0310 Dec 24, 2024
fc629fb
Merge remote-tracking branch 'upstream/master' into fix-morphtarget-bind
noname0310 Dec 30, 2024
78fa35e
Update thinEffectLayer.ts
noname0310 Dec 30, 2024
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
7 changes: 3 additions & 4 deletions packages/dev/core/src/Culling/Helper/computeShaderBoundingHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export class ComputeShaderBoundingHelper implements IBoundingInfoHelperPlatform
this._processedMeshes.push(mesh);

const manager = (<Mesh>mesh).morphTargetManager;
if (manager) {
if (manager && manager.supportsPositions) {
maxNumInfluencers = Math.max(maxNumInfluencers, manager.numTargets);
}
}
Expand All @@ -165,10 +165,9 @@ export class ComputeShaderBoundingHelper implements IBoundingInfoHelperPlatform
this._uniqueComputeShaders.add(computeShaderWithoutMorph);

const manager = (<Mesh>mesh).morphTargetManager;
if (manager) {
if (manager && manager.supportsPositions) {
defines = defines.slice();
defines.push("#define MORPHTARGETS");
defines.push("#define MORPHTARGETS_POSITION");
defines.push("#define NUM_MORPH_INFLUENCERS " + maxNumInfluencers);

const computeShaderWithMorph = this._getComputeShader(defines, hasBones, true);
Expand Down Expand Up @@ -233,7 +232,7 @@ export class ComputeShaderBoundingHelper implements IBoundingInfoHelperPlatform
const [computeShaderWithoutMorph, computeShaderWithMorph] = this._computeShaders[i];

const manager = (<Mesh>mesh).morphTargetManager;
const hasMorphs = manager && manager.numInfluencers > 0;
const hasMorphs = manager && manager.numInfluencers > 0 && manager.supportsPositions;
const computeShader = hasMorphs ? computeShaderWithMorph : computeShaderWithoutMorph;

this._extractDataAndLink(computeShader, mesh as Mesh, VertexBuffer.PositionKind, 3, "positionBuffer", this._positionBuffers);
Expand Down
102 changes: 40 additions & 62 deletions packages/dev/core/src/Culling/Helper/transformFeedbackBoundingHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import type { Engine } from "core/Engines/engine";
import { Constants } from "core/Engines/constants";
import type { Nullable } from "core/types";
import type { AbstractMesh } from "core/Meshes/abstractMesh";
import { BindBonesParameters, BindMorphTargetParameters, PrepareAttributesForBakedVertexAnimation } from "core/Materials/materialHelper.functions";
import {
BindBonesParameters,
BindMorphTargetParameters,
PrepareAttributesForBakedVertexAnimation,
PrepareAttributesForMorphTargetsInfluencers,
} from "core/Materials/materialHelper.functions";
import type { Mesh } from "core/Meshes/mesh";
import type { IBoundingInfoHelperPlatform } from "./IBoundingInfoHelperPlatform";
import { extractMinAndMax } from "core/Maths/math.functions";
Expand Down Expand Up @@ -63,9 +68,7 @@ export class TransformFeedbackBoundingHelper implements IBoundingInfoHelperPlatf
let computeEffect: Effect;
let numInfluencers = 0;
const defines: string[] = [];
let uniforms: string[] = [];
const attribs = [VertexBuffer.PositionKind];
const samplers: string[] = [];

// Bones
if (mesh && mesh.useBones && mesh.computeBonesUsingShaders && mesh.skeleton) {
Expand All @@ -75,28 +78,9 @@ export class TransformFeedbackBoundingHelper implements IBoundingInfoHelperPlatf
attribs.push(VertexBuffer.MatricesIndicesExtraKind);
attribs.push(VertexBuffer.MatricesWeightsExtraKind);
}

const skeleton = mesh.skeleton;

defines.push("#define NUM_BONE_INFLUENCERS " + mesh.numBoneInfluencers);

if (skeleton.isUsingTextureForMatrices) {
defines.push("#define BONETEXTURE");

if (uniforms.indexOf("boneTextureWidth") === -1) {
Popov72 marked this conversation as resolved.
Show resolved Hide resolved
uniforms.push("boneTextureWidth");
}

if (samplers.indexOf("boneSampler") === -1) {
samplers.push("boneSampler");
}
} else {
defines.push("#define BonesPerMesh " + (skeleton.bones.length + 1));

if (uniforms.indexOf("mBones") === -1) {
uniforms.push("mBones");
}
}
defines.push("#define BONETEXTURE " + mesh.skeleton.isUsingTextureForMatrices);
defines.push("#define BonesPerMesh " + (mesh.skeleton.bones.length + 1));
} else {
defines.push("#define NUM_BONE_INFLUENCERS 0");
}
Expand All @@ -107,55 +91,49 @@ export class TransformFeedbackBoundingHelper implements IBoundingInfoHelperPlatf
numInfluencers = manager.numMaxInfluencers || manager.numInfluencers;
if (numInfluencers > 0) {
defines.push("#define MORPHTARGETS");
defines.push("#define MORPHTARGETS_POSITION");
}
if (manager.isUsingTextureForTargets) {
defines.push("#define MORPHTARGETS_TEXTURE");

if (uniforms.indexOf("morphTargetTextureIndices") === -1) {
uniforms.push("morphTargetTextureIndices");
if (manager.hasPositions) defines.push("#define MORPHTARGETTEXTURE_HASPOSITIONS");
sebavan marked this conversation as resolved.
Show resolved Hide resolved
if (manager.supportsPositions) {
defines.push("#define MORPHTARGETS_POSITION");
}

if (samplers.indexOf("morphTargets") === -1) {
samplers.push("morphTargets");
defines.push("#define NUM_MORPH_INFLUENCERS " + numInfluencers);
if (manager.isUsingTextureForTargets) {
defines.push("#define MORPHTARGETS_TEXTURE");
}
}
defines.push("#define NUM_MORPH_INFLUENCERS " + numInfluencers);
for (let index = 0; index < numInfluencers; index++) {
attribs.push(VertexBuffer.PositionKind + index);
}
if (numInfluencers > 0) {
uniforms = uniforms.slice();
uniforms.push("morphTargetInfluences");
uniforms.push("morphTargetCount");
uniforms.push("morphTargetTextureInfo");
uniforms.push("morphTargetTextureIndices");
PrepareAttributesForMorphTargetsInfluencers(
attribs,
mesh,
numInfluencers,
true, // usePositionMorph
false, // useNormalMorph
false, // useTangentMorph
false, // useUVMorph
false // useUV2Morph
);
}
}

// Baked Vertex Animation
const bvaManager = (<Mesh>mesh).bakedVertexAnimationManager;

if (bvaManager && bvaManager.isEnabled) {
defines.push("#define BAKED_VERTEX_ANIMATION_TEXTURE");
if (uniforms.indexOf("bakedVertexAnimationSettings") === -1) {
uniforms.push("bakedVertexAnimationSettings");
}
if (uniforms.indexOf("bakedVertexAnimationTextureSizeInverted") === -1) {
uniforms.push("bakedVertexAnimationTextureSizeInverted");
}
if (uniforms.indexOf("bakedVertexAnimationTime") === -1) {
uniforms.push("bakedVertexAnimationTime");
}

if (samplers.indexOf("bakedVertexAnimationTexture") === -1) {
samplers.push("bakedVertexAnimationTexture");
}
PrepareAttributesForBakedVertexAnimation(attribs, mesh, defines);
}

const join = defines.join("\n");
if (!this._effects[join]) {
const uniforms = [
"boneTextureWidth",
"mBones",
"morphTargetInfluences",
"morphTargetCount",
"morphTargetTextureInfo",
"morphTargetTextureIndices",
"bakedVertexAnimationSettings",
"bakedVertexAnimationTextureSizeInverted",
"bakedVertexAnimationTime",
];
const samplers = ["boneSampler", "morphTargets", "bakedVertexAnimationTexture"];

const computeEffectOptions = {
attributes: attribs,
uniformsNames: uniforms,
Expand Down Expand Up @@ -204,9 +182,9 @@ export class TransformFeedbackBoundingHelper implements IBoundingInfoHelperPlatf
BindBonesParameters(mesh, effect);

// Morph targets
const manager = (<Mesh>mesh).morphTargetManager;
if (manager && manager.numInfluencers > 0) {
BindMorphTargetParameters(<Mesh>mesh, effect);
BindMorphTargetParameters(mesh, effect);
if (mesh.morphTargetManager && mesh.morphTargetManager.isUsingTextureForTargets) {
mesh.morphTargetManager._bind(effect);
}

// BVA
Expand Down
26 changes: 24 additions & 2 deletions packages/dev/core/src/Layers/effectLayer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,12 +696,34 @@ export abstract class EffectLayer {
morphInfluencers = manager.numMaxInfluencers || manager.numInfluencers;
if (morphInfluencers > 0) {
defines.push("#define MORPHTARGETS");
defines.push("#define MORPHTARGETS_POSITION");
if (manager.hasPositions) defines.push("#define MORPHTARGETTEXTURE_HASPOSITIONS");
if (manager.hasNormals) defines.push("#define MORPHTARGETTEXTURE_HASNORMALS");
if (manager.hasTangents) defines.push("#define MORPHTARGETTEXTURE_HASTANGENTS");
if (manager.hasUVs) defines.push("#define MORPHTARGETTEXTURE_HASUVS");
if (manager.hasUV2s) defines.push("#define MORPHTARGETTEXTURE_HASUV2S");
if (manager.supportsPositions) {
defines.push("#define MORPHTARGETS_POSITION");
}
if (manager.supportsUVs) {
if (uv1) defines.push("#define MORPHTARGETS_UV");
}
if (manager.supportsUV2s) {
if (uv2) defines.push("#define MORPHTARGETS_UV2");
}
defines.push("#define NUM_MORPH_INFLUENCERS " + morphInfluencers);
if (manager.isUsingTextureForTargets) {
defines.push("#define MORPHTARGETS_TEXTURE");
}
PrepareAttributesForMorphTargetsInfluencers(attribs, mesh, morphInfluencers);
PrepareAttributesForMorphTargetsInfluencers(
attribs,
mesh,
morphInfluencers,
true, // usePositionMorph
false, // useNormalMorph
false, // useTangentMorph
uv1, // useUVMorph
uv2 // useUV2Morph
);
}
}

Expand Down
37 changes: 34 additions & 3 deletions packages/dev/core/src/Lights/Shadows/shadowGenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,6 @@ export class ShadowGenerator implements IShadowGenerator {

// Morph targets
BindMorphTargetParameters(renderingMesh, effect);

if (renderingMesh.morphTargetManager && renderingMesh.morphTargetManager.isUsingTextureForTargets) {
renderingMesh.morphTargetManager._bind(effect);
}
Expand Down Expand Up @@ -1552,10 +1551,15 @@ export class ShadowGenerator implements IShadowGenerator {

const mesh = subMesh.getMesh();

let useNormal = false;
let uv1 = false;
let uv2 = false;

// Normal bias.
if (this.normalBias && mesh.isVerticesDataPresent(VertexBuffer.NormalKind)) {
attribs.push(VertexBuffer.NormalKind);
defines.push("#define NORMAL");
useNormal = true;
if (mesh.nonUniformScaling) {
defines.push("#define NONUNIFORMSCALING");
}
Expand Down Expand Up @@ -1584,11 +1588,13 @@ export class ShadowGenerator implements IShadowGenerator {
if (mesh.isVerticesDataPresent(VertexBuffer.UVKind)) {
attribs.push(VertexBuffer.UVKind);
defines.push("#define UV1");
uv1 = true;
}
if (mesh.isVerticesDataPresent(VertexBuffer.UV2Kind)) {
if (this._opacityTexture.coordinatesIndex === 1) {
attribs.push(VertexBuffer.UV2Kind);
defines.push("#define UV2");
uv2 = true;
}
}
}
Expand Down Expand Up @@ -1625,12 +1631,37 @@ export class ShadowGenerator implements IShadowGenerator {
morphInfluencers = manager.numMaxInfluencers || manager.numInfluencers;
if (morphInfluencers > 0) {
defines.push("#define MORPHTARGETS");
defines.push("#define MORPHTARGETS_POSITION");
if (manager.hasPositions) defines.push("#define MORPHTARGETTEXTURE_HASPOSITIONS");
if (manager.hasNormals) defines.push("#define MORPHTARGETTEXTURE_HASNORMALS");
if (manager.hasTangents) defines.push("#define MORPHTARGETTEXTURE_HASTANGENTS");
if (manager.hasUVs) defines.push("#define MORPHTARGETTEXTURE_HASUVS");
if (manager.hasUV2s) defines.push("#define MORPHTARGETTEXTURE_HASUV2S");
if (manager.supportsPositions) {
defines.push("#define MORPHTARGETS_POSITION");
}
if (manager.supportsNormals) {
if (useNormal) defines.push("#define MORPHTARGETS_NORMAL");
}
if (manager.supportsUVs) {
if (uv1) defines.push("#define MORPHTARGETS_UV");
}
if (manager.supportsUV2s) {
if (uv2) defines.push("#define MORPHTARGETS_UV2");
}
defines.push("#define NUM_MORPH_INFLUENCERS " + morphInfluencers);
if (manager.isUsingTextureForTargets) {
defines.push("#define MORPHTARGETS_TEXTURE");
}
PrepareAttributesForMorphTargetsInfluencers(attribs, mesh, morphInfluencers);
PrepareAttributesForMorphTargetsInfluencers(
attribs,
mesh,
morphInfluencers,
true, // usePositionMorph
useNormal, // useNormalMorph
false, // useTangentMorph
uv1, // useUVMorph
uv2 // useUV2Morph
);
}
}

Expand Down
Loading