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

Editor: Added transmission support. #21896

Merged
merged 1 commit into from May 27, 2021
Merged

Editor: Added transmission support. #21896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions editor/js/Sidebar.Material.js
View file
Open in desktop
Expand Up @@ -176,6 +176,16 @@ function SidebarMaterial( editor ) {
container.add( materialSheenRow );
*/

// transmission

var materialTransmissionRow = new UIRow();
var materialTransmission = new UINumber( 1 ).setWidth( '30px' ).setRange( 0, 1 ).onChange( update );

materialTransmissionRow.add( new UIText( strings.getKey( 'sidebar/material/transmission' ) ).setWidth( '90px' ) );
materialTransmissionRow.add( materialTransmission );

container.add( materialTransmissionRow );

// emissive

var materialEmissiveRow = new UIRow();
Expand Down Expand Up @@ -682,6 +692,12 @@ function SidebarMaterial( editor ) {
}
*/

if ( material.transmission !== undefined && Math.abs( material.transmission - materialTransmission.getValue() ) >= epsilon ) {

editor.execute( new SetMaterialValueCommand( editor, currentObject, 'transmission', materialTransmission.getValue(), currentMaterialSlot ) );

}

if ( material.emissive !== undefined && material.emissive.getHex() !== materialEmissive.getHexValue() ) {

editor.execute( new SetMaterialColorCommand( editor, currentObject, 'emissive', materialEmissive.getHexValue(), currentMaterialSlot ) );
Expand Down Expand Up @@ -1232,6 +1248,7 @@ function SidebarMaterial( editor ) {
'metalness': materialMetalnessRow,
'emissive': materialEmissiveRow,
// 'sheen': materialSheenRow,
'transmission': materialTransmissionRow,
'specular': materialSpecularRow,
'shininess': materialShininessRow,
'clearcoat': materialClearcoatRow,
Expand Down Expand Up @@ -1377,6 +1394,12 @@ function SidebarMaterial( editor ) {
}
*/

if ( material.transmission !== undefined ) {

materialTransmission.setValue( material.transmission );

}

if ( material.emissive !== undefined ) {

materialEmissive.setHexValue( material.emissive.getHexString() );
Expand Down
3 changes: 3 additions & 0 deletions editor/js/Strings.js
View file
Open in desktop
Expand Up @@ -243,6 +243,7 @@ function Strings( config ) {
'sidebar/material/roughness': 'Roughness',
'sidebar/material/metalness': 'Metalness',
'sidebar/material/sheen': 'Sheen',
'sidebar/material/transmission': 'Transmission',
'sidebar/material/emissive': 'Emissive',
'sidebar/material/specular': 'Specular',
'sidebar/material/shininess': 'Shininess',
Expand Down Expand Up @@ -577,6 +578,7 @@ function Strings( config ) {
'sidebar/material/roughness': 'Rugosité',
'sidebar/material/metalness': 'Métal',
'sidebar/material/sheen': 'Éclat',
'sidebar/material/transmission': 'Transmission',
'sidebar/material/emissive': 'Émissif',
'sidebar/material/specular': 'Spéculaire',
'sidebar/material/shininess': 'Brillance',
Expand Down Expand Up @@ -911,6 +913,7 @@ function Strings( config ) {
'sidebar/material/roughness': '粗糙度',
'sidebar/material/metalness': '金属度',
'sidebar/material/sheen': '光泽',
'sidebar/material/transmission': 'Transmission',
'sidebar/material/emissive': '自发光',
'sidebar/material/specular': '高光',
'sidebar/material/shininess': '高光大小',
Expand Down