浏览代码

Editor: Added attenuation, attenuation distance and thickness to SidebarMaterial. (#22208)

Mr.doob 4 年之前
父节点
当前提交
de5ab57485
共有 2 个文件被更改,包括 32 次插入11 次删除
  1. 20 5
      editor/js/Sidebar.Material.js
  2. 12 6
      editor/js/Strings.js

+ 20 - 5
editor/js/Sidebar.Material.js

@@ -120,11 +120,6 @@ function SidebarMaterial( editor ) {
 	const materialMetalness = new SidebarMaterialNumberProperty( editor, 'metalness', strings.getKey( 'sidebar/material/metalness' ), [ 0, 1 ] );
 	container.add( materialMetalness );
 
-	// transmission
-
-	const materialTransmission = new SidebarMaterialNumberProperty( editor, 'transmission', strings.getKey( 'sidebar/material/transmission' ), [ 0, 1 ] );
-	container.add( materialTransmission );
-
 	// clearcoat
 
 	const materialClearcoat = new SidebarMaterialNumberProperty( editor, 'clearcoat', strings.getKey( 'sidebar/material/clearcoat' ), [ 0, 1 ] );
@@ -135,6 +130,26 @@ function SidebarMaterial( editor ) {
 	const materialClearcoatRoughness = new SidebarMaterialNumberProperty( editor, 'clearcoatRoughness', strings.getKey( 'sidebar/material/clearcoatroughness' ), [ 0, 1 ] );
 	container.add( materialClearcoatRoughness );
 
+	// transmission
+
+	const materialTransmission = new SidebarMaterialNumberProperty( editor, 'transmission', strings.getKey( 'sidebar/material/transmission' ), [ 0, 1 ] );
+	container.add( materialTransmission );
+
+	// attenuation
+
+	const materialAttenuation = new SidebarMaterialColorProperty( editor, 'attenuation', strings.getKey( 'sidebar/material/attenuation' ) );
+	container.add( materialAttenuation );
+
+	// attenuation distance
+
+	const materialAttenuationDistance = new SidebarMaterialNumberProperty( editor, 'attenuationDistance', strings.getKey( 'sidebar/material/attenuationDistance' ) );
+	container.add( materialAttenuationDistance );
+
+	// thickness
+
+	const materialThickness = new SidebarMaterialNumberProperty( editor, 'thickness', strings.getKey( 'sidebar/material/thickness' ) );
+	container.add( materialThickness );
+
 	// vertex colors
 
 	const materialVertexColors = new SidebarMaterialBooleanProperty( editor, 'vertexColors', strings.getKey( 'sidebar/material/vertexcolors' ) );

+ 12 - 6
editor/js/Strings.js

@@ -244,13 +244,15 @@ function Strings( config ) {
 			'sidebar/material/roughness': 'Roughness',
 			'sidebar/material/metalness': 'Metalness',
 			'sidebar/material/reflectivity': 'Reflectivity',
-			'sidebar/material/sheen': 'Sheen',
-			'sidebar/material/transmission': 'Transmission',
 			'sidebar/material/emissive': 'Emissive',
 			'sidebar/material/specular': 'Specular',
 			'sidebar/material/shininess': 'Shininess',
 			'sidebar/material/clearcoat': 'Clearcoat',
 			'sidebar/material/clearcoatroughness': 'Clearcoat Roughness',
+			'sidebar/material/transmission': 'Transmission',
+			'sidebar/material/attenuation': 'Attenuation',
+			'sidebar/material/attenuationDistance': 'Attenuation Distance',
+			'sidebar/material/thickness': 'Thickness',
 			'sidebar/material/vertexcolors': 'Vertex Colors',
 			'sidebar/material/matcap': 'Matcap',
 			'sidebar/material/map': 'Map',
@@ -570,13 +572,15 @@ function Strings( config ) {
 			'sidebar/material/roughness': 'Rugosité',
 			'sidebar/material/metalness': 'Métal',
 			'sidebar/material/reflectivity': 'Reflectivity',
-			'sidebar/material/sheen': 'Éclat',
-			'sidebar/material/transmission': 'Transmission',
 			'sidebar/material/emissive': 'Émissif',
 			'sidebar/material/specular': 'Spéculaire',
 			'sidebar/material/shininess': 'Brillance',
 			'sidebar/material/clearcoat': 'Vernis',
 			'sidebar/material/clearcoatroughness': 'Rugosité du vernis',
+			'sidebar/material/transmission': 'Transmission',
+			'sidebar/material/attenuation': 'Attenuation',
+			'sidebar/material/attenuationDistance': 'Attenuation Distance',
+			'sidebar/material/thickness': 'Thickness',
 			'sidebar/material/vertexcolors': 'Couleurs aux Sommets',
 			'sidebar/material/matcap': 'Matcap',
 			'sidebar/material/map': 'Texture',
@@ -896,13 +900,15 @@ function Strings( config ) {
 			'sidebar/material/roughness': '粗糙度',
 			'sidebar/material/metalness': '金属度',
 			'sidebar/material/reflectivity': 'Reflectivity',
-			'sidebar/material/sheen': '光泽',
-			'sidebar/material/transmission': '透射',
 			'sidebar/material/emissive': '自发光',
 			'sidebar/material/specular': '高光',
 			'sidebar/material/shininess': '高光大小',
 			'sidebar/material/clearcoat': '清漆',
 			'sidebar/material/clearcoatroughness': '清漆粗糙度',
+			'sidebar/material/transmission': 'Transmission',
+			'sidebar/material/attenuation': 'Attenuation',
+			'sidebar/material/attenuationDistance': 'Attenuation Distance',
+			'sidebar/material/thickness': 'Thickness',
 			'sidebar/material/vertexcolors': '顶点颜色',
 			'sidebar/material/matcap': '材质捕获',
 			'sidebar/material/map': '贴图',