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

Docs: Add some missing options to MeshPhysicalMaterial demo. #26753

Merged
merged 5 commits into from
Sep 15, 2023
Merged

Docs: Add some missing options to MeshPhysicalMaterial demo. #26753

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c87e086
Add some missing options to `MeshPhysicalMaterial` demo
Ameobea Sep 14, 2023
ba2778e
Use real default `sheenColor in material browser
Ameobea Sep 14, 2023
0f5088d
Re-disable dirlights in `MeshPhysicalMaterial` material browser
Ameobea Sep 14, 2023
42b9643
Update docs to correct the default `sheenColor`
Ameobea Sep 14, 2023
f262559
Add back deleted comment
Ameobea Sep 14, 2023
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
28 changes: 18 additions & 10 deletions docs/scenes/material-browser.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,8 @@
envMaps: envMapKeysPBR[ 0 ],
map: diffuseMapKeys[ 0 ],
roughnessMap: roughnessMapKeys[ 0 ],
alphaMap: alphaMapKeys[ 0 ]
alphaMap: alphaMapKeys[ 0 ],
metalnessMap: alphaMapKeys[ 0 ]
};

const folder = gui.addFolder( 'THREE.MeshStandardMaterial' );
Expand All @@ -548,8 +549,7 @@
folder.add( data, 'map', diffuseMapKeys ).onChange( updateTexture( material, 'map', diffuseMaps ) );
folder.add( data, 'roughnessMap', roughnessMapKeys ).onChange( updateTexture( material, 'roughnessMap', roughnessMaps ) );
folder.add( data, 'alphaMap', alphaMapKeys ).onChange( updateTexture( material, 'alphaMap', alphaMaps ) );

// TODO metalnessMap
folder.add( data, 'metalnessMap', alphaMapKeys ).onChange( updateTexture( material, 'metalnessMap', alphaMaps ) );

}

Expand All @@ -561,7 +561,11 @@
envMaps: envMapKeys[ 0 ],
map: diffuseMapKeys[ 0 ],
roughnessMap: roughnessMapKeys[ 0 ],
alphaMap: alphaMapKeys[ 0 ]
alphaMap: alphaMapKeys[ 0 ],
metalnessMap: alphaMapKeys[ 0 ],
sheenColor: 0xffffff,
specularColor: material.specularColor.getHex(),
iridescenceMap: alphaMapKeys[ 0 ]
};

const folder = gui.addFolder( 'THREE.MeshPhysicalMaterial' );
Expand All @@ -571,9 +575,17 @@

folder.add( material, 'roughness', 0, 1 );
folder.add( material, 'metalness', 0, 1 );
folder.add( material, 'ior', 1, 2.333 );
folder.add( material, 'reflectivity', 0, 1 );
folder.add( material, 'iridescence', 0, 1 );
folder.add( material, 'iridescenceIOR', 1, 2.333 );
folder.add( material, 'sheen', 0, 1 );
folder.add( material, 'sheenRoughness', 0, 1 );
folder.addColor( data, 'sheenColor' ).onChange( handleColorChange( material.sheenColor ) );
folder.add( material, 'clearcoat', 0, 1 ).step( 0.01 );
folder.add( material, 'clearcoatRoughness', 0, 1 ).step( 0.01 );
folder.add( material, 'specularIntensity', 0, 1);
folder.addColor( data, 'specularColor' ).onChange( handleColorChange( material.specularColor ) );
folder.add( material, 'flatShading' ).onChange( needsUpdate( material, geometry ) );
folder.add( material, 'wireframe' );
folder.add( material, 'vertexColors' ).onChange( needsUpdate( material, geometry ) );
Expand All @@ -582,8 +594,8 @@
folder.add( data, 'map', diffuseMapKeys ).onChange( updateTexture( material, 'map', diffuseMaps ) );
folder.add( data, 'roughnessMap', roughnessMapKeys ).onChange( updateTexture( material, 'roughnessMap', roughnessMaps ) );
folder.add( data, 'alphaMap', alphaMapKeys ).onChange( updateTexture( material, 'alphaMap', alphaMaps ) );

// TODO metalnessMap
folder.add( data, 'metalnessMap', alphaMapKeys ).onChange( updateTexture( material, 'metalnessMap', alphaMaps ) );
folder.add( data, 'iridescenceMap', alphaMapKeys ).onChange( updateTexture( material, 'iridescenceMap', alphaMaps ) );

}

Expand Down Expand Up @@ -678,10 +690,6 @@
guiMaterial( gui, mesh, material, geometry );
guiMeshPhysicalMaterial( gui, mesh, material, geometry );

// only use scene environment

light1.visible = false;
light2.visible = false;
Mugen87 marked this conversation as resolved.
Show resolved Hide resolved
light3.visible = false;

return material;
Expand Down