Skip to content

WebGPURenderer: Reuse MatcapUVNode in MeshMatcapNodeMaterial #28274

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 2 commits into from
May 3, 2024
+4 −8
Merged

WebGPURenderer: Reuse MatcapUVNode in MeshMatcapNodeMaterial #28274

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcf0cc7
add note
sunag May 3, 2024
3bbb1ec
use matcapUV
sunag May 3, 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
10 changes: 3 additions & 7 deletions examples/jsm/nodes/materials/MeshMatcapNodeMaterial.js
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import NodeMaterial, { addNodeMaterial } from './NodeMaterial.js';
import { materialReference } from '../accessors/MaterialReferenceNode.js';
import { diffuseColor } from '../core/PropertyNode.js';
import { vec2, vec3 } from '../shadernode/ShaderNode.js';
import { positionViewDirection } from '../accessors/PositionNode.js';
import { vec3 } from '../shadernode/ShaderNode.js';
import { MeshMatcapMaterial } from 'three';
import { transformedNormalView } from '../accessors/NormalNode.js';
import { mix } from '../math/MathNode.js';
import { matcapUV } from '../utils/MatcapUVNode.js';

const defaultValues = new MeshMatcapMaterial();

@@ -27,10 +26,7 @@ class MeshMatcapNodeMaterial extends NodeMaterial {

setupVariants( builder ) {

const x = vec3( positionViewDirection.z, 0.0, positionViewDirection.x.negate() ).normalize();
const y = positionViewDirection.cross( x );

const uv = vec2( x.dot( transformedNormalView ), y.dot( transformedNormalView ) ).mul( 0.495 ).add( 0.5 ) ; // 0.495 to remove artifacts caused by undersized matcap disks
const uv = matcapUV;

let matcapColor;

2 changes: 1 addition & 1 deletion examples/jsm/nodes/utils/MatcapUVNode.js
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ class MatcapUVNode extends TempNode {
const x = vec3( positionViewDirection.z, 0, positionViewDirection.x.negate() ).normalize();
const y = positionViewDirection.cross( x );

return vec2( x.dot( transformedNormalView ), y.dot( transformedNormalView ) ).mul( 0.495 ).add( 0.5 );
return vec2( x.dot( transformedNormalView ), y.dot( transformedNormalView ) ).mul( 0.495 ).add( 0.5 ); // 0.495 to remove artifacts caused by undersized matcap disks

}