Skip to content

native morph workaround #16910

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

Merged
merged 5 commits into from
Jul 22, 2025
Merged

native morph workaround #16910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1eea5d4
native morph work around
CedricGuillemet Jul 22, 2025
4703cb7
native define
CedricGuillemet Jul 22, 2025
08f425f
workaround
CedricGuillemet Jul 22, 2025
9688dc5
wgsl casting
CedricGuillemet Jul 22, 2025
a57548b
webgpu fix
CedricGuillemet Jul 22, 2025
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
2 changes: 1 addition & 1 deletion 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 @@ -268,7 +268,7 @@ export class ComputeShaderBoundingHelper implements IBoundingInfoHelperPlatform
);

ubo.updateFloat3("morphTargetTextureInfo", manager._textureVertexStride, manager._textureWidth, manager._textureHeight);
ubo.updateInt("morphTargetCount", manager.numInfluencers);
ubo.updateFloat("morphTargetCount", manager.numInfluencers);
ubo.update();
}

Expand Down
2 changes: 1 addition & 1 deletion packages/dev/core/src/Materials/Node/Blocks/Vertex/morphTargetsBlock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ export class MorphTargetsBlock extends NodeMaterialBlock {
const uniformsPrefix = isWebGPU ? "uniforms." : "";
if (manager?.isUsingTextureForTargets) {
injectionCode += `for (${isWebGPU ? "var" : "int"} i = 0; i < NUM_MORPH_INFLUENCERS; i++) {\n`;
injectionCode += `if (i >= ${uniformsPrefix}morphTargetCount) { break; }\n`;
injectionCode += `if (${isWebGPU ? "f32" : "float"}(i) >= ${uniformsPrefix}morphTargetCount) { break; }\n`;

injectionCode += `vertexID = ${isWebGPU ? "f32(vertexInputs.vertexIndex" : "float(gl_VertexID"}) * ${uniformsPrefix}morphTargetTextureInfo.x;\n`;
if (supportPositions) {
Expand Down
2 changes: 1 addition & 1 deletion packages/dev/core/src/Morph/morphTargetManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ export class MorphTargetManager implements IDisposable {
effect.setFloat3("morphTargetTextureInfo", this._textureVertexStride, this._textureWidth, this._textureHeight);
effect.setFloatArray("morphTargetTextureIndices", this._morphTargetTextureIndices);
effect.setTexture("morphTargets", this._targetStoreTexture);
effect.setInt("morphTargetCount", this.numInfluencers);
effect.setFloat("morphTargetCount", this.numInfluencers);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/dev/core/src/Shaders/ShadersInclude/morphTargetsVertex.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#ifdef MORPHTARGETS_TEXTURE
#if {X} == 0
for (int i = 0; i < NUM_MORPH_INFLUENCERS; i++) {
if (i >= morphTargetCount) break;
if (float(i) >= morphTargetCount) break;

vertexID = float(gl_VertexID) * morphTargetTextureInfo.x;

Expand Down
2 changes: 1 addition & 1 deletion packages/dev/core/src/Shaders/ShadersInclude/morphTargetsVertexDeclaration.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
attribute vec4 color{X};
#endif
#elif {X} == 0
uniform int morphTargetCount;
uniform float morphTargetCount;
#endif
#endif
2 changes: 1 addition & 1 deletion packages/dev/core/src/ShadersWGSL/ShadersInclude/morphTargetsVertex.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#ifdef MORPHTARGETS_TEXTURE
#if {X} == 0
for (var i = 0; i < NUM_MORPH_INFLUENCERS; i = i + 1) {
if (i >= uniforms.morphTargetCount) {
if (f32(i) >= uniforms.morphTargetCount) {
break;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/dev/core/src/ShadersWGSL/ShadersInclude/morphTargetsVertexDeclaration.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
attribute color{X} : vec4<f32>;
#endif
#elif {X} == 0
uniform morphTargetCount: i32;
uniform morphTargetCount: f32;
#endif
#endif
4 changes: 2 additions & 2 deletions packages/dev/core/src/ShadersWGSL/boundingInfo.compute.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const identity = mat4x4f(

struct Settings {
morphTargetTextureInfo: vec3f,
morphTargetCount: i32,
morphTargetCount: f32,
indexResult : u32,
};

Expand Down Expand Up @@ -165,7 +165,7 @@ fn main(@builtin(global_invocation_id) global_id : vec3<u32>) {

#ifdef MORPHTARGETS
for (var i = 0; i < NUM_MORPH_INFLUENCERS; i = i + 1) {
if (i >= settings.morphTargetCount) {
if (f32(i) >= settings.morphTargetCount) {
break;
}
positionUpdated = positionUpdated + (readVector3FromRawSampler(i, index) - position) * morphTargetInfluences[i];
Expand Down