-
-
Notifications
You must be signed in to change notification settings - Fork 35.6k
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.
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
WebGPURenderer: Support rotation of env maps. #30528
Merged
+70
−15
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,59 @@ | ||
import { Euler } from '../../math/Euler.js'; | ||
import { Matrix4 } from '../../math/Matrix4.js'; | ||
import { uniform } from '../core/UniformNode.js'; | ||
|
||
const _e1 = /*@__PURE__*/ new Euler(); | ||
const _m1 = /*@__PURE__*/ new Matrix4(); | ||
|
||
/** | ||
* TSL object that represents the refraction ratio of the material used for rendering the current object. | ||
* | ||
* @tsl | ||
* @type {UniformNode<float>} | ||
*/ | ||
export const materialRefractionRatio = /*@__PURE__*/ uniform( 0 ).onReference( ( { material } ) => material ).onRenderUpdate( ( { material } ) => material.refractionRatio ); | ||
export const materialRefractionRatio = /*@__PURE__*/ uniform( 0 ).onReference( ( { material } ) => material ).onObjectUpdate( ( { material } ) => material.refractionRatio ); | ||
|
||
/** | ||
* TSL object that represents the intensity of environment maps of PBR materials. | ||
* When `material.envMap` is set, the value is `material.envMapIntensity` otherwise `scene.environmentIntensity`. | ||
* | ||
* @tsl | ||
* @type {Node<float>} | ||
*/ | ||
export const materialEnvIntensity = /*@__PURE__*/ uniform( 1 ).onReference( ( { material } ) => material ).onObjectUpdate( function ( { material, scene } ) { | ||
|
||
return material.envMap ? material.envMapIntensity : scene.environmentIntensity; | ||
|
||
} ); | ||
|
||
/** | ||
* TSL object that represents the rotation of environment maps. | ||
* When `material.envMap` is set, the value is `material.envMapRotation`. `scene.environmentRotation` controls the | ||
* rotation of `scene.environment` instead. | ||
* | ||
* @tsl | ||
* @type {Node<mat4>} | ||
*/ | ||
export const materialEnvRotation = /*@__PURE__*/ uniform( new Matrix4() ).onReference( function ( frame ) { | ||
|
||
return frame.material; | ||
|
||
} ).onObjectUpdate( function ( { material, scene } ) { | ||
|
||
const rotation = ( scene.environment !== null && material.envMap === null ) ? scene.environmentRotation : material.envMapRotation; | ||
|
||
if ( rotation ) { | ||
|
||
_e1.copy( rotation ); | ||
|
||
_m1.makeRotationFromEuler( _e1 ); | ||
|
||
} else { | ||
|
||
_m1.identity(); | ||
|
||
} | ||
|
||
return _m1; | ||
|
||
} ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had to change the update scope from
render
toobject
otherwise different intensity values in different materials were not honored correctly. Same for rotation and refraction ratio.