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

SkinningNode: Fix previousBoneMatrices #30161

Merged
merged 2 commits into from
Dec 18, 2024
+10 −1
Merged

SkinningNode: Fix previousBoneMatrices #30161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
202921c
fix previousBoneMatrices
sunag Dec 18, 2024
cf7e6c1
fix no MRT
sunag Dec 18, 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
2 changes: 1 addition & 1 deletion src/nodes/accessors/SkinningNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ class SkinningNode extends Node {

const mrt = builder.renderer.getMRT();

return mrt && mrt.has( 'velocity' );
return ( mrt && mrt.has( 'velocity' ) ) || builder.object.userData.useVelocity === true;

}

Expand Down
9 changes: 9 additions & 0 deletions src/nodes/lighting/ShadowNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,12 +662,21 @@ class ShadowNode extends ShadowBaseNode {
const currentRenderObjectFunction = renderer.getRenderObjectFunction();
const currentMRT = renderer.getMRT();

const useVelocity = currentMRT ? currentMRT.has( 'velocity' ) : false;

renderer.setMRT( null );

renderer.setRenderObjectFunction( ( object, scene, _camera, geometry, material, group, ...params ) => {

if ( object.castShadow === true || ( object.receiveShadow && shadowType === VSMShadowMap ) ) {

if ( useVelocity ) {

object.userData = object.userData || {};
object.userData.useVelocity = true;
Copy link
Owner

@mrdoob mrdoob Dec 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May be better to do a local WeakMap for this?
I think we should avoid leaking renderer internals into userData.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I can see that it's being accessed from another class...
Maybe better to call it _useVelocity then?


}

object.onBeforeShadow( renderer, object, camera, shadow.camera, geometry, scene.overrideMaterial, group );

renderer.renderObject( object, scene, _camera, geometry, material, group, ...params );
Expand Down
Loading