PMREMNode: Added pmremVersion logic

sunag · sunag · commit 05681cb79dcc · 2024-03-24T11:59:26.000-03:00
diff --git a/examples/jsm/nodes/pmrem/PMREMNode.js b/examples/jsm/nodes/pmrem/PMREMNode.js
@@ -26,7 +26,9 @@ function _getPMREMFromTexture( texture ) {
 
 	let cacheTexture = _cache.get( texture );
 
-	if ( cacheTexture === undefined ) {
+	const pmremVersion = cacheTexture !== undefined ? cacheTexture.pmremVersion : - 1;
+
+	if ( pmremVersion !== texture.pmremVersion ) {
 
 		if ( texture.isCubeTexture ) {
 
@@ -36,7 +38,7 @@ function _getPMREMFromTexture( texture ) {
 
 			}
 
-			cacheTexture = _generator.fromCubemap( texture );
+			cacheTexture = _generator.fromCubemap( texture, cacheTexture );
 
 		} else {
 
@@ -46,10 +48,12 @@ function _getPMREMFromTexture( texture ) {
 
 			}
 
-			cacheTexture = _generator.fromEquirectangular( texture );
+			cacheTexture = _generator.fromEquirectangular( texture, cacheTexture );
 
 		}
 
+		cacheTexture.pmremVersion = texture.pmremVersion;
+
 		_cache.set( texture, cacheTexture );
 
 	}
@@ -104,13 +108,14 @@ class PMREMNode extends TempNode {
 
 	}
 
-	updateBefore( frame ) {
+	updateBefore() {
 
 		let pmrem = this._pmrem;
 
-		if ( pmrem === null ) {
+		const pmremVersion = pmrem ? pmrem.pmremVersion : - 1;
+		const texture = this._value;
 
-			const texture = this._value;
+		if ( pmremVersion !== texture.pmremVersion ) {
 
 			if ( texture.isPMREMTexture === true ) {
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ function _getPMREMFromTexture( texture ) {`
`26`	`26`
`27`	`27`	`let cacheTexture = _cache.get( texture );`
`28`	`28`
`29`		`- if ( cacheTexture === undefined ) {`
	`29`	`+ const pmremVersion = cacheTexture !== undefined ? cacheTexture.pmremVersion : - 1;`
	`30`	`+`
	`31`	`+ if ( pmremVersion !== texture.pmremVersion ) {`
`30`	`32`
`31`	`33`	`if ( texture.isCubeTexture ) {`
`32`	`34`
`@@ -36,7 +38,7 @@ function _getPMREMFromTexture( texture ) {`
`36`	`38`
`37`	`39`	`}`
`38`	`40`
`39`		`- cacheTexture = _generator.fromCubemap( texture );`
	`41`	`+ cacheTexture = _generator.fromCubemap( texture, cacheTexture );`
`40`	`42`
`41`	`43`	`} else {`
`42`	`44`
`@@ -46,10 +48,12 @@ function _getPMREMFromTexture( texture ) {`
`46`	`48`
`47`	`49`	`}`
`48`	`50`
`49`		`- cacheTexture = _generator.fromEquirectangular( texture );`
	`51`	`+ cacheTexture = _generator.fromEquirectangular( texture, cacheTexture );`
`50`	`52`
`51`	`53`	`}`
`52`	`54`
	`55`	`+ cacheTexture.pmremVersion = texture.pmremVersion;`
	`56`	`+`
`53`	`57`	`_cache.set( texture, cacheTexture );`
`54`	`58`
`55`	`59`	`}`
`@@ -104,13 +108,14 @@ class PMREMNode extends TempNode {`
`104`	`108`
`105`	`109`	`}`
`106`	`110`
`107`		`- updateBefore( frame ) {`
	`111`	`+ updateBefore() {`
`108`	`112`
`109`	`113`	`let pmrem = this._pmrem;`
`110`	`114`
`111`		`- if ( pmrem === null ) {`
	`115`	`+ const pmremVersion = pmrem ? pmrem.pmremVersion : - 1;`
	`116`	`+ const texture = this._value;`
`112`	`117`
`113`		`- const texture = this._value;`
	`118`	`+ if ( pmremVersion !== texture.pmremVersion ) {`
`114`	`119`
`115`	`120`	`if ( texture.isPMREMTexture === true ) {`
`116`	`121`