Explorar el Código

Editor: Add sheen support. (#24835)

Michael Herzog hace 2 años
padre
commit
ff0d460078
Se han modificado 2 ficheros con 45 adiciones y 0 borrados
  1. 25 0
      editor/js/Sidebar.Material.js
  2. 20 0
      editor/js/Strings.js

+ 25 - 0
editor/js/Sidebar.Material.js

@@ -146,6 +146,21 @@ function SidebarMaterial( editor ) {
 	const materialIridescenceThicknessMax = new SidebarMaterialRangeValueProperty( editor, 'iridescenceThicknessRange', strings.getKey( 'sidebar/material/iridescenceThicknessMax' ), false, [ 0, Infinity ], 0, 10, 1, 'nm' );
 	container.add( materialIridescenceThicknessMax );
 
+	// sheen
+
+	const materialSheen = new SidebarMaterialNumberProperty( editor, 'sheen', strings.getKey( 'sidebar/material/sheen' ), [ 0, 1 ] );
+	container.add( materialSheen );
+
+	// sheen roughness
+
+	const materialSheenRoughness = new SidebarMaterialNumberProperty( editor, 'sheenRoughness', strings.getKey( 'sidebar/material/sheenroughness' ), [ 0, 1 ] );
+	container.add( materialSheenRoughness );
+
+	// sheen color
+
+	const materialSheenColor = new SidebarMaterialColorProperty( editor, 'sheenColor', strings.getKey( 'sidebar/material/sheencolor' ) );
+	container.add( materialSheenColor );
+
 	// transmission
 
 	const materialTransmission = new SidebarMaterialNumberProperty( editor, 'transmission', strings.getKey( 'sidebar/material/transmission' ), [ 0, 1 ] );
@@ -241,6 +256,16 @@ function SidebarMaterial( editor ) {
 	const materialIridescenceMap = new SidebarMaterialMapProperty( editor, 'iridescenceMap', strings.getKey( 'sidebar/material/iridescencemap' ) );
 	container.add( materialIridescenceMap );
 
+	// sheen color map
+
+	const materialSheenColorMap = new SidebarMaterialMapProperty( editor, 'sheenColorMap', strings.getKey( 'sidebar/material/sheencolormap' ) );
+	container.add( materialSheenColorMap );
+
+	// sheen roughness map
+
+	const materialSheenRoughnessMap = new SidebarMaterialMapProperty( editor, 'sheenRoughnessMap', strings.getKey( 'sidebar/material/sheenroughnessmap' ) );
+	container.add( materialSheenRoughnessMap );
+
 	// iridescence thickness map
 
 	const materialIridescenceThicknessMap = new SidebarMaterialMapProperty( editor, 'iridescenceThicknessMap', strings.getKey( 'sidebar/material/iridescencethicknessmap' ) );

+ 20 - 0
editor/js/Strings.js

@@ -262,6 +262,9 @@ function Strings( config ) {
 			'sidebar/material/iridescence': 'Iridescence',
 			'sidebar/material/iridescenceIOR': 'Thin-Film IOR',
 			'sidebar/material/iridescenceThicknessMax': 'Thin-Film Thickness',
+			'sidebar/material/sheen': 'Sheen',
+			'sidebar/material/sheenroughness': 'Sheen Roughness',
+			'sidebar/material/sheencolor': 'Sheen Color',
 			'sidebar/material/transmission': 'Transmission',
 			'sidebar/material/attenuationDistance': 'Attenuation Distance',
 			'sidebar/material/attenuationColor': 'Attenuation Color',
@@ -279,6 +282,8 @@ function Strings( config ) {
 			'sidebar/material/specularmap': 'Specular Map',
 			'sidebar/material/iridescencemap': 'Irid. Map',
 			'sidebar/material/iridescencethicknessmap': 'Thin-Film Thickness Map',
+			'sidebar/material/sheencolormap': 'Sheen Color Map',
+			'sidebar/material/sheenroughnessmap': 'Sheen Rough. Map',
 			'sidebar/material/envmap': 'Env Map',
 			'sidebar/material/lightmap': 'Light Map',
 			'sidebar/material/aomap': 'AO Map',
@@ -605,6 +610,12 @@ function Strings( config ) {
 			'sidebar/material/shininess': 'Brillance',
 			'sidebar/material/clearcoat': 'Vernis',
 			'sidebar/material/clearcoatroughness': 'Rugosité du vernis',
+			'sidebar/material/iridescence': 'Iridescence',
+			'sidebar/material/iridescenceIOR': 'Thin-Film IOR',
+			'sidebar/material/iridescenceThicknessMax': 'Thin-Film Thickness',
+			'sidebar/material/sheen': 'Sheen',
+			'sidebar/material/sheenroughness': 'Sheen Roughness',
+			'sidebar/material/sheencolor': 'Sheen Color',
 			'sidebar/material/transmission': 'Transmission',
 			'sidebar/material/attenuationDistance': 'Attenuation Distance',
 			'sidebar/material/attenuationColor': 'Attenuation Color',
@@ -620,6 +631,10 @@ function Strings( config ) {
 			'sidebar/material/roughnessmap': 'Texture de rugosité',
 			'sidebar/material/metalnessmap': 'Texture métallique',
 			'sidebar/material/specularmap': 'Texture spéculaire',
+			'sidebar/material/iridescencemap': 'Irid. Map',
+			'sidebar/material/iridescencethicknessmap': 'Thin-Film Thickness Map',
+			'sidebar/material/sheencolormap': 'Sheen Color Map',
+			'sidebar/material/sheenroughnessmap': 'Sheen Rough. Map',
 			'sidebar/material/envmap': 'Texture d\'environnement',
 			'sidebar/material/lightmap': 'Texture d\'éclairage',
 			'sidebar/material/aomap': 'Texture d\'occlusion ambiante',
@@ -949,6 +964,9 @@ function Strings( config ) {
 			'sidebar/material/iridescence': '彩虹色',
 			'sidebar/material/iridescenceIOR': '彩虹色折射率',
 			'sidebar/material/iridescenceThicknessMax': '彩虹色厚度',
+			'sidebar/material/sheen': 'Sheen',
+			'sidebar/material/sheenroughness': 'Sheen Roughness',
+			'sidebar/material/sheencolor': 'Sheen Color',
 			'sidebar/material/transmission': '透光',
 			'sidebar/material/attenuationDistance': '衰减距离',
 			'sidebar/material/attenuationColor': '衰减色',
@@ -966,6 +984,8 @@ function Strings( config ) {
 			'sidebar/material/specularmap': '高光贴图',
 			'sidebar/material/iridescencemap': '彩虹色贴图',
 			'sidebar/material/iridescencethicknessmap': '彩虹色厚度贴图',
+			'sidebar/material/sheencolormap': 'Sheen Color Map',
+			'sidebar/material/sheenroughnessmap': 'Sheen Rough. Map',
 			'sidebar/material/envmap': '环境贴图',
 			'sidebar/material/lightmap': '光照贴图',
 			'sidebar/material/aomap': '环境光遮蔽贴图',