Skip to content

NodeMaterialObserver: Clean up #29737

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 1 commit into from
Oct 23, 2024
Merged

NodeMaterialObserver: Clean up #29737

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
37 changes: 7 additions & 30 deletions src/materials/nodes/manager/NodeMaterialObserver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { Vector2 } from '../../../math/Vector2.js';

const refreshUniforms = [
'alphaMap',
'alphaTest',
Expand Down Expand Up @@ -53,8 +51,6 @@ const refreshUniforms = [
'transmissionMap'
];

const _vector2 = /*@__PURE__*/ new Vector2();

class NodeMaterialObserver {

constructor( builder ) {
Expand Down Expand Up @@ -121,10 +117,10 @@ class NodeMaterialObserver {

if ( data.material.transmission > 0 ) {

const bufferSize = this._getFrameBufferSize( renderObject );
const { width, height } = renderObject.context;

data.bufferWidth = bufferSize.x;
data.bufferHeight = bufferSize.y;
data.bufferWidth = width;
data.bufferHeight = height;

}

Expand Down Expand Up @@ -206,25 +202,6 @@ class NodeMaterialObserver {

}

_getFrameBufferSize( renderObject ) {

const renderer = renderObject.renderer;
const renderTarget = renderer.getRenderTarget();

if ( renderTarget ) {

_vector2.set( renderTarget.width, renderTarget.height );

} else {

renderer.getDrawingBufferSize( _vector2 );

}

return _vector2;

}

equals( renderObject ) {

const { object, material, geometry } = renderObject;
Expand Down Expand Up @@ -283,12 +260,12 @@ class NodeMaterialObserver {

if ( materialData.transmission > 0 ) {

const bufferSize = this._getFrameBufferSize( renderObject );
const { width, height } = renderObject.context;

if ( renderObjectData.bufferWidth !== bufferSize.x || renderObjectData.bufferHeight !== bufferSize.y ) {
if ( renderObjectData.bufferWidth !== width || renderObjectData.bufferHeight !== height ) {

renderObjectData.bufferWidth = bufferSize.x;
renderObjectData.bufferHeight = bufferSize.y;
renderObjectData.bufferWidth = width;
renderObjectData.bufferHeight = height;

return false;

Expand Down