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

Jump to bottom

WebGPURenderer: support mat2() and extend RotateNode to support vec2 rotation. #27612

Merged
merged 4 commits into from
Jan 23, 2024
Merged

WebGPURenderer: support mat2() and extend RotateNode to support vec2 rotation. #27612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b7fe40
add mat2
Jan 12, 2024
59b814e
extend rotateNode to vec2
Jan 23, 2024
5fa28cb
remove unused code
Jan 23, 2024
d8054a0
rework
Jan 23, 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
1 change: 1 addition & 0 deletions examples/jsm/nodes/core/NodeBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,7 @@ class NodeBuilder {

if ( vecNum !== null ) return Number( vecNum[ 1 ] );
if ( vecType === 'float' || vecType === 'bool' || vecType === 'int' || vecType === 'uint' ) return 1;
if ( /mat2/.test( type ) === true ) return 4;
Copy link
Contributor

Choose a reason for hiding this comment

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

I love how simple it was to introduce a new type!

if ( /mat3/.test( type ) === true ) return 9;
if ( /mat4/.test( type ) === true ) return 16;

Expand Down
1 change: 1 addition & 0 deletions examples/jsm/nodes/core/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const NodeType = {
VECTOR2: 'vec2',
VECTOR3: 'vec3',
VECTOR4: 'vec4',
MATRIX2: 'mat2',
MATRIX3: 'mat3',
MATRIX4: 'mat4'
};
Expand Down
8 changes: 1 addition & 7 deletions examples/jsm/nodes/materials/SpriteNodeMaterial.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,7 @@ class SpriteNodeMaterial extends NodeMaterial {

const rotation = float( rotationNode || materialRotation );

const cosAngle = rotation.cos();
const sinAngle = rotation.sin();

const rotatedPosition = vec2( // @TODO: Maybe we can create mat2 and write something like rotationMatrix.mul( alignedPosition )?
vec2( cosAngle, sinAngle.negate() ).dot( alignedPosition ),
vec2( sinAngle, cosAngle ).dot( alignedPosition )
);
const rotatedPosition = alignedPosition.rotate( rotation );

mvPosition = vec4( mvPosition.xy.add( rotatedPosition ), mvPosition.zw );

Expand Down
9 changes: 9 additions & 0 deletions examples/jsm/nodes/shadernode/ShaderNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,11 @@ export const ivec4 = new ConvertType( 'ivec4' );
export const uvec4 = new ConvertType( 'uvec4' );
export const bvec4 = new ConvertType( 'bvec4' );

export const mat2 = new ConvertType( 'mat2' );
export const imat2 = new ConvertType( 'imat2' );
export const umat2 = new ConvertType( 'umat2' );
export const bmat2 = new ConvertType( 'bmat2' );

export const mat3 = new ConvertType( 'mat3' );
export const imat3 = new ConvertType( 'imat3' );
export const umat3 = new ConvertType( 'umat3' );
Expand Down Expand Up @@ -604,6 +609,10 @@ addNodeElement( 'vec4', vec4 );
addNodeElement( 'ivec4', ivec4 );
addNodeElement( 'uvec4', uvec4 );
addNodeElement( 'bvec4', bvec4 );
addNodeElement( 'mat2', mat2 );
addNodeElement( 'imat2', imat2 );
addNodeElement( 'umat2', umat2 );
addNodeElement( 'bmat2', bmat2 );
addNodeElement( 'mat3', mat3 );
addNodeElement( 'imat3', imat3 );
addNodeElement( 'umat3', umat3 );
Expand Down
39 changes: 32 additions & 7 deletions examples/jsm/nodes/utils/RotateNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
addNodeElement,
nodeProxy,
vec4,
mat2,
mat4,
} from '../shadernode/ShaderNode.js';
import { cos, sin } from '../math/MathNode.js';
Expand All @@ -12,23 +13,47 @@ class RotateNode extends TempNode {

constructor( positionNode, rotationNode ) {

super( 'vec3' );
super();

this.positionNode = positionNode;
this.rotationNode = rotationNode;

}

setup() {
getNodeType( builder ) {

return this.positionNode.getNodeType( builder );

}

setup( builder ) {

const { rotationNode, positionNode } = this;

const rotation = rotationNode;
const rotationXMatrix = mat4( vec4( 1.0, 0.0, 0.0, 0.0 ), vec4( 0.0, cos( rotation.x ), sin( rotation.x ).negate(), 0.0 ), vec4( 0.0, sin( rotation.x ), cos( rotation.x ), 0.0 ), vec4( 0.0, 0.0, 0.0, 1.0 ) );
const rotationYMatrix = mat4( vec4( cos( rotation.y ), 0.0, sin( rotation.y ), 0.0 ), vec4( 0.0, 1.0, 0.0, 0.0 ), vec4( sin( rotation.y ).negate(), 0.0, cos( rotation.y ), 0.0 ), vec4( 0.0, 0.0, 0.0, 1.0 ) );
const rotationZMatrix = mat4( vec4( cos( rotation.z ), sin( rotation.z ).negate(), 0.0, 0.0 ), vec4( sin( rotation.z ), cos( rotation.z ), 0.0, 0.0 ), vec4( 0.0, 0.0, 1.0, 0.0 ), vec4( 0.0, 0.0, 0.0, 1.0 ) );
const nodeType = this.getNodeType( builder );

if ( nodeType === 'vec2' ) {

const cosAngle = rotationNode.cos();
const sinAngle = rotationNode.sin();

const rotationMatrix = mat2(
cosAngle, sinAngle,
sinAngle.negate(), cosAngle
);

return rotationMatrix.mul( positionNode );

} else {

const rotation = rotationNode;
const rotationXMatrix = mat4( vec4( 1.0, 0.0, 0.0, 0.0 ), vec4( 0.0, cos( rotation.x ), sin( rotation.x ).negate(), 0.0 ), vec4( 0.0, sin( rotation.x ), cos( rotation.x ), 0.0 ), vec4( 0.0, 0.0, 0.0, 1.0 ) );
const rotationYMatrix = mat4( vec4( cos( rotation.y ), 0.0, sin( rotation.y ), 0.0 ), vec4( 0.0, 1.0, 0.0, 0.0 ), vec4( sin( rotation.y ).negate(), 0.0, cos( rotation.y ), 0.0 ), vec4( 0.0, 0.0, 0.0, 1.0 ) );
const rotationZMatrix = mat4( vec4( cos( rotation.z ), sin( rotation.z ).negate(), 0.0, 0.0 ), vec4( sin( rotation.z ), cos( rotation.z ), 0.0, 0.0 ), vec4( 0.0, 0.0, 1.0, 0.0 ), vec4( 0.0, 0.0, 0.0, 1.0 ) );

return rotationXMatrix.mul( rotationYMatrix ).mul( rotationZMatrix ).mul( vec4( positionNode, 1.0 ) ).xyz;

return rotationXMatrix.mul( rotationYMatrix ).mul( rotationZMatrix ).mul( vec4( positionNode, 1.0 ) ).xyz;
}

}

Expand Down
10 changes: 1 addition & 9 deletions examples/jsm/nodes/utils/RotateUVNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,9 @@ class RotateUVNode extends TempNode {

const { uvNode, rotationNode, centerNode } = this;

const cosAngle = rotationNode.cos();
const sinAngle = rotationNode.sin();

const vector = uvNode.sub( centerNode );

const rotatedVector = vec2( // @TODO: Maybe we can create mat2 and write something like rotationMatrix.mul( vector )?
vec2( cosAngle, sinAngle ).dot( vector ),
vec2( sinAngle.negate(), cosAngle ).dot( vector )
);

return rotatedVector.add( centerNode );
return vector.rotate( rotationNode ).add( centerNode );

}

Expand Down
5 changes: 5 additions & 0 deletions examples/jsm/renderers/webgpu/nodes/WGSLNodeBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ const wgslTypeLib = {
uvec4: 'vec4<u32>',
bvec4: 'vec4<bool>',

mat2: 'mat2x2<f32>',
imat2: 'mat2x2<i32>',
umat2: 'mat2x2<u32>',
bmat2: 'mat2x2<bool>',

mat3: 'mat3x3<f32>',
imat3: 'mat3x3<i32>',
umat3: 'mat3x3<u32>',
Expand Down